From 09eb42bc573dabbeb986333f5a54b4129c100a8f Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Mon, 18 Apr 2016 19:50:02 +0000 Subject: [PATCH] FSN#36112 Workflowschermen nieuwe stijl svn path=/Website/trunk/; revision=29005 --- APPL/MGT/mld_workflow_expression.asp | 118 +++++++++++++++++++++++++++ APPL/MGT/mld_workflowstep.asp | 17 ++++ APPL/MGT/mld_workflowstep.js | 10 +++ APPL/SCF/scaffolding.inc | 5 +- 4 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 APPL/MGT/mld_workflow_expression.asp diff --git a/APPL/MGT/mld_workflow_expression.asp b/APPL/MGT/mld_workflow_expression.asp new file mode 100644 index 0000000000..721d7e3a47 --- /dev/null +++ b/APPL/MGT/mld_workflow_expression.asp @@ -0,0 +1,118 @@ +<%@language = "javascript" %> +<% +/* $Revision$ + $Id$ + + File: mld_workflow_expression.asp + Description: Detailscherm om expressie te bouwen + Parameters: step_key (REQUIRED) + Context: + Note: Modal popup + +*/ %> + + + + + +<% +FCLTHeader.Requires({ plugins: ["jQuery", "suggest"], + js: ["jQuery-ui.js", "modal_kenmerken.js"] + }) + +var step_key = getQParamInt("step_key"); + +var sql = "SELECT ms.mld_stdmelding_key," + + " md.ins_discipline_key," + + " md.ins_srtdiscipline_key" + + " FROM mld_workflowstep ws," + + " mld_stdmelding ms," + + " mld_discipline md" + + " WHERE ws.mld_stdmelding_key = ms.mld_stdmelding_key" + + " AND md.ins_discipline_key = ms.mld_ins_discipline_key" + + " AND ws.mld_workflowstep_key = " + step_key; +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() +%> + + + +<% + FCLTHeader.Generate(); +%> + + + + +
+<% + 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); +%>
+
+ + diff --git a/APPL/MGT/mld_workflowstep.asp b/APPL/MGT/mld_workflowstep.asp index 056177542a..9651f1ac10 100644 --- a/APPL/MGT/mld_workflowstep.asp +++ b/APPL/MGT/mld_workflowstep.asp @@ -70,6 +70,23 @@ var scf_params = }, "transit": { "mystart": mystart_key + }, + "included": { + "rules": { + "edit": { + "requires": { + js: ["./mld_workflowstep.js"] + }, + "buttons": [{ title: L("mld_workflowrule_condition"), action: "build_expression(" + prevstep + ")"}] + }, + "list": { + "columns": [ + "id", + "nextstep", + "condition" + ] + } + } } }; diff --git a/APPL/MGT/mld_workflowstep.js b/APPL/MGT/mld_workflowstep.js index 597af4d2e9..341eed629a 100644 --- a/APPL/MGT/mld_workflowstep.js +++ b/APPL/MGT/mld_workflowstep.js @@ -3,6 +3,16 @@ $Id$ */ +function build_expression(step_key) +{ + parent.FcltMgr.openModalDetail("./mld_workflow_expression.asp?step_key=" + step_key, "Uitdrukking", + { callback: function (data) + { if (data.expression) + $("textarea#condition").val(data.expression); + } + } ); +} + function add_step(row) { var prevstep_key = row.getAttribute("ROWKEY"); diff --git a/APPL/SCF/scaffolding.inc b/APPL/SCF/scaffolding.inc index 8b54e64151..c38751f19d 100644 --- a/APPL/SCF/scaffolding.inc +++ b/APPL/SCF/scaffolding.inc @@ -51,7 +51,10 @@ function scaffolding(model, scf_params) var imodel = getQParam("model", ""); // include model if (model.includes && imodel in model.includes) { - scf_params = {}; // settings gelden alleen op het hoofdmodel? + if ("included" in scf_params) + scf_params = scf_params.included[imodel] || {} + else + scf_params = {}; // settings gelden alleen op het hoofdmodel? scf_params.orgmodel = model; scf_params.incsetting = model.includes[imodel]; // scf_params.incsetting.joinfield zal nu ook altijd in de url voorkomen