[Echobase-commits] 01/01: Toggle visibility between voyages and morings

23 Jun 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/8180 in repository echobase.

See https://gitlab.nuiton.org/codelutin/echobase.git

commit 6c3b2f16d32e1c9f5632a794d1a9d7a467977053
Author: Julien Ruchaud <julien.ruchaud@debux.org>
Date:   Thu Jun 23 16:58:28 2016 +0200

    Toggle visibility between voyages and morings
---
 .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp     | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp
index de7f095..963c214 100644
--- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp
+++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp
@@ -112,7 +112,6 @@
           
           $('#voyageDetail').show();
           $('#mooringDetail').hide();
-          $('#importLogDetail').show();
         }
       });
     return false;
@@ -134,7 +133,6 @@
           
           $('#voyageDetail').hide();
           $('#mooringDetail').show();
-          $('#importLogDetail').show();
         }
       });
     return false;
@@ -184,24 +182,24 @@
   jQuery(document).ready(function () {
     toggleTab();
     
-    var lastEntityId = null;
-    
     // display voyage infos
-    $.addRowSelectTopic('voyages', function () {
+    $.addRowSelectTopic('voyages', function (event) {
       var voyageId = $("tr[aria-selected=true] td[aria-describedby='voyages_id']").text();
-      if (lastEntityId !== voyageId) {
-        loadVoyageDetail(voyageId);
+      loadVoyageDetail(voyageId);
+      
+      if (event.originalEvent.iCol === 1 || event.originalEvent.cellcontent === "<ul></ul>") {
+        $('#importLogDetail').hide();
       }
-      lastEntityId = voyageId;
     });
 
     // display mooring infos
-    $.addRowSelectTopic('moorings', function () {
+    $.addRowSelectTopic('moorings', function (event) {
       var mooringId = $("tr[aria-selected=true] td[aria-describedby='moorings_id']").text();
-      if (lastEntityId !== mooringId) {
-        loadMooringDetail(mooringId);
+      loadMooringDetail(mooringId);
+      
+      if (event.originalEvent.iCol === 1 || event.originalEvent.cellcontent === "<ul></ul>") {
+        $('#importLogDetail').hide();
       }
-      lastEntityId = mooringId;
     });
   });
 </script>

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Echobase-commits] 01/01: Toggle visibility between voyages and morings

codelutin.com scm