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

LOGC#42807 datumkolomopties bij lopende zaken

Browse Source 
svn path=/Website/trunk/; revision=35408
This commit is contained in:
Peter Feij
2017-09-22 09:45:36 +00:00
parent e9f3b5bed5
commit 5a31c2fa94
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
APPL/FAC/fac_list.asp
View File

@@ -4,7 +4,7 @@
$Id$
File: fac_list.asp
Description: Toont verplichtingen etc van user
Description: Toont verplichtingen (lopende zaken) etc van user
Parameters: prs_key optioneel (anders user_key)
Context:
Note: De urole (voor vervolgacties) wordt impliciet bepaald door
@@ -14,8 +14,10 @@
Note: mld.inc en res.inc wordt geinclude tbv single source. Afgewogen.
tussen: includen, getmldstatustext hierin kopieren, getmldstatustext naar shared.inc moven.
Gekozen voor de eerste, de derde zou beter zijn (later) TODO
*/ %>
Note: Naar wens kan met de dates parameter de zichtbaarheid van datumkolommen worden beinvloed (voor widgetportal)
*/ %>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../shared/data_recordset.inc" -->
<!-- #include file="../Shared/resultset_table_v2.inc" -->
@@ -29,6 +31,12 @@
var pkey = getQParamInt("prs_key", user_key);
var outputmode = getQParamInt("outputmode", 0); // 0 = screen, 1 = print, 2 = excel etc
var showall = getQParamInt("showall", 0) == 1;
var faclist_mode = getQParamInt("dates", 1);
// 0 = do not show datecolumns
// &1 = show expected end date (default)
// &2 = show last modification date
// &4 = show first (registration) date
var urole = "?";
if (pkey == user_key)
urole = "fe";
@@ -378,6 +386,7 @@ function sqlTracking(refkey, node)
+ " , m.mld_melding_status status_key"
+ " , NULL bo_status_key"
+ " , m.mld_melding_flag extra1"
+ " , m.mld_melding_datum startdatum"
+ sqlTracking('m.mld_melding_key', 'melding')
+ " FROM mld_melding m"
+ " , ins_srtdiscipline isd"
@@ -417,6 +426,7 @@ function sqlTracking(refkey, node)
+ " , m.mld_melding_status status_key"
+ " , NULL bo_status_key"
+ " , m.mld_melding_flag extra1"
+ " , m.mld_melding_datum startdatum"
+ sqlTracking('m.mld_melding_key', 'melding')
+ " FROM mld_melding m"
+ " , ins_srtdiscipline isd"
@@ -461,6 +471,7 @@ function sqlTracking(refkey, node)
+ " , b.bes_bestelling_status status_key"
+ " , NULL bo_status_key"
+ " , NULL extra1"
+ " , b.bes_bestelling_datum startdatum"
+ sqlTracking('bes_bestelling_key', 'bestelling')
+ " FROM bes_bestelling b"
+ " , fac_tracking tr"
@@ -498,6 +509,7 @@ function sqlTracking(refkey, node)
+ " , b.bes_bestelling_status status_key"
+ " , NULL bo_status_key"
+ " , NULL extra1"
+ " , b.bes_bestelling_datum startdatum"
+ sqlTracking('bes_bestelling_key', 'bestelling')
+ " FROM bes_bestelling b"
+ " , fac_tracking tr"
@@ -524,6 +536,7 @@ function sqlTracking(refkey, node)
+ " , NULL status_key"
+ " , NULL bo_status_key"
+ " , NULL extra1"
+ " , NULL startdatum"
+ sqlTracking('ins_deel_key', 'deel')
+ " FROM ins_v_aanwezigdeel d"
+ " , ins_srtdeel sd"
@@ -544,6 +557,7 @@ function sqlTracking(refkey, node)
+ " , DECODE (res_rsv_ruimte_dirtlevel, 0, rr.res_status_fo_key, -1) status_key"
+ " , rr.res_status_bo_key bo_status_key"
+ " , rr.res_rsv_ruimte_flag extra1"
+ " , rr.res_rsv_ruimte_aanmaak startdatum" // aanmaakdatum niet relevant
+ sqlTracking("rr.res_rsv_ruimte_key","reservering")
+ " FROM res_v_aanwezigrsv_ruimte rr"
+ " , fac_tracking tr"
@@ -574,6 +588,7 @@ function sqlTracking(refkey, node)
+ " , DECODE (res_rsv_ruimte_dirtlevel, 0, rr.res_status_fo_key, -1) status_key"
+ " , rr.res_status_bo_key bo_status_key"
+ " , rr.res_rsv_ruimte_flag extra1"
+ " , rr.res_rsv_ruimte_aanmaak startdatum" // aanmaakdatum niet helemaal relevant maar vooruit
+ sqlTracking("rr.res_rsv_ruimte_key","reservering")
+ " FROM res_v_aanwezigrsv_ruimte rr"
+ " WHERE rr.res_status_bo_key IN (4, 3, 2, 7)"
@@ -594,6 +609,7 @@ function sqlTracking(refkey, node)
+ " , DECODE (res_rsv_ruimte_dirtlevel + res_rsv_deel_dirtlevel, 0, rr.res_status_fo_key, -1) status_key"
+ " , rr.res_status_bo_key bo_status_key"
+ " , rr.res_rsv_ruimte_flag extra1"
+ " , rr.res_rsv_ruimte_aanmaak startdatum" // aanmaakdatum niet helemaal relevant maar vooruit
+ sqlTracking("rr.res_rsv_ruimte_key","reservering")
+ " FROM res_v_aanwezigrsv_ruimte rr"
+ " , res_v_aanwezigrsv_deel dd"
@@ -615,6 +631,7 @@ function sqlTracking(refkey, node)
+ " , DECODE (res_rsv_ruimte_dirtlevel + res_rsv_deel_dirtlevel, 0, rr.res_status_fo_key, -1) status_key"
+ " , rr.res_status_bo_key bo_status_key"
+ " , rr.res_rsv_ruimte_flag extra1"
+ " , rr.res_rsv_ruimte_aanmaak startdatum" // aanmaakdatum niet helemaal relevant maar vooruit
+ sqlTracking("rr.res_rsv_ruimte_key","reservering")
+ " FROM res_v_aanwezigrsv_ruimte rr"
+ " , res_v_aanwezigrsv_deel dd"
@@ -636,6 +653,7 @@ function sqlTracking(refkey, node)
+ " , DECODE (res_rsv_ruimte_dirtlevel + res_rsv_artikel_dirtlevel, 0, rr.res_status_fo_key, -1) status_key"
+ " , rr.res_status_bo_key bo_status_key"
+ " , rr.res_rsv_ruimte_flag extra1"
+ " , rr.res_rsv_ruimte_aanmaak startdatum" // aanmaakdatum niet helemaal relevant maar vooruit
+ sqlTracking("rr.res_rsv_ruimte_key","reservering")
+ " FROM res_v_aanwezigrsv_ruimte rr"
+ " , res_v_aanwezigrsv_artikel dd"
@@ -657,6 +675,7 @@ function sqlTracking(refkey, node)
+ " , DECODE (res_rsv_ruimte_dirtlevel + res_rsv_artikel_dirtlevel, 0, rr.res_status_fo_key, -1) status_key"
+ " , rr.res_status_bo_key bo_status_key"
+ " , rr.res_rsv_ruimte_flag extra1"
+ " , rr.res_rsv_ruimte_aanmaak startdatum" // aanmaakdatum niet helemaal relevant maar vooruit
+ sqlTracking("rr.res_rsv_ruimte_key","reservering")
+ " FROM res_v_aanwezigrsv_ruimte rr"
+ " , res_v_aanwezigrsv_artikel dd"
@@ -676,6 +695,7 @@ function sqlTracking(refkey, node)
+ " , NULL status_key"
+ " , NULL bo_status_key"
+ " , NULL extra1"
+ " , NULL startdatum" // aanmaakdatum hebben we niet
+ sqlTracking('b.bez_afspraak_key', 'afspraak')
+ " FROM bez_bezoekers b"
+ " , bez_afspraak a"
@@ -695,6 +715,7 @@ function sqlTracking(refkey, node)
+ " , NULL status_key"
+ " , NULL bo_status_key"
+ " , NULL extra1"
+ " , NULL startdatum" // aanmaakdatum hebben we niet
+ sqlTracking('b.bez_afspraak_key', 'afspraak')
+ " FROM bez_bezoekers b"
+ " , bez_afspraak a"
@@ -715,6 +736,7 @@ function sqlTracking(refkey, node)
+ " , recentdatum"
+ " , bo_status_key"
+ " , extra1"
+ " , startdatum"
+ " FROM (" + sqln + ")"
+ " WHERE prs_perslid_key = " + pkey
+ " AND xmlnode IS NOT NULL"
@@ -725,7 +747,6 @@ function sqlTracking(refkey, node)
var calendarurl = 'appl/shared/fullcalendar.asp?worker=faclist';
buttons = [{ icon: "calendar_1.png", title: L("lcl_calendar"), action: "FcltMgr.openDetail('" + calendarurl + "', '" + L("lcl_prs_frame_facilities") + "')" }];
var rst = new ResultsetTable({ sql: sqln,
keyColumn: "item_key",
ID: "factable",
@@ -738,12 +759,16 @@ function sqlTracking(refkey, node)
summaryShow: function(){},
emptySetString: L("lcl_geenfaciliteiten")
});
rst.addColumn(new Column({caption: L("lcl_myfacilities_date"), content: "datum", datatype: "datetime", prettydate: true }));
//rst.addColumn(new Column({caption: L("lcl_myfacilities_time"), content: fntime}));
if ((faclist_mode & 1) == 1)
rst.addColumn(new Column({caption: L("lcl_myfacilities_date"), content: "datum", datatype: "datetime", prettydate: true }));
rst.addColumn(new Column({caption: L("lcl_faciliteit"), content: fncolType}));
if ((faclist_mode & 4) == 4)
rst.addColumn(new Column({caption: L("lcl_mld_date_time"), content: "startdatum", datatype: "datetime", prettydate: true }));
rst.addColumn(new Column({caption: L("lcl_descr"), content: "detail"}));
rst.addColumn(new Column({caption: L("lcl_status"), content: fnstatus}));
//rst.addColumn(new Column({caption: L("lcl_fac_laatste_actie"), content: "recentdatum", datatype: "datetime", prettydate: true})); // experiment
if ((faclist_mode & 2) == 2)
rst.addColumn(new Column({caption: L("lcl_fac_laatste_actie"), content: "recentdatum", datatype: "datetime", prettydate: true})); // experiment
rst.addColumn(new Column({caption: L("lcl_fac_extra1"), content: fnExtra1}));
if (S("facilities_flike_past") >= 0)
rst.addColumn(new Column({caption: L("lcl_fac_oordeel"), content: fnLike}));