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

YKPN#60847 -- Projecten in calendar tonen

Browse Source 
svn path=/Website/branches/v2019.2/; revision=45600
This commit is contained in:
Arthur Egberink
2020-01-28 08:40:25 +00:00
parent b89167fd85
commit a1fc8ffdbb
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/MLD/mld_melding_worker.asp
View File

@@ -18,6 +18,7 @@ var JSON_Result = true;
var date_from = new Date(getQParamInt("start") * 1000);
var date_to = new Date(getQParamInt("end") * 1000);
var behkey = getQParamInt("bk");
var disckey = getQParamInt("disc");
function fnNodeColor(oRs) {
var lecolor = "#ccc";
@@ -42,7 +43,7 @@ var JSON_Result = true;
+ " FROM ("
+ "SELECT mld_melding_key item_key"
+ ", sd.ins_srtdiscipline_prefix||mld_melding_key item" // +prefix
+ ", mld_stdmelding_omschrijving detail"
+ ", mld_melding_onderwerp detail"
+ ", mld_melding_datum datum1"
+ ", mld_melding_einddatum datum2"
+ ", mld_melding_status"
@@ -52,10 +53,11 @@ var JSON_Result = true;
+ ", ins_srtdiscipline sd"
+ " WHERE m.mld_stdmelding_key = s.mld_stdmelding_key"
+ " AND s.mld_ins_discipline_key = d.ins_discipline_key"
+ (disckey==-1?"":" AND d.ins_discipline_key = " + disckey)
+ " AND d.ins_srtdiscipline_key = sd.ins_srtdiscipline_key"
+ " AND m.mld_melding_status IN (0,2,4,7)" // lopende
+ " AND m.fac_activiteit_key IS NULL"
+ " AND m.mld_melding_behandelaar_key = " + behkey
+ (behkey==-1?"":" AND m.mld_melding_behandelaar_key = " + behkey)
+ " AND m.mld_melding_datum <= " + date_to.toSQL(true)
+ " AND m.mld_melding_einddatum >= " + date_from.toSQL(true)
+ ")";

2
APPL/Shared/fullcalendar.asp
View File

@@ -24,7 +24,7 @@ DOCTYPE_Disable = 1;
switch (pworker)
{
case "faclist" : lworker = "../fac/fac_list_worker.asp"; break;
case "mldlist" : lworker = "../mld/mld_melding_worker.asp?bk="+getQParamInt("bk");
case "mldlist" : lworker = "../mld/mld_melding_worker.asp?bk="+getQParamInt("bk",-1)+"&disc="+getQParamInt("disc",-1);
break;
case "opdrlist" : lworker = "../mld/mld_opdr_worker.asp"; break;
// Leuk zou zijn om hier een exit te hebben die een usrrap als worker kan definieren worker=usrrap en workerkey=usrrapkey