FSN#38470 TD's van hamburgers en flags in overzichten klikbaar gemaakt

svn path=/Website/trunk/; revision=37805
2018-04-30 13:56:32 +00:00
parent 05acdc966d
commit 280038c13f
7 changed files with 37 additions and 8 deletions
--- a/APPL/BES/opdr_list.inc
+++ b/APPL/BES/opdr_list.inc
@@ -114,6 +114,11 @@ function opdr_list (pautfunction, params)
    <head>
 <%    FCLTHeader.Generate({ outputmode: outputmode }); %>
      <script type="text/javascript">
+
+        $(function() {
+          $(".clickParent").parent().on("click", function(e) { e.stopPropagation(); $(this).find("> .clickParent").trigger("click"); });
+        });
+
        // Text strings used by bes_list.js
        urole = "<%=urole%>";
        bes_bestelopdr_prefix = "<%=S("bes_bestelopdr_prefix")%>";
@@ -349,7 +354,7 @@ function opdr_list (pautfunction, params)
        {
            var flagIcon = flagkey == 0 ? "fa-circle-o" : "fa-circle";
            // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
-            displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleBesopdrFlag(event, "+ bestelopdr_key +");'":"")
+            displ = "<div class='clickParent' " + ((urole == "bo" || urole == "fo") ? "onclick='toggleBesopdrFlag(event, "+ bestelopdr_key +");'":"")
                  + " title='"+safe.htmlattr(ttl)+"'>"
                  + "<i id='besopdrflagimg"+bestelopdr_key+"' flagkey='"+flagkey+"' class='fa "+flagIcon+" besopdrflag"+flagkey+"'></i>"
                  + "<span style='display:none'>"+(flagkey||999)+"</span></div>";
--- a/APPL/BEZ/bez_list.inc
+++ b/APPL/BEZ/bez_list.inc
@@ -195,6 +195,11 @@ function bez_list(pautfunction, params)
        FCLTHeader.Generate({ outputmode: outputmode });
 %>
  <script type="text/javascript">
+
+    $(function() {
+      $(".clickParent").parent().on("click", function(e) { e.stopPropagation(); $(this).find("> .clickParent").trigger("click"); });
+    });
+
    urole = "<%=urole%>";
    contactonly = <%=params.contactonly?1:0%>;
    var todayString = "<%=toDateString(new Date())%>";
@@ -1045,7 +1050,7 @@ function bez_list(pautfunction, params)
        {
            var flagIcon = flagkey == 0 ? "fa-circle-o" : "fa-circle";
            // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
-            displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleBezFlag(event, "+ afspr_key +", "+ bez_key +");'":"")
+            displ = "<div class='clickParent' " + ((urole == "bo" || urole == "fo") ? "onclick='toggleBezFlag(event, "+ afspr_key +", "+ bez_key +");'":"")
                  + " title='"+safe.htmlattr(ttl)+"'>"
                  + "<i id='bezflagimg"+bez_key+"' flagkey='"+flagkey+"' class='fa "+flagIcon+" bezflag"+flagkey+"'></i>"
                  + "<span style='display:none'>"+(flagkey||999)+"</span></div>";
--- a/APPL/FIN/fin_list.inc
+++ b/APPL/FIN/fin_list.inc
@@ -115,6 +115,10 @@ function fin_list (params)
      FCLTHeader.Generate({ outputmode: outputmode });
 %>
 <script>
+
+        $(function() {
+          $(".clickParent").parent().on("click", function(e) { e.stopPropagation(); $(this).find("> .clickParent").trigger("click"); });
+        });
 /*
          function scf_reload (json)
          {
@@ -924,7 +928,7 @@ function fin_list (params)
        {
            var flagIcon = flagkey == 0 ? "fa-circle-o" : "fa-circle";
            // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
-            displ = "<div onclick='toggleFlag(event, "+ finkey +");'"
+            displ = "<div class='clickParent' onclick='toggleFlag(event, "+ finkey +");'"
                  + " title='"+safe.htmlattr(ttl)+"'>"
                  + "<i id='finflag"+finkey+"' flagkey='"+flagkey+"' class='fa "+flagIcon+" finflag"+flagkey+"'></i>"
                  + "<span style='display:none'>"+(flagkey||999)+"</span></div>";
--- a/APPL/Localscripts/resultset_table_v2.js
+++ b/APPL/Localscripts/resultset_table_v2.js
@@ -234,8 +234,8 @@ function initActions(tableID, hambType)
                if (hambType == 1) // Hamburger onClick
                {
                    $("#" + tableID)
-                                .on('click', '.hamburger', showHamburgerActions)
-                                .on('click', '.hamburger', FcltMgr.stopPropagation);
+                                .on('click', '.hambCont', showHamburgerActions)
+                                .on('click', '.hambCont', FcltMgr.stopPropagation);
                }
                else if (hambType == 2) // Hamburger onMouseOver
                {
--- a/APPL/MLD/mld_list.inc
+++ b/APPL/MLD/mld_list.inc
@@ -746,7 +746,7 @@ function mld_list (pautfunction, params)
        {
            var flagIcon = flagkey == 0 ? "fa-circle-o" : "fa-circle";
            // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
-            displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleMldFlag(event, "+ mldkey +");'":"")
+            displ = "<div class='clickParent' " + ((urole == "bo" || urole == "fo") ? "onclick='toggleMldFlag(event, "+ mldkey +");'":"")
                  + " title='"+safe.htmlattr(ttl)+"'>"
                  + "<i id='mldflagimg"+mldkey+"' flagkey='"+flagkey+"' class='fa "+flagIcon+" mldflag"+flagkey+"'></i>"
                  + "<span style='display:none'>"+(flagkey||999)+"</span></div>";
@@ -1065,6 +1065,11 @@ if (!excel && !print)
 {%>
      <!-- LEGENDA  -->
    <script type="text/javascript">
+
+        $(function() {
+          $(".clickParent").parent().on("click", function(e) { e.stopPropagation(); $(this).find("> .clickParent").trigger("click"); });
+        });
+
        function openLegenda()
        {
            params = { width: 250,
--- a/APPL/MLD/opdr_list.inc
+++ b/APPL/MLD/opdr_list.inc
@@ -579,7 +579,7 @@ function opdr_list(params)
        {
            var flagIcon = flagkey == 0 ? "fa-circle-o" : "fa-circle";
            // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
-            displ = "<div" + ((urole == "bo" || urole == "fo") ? " onclick='toggleOpdrFlag(event, "+ opdrkey +");'":"")
+            displ = "<div class='clickParent' " + ((urole == "bo" || urole == "fo") ? "onclick='toggleOpdrFlag(event, "+ opdrkey +");'":"")
                  + " title='"+safe.htmlattr(ttl)+"'>"
                  + "<i id='opdrflag"+opdrkey+"' flagkey='"+flagkey+"' class='fa "+flagIcon+" opdrflag"+flagkey+"'></i>"
                  + "<span style='display:none'>"+(flagkey||999)+"</span></div>";
@@ -730,6 +730,11 @@ function opdr_list(params)
 %>
      <!-- LEGENDA  -->
      <script type="text/javascript">
+
+        $(function() {
+          $(".clickParent").parent().on("click", function(e) { e.stopPropagation(); $(this).find("> .clickParent").trigger("click"); });
+        });
+
        function openLegenda()
        {
            params = { width: 250,
--- a/APPL/RES/res_list.inc
+++ b/APPL/RES/res_list.inc
@@ -210,6 +210,11 @@ function res_list (pautfunction, params)
      FCLTHeader.Generate({ outputmode: outputmode });
 %>
      <script type="text/javascript">
+
+        $(function() {
+          $(".clickParent").parent().on("click", function(e) { e.stopPropagation(); $(this).find("> .clickParent").trigger("click"); });
+        });
+
        var urole = "<%=urole%>";
        var groupres = "<%=groupres%>";
        var user_naam = "<%=safe.jsstring(user.naam())%>";
@@ -246,7 +251,7 @@ function res_list (pautfunction, params)
        else
            var flagimg = "<i id='resflagimg"+reskey+"' flagkey='"+flagkey+"' class='fa fa-circle resflag"+flagkey+"'>";
        // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
-        displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleResFlag(event, "+ reskey +");'":"")
+        displ = "<div class='clickParent' " + ((urole == "bo" || urole == "fo") ? "onclick='toggleResFlag(event, "+ reskey +");'":"")
              + " title='"+safe.htmlattr(ttl)+"'>"
              + flagimg
              + "<span style='display:none'>"+(flagkey||999)+"</span></div>";