FSN#35338 Bevindingen beheerschermen 2016.1

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

APPL/API2/model_bes_kenmerkbestel.inc

@@ -39,6 +39,7 @@ function model_bes_kenmerkbestel()
             "dbs": "bes_srtinstallatie_key",
             "label": L("bes_ins_discipline_key"),
             "typ": "key",
+            "required": true,
             "insertonly": true,
             "foreign": {
                 "tbl": "bes_v_aanwezigdiscipline",
@@ -65,7 +66,7 @@ function model_bes_kenmerkbestel()
             },
             "filter": "exact",
             "defaultvalue": null,
-            "LOVinit": ""
+            "emptyoption": null
         },
         "level": {
             "dbs": "bes_kenmerk_niveau",

APPL/API2/model_cad_legendawaarde.inc

@@ -95,8 +95,10 @@ function model_cad_legendawaarde()
     function fnshowcolor(oRs)
     {   // Tonen van gekleurde blokjes bij de waarde in de lijst.
         var kleur = (oRs.Fields("rgb").Value).replace(/ /g, "");
-
+        var result = "<span style='width:50px; float:left; display:inline'>"
-        return "<div style='width:20px; background-color:#" + safe.html(kleur) + "'><span style='padding-left:25px'>" + safe.html(kleur) + "</span></div>";
+                   + "<div style='width:20px; background-color:#" + safe.html(kleur) + "'>"
+                   + "<div style='padding-left:25px'>" + safe.html(kleur) + "</div></div></span>"
+        return result;
     }
 
     this.hook_pre_edit = function (obj, fld)

APPL/API2/model_fac_srtnotificatie.inc

@@ -31,13 +31,13 @@ function model_fac_srtnotificatie()
             "required": true,
             "filter": "exact"
         },
-        "code": {
+        "name": {
             "dbs": "fac_srtnotificatie_code",
             "label": L("fac_srtnotificatie_code"),
             "typ": "varchar",
             "insertonly": true
         },
-        "name": {
+        "description": {
             "dbs": "fac_srtnotificatie_oms",
             "label": L("fac_srtnotificatie_oms"),
             "typ": "memo",
@@ -67,7 +67,7 @@ function model_fac_srtnotificatie()
         },
         "notification_mode": {
             "dbs": "fac_srtnotificatie_mode",
-            "label": L("fac_srtnotificatie_mode"),
+            "label": "",
             "typ": "number",
             "bits": [
                 {

APPL/API2/model_mld_behandelgroep.inc

@@ -39,6 +39,7 @@ function model_mld_behandelgroep()
             "dbs": "mld_behandelgroep_naam",
             "label": L("mld_behandelgroep_naam"),
             "typ": "varchar",
+            "required": true,
             "translate": true
         },
         "description": {

APPL/API2/model_mld_dienstpakket.inc

@@ -35,9 +35,20 @@ function model_mld_dienstpakket()
         "level": {
             "dbs": "mld_dienstniveau_key",
             "label": L("mld_dienstniveau_omschr"),
-            "typ": "key"
+            "typ": "key",
+            "foreign": {
+                "tbl": "mld_dienstniveau",
+                "key": "mld_dienstniveau_key",
+                "desc": "mld_dienstniveau_omschr"
+            }
         },
-        "call": {
+        "_catalog": {
+            "dbs": "vakgroep_key", // dummy tabel/veld voor aanmaken met ext_sql
+            "label": L("mld_discipline"),
+            "typ": "key",
+            "foreign": "MLD_DISCIPLINE"
+        },
+        "issuetype": {
             "dbs": "mld_stdmelding_key",
             "label": L("lcl_mld_stdmelding"),
             "typ": "key",
@@ -54,23 +65,46 @@ function model_mld_dienstpakket()
                      + "  order by 2)",
                 "key": "mld_stdmelding_key",
                 "desc": "full_description"
-            }
+            },
+            "multiselect": true
         }
     };
 
     this.list = {
         "columns": [
             "id",
-            "call"
+            "issuetype"
         ]
     };
 
     this.edit = {
-        "modal": true
+        "modal": true,
+        "requires": {
+            "js": ["../mgt/mld_dienstpakket.js"]
+        }
     };
 
 
-    this.REST_GET    = generic_REST_GET(this);
+function fn_ext_sql()
+{
+         var ext_sql = "(SELECT sd.ins_srtdiscipline_key  vakgroeptype_key"
+                     + "      , sd.ins_srtdiscipline_prefix || '-' ||"
+                     + "        td.ins_discipline_omschrijving  vakgroeptype_oms"
+                     + "   FROM ins_srtdiscipline sd"
+                     + "      , ins_tab_discipline td"
+                     + "  WHERE sd.ins_srtdiscipline_key = td.ins_srtdiscipline_key"
+                     + "    AND td.ins_discipline_verwijder IS NULL"
+                     + "  ORDER BY 2) srtdisc"
+    var ext_sql = "(SELECT 1 vakgroep_key FROM DUAL) vakgroep";
+
+    return ext_sql;
+}
+
+    this.REST_GET    = generic_REST_GET(this, {
+        "GET": {
+            "table": [ fn_ext_sql() ]
+        }
+    });
     this.REST_POST   = generic_REST_POST(this);
     this.REST_DELETE = generic_REST_DELETE(this);
     // Gegevens mogen niet gewijzigd worden.

APPL/API2/model_mld_srtdiscipline.inc

@@ -75,7 +75,6 @@ function model_mld_srtdiscipline()
             "dbs": "ins_srtdiscipline_kostenklant",
             "label": L("ins_srtdiscipline_kostenklant"),
             "typ": "key",
-            "translate": true,
             "defaultvalue": "0",
             "LOV": L("ins_srtdiscipline_kostenklantLOV"),
             "emptyoption": null

APPL/API2/model_persons.inc

@@ -38,7 +38,7 @@ model_persons =
              "lastname"  : { dbs: "prs_perslid_naam",      "label": L("lcl_prs_person_name"),     typ: "varchar",       filter: "like"},
              "firstname" : { dbs: "prs_perslid_voornaam",  "label": L("lcl_prs_person_voornaam"), typ: "varchar",       filter: "like"},
              "mail"      : { dbs: "prs_perslid_email",     "label": L("lcl_prs_person_email"),    typ: "varchar",       filter: "exact"},
-             "login"     : { dbs: "prs_perslid_oslogin",   "label": L("lcl_prs_person_login"),    typ: "varchar",       filter: "exact"},
+             "login"     : { dbs: "prs_perslid_oslogin",   "label": L("lcl_prs_person_login"),    typ: "varchar",       filter: "like"},
              "department": { dbs: "prs_afdeling_key",      "label": L("lcl_prs_organisatie"),     typ: "key",           foreign: "prs_afdeling"},
              "company":    { dbs: "prs_v_afdeling.prs_bedrijf_key",              "label": L("lcl_prs_company"),        typ: "key",   foreign: "prs_bedrijf"},
              "location"  : { dbs: "prs_v_werkplek_gegevens.alg_locatie_key",     "label":   L("lcl_location"),  typ: "key", foreign: "alg_locatie", filter: "exact"},

APPL/MGT/cnt_discipline.asp

@@ -27,8 +27,10 @@ scaffolding(this_model,
         },
         "list": {
             "columns": [
+                "id",
                 "name",
-                "costtype"
+                "costtype",
+                "invoice_type"
             ]
         },
         "edit": {

APPL/MGT/fac_functie.asp

@@ -54,14 +54,15 @@
                     //"module",
                     "name",
                     "description",
+                    "info",
                     "discipline"
-                  ],
+                ],
                 "orderby": [
                     "module",
                     "_sorter",
                     "name",
                     "description"
-                 ],
+                ],
                 "fnRowData": fnrowData,
                 "requires": {
                   js: ["./fac_functie.js"]

APPL/MGT/fac_srtnotificatie.asp

@@ -22,16 +22,16 @@ scaffolding(this_model,
         "search": {
             "autosearch": true,
             "filters": [
+                "description",
                 "name",
-                "code",
                 "xmlnode"
             ]
         },
         "list": {
             "columns": [
                 "xmlnode",
-                "code",
                 "name",
+                "description",
                 "notification_mode",
                 "mode_status",
                 "mode_email",

APPL/MGT/mrk_discipline.asp

@@ -28,6 +28,9 @@ scaffolding(this_model,
                 "id",
                 "name"
             ]
+        },
+        "edit": {
+            "modal": true
         }
     });
 %>

APPL/MLD/mld_stddienst.asp

@@ -0,0 +1,81 @@
+<%@language = "javascript" %>
+<% /*
+     $Revision$
+     $Id$
+
+     File:          mld_stddienst.asp
+     Description:   Voeg een dienstniveau toe aan de geselecteerde standardmeldingen.
+     Parameters:    std_key    StandaardMelding array (keys)
+     Context:       Vanuit overzicht meldingen via bulk-actie
+
+*/
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/iface.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="../Shared/selector.inc" -->
+<%
+FCLTHeader.Requires({ plugins: ["jQuery"],
+                      js: ["jQuery-ui.js"]
+                    });
+var std_key_arr = getQParamIntArray("std_key");
+
+var TransitParam = buildTransitParam(["std_key"]);
+
+%>
+<html>
+  <head>
+<%  FCLTHeader.Generate(); %>
+      <script>
+
+        function mld_cancel()
+        {
+            FcltMgr.closeDetail(window, { cancel: true } );
+        }
+
+        function mld_submit()
+        {
+          if (!validateForm("stddienstform"))
+            return false;
+
+          $.post($("form[name=stddienstform]")[0].action,
+                 $("[name=stddienstform]").serialize(),
+                 FcltCallbackClose
+                 , "json");
+          return true; // disable button
+        }
+
+      </script>
+  </head>
+
+  <body class="modal" id="mod_mldstddienst">
+
+    <form id="stddienstform" name="stddienstform" action="mld_stddienst_save.asp?x=x<%=TransitParam%>" method="post">
+<%
+
+      BLOCK_START("mldClose", L("mld_dienstpakket"));
+
+        var sql = "SELECT mld_dienstniveau_key"
+                + "     , mld_dienstniveau_omschr"
+                + "  FROM mld_dienstniveau"
+                + " ORDER BY 2";
+        FCLTselector("dienst_key",
+                     sql,
+                     { label: L("lcl_mld_dienst_niveau"),
+                       initKey: -1,
+                       required: true,
+                       emptyOption: ""
+                     }
+                    );
+
+      BLOCK_END();
+
+      var buttons = [];
+      buttons.push({title: L("lcl_submit"), icon: "accept.png", action: "mld_submit()", singlepress: true, id: "btn_save_submit"  })
+      buttons.push({title: L("lcl_cancel"), icon: "cancel.png", action: "mld_cancel()" });
+      CreateButtons(buttons);
+IFACE.FORM_END();
+%>
+    </form>
+  </body>
+</html>

APPL/MLD/mld_stddienst_save.asp

@@ -0,0 +1,54 @@
+<%@language = "javascript" %>
+<% /*
+     $Revision$
+     $Id$
+
+     Accepteer een melding door FO (alleen direct na invoer) of BO (vanuit lijst of expliciet)
+     Zet de huidige user (die kennelijk dus een behandelaar kan zijn) direct als de behandelaar.
+     Deze eerste behandelaar wordt vooralsnog niet expliciet getrackt, dat wordt geimpliceerd
+     door het accepteren
+
+     File:          mld_stddienst_save.asp
+     Description:   Sla de geselecteerde standardmeldingen op bij een dienstniveau.
+                    Dit is een dienstpakket.
+     Parameters:    std_key      StandaardMelding array (keys)
+                    dienst_key   Dienstniveau key
+     Context:
+
+*/ %>
+
+<%
+var JSON_Result = true;
+%>
+
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<%
+protectRequest.validateToken();
+var std_key_arr = getQParamIntArray("std_key");
+var dienst_key  = getFParamInt("dienst_key");
+
+for (var i=0; i<std_key_arr.length; i++)
+{
+    var sql_t = "SELECT COUNT(*) aantal"
+              + "  FROM mld_dienstpakket"
+              + " WHERE mld_dienstniveau_key = " + dienst_key
+              + "   AND mld_stdmelding_key = " + std_key_arr[i];
+    var oRs_t = Oracle.Execute(sql_t);
+    if (oRs_t("aantal").Value == 0)
+    {
+        var sql_i = "INSERT INTO mld_dienstpakket"
+                  + " ( mld_dienstniveau_key"
+                  + " , mld_stdmelding_key"
+                  + " ) VALUES"
+                  + " (" + dienst_key
+                  + " ," + std_key_arr[i]
+                  + " )";
+        Oracle.Execute(sql_i);
+    }
+    oRs_t.Close();
+}
+
+var result = {success: true, message: "", key: std_key_arr.join(",")};
+Response.Write(JSON.stringify(result));
+%>

APPL/MLD/mld_stdmelding_search.asp

@@ -19,7 +19,9 @@
 <!-- #include file="../Shared/kenmerk_beheer.inc" -->
 
 <%
-FCLTHeader.Requires({ plugins:["jQuery"]});
+FCLTHeader.Requires({ plugins: ["jQuery"],
+                      js: ["jQuery-ui.js"]
+                    });
 
 var authparams = user.checkAutorisation("WEB_MLDMGT");
 

APPL/MLD/mld_stdmelding_search_list.asp

@@ -41,6 +41,16 @@ var authparams = user.checkAutorisation("WEB_MLDMGT");
           var url = "appl/mld/mld_stdmelding.asp?<%=(simple>0?"simple=1&":"")%>stdm_key=" + stdm_key;
           FcltMgr.openDetail(url, "<%=L("lcl_mld_standaardmelding")%> " + stdm_key);
         }
+
+        function mkm_dienstniveau(rowArray, isMulti)
+        {
+          var stdKeyString = getKeyString(rowArray);
+          var stdUrl = "../mld/mld_stddienst.asp?std_key=" + stdKeyString;
+          FcltMgr.openModalDetail( stdUrl
+                                 , L("mld_dienstpakket")
+                                 , { callback: FcltCallbackRefresh }
+                                 );
+        }
     </script>
   </head>
 
@@ -203,6 +213,7 @@ var authparams = user.checkAutorisation("WEB_MLDMGT");
     rst.addColumn(new Column({caption: L("lcl_mld_expiration_date"), datatype: "date", content: "vervaldatum"}));
 
     rst.addAction({ action: "mkm_edit", caption: L("lcl_edit"), isDefault: true});
+    rst.addAction({ action: "mkm_dienstniveau", caption: "Toevoegen aan dienstniveau", multi: true, multiOnce: true});  // TODO: L("lcl_add_dientniveau")
 
     var cnt = rst.processResultset();
 %>