FSN#35338 Bevindingen beheerschermen 2016.1

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

APPL/API2/model_cnt_disc_params.inc

@@ -73,7 +73,8 @@ model_cnt_disc_params =
         "remark": {
             "dbs": "cnt_disc_params_opmerking",
             "label": L("cnt_discipline_opmerking"),
-            "typ": "memo"
+            "typ": "memo",
+            "translate": true
         }
     }
 }

APPL/API2/model_fac_export_app.inc

@@ -0,0 +1,116 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_fac_export_app.inc
+
+    Description:    Vanuit CodeCharge gegenereerd model voor fac_export_app
+
+    Context:
+
+    Notes:
+*/
+%>
+<%
+
+function model_fac_export_app()
+{
+    this.table = "fac_export_app";
+    this.primary = "fac_export_app_key";
+    this.records_name = "fac_export_apps";
+    this.record_name = "fac_export_app";
+    this.autfunction = "WEB_PRSSYS";
+    this.record_title = L("fac_export_app");
+    this.records_title = L("fac_export_app_m");
+
+
+    this.fields = {
+        "id": {
+            "dbs": "fac_export_app_key",
+            "label": "Key",
+            "typ": "key",
+            "required": true,
+            "filter": "exact",
+            "seq": "fac_s_fac_export_app_key"
+        },
+        "name": {
+            "dbs": "fac_export_app_code",
+            "label": L("fac_export_app_code"),
+            "typ": "varchar"
+        },
+        "description": {
+            "dbs": "fac_export_app_oms",
+            "label": L("fac_export_app_oms"),
+            "typ": "varchar"
+        },
+        "authorization": {
+            "dbs": "fac_functie_key",
+            "label": L("fac_functie_key"),
+            "typ": "key",
+            "foreign": fac_functie_foreign("EXT1")
+        },
+        "charset": {
+            "dbs": "fac_export_app_charset",
+            "label": L("fac_export_app_charset"),
+            "typ": "varchar"
+        },
+        "folder": {
+            "dbs": "fac_export_app_folder",
+            "label": L("fac_export_app_folder"),
+            "typ": "varchar"
+        },
+        "fileprefix": {
+            "dbs": "fac_export_app_file_prefix",
+            "label": L("fac_export_app_file_prefix"),
+            "typ": "varchar"
+        },
+        "postfix": {
+            "dbs": "fac_export_app_postfix",
+            "label": L("fac_export_app_postfix"),
+            "typ": "varchar"
+        },
+        "logpostfix": {
+            "dbs": "fac_export_app_log_postfix",
+            "label": L("fac_export_app_log_postfix"),
+            "typ": "varchar"
+        },
+        "flags": {
+            "dbs": "fac_export_app_flags",
+            "label": L("fac_export_app_flags"),
+            "typ": "number"
+        },
+        "xsl": {
+            "dbs": "fac_export_app_xsl",
+            "label": L("fac_export_app_xsl"),
+            "typ": "varchar"
+        },
+        "timestamp": {
+            "dbs": "fac_export_app_timestamp",
+            "label": L("fac_export_app_timestamp"),
+            "typ": "varchar"
+        },
+        "exported": {
+            "dbs": "fac_export_app_datum",
+            "label": L("fac_export_app_datum"),
+            "typ": "datetime"
+        },
+        "created": {
+            "dbs": "fac_export_app_aanmaak",
+            "label": L("fac_export_app_aanmaak"),
+            "typ": "datetime",
+            "readonly": true
+        },
+        "prefix": {
+            "dbs": "fac_export_app_prefix",
+            "label": L("fac_export_app_prefix"),
+            "typ": "varchar"
+        }
+    };
+
+
+    this.REST_GET    = generic_REST_GET(this);
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
+}
+%>

APPL/API2/model_fac_notificatiejob.inc

@@ -38,12 +38,14 @@ function model_fac_notificatiejob()
             "dbs": "fac_notificatie_job_oms",
             "label": L("fac_notificatie_job_oms"),
             "typ": "varchar",
+            "required": true,
             "translate": true
         },
         "job_view": {
             "dbs": "fac_notificatie_job_view",
             "label": L("fac_notificatie_job_view"),
-            "typ": "memo"
+            "typ": "varchar",
+            "required": true
         },
         "job_mode": {
             "dbs": "fac_notificatie_job_mode",
@@ -88,7 +90,7 @@ function model_fac_notificatiejob()
         "job_nextrun": {
             "dbs": "fac_notificatie_job_nextrun",
             "label": L("fac_notificatie_job_nextrun"),
-            "typ": "date"
+            "typ": "datetime"
         }
     };
 

APPL/API2/model_fac_profiel.inc

@@ -39,6 +39,7 @@ function model_fac_profiel()
             "label": L("fac_profiel_omschrijving"),
             "typ": "varchar",
             "required": true,
+            "translate": true,
             "filter": "like"
         },
         "profile_limit": {

APPL/API2/model_fac_srtnotificatie.inc

@@ -29,18 +29,18 @@ function model_fac_srtnotificatie()
             "label": "Key",
             "typ": "key",
             "required": true,
-            "filter": "exact",
+            "filter": "exact"
-            "seq": "fac_s_fac_srtnotificatie_key"
         },
         "code": {
             "dbs": "fac_srtnotificatie_code",
             "label": L("fac_srtnotificatie_code"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "insertonly": true
         },
         "name": {
             "dbs": "fac_srtnotificatie_oms",
             "label": L("fac_srtnotificatie_oms"),
-            "typ": "varchar",
+            "typ": "memo",
             "translate": true,
             "filter": "like"
         },
@@ -48,6 +48,7 @@ function model_fac_srtnotificatie()
             "dbs": "fac_srtnotificatie_xmlnode",
             "label": L("fac_srtnotificatie_xmlnode"),
             "typ": "varchar",
+            "insertonly": true,
             "LOV": fill_srtnotificatie_LOV(),
             "emptyoption": null
         },
@@ -55,12 +56,14 @@ function model_fac_srtnotificatie()
             "dbs": "fac_srtnotificatie_url",
             "label": L("fac_srtnotificatie_url"),
             "typ": "varchar",
+            "insertonly": true,
             "defaultvalue": "1"
         },
         "group": {
             "dbs": "fac_srtnotificatie_groep",
             "label": L("fac_srtnotificatie_groep"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "insertonly": true
         },
         "notification_mode": {
             "dbs": "fac_srtnotificatie_mode",
@@ -105,12 +108,14 @@ function model_fac_srtnotificatie()
         "usermode": {
             "dbs": "fac_srtnotificatie_usermode",
             "label": L("fac_srtnotificatie_usermode"),
-            "typ": "check"
+            "typ": "check0",
+            "listfunction": fnshowusermode
         },
         "mail_building": {
             "dbs": "fac_srtnotificatie_gebouw",
-            "label": "E-mail sturen naar gebouw",
+            "label": L("fac_srtnotificatie_gebouw"),
-            "typ": "check0"
+            "typ": "check0",
+            "listfunction": fnshowmailbuilding
         },
         "delay": {
             "dbs": "fac_srtnotificatie_delay",
@@ -118,15 +123,64 @@ function model_fac_srtnotificatie()
             "typ": "number",
             "required": true,
             "defaultvalue": "0"
+        },
+        "mode_status": {
+            "dbs": "notimode.status",
+            "label": L("fac_srtnotificatie_status"),
+            "typ": "varchar",
+            "hidden_fld": true
+        },
+        "mode_email": {
+            "dbs": "notimode.email",
+            "label": L("fac_srtnotificatie_mail"),
+            "typ": "varchar",
+            "hidden_fld": true
+        },
+        "mode_sms": {
+            "dbs": "notimode.sms",
+            "label": L("fac_srtnotificatie_sms"),
+            "typ": "varchar",
+            "hidden_fld": true
+        },
+        "mode_alert": {
+            "dbs": "notimode.portal",
+            "label": L("fac_srtnotificatie_alert"),
+            "typ": "varchar",
+            "hidden_fld": true
         }
     };
 
     if (!S("puo_smsaccount"))
         this.fields.notification_mode.bits[0].radios.splice(2, 1);
 
-    this.REST_GET    = generic_REST_GET(this);
+
+    var ext_sql = "(SELECT fac_srtnotificatie_key"
+                + "      , DECODE(BITAND(fac_srtnotificatie_mode, 1), 1,"+ safe.qL("lcl_on") +", '') status"
+                + "      , DECODE(BITAND(fac_srtnotificatie_mode, 2), 2,"+ safe.qL("lcl_on") +", '') email"
+                + "      , DECODE(BITAND(fac_srtnotificatie_mode, 4), 4,"+ safe.qL("lcl_on") +", '') sms"
+                + "      , DECODE(BITAND(fac_srtnotificatie_mode, 8), 8,"+ safe.qL("lcl_on") +", '') portal"
+                + "   FROM fac_srtnotificatie) notimode ";
+
+
+    this.REST_GET    = generic_REST_GET(this, {
+        "GET": {
+            "tables": [ext_sql],
+            "wheres": ["fac_srtnotificatie.fac_srtnotificatie_key = notimode.fac_srtnotificatie_key"]
+        }
+    });
     this.REST_POST   = generic_REST_POST(this);
     this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this);
+    // Verwijderen niet toegestaan.
+
+
+    function fnshowusermode(oRs)
+    {
+        return (oRs.Fields("usermode").Value == 1 ? L("lcl_Yes") : "");
+    }
+
+    function fnshowmailbuilding(oRs)
+    {
+        return (oRs.Fields("mail_building").Value == 1 ? L("lcl_Yes") : "");
+    }
 }
 %>

APPL/API2/model_mld_workflowstep.inc

@@ -59,7 +59,8 @@ function model_mld_workflowstep(mystart_key)
             "dbs": "mld_workflowstep_omschrijving",
             "label": L("mld_workflowstep_omschr"),
             "typ": "varchar",
-            "required": true
+            "required": true,
+            "translate": true
         },
         "start": {
             "dbs": "mld_workflowstep_start_key",

APPL/API2/model_mrk_discipline.inc

@@ -20,8 +20,8 @@ function model_mrk_discipline()
   this.records_name = "ins_tab_disciplines";
   this.record_name = "ins_tab_discipline";
   this.autfunction = "WEB_MRKMGT";
-  this.record_title = L("mrk_tab_discipline");
+  this.record_title = L("mrk_discipline");
-  this.records_title = L("mrk_tab_discipline_m");
+  this.records_title = L("mrk_discipline_m");
 
 
     this.fields = {

APPL/MGT/cad_legendawaarde.js

@@ -10,9 +10,9 @@ $(document).ready(function () {
 
 function init_cad_legendawaarde()
 {
-    var kleur = "#" + $("#value_rgb").val();
+    var kleur = "#" + $("#rgb").val();
 
-    $("#value_rgb").on("change", function() { change_value_rgb(); });
+    $("#rgb").on("change", function() { change_rgb(); });
     $("#_color").on("click", function() { showColor(); });
     $("#btn_cp_accept").on("click", function() { acceptColor(); });
     $("#btn_cp_hide").on("click", function()   { hideColor();   });
@@ -43,7 +43,7 @@ function acceptColor()
     var kleur = $("#color_select").colorpicker("val");
     var rgb = kleur.replace("#","").toUpperCase().trim();
 
-    $("#value_rgb").val(rgb);
+    $("#rgb").val(rgb);
     $("#_color span").css("background-color", kleur);
     $("#color_panel").hide();
     FcltMgr.resized();
@@ -55,9 +55,9 @@ function hideColor()
     FcltMgr.resized();
 }
 
-function change_value_rgb()
+function change_rgb()
 {
-    var rgb = $("#value_rgb").val();
+    var rgb = $("#rgb").val();
 
     $("#_color span").css("background-color", "#"+rgb);
 }

APPL/MGT/cad_thema.asp

@@ -36,7 +36,7 @@ scaffolding(this_model,
                 "legenda",
                 "type_place",
                 "type_situation"
-                ]
+            ]
         },
         "list": {
             "columns": [
@@ -46,7 +46,10 @@ scaffolding(this_model,
                 "type_place",
                 "type_situation"
             ]
-          }
+          },
+          "wrap": {
+                  //"frames": [{ url: "cad_legenda.asp?mode=wrap&id=1" }]
+              }
     });
 
 

APPL/MGT/fac_export_app.asp

@@ -1,14 +1,38 @@
 <%@language = "javascript" %>
+<% /*
+    $Revision$
+    $Id$
 
-<!-- #include file="../scf/scaffolding.inc" -->
+    File:           fac_export_app.asp
-<!-- #include file="../api2/model_generic.inc" -->
 
-<%
+    Description:    fac_management aanroep van model_fac_export_app
-    var table = "fac_export_app";
 
-    var model = model_generic(table, "WEB_PRSSYS");
+    Context:
-    model.search.autosearch = true; // Zijn nooit echt veel records
 
-    api2.generic_REST(model);
+    Notes:
-    scaffolding(model, {});
+*/
 %>
+<!-- #include file="../scf/scaffolding.inc" -->
+<!-- #include file="../mgt/mgt_tools.inc" -->
+<!-- #include file="../api2/model_fac_export_app.inc" -->
+<%
+var this_model = new model_fac_export_app();
+
+scaffolding(this_model,
+    {
+        "search": {
+            "autosearch": true,
+            "filters": [
+                "description",
+                "authorization"
+            ]
+        },
+        "list": {
+            "columns": [
+                "id",
+                "description",
+                "authorization"
+            ]
+        }
+    });
+%>

APPL/MGT/fac_srtnotificatie.asp

@@ -23,13 +23,23 @@ scaffolding(this_model,
             "autosearch": true,
             "filters": [
                 "name",
+                "code",
                 "xmlnode"
             ]
         },
         "list": {
             "columns": [
-                "id",
+                "xmlnode",
-                "name"
+                "code",
+                "name",
+                "notification_mode",
+                "mode_status",
+                "mode_email",
+                "mode_sms",
+                "mode_alert",
+                "usermode",
+                "mail_building",
+                "delay"
             ]
         }
     });

APPL/MGT/fac_usergraph.asp

@@ -29,6 +29,7 @@ scaffolding(this_model,
         },
         "list": {
             "columns": [
+                "id",
                 "view_name",
                 "name",
                 "graph_type"