admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#36724 RES: default expire dagen

Browse Source 
svn path=/Website/trunk/; revision=37491
This commit is contained in:
Erik Groener
2018-03-26 09:09:12 +00:00
parent c5bd3d80a0
commit 44417f7cbd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
APPL/API2/model_res_disc_params.inc
View File

@@ -86,6 +86,7 @@ model_res_disc_params =
"dbs": "res_disc_params_cancel_dagen",
"label": L("res_catalogus_cancel_dagen"),
"typ": "number",
"defaultvalue": 1,
"multiedit": true
},
"remoteurl": {

4
APPL/RES/res.inc
View File

@@ -488,7 +488,7 @@ res = {
if (mode == 2)
var sql = "SELECT fac.DatumTijdPlusUitvoerTijd(SYSDATE, rdp.res_disc_params_expire_dagen, 'DAGEN', null, null, 2) datum";
else
var sql = "SELECT fac.DatumTijdPlusUitvoerTijd(SYSDATE, COALESCE(" + (mode == 1? "res_disc_params_cancel_dagen" : "res_disc_params_expire_dagen") + ", 1),"
var sql = "SELECT fac.DatumTijdPlusUitvoerTijd(SYSDATE, " + (mode == 1? "res_disc_params_cancel_dagen" : "res_disc_params_expire_dagen") + ","
+ " 'DAGEN', " + ((restype == "CV" && S("res_cat_t1") >= 0)? S("res_cat_t1") : S("res_t1")) + ", "
+ " COALESCE(CASE"
+ " WHEN res_disc_params_expire_tijd = -1 OR res_disc_params_expire_tijd IS NULL"
@@ -497,7 +497,7 @@ res = {
+ " END, " + ((restype == "CV" && S("res_cat_t2") >= 0)? S("res_cat_t2") : S("res_t2")) + "), 1) datum"
sql += " , res_disc_params_expire_tijd"
+ " , COALESCE(" + (mode == 1? "res_disc_params_cancel_dagen" : "res_disc_params_expire_dagen") + ", 1) dagen"
+ " , " + (mode == 1? "res_disc_params_cancel_dagen" : "res_disc_params_expire_dagen") + " dagen"
+ " , ins_discipline_min_level"
+ " , ins_discipline_omschrijving"
+ " FROM res_disc_params rdp, res_discipline rd"