FSN#30200 Workflow expression editor savepoint

svn path=/Website/trunk/; revision=25598
2015-07-08 12:10:14 +00:00
parent 51cd13ae48
commit 2c04deeecf
8 changed files with 242 additions and 37 deletions
--- a/APPL/Localscripts/modal_kenmerken.js
+++ b/APPL/Localscripts/modal_kenmerken.js
@@ -76,6 +76,7 @@ function doSubmitWithKenmerken()

  // Strip alle velden er uit die niets doen. Voorkomt extreem lange querystring
  var $dk2 = $('div#dkenmmodal2'); // shortcut
+  /* Global kenmerk_waarden */
  for (var m = 0; m < kenmerk_waarden.length; m++)
  {
    if (kenmerk_waarden[m].op == 'IS NOT NULL' || kenmerk_waarden[m].op == 'IS NULL')
@@ -84,7 +85,7 @@ function doSubmitWithKenmerken()
        continue;
    if (kenmerk_waarden[m].val != '-1' && kenmerk_waarden[m].val != '' && (kenmerk_waarden[m].typ == "R" || kenmerk_waarden[m].typ == "S"))
        continue;
-    // Scrappen
+    // Schrappen
    $dk2.find("#k" + (m+1) + "val").remove();
    $dk2.find("#k" + (m+1) + "key").remove();
    $dk2.find("#k" + (m+1) + "t").remove();
@@ -97,6 +98,25 @@ function doSubmitWithKenmerken()
  $('div#dkenmmodal2').formhtml("").hide();
 }

+function kenmerkValues(n)
+{
+  if ($("#k" + n + "t").val() == "N" && $("#has_k" + n + "val").val() == 1)
+  { // Het is een checkbox
+    this.checkbox = true;
+    if ($("#k" + n + "val").prop("checked"))
+      this.val = 1;
+    else
+      this.val = 0;
+  }
+  else
+    this.val = $("#k" + n + "val").val();
+
+  this.key = $("#k" + n + "key").val();
+  this.typ = $("#k" + n + "t").val();
+  this.op = $("#ko" + n).val();
+  this.suggest = (this.typ == "S"? $("#Suggest" + "k" + n + "_show").val(): "");
+}
+
 function showKenmerkModal(purl, ptitle)
 {
  // ***** START INTERNE FUNCTIES *****
@@ -107,25 +127,6 @@ function showKenmerkModal(purl, ptitle)
  }


-  function kenmerkValues(n)
-  {
-    if ($("#k" + n + "t").val() == "N" && $("#has_k" + n + "val").val() == 1)
-    { // Het is een checkbox
-      this.checkbox = true;
-      if ($("#k" + n + "val").prop("checked"))
-        this.val = 1;
-      else
-        this.val = 0;
-    }
-    else
-      this.val = $("#k" + n + "val").val();
-
-    this.key = $("#k" + n + "key").val();
-    this.typ = $("#k" + n + "t").val();
-    this.op = $("#ko" + n).val();
-    this.suggest = (this.typ == "S"? $("#Suggest" + "k" + n + "_show").val(): "");
-  }
-
  function _doOk()
  {
    var kenmerkArray = new Array();
--- a/APPL/MLD/mld_flexkenmerk.inc
+++ b/APPL/MLD/mld_flexkenmerk.inc
@@ -261,7 +261,7 @@ function generateFlexKenmerkBlock(params)
      // Bij 'advanced' groeperen we op mld_srtkenmerk_key ipv mld_kenmerk_key
      // in de zoek-html komt uiteindelijk de srtkenmerk_key te staan
      // in getkenmerksql.inc wordt dat voor MLD weer intelligent opgepikt
-      var sql = "SELECT DISTINCT " + (advanced?"k.mld_srtkenmerk_key":"k.mld_kenmerk_key") + "  kenmerk_key, "
+      var sql = "SELECT DISTINCT " + (advanced&&!params.wfbuilder?"k.mld_srtkenmerk_key":"k.mld_kenmerk_key") + "  kenmerk_key, "
              + "k.mld_kenmerk_niveau,"
              + (Session("logging")>0?" k.mld_kenmerk_niveau || ':' ||":"") // Lettertje ervoor bij logging
              + lcl.xsql('t.mld_srtkenmerk_omschrijving', 't.mld_srtkenmerk_key') +" kenmerk_omschrijving, "
@@ -425,6 +425,8 @@ function generateFlexKenmerkBlock(params)
                    fnpost: params.fnpost,
                    mobile: params.mobile,
                    hideVervallen: newMelding||newOpdracht,
-                    niveau: kenmerk_module }
+                    niveau: kenmerk_module,
+                    wfbuilder: params.wfbuilder
+                  }
                 );
 } %>
--- a/APPL/Shared/default.csx
+++ b/APPL/Shared/default.csx
@@ -2367,6 +2367,7 @@ body#mod_resmulti div#show_date_from { height: 250px }
 #mod_mldobj .label {
    width: 220px !important;
 }
+#mod_wfexpression { width: 700px; }


 /* ==== menu styles ==== */
--- a/APPL/Shared/kenmerk_common.inc
+++ b/APPL/Shared/kenmerk_common.inc
@@ -225,6 +225,7 @@ function getDatatypeValue(table, column, checkval)
 //                 defaults { bsn: "12345678", plaats: "Enschede", postcode:"1234AB" } altijd lowercase namen
 //                 prs_key (of obsolete reqId) - key om bij defaultwaarde in ##PRS_PERSLID_KEY## te substitueren
 //                 fnpre en fnpost: functies die voor en na genereren worden aangroepen *mits er kenmerken zijn*
+//                 wfbuilder: toon ook flex-colname :f123 (voor workflow expression builder)
 //               }
 // ================================================================================================
 function listKenmerk(sql, module, key, props)
@@ -1285,6 +1286,9 @@ function listKenmerk(sql, module, key, props)
        if (makeCheckbox && props.mobile) // Zie commentaar iets verderop
            props.label_colspan = 2;

+        if (props.wfbuilder) // Workflow Expression Builder
+          kenmerk_write("<td>:flex{0}</td>".format(kkey));
+
        if (!props.mobile && !nolabel)
          kenmerk_write('<td class="label' + (ktype == 'L' || ktype == 'l'? ' flexlabel' : '')+ (kenmerk_search? ' flexsearch' : '') + '"'
                      + (props.label_colspan? ' colspan=' + props.label_colspan : '')
--- a/APPL/facmgtVB/BuildExpression.asp
+++ b/APPL/facmgtVB/BuildExpression.asp
@@ -0,0 +1,133 @@
+<%@language = "javascript" %>
+<%
+/*  $Revision$
+    $Id$
+
+    File:               mld_show_melding.asp
+    Description:        Detailscherm voor meldingen
+    Parameters:         mld_key (REQUIRED)
+                        urol (REQUIRED)
+                        verynew: optional
+    Context:
+    Note:               TODO: ik kom hier af en toe met een urole, die me eigenlijk niet zo interesseert
+                              maar mogelijk moet dat hogerop worden opgelost (mld_melding.asp)
+                              Case: na toevoegen als FE kom je terug maar zie je geen opdrachtframe omdat daar
+                                    vast op fe wordt gecheckt?
+                                    De urole is inprincipe wel nodig voor scopes die kunnen verschillen,
+                                    maar dat is in showmode niet zo wezenlijk.
+
+    Note:           De lcl-textcontextswitcher is srtdisc=ins_srtdiscipline_key
+                    Deze is dus verplicht, altijd bekend en moet bij alle
+                    lcl's worden meegegeven.
+
+*/ %>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/iface.inc" -->
+<!-- #include file="../mld/mld.inc" -->
+<!-- #include file="../mld/mld_flexkenmerk.inc" -->
+
+<%
+FCLTHeader.Requires({ plugins: ["jQuery", "suggest"],
+                      js: ["jQuery-ui.js", "modal_kenmerken.js"]
+                    })
+
+var step_key = getQParamInt("step_key");
+
+var sql = "SELECT DISTINCT mld_workflowstep_omschrijving,"
+        + "       mld_workflowstep_key,"
+        + "       ms.mld_stdmelding_omschrijving,"
+        + "       ms.mld_stdmelding_key,"
+        + "       md.ins_discipline_key,"
+        + "       md.ins_srtdiscipline_key,"
+        + "       FLOOR( (SELECT MAX(mld_srtkenmerk_key) FROM mld_srtkenmerk)/100 + 1)*100 maxclr"
+        + "  FROM mld_workflowstep ws,"
+        + "       mld_stdmelding ms,"
+        + "       mld_discipline md"
+        + " WHERE ws.mld_stdmelding_key = ms.mld_stdmelding_key"
+        + "   AND ws.mld_workflowstep_start_key IS NULL"
+        + "   AND md.ins_discipline_key = ms.mld_ins_discipline_key"
+        + "   AND ws.mld_workflowstep_key = " + step_key
+        + " ORDER BY mld_workflowstep_omschrijving";
+var oRs = Oracle.Execute(sql);
+var srtdisc_key = oRs("ins_srtdiscipline_key").Value;
+var disc_key = oRs("ins_discipline_key").Value;
+var stdm_key = oRs("mld_stdmelding_key").Value;
+oRs.Close()
+%>
+
+<html>
+  <head>
+<%
+    FCLTHeader.Generate();
+%>
+    <script  type="text/javascript" >
+        window.return_data = {};
+        function quoted_sql(tekst, maxlen) // maxlen is optioneel
+        {
+            if (tekst == null)
+                return "NULL";
+            if (!maxlen)
+                maxlen = 4000;
+            tekst = tekst.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]+/g, "?");
+            tekst = tekst.substr(0, maxlen);
+            return "'" + tekst.replace(/\'/g,"''") + "'"; // " syntax highlight correctie
+        }
+        function preview ()
+        {
+          $("#sample").html(expr_text());
+          FcltMgr.resized();
+        }
+        $(function () { $("input,select").change(preview); });
+        function expr_text()
+        {
+          var sqlarr = [];
+          var aantal_kenm = $("#k_all").val();
+          // Ingevulde waarden van de kenmerken bewaren.
+          // TODO: getKenmerkSql hier inzetten?
+          for (var n = 1; n <= aantal_kenm; n++)
+          {
+             var kw = new kenmerkValues(n);
+             var keyname = ":flex" + kw.key;
+             if (kw.op == 'IS NOT NULL' || kw.op == 'IS NULL')
+                sqlarr.push(keyname + " " + kw.op)
+             else if (kw.val && kw.typ != "R" && kw.typ != "S")
+             {
+                if (kw.op == 'LIKE' || kw.op == 'NOT LIKE')
+                    sqlarr.push("UPPER(" + keyname + ") " + kw.op + " " + quoted_sql(kw.val.toUpperCase()))
+                else
+                    sqlarr.push(keyname + " " + kw.op + " " + quoted_sql(kw.val))
+             }
+             else if (kw.val != '-1' && kw.val != '' && (kw.typ == "R" || kw.typ == "S"))
+                sqlarr.push(keyname + " " + kw.op + " " + quoted_sql(kw.val));
+          }
+          return sqlarr.join(" AND ");
+        }
+        function expr_submit()
+        {
+          window.return_data.org_data = FcltMgr.dialogArguments();
+          window.return_data.expression = expr_text();
+          FcltMgr.closeDetail(window, return_data);
+        }
+
+    </script>
+  </head>
+
+  <body class="modal" id="mod_wfexpression" >
+  <form id="wf" name="wf" method="post">
+<%
+    generateFlexKenmerkBlock({ stdm_arr      : [stdm_key],
+                               disc_arr      : [disc_key],
+                               srtdisc       : [srtdisc_key], // Srtdiscipline/Soort melding
+                               flexcolumns   : 1,
+                               closing       : 1,
+                               advanced      : true,
+                               wfbuilder     : true
+                             });
+
+      var buttons =  [ {title: L("lcl_submit"), icon: "opslaan.png", action: "expr_submit()" },
+                       {title: L("lcl_cancel"), icon: "undo.png", action: "FcltMgr.closeDetail( window )" }];
+      CreateButtons(buttons);
+%></form>
+    <div id='sample'></div>
+  </body>
+</html>
--- a/APPL/facmgtVB/mld_workflowrecord3.asp
+++ b/APPL/facmgtVB/mld_workflowrecord3.asp
@@ -6,7 +6,7 @@
 '

 '-------------------------------
-' 
+'
 ' mld_workflowrecord3 CustomIncludes Event begin
 %>
 <!-- #INCLUDE FILE="Common.asp" -->
@@ -105,16 +105,18 @@ UnloadTemplate
 '-------------------------------
 Sub WorkflowRuleRecordAction(sAction)
 '-------------------------------
-' Initialize variables  
+' Initialize variables
 '-------------------------------
  Dim bExecSQL: bExecSQL = true
  Dim sActionFileName : sActionFileName = ""
  Dim sParams : sParams = "?"
-  Dim sWhere : sWhere = "" 
+  Dim sWhere : sWhere = ""
  Dim bErr : bErr = False
  Dim pPKMLD_WORKFLOWRULE_KEY : pPKMLD_WORKFLOWRULE_KEY = ""
  Dim fldMLD_WORKFLOWRULE_OMSCHRIJVING : fldMLD_WORKFLOWRULE_OMSCHRIJVING = ""
  Dim fldMLD_WORKFLOWSTEP_NEXT_KEY : fldMLD_WORKFLOWSTEP_NEXT_KEY = ""
+  Dim fldMLD_WORKFLOWRULE_JOINTYPE : fldMLD_WORKFLOWRULE_JOINTYPE = ""
+  Dim fldMLD_WORKFLOWRULE_CONDITION : fldMLD_WORKFLOWRULE_CONDITION = ""
  Dim fldMLD_WORKFLOWSTEP_START_KEY : fldMLD_WORKFLOWSTEP_START_KEY = ""
 '-------------------------------

@@ -158,6 +160,8 @@ sParams = "?F_MLD_WORKFLOWSTEP_KEY=" & ToURL(GetParam("Trn_F_MLD_WORKFLOWSTEP_KE
 '-------------------------------
  fldMLD_WORKFLOWRULE_OMSCHRIJVING = GetParam("MLD_WORKFLOWRULE_OMSCHRIJVING")
  fldMLD_WORKFLOWSTEP_NEXT_KEY = GetParam("MLD_WORKFLOWSTEP_NEXT_KEY")
+  fldMLD_WORKFLOWRULE_JOINTYPE = GetParam("MLD_WORKFLOWRULE_JOINTYPE")
+  fldMLD_WORKFLOWRULE_CONDITION = GetParam("MLD_WORKFLOWRULE_CONDITION")
  fldMLD_WORKFLOWSTEP_START_KEY = GetParam("MLD_WORKFLOWSTEP_START_KEY")

 '-------------------------------
@@ -165,7 +169,10 @@ sParams = "?F_MLD_WORKFLOWSTEP_KEY=" & ToURL(GetParam("Trn_F_MLD_WORKFLOWSTEP_KE
 '-------------------------------
  if sAction = "insert" or sAction = "update" then
    if not isNumeric(fldMLD_WORKFLOWSTEP_NEXT_KEY) then
-      sWorkflowRuleRecordErr = sWorkflowRuleRecordErr & "De waarde in veld Volgende stap is niet correct.<br>"
+      sWorkflowRuleRecordErr = sWorkflowRuleRecordErr & "The value in field Volgende stap is incorrect.<br>"
+    end if
+    if not isNumeric(fldMLD_WORKFLOWRULE_JOINTYPE) then
+      sWorkflowRuleRecordErr = sWorkflowRuleRecordErr & "The value in field Join type is incorrect.<br>"
    end if
 '-------------------------------
 ' WorkflowRuleRecord Check Event begin
@@ -189,10 +196,14 @@ sParams = "?F_MLD_WORKFLOWSTEP_KEY=" & ToURL(GetParam("Trn_F_MLD_WORKFLOWSTEP_KE
 '-------------------------------
      sSQL = "insert into MLD_WORKFLOWRULE (" & _
          "MLD_WORKFLOWRULE_OMSCHRIJVING," & _
-          "MLD_WORKFLOWSTEP_NEXT_KEY)" & _
+          "MLD_WORKFLOWSTEP_NEXT_KEY," & _
+          "MLD_WORKFLOWRULE_JOINTYPE," & _
+          "MLD_WORKFLOWRULE_CONDITION)" & _
          " values (" & _
          ToSQL(fldMLD_WORKFLOWRULE_OMSCHRIJVING, "Text") & "," & _
-          ToSQL(fldMLD_WORKFLOWSTEP_NEXT_KEY, "Number") & _
+          ToSQL(fldMLD_WORKFLOWSTEP_NEXT_KEY, "Number") & "," & _
+          ToSQL(fldMLD_WORKFLOWRULE_JOINTYPE, "Number") & "," & _
+          ToSQL(fldMLD_WORKFLOWRULE_CONDITION, "Text") & _
          ")"
    case "update"
 '-------------------------------
@@ -201,7 +212,9 @@ sParams = "?F_MLD_WORKFLOWSTEP_KEY=" & ToURL(GetParam("Trn_F_MLD_WORKFLOWSTEP_KE
 '-------------------------------
      sSQL = "update MLD_WORKFLOWRULE set " & _
        "MLD_WORKFLOWRULE_OMSCHRIJVING=" & ToSQL(fldMLD_WORKFLOWRULE_OMSCHRIJVING, "Text") & _
-        ",MLD_WORKFLOWSTEP_NEXT_KEY=" & ToSQL(fldMLD_WORKFLOWSTEP_NEXT_KEY, "Number")
+        ",MLD_WORKFLOWSTEP_NEXT_KEY=" & ToSQL(fldMLD_WORKFLOWSTEP_NEXT_KEY, "Number") & _
+        ",MLD_WORKFLOWRULE_JOINTYPE=" & ToSQL(fldMLD_WORKFLOWRULE_JOINTYPE, "Number") & _
+        ",MLD_WORKFLOWRULE_CONDITION=" & ToSQL(fldMLD_WORKFLOWRULE_CONDITION, "Text")
      sSQL = sSQL & " where " & sWhere
    case "delete"
 '-------------------------------
@@ -247,7 +260,7 @@ sParams = "?F_MLD_WORKFLOWSTEP_KEY=" & ToURL(GetParam("Trn_F_MLD_WORKFLOWSTEP_KE
 '-------------------------------
 if len(sWorkflowRuleRecordErr) > 0 then Exit Sub
  on error resume next
-  if bExecSQL then 
+  if bExecSQL then
    cn.execute sSQL
  end if
  sWorkflowRuleRecordErr = ProcessError
@@ -284,6 +297,8 @@ Sub WorkflowRuleRecord_Show()
  else
    fldMLD_WORKFLOWRULE_OMSCHRIJVING = GetParam("MLD_WORKFLOWRULE_OMSCHRIJVING")
    fldMLD_WORKFLOWSTEP_NEXT_KEY = GetParam("MLD_WORKFLOWSTEP_NEXT_KEY")
+    fldMLD_WORKFLOWRULE_JOINTYPE = GetParam("MLD_WORKFLOWRULE_JOINTYPE")
+    fldMLD_WORKFLOWRULE_CONDITION = GetParam("MLD_WORKFLOWRULE_CONDITION")
    SetVar "Trn_F_MLD_WORKFLOWSTEP_KEY", GetParam("Trn_F_MLD_WORKFLOWSTEP_KEY")
    SetVar "Trn_MLD_WORKFLOWSTEP_KEY", GetParam("Trn_MLD_WORKFLOWSTEP_KEY")
    pMLD_WORKFLOWRULE_KEY = GetParam("PK_MLD_WORKFLOWRULE_KEY")
@@ -296,6 +311,7 @@ Sub WorkflowRuleRecord_Show()
 '-------------------------------
 ' Load all form fields

+  fldExprBuilder = GetParam("ExprBuilder")
  fldMLD_WORKFLOWSTEP_START_KEY = GetParam("MLD_WORKFLOWSTEP_START_KEY")
 '-------------------------------

@@ -303,7 +319,7 @@ Sub WorkflowRuleRecord_Show()
 ' Build WHERE statement

  if IsEmpty(pMLD_WORKFLOWRULE_KEY) then bPK = False
-  
+
  sWhere = sWhere & "MLD_WORKFLOWRULE_KEY=" & ToSQL(pMLD_WORKFLOWRULE_KEY, "Number")
  SetVar "PK_MLD_WORKFLOWRULE_KEY", pMLD_WORKFLOWRULE_KEY
 '-------------------------------
@@ -341,6 +357,8 @@ end if
    if sWorkflowRuleRecordErr = "" then
      fldMLD_WORKFLOWRULE_OMSCHRIJVING = GetValue(rs, "MLD_WORKFLOWRULE_OMSCHRIJVING")
      fldMLD_WORKFLOWSTEP_NEXT_KEY = GetValue(rs, "MLD_WORKFLOWSTEP_NEXT_KEY")
+      fldMLD_WORKFLOWRULE_JOINTYPE = GetValue(rs, "MLD_WORKFLOWRULE_JOINTYPE")
+      fldMLD_WORKFLOWRULE_CONDITION = GetValue(rs, "MLD_WORKFLOWRULE_CONDITION")
    end if
    SetVar "WorkflowRuleRecordInsert", ""
    Parse "WorkflowRuleRecordEdit", False
@@ -374,6 +392,8 @@ sqlNextKeys = "select w.mld_workflowstep_key, "&_
              "  and w.mld_workflowstep_start_key = " & ToSQL(fldMLD_WORKFLOWSTEP_START_KEY, "Number")


+fldExprBuilder= "<input type=button onClick=""Uitdrukking("&GetParam("MLD_WORKFLOWSTEP_KEY")&");return false;"" NAME='pick' ID='pick' value=""Uitdrukking""></input>"
+
 fldMLD_WORKFLOWSTEP_KEY = getWorkflowStepOmschr(fldMLD_WORKFLOWSTEP_KEY)

 if fldMLD_WORKFLOWRULE_RESULT = "1" then
@@ -401,7 +421,10 @@ end if
        rsMLD_WORKFLOWSTEP_NEXT_KEY.MoveNext
      wend
      set rsMLD_WORKFLOWSTEP_NEXT_KEY = nothing
-    
+
+      SetVar "MLD_WORKFLOWRULE_JOINTYPE", ToHTML(fldMLD_WORKFLOWRULE_JOINTYPE)
+      SetVar "MLD_WORKFLOWRULE_CONDITION", ToHTML(fldMLD_WORKFLOWRULE_CONDITION)
+      SetVar "ExprBuilder", fldExprBuilder
      SetVar "MLD_WORKFLOWSTEP_START_KEY", ToHTML(fldMLD_WORKFLOWSTEP_START_KEY)
  Parse "FormWorkflowRuleRecord", False

--- a/APPL/facmgtVB/mld_workflowrecord3.html
+++ b/APPL/facmgtVB/mld_workflowrecord3.html
@@ -12,7 +12,17 @@
  <tr>
   <td valign="top">
   <!--BeginFormWorkflowRuleRecordHeader-->
-   
+   <script>
+  function Uitdrukking(step_key)
+  {
+    parent.FcltMgr.openModalDetail("../facmgtvb/BuildExpression.asp?step_key=" + step_key, "Uitdrukking",
+                { callback: function (data)
+                        { if (data.expression)
+                             $("textarea[name=MLD_WORKFLOWRULE_CONDITION]").val(data.expression);
+                        }
+                } );
+  }
+</script>
   <!--EndFormWorkflowRuleRecordHeader-->
   <!--BeginFormWorkflowRuleRecord-->
   <form method="POST" action="{FileName}" name="WorkflowRuleRecord">
@@ -51,6 +61,21 @@
      <td class="DataTD"><select name="MLD_WORKFLOWSTEP_NEXT_KEY"><!--BeginWorkflowRuleRecordLBMLD_WORKFLOWSTEP_NEXT_KEY--><option value="{ID}" {Selected}>{Value}</option><!--EndWorkflowRuleRecordLBMLD_WORKFLOWSTEP_NEXT_KEY--></select></td>
     </tr>
     
+     <tr>
+      <td class="FieldCaptionTD"><font class="FieldCaptionFONT">Join type</font></td>
+      <td class="DataTD"><textarea name="MLD_WORKFLOWRULE_JOINTYPE" cols="80" rows="">{MLD_WORKFLOWRULE_JOINTYPE}</textarea></td>
+     </tr>
+     
+     <tr>
+      <td class="FieldCaptionTD"><font class="FieldCaptionFONT">Voorwaarde</font></td>
+      <td class="DataTD"><textarea name="MLD_WORKFLOWRULE_CONDITION" cols="80" rows="">{MLD_WORKFLOWRULE_CONDITION}</textarea></td>
+     </tr>
+     
+     <tr>
+      <td class="FieldCaptionTD"><font class="FieldCaptionFONT">Uitdrukking</font></td>
+      <td class="DataTD"><font class="DataFONT">{ExprBuilder}&nbsp;</font></td>
+     </tr>
+     
     <tr>
      <td colspan="2" align="right">

--- a/APPL/facmgtVB/workflow_overview.asp
+++ b/APPL/facmgtVB/workflow_overview.asp
@@ -79,6 +79,7 @@ function makeOverview()
      var pad = 'ffffff';
      var desc;
      var outp = "<table><tr>";
+      var allkenmerken = {};

      var sql = "SELECT DISTINCT mld_workflowstep_omschrijving,"
              + "       mld_workflowstep_key,"
@@ -148,14 +149,17 @@ function makeOverview()
                  + " ORDER BY mld_kenmerk_volgnummer";

         var oRs1 = Oracle.Execute(sql1);
-         desc += "<table><tr class='hdr'><th>nr</th><th>kenmerk</th><th>grp</th><th>verpl</th><th>ntw</th><th>niv</th></tr>";
+         desc += "<table><tr class='hdr'><th>key</th><th>nr</th><th>kenmerk</th><th>grp</th><th>verpl</th><th>ntw</th><th>niv</th></tr>";
         while (!oRs1.Eof)
         {
+            allkenmerken[oRs1("mld_kenmerk_key").value] = oRs1("mld_srtkenmerk_omschrijving").Value;
            if (colorise != -1) {
               clr = Math.round(oRs1("mld_srtkenmerk_key").value / maxClr * 255*255*255).toString(16);
               clr = pad.substring(0, pad.length - clr.length) + clr;
            }
-            desc += "<tr class='sk sk"+oRs1("mld_srtkenmerk_key").value+"' style='background-color: #"+clr+";'><td class='nr'>"+oRs1("mld_kenmerk_volgnummer").Value+"</td>"
+            desc += "<tr class='sk sk"+oRs1("mld_srtkenmerk_key").value+"' style='background-color: #"+clr+";'>"
+                  + "<td class='nr'>"+oRs1("mld_kenmerk_key").Value+"</td>"
+                  + "<td class='nr'>"+oRs1("mld_kenmerk_volgnummer").Value+"</td>"
                  + "<td>"+oRs1("mld_srtkenmerk_omschrijving").Value+"</td>"
                  + "<td class='nr'>"+(oRs1("mld_kenmerk_groep").Value>=1?oRs1("mld_kenmerk_groep").Value:"")+"</td>"
                  + "<td class='nr'>"+(oRs1("mld_kenmerk_verplicht").Value>=1?oRs1("mld_kenmerk_verplicht").Value:"")+"</td>"
@@ -171,9 +175,11 @@ function makeOverview()
         oRs.MoveNext();
      }

-      for (i=0;i<10;i++) {
+
+      for (i=0;i<10;i++) { // Maximaal 10 stappen?
         var sql = "SELECT DISTINCT ws.mld_workflowstep_key,"
                 + "       ws.mld_workflowstep_omschrijving,"
+                 + "       wr.mld_workflowrule_condition,"
                 + "       ms.mld_stdmelding_omschrijving,"
                 + "       ms.mld_stdmelding_key,"
                 + "       md.ins_discipline_key,"
@@ -199,6 +205,8 @@ function makeOverview()
            {
               keys.push(oRs("mld_workflowstep_key").Value );
               desc = "<p><b>"+oRs("mld_workflowstep_omschrijving").Value+"</b><br/>("+oRs("mld_stdmelding_omschrijving").Value+")</p>";
+               var condition = oRs("mld_workflowrule_condition").Value;
+               var condition_friendly_safe = condition || "";

               var sql1 = "   SELECT mkm.mld_kenmerk_key,"
                        + "          mkm.mld_kenmerk_niveau,"
@@ -248,6 +256,7 @@ function makeOverview()
               desc += "<table><tr class='hdr'><th>nr</th><th>kenmerk</th><th>grp</th><th>verpl</th><th>ntw</th><th>niv</th></tr>";
               while (!oRs1.Eof)
               {
+                  allkenmerken[oRs1("mld_kenmerk_key").value] = oRs1("mld_srtkenmerk_omschrijving").Value;
                  if (colorise != -1) {
                     clr = Math.round(oRs1("mld_srtkenmerk_key").value / maxClr * 255*255*255).toString(16);
                     clr = pad.substring(0, pad.length - clr.length) + clr;
@@ -262,8 +271,15 @@ function makeOverview()
                  oRs1.MoveNext();
               }
               desc +="</table>";
+               if (condition)
+               {
+                  for (var key in allkenmerken)
+                    condition_friendly_safe = condition_friendly_safe.replace(new RegExp(":flex" + key, 'g'), "<em>" + safe.html(allkenmerken[key]) + "</em>");

-               outp += "<td style='vertical-align:top'>"+desc+"</td>";
+                  desc = "<strong>WHEN:</strong> " + safe.html(condition) + "<br><strong>FRIENDLY:</strong> " + condition_friendly_safe + "<br>" + desc
+                }
+
+               outp += "<td style='vertical-align:top'>"+ desc+"</td>";
               oRs.MoveNext();
            }
         }