FSN#35094 nieuwe icons (flags)

svn path=/Website/trunk/; revision=31485

APPL/MLD/mld_list.inc

@@ -395,6 +395,9 @@ function mld_list (pautfunction, params)
           if (oRs("isWorkflow").Value)
             class1 += " wfstep";
 
+          class1 += " sd_"+oRs("ins_srtdiscipline_prefix").Value || "";
+          class1 += " d_"+oRs("ins_discipline_key").Value;
+
           return class1;
       }
 
@@ -514,7 +517,7 @@ function mld_list (pautfunction, params)
           return oRs("nrOrders").Value == 1 ? "1 " + L("lcl_shared_order") : oRs("nrOrders").Value + " " + L("lcl_orders");
         else
           return null;
-      }  
+      }
 
       function fncolKey(oRs)
       {
@@ -556,7 +559,7 @@ function mld_list (pautfunction, params)
         if (oRs("notitie").Value != null)
         {
           var notitietext = (oRs("notitie").Value.length > 30? oRs("notitie").Value.substr(0, 30) + "..." : oRs("notitie").Value)
-          return (outputmode == 0? L("lcl_fin_note") + ": " + toDateString(oRs("notitiedatum").Value) + "\n" + notitietext : "");
+          return (outputmode == 0? toDateTimeString(oRs("notitiedatum").Value) + ": " +  notitietext : "");
         }
         else return "";
       }
@@ -565,18 +568,28 @@ function mld_list (pautfunction, params)
       {
         var mldkey = oRs("mld_melding_key").Value;
         var flagkey = oRs("mld_melding_flag").Value || 0;
+        var ttl = L("lcl_mld_flag" + flagkey);
+        var displ = "";
 
-        var displ = flagkey||"";
-        if (!excel)  // maak er dan nog leuke plaatjes van
+        if (print)
         {
-            var flagimg = "<img id='mldflagimg"+mldkey+"' flagkey='"+flagkey+"' src='../Pictures/mldflag"+flagkey+".png'>";
+            if (flagkey != 0) displ = safe.html(ttl);  // else blijft-ie gewoon leeg
+        }
+        else if (excel)  // dan gewoon maar de code, handig groeperen
+        {
+            displ = flagkey||"";
+        }
+        else  // maak er dan nog leuke plaatjes van
+        {
+            if (flagkey == 0)
+                var flagimg = "<i id='mldflagimg"+mldkey+"' flagkey='0' class='fa fa-circle-o mldflag"+flagkey+"'>";
+            else
+                var flagimg = "<i id='mldflagimg"+mldkey+"' flagkey='"+flagkey+"' class='fa fa-circle mldflag"+flagkey+"'>";
             // Met hidden flagkey voor sortering. 999 zorgt dat bij 1 keer sorteren de gevlagde direct bovenaan staan
-            var ttl = L("lcl_mld_flag" + flagkey);
-            displ =  "<div "
-                            + ((urole == 'bo' || urole == 'fo')?"onclick='toggleFlag(event, "+ mldkey +");'":"")
-                            +" title='"+safe.htmlattr(ttl)+"'>"
-                        +flagimg
-                        +"<span style='display:none'>"+(flagkey||999)+"</span></div>";
+            displ = "<div " + ((urole == "bo" || urole == "fo") ? "onclick='toggleFlag(event, "+ mldkey +");'":"")
+                  + " title='"+safe.htmlattr(ttl)+"'>"
+                  + flagimg
+                  + "<span style='display:none'>"+(flagkey||999)+"</span></div>";
         }
         return displ;
       }
@@ -782,7 +795,7 @@ function mld_list (pautfunction, params)
                                     });
 
       if (S('mld_melding_flags') > 0 && !frontend)
-        rst.addColumn(new Column({caption: "o", content: fncolFlags, align: "center"}));
+        rst.addColumn(new Column({caption: I("fa-circle"), content: fncolFlags, align: "center"}));
       rst.addColumn(new Column({caption: "!", content: fncolSpoed, hasActions: true}));
       rst.addColumn(new Column({caption: L("lcl_mld_number"), datatype: "number", content: fncolKey }));
       if (!minfo)
@@ -891,7 +904,7 @@ if (!excel && !print)
           <td title="<%= L("lcl_mld_legenda_updated_tt") %>"><%= L("lcl_mld_legenda_updated") %></td>
         </tr>
         <tr class="expired2 updated">
-          <td title="<%= L("lcl_mld_legenda_expired2_tt") %>/<%= L("lcl_mld_legenda_updated_tt")%>"><%= L("lcl_mld_legenda_expired2") %>/<%= L("lcl_mld_legenda_updated") %></td>
+          <td title="<%= L("lcl_mld_legenda_expired2_tt") %>/<%= L("lcl_mld_legenda_updated_tt")%>"><%= L("lcl_mld_legenda_expired2") %>+<%= L("lcl_mld_legenda_updated") %></td>
         </tr>
         <tr class="unsolved">
           <td title="<%= L("lcl_mld_legenda_unsolved_tt") %>"><%= L("lcl_mld_legenda_unsolved") %></td>
@@ -910,9 +923,7 @@ if (!excel && !print)
     <%  // Vlag 0 tonen we niet
         for (var flagkey=1; flagkey < S('mld_melding_flags'); flagkey++)
         {
-            %><tr><td><img src='../Pictures/mldflag<%=flagkey%>.png'>
-                  <%=L("lcl_mld_flag"+flagkey)%></td></tr>
-            <%
+            %><tr><td><i class='fa fa-circle mldflag<%=flagkey%>'></i>&nbsp;<%=L("lcl_mld_flag"+flagkey)%></td></tr><%
         }
     %>
       </table>

APPL/MLD/mld_list.js

@@ -195,10 +195,10 @@ function setFlag(data)
 { // Zet de flag en het volgnummer van de flag.
 	var mld_key = data.mld_key;
 	var flagkey = data.newflag;
-	var flagimg = '../Pictures/mldflag'+flagkey+'.png';
+	var flagimg = 'fa fa-circle mldflag'+flagkey;
 
   $('#mldflagimg'+mld_key).attr('flagkey', flagkey);
-  $('#mldflagimg'+mld_key).attr('src', flagimg);
+  $('#mldflagimg'+mld_key).attr('class', flagimg);
   $('#mldflagimg'+mld_key).parent().attr('title', L("lcl_mld_flag" + flagkey));
   $('#mldflagimg'+mld_key).next().text(flagkey||999); // Hidden span voor sorteren
   $('#complainstable th').removeClass('sorttable_sorted sorttable_sorted_reverse'); // sortable cache't namelijk

APPL/MLD/mld_search.asp

@@ -826,7 +826,7 @@ if (!frontend && srtdisc > -1)
 <%                    }
                       else
                       {
-                        %><label for="flag<%=flagkey%>"><input type="checkbox" name="flag<%=flagkey%>" id="flag<%=flagkey%>" checked><img src='../Pictures/mldflag<%=flagkey%>.png'>&nbsp;<%=safe.html(L("lcl_mld_flag"+flagkey))%></label><br>
+                        %><label for="flag<%=flagkey%>"><input type="checkbox" name="flag<%=flagkey%>" id="flag<%=flagkey%>" checked><i class="fa fa-circle mldflag<%=flagkey%> mlds"></i>&nbsp;<%=safe.html(L("lcl_mld_flag"+flagkey))%></label><br>
 <%                    }
                     } %>
                 </td>