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

AADB#56093 extra cyclus kolom

Browse Source 
svn path=/Website/trunk/; revision=41333
This commit is contained in:
Peter Feij
2019-03-06 11:29:11 +00:00
parent adc469d56e
commit 460b583fb5
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
APPL/INS/ins.inc
View File

@@ -1924,6 +1924,7 @@ ins = {checkAutLevel:
+ ", ispn.ins_deelsrtcontrole_plandatum"
+ ", ispn.inspectie_eind"
+ ", ispn.inspectie_eenheid"
+ ", ispn.periode"
+ ", ispn.nonext"
+ ", ispn.ctr_controle_type"
+ (!mobile
@@ -2277,12 +2278,12 @@ ins = {checkAutLevel:
+ ", i.ins_deel_mjb_score2"
+ ", s.ins_srtdeel_mjb_grensscore1"
+ (anyflex ? flex_select : "")
+ ", CASE WHEN i.ins_alg_ruimte_type_org IS NOT NULL"
+ " THEN (SELECT p.prs_perslid_naam_full"
+ " FROM prs_v_perslid_fullnames_all p"
+ " WHERE p.prs_perslid_key = i.ins_alg_ruimte_key)"
+ " ELSE NULL"
+ " END uitgeleend_aan"
+ ", CASE WHEN i.ins_alg_ruimte_type_org IS NOT NULL"
+ " THEN (SELECT p.prs_perslid_naam_full"
+ " FROM prs_v_perslid_fullnames_all p"
+ " WHERE p.prs_perslid_key = i.ins_alg_ruimte_key)"
+ " ELSE NULL"
+ " END uitgeleend_aan"
+ sqlKenmerkBewerkbaar_select
+ ", NULL prs_bedrijf_key"
+ ", NULL prs_afdeling_key1"

18
APPL/INS/ins_list.inc
View File

@@ -821,6 +821,23 @@ function ins_list (pautfunction, params)
return "<span style='white-space: nowrap'>"+dttxt+"</span>";
}
function fnCyclus(oRs)
{
var res = "";
var txt = "";
var aantal = oRs("periode").Value;
switch (oRs("inspectie_eenheid").Value) // 0=uurlijks, 1=dagelijks, 2=wekelijk, 3=maandelijk, 4=jaarlijks, null=niet
{
case 0: { txt = L("lcl_ins_controle_period_hour"); break; }
case 1: { txt = L("lcl_ins_controle_period_day"); break; }
case 2: { txt = L("lcl_ins_controle_period_week"); break; }
case 3: { txt = L("lcl_ins_controle_period_month"); break; }
case 4: { txt = L("lcl_ins_controle_period_year"); break; }
}
if (txt) res = aantal + "-" + txt;
return res;
}
function fnCMSuccess(oRs)
{
var res = "";
@@ -1022,6 +1039,7 @@ function ins_list (pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_obj_koppeloms"), content: "ins_deelkoppeling_omschrijving"}));
if (inspect)
{
rst.addColumn(new Column({caption: L("lcl_ins_controle_cyclus"), content: fnCyclus}));
rst.addColumn(new Column({caption: L("lcl_ins_status"), content: fnStatus}));
rst.addColumn(new Column({caption: (inspDone? L("lcl_ins_controle_datum") : L("lcl_ins_controle_next")), content: fnInspectie}));
rst.addColumn(new Column({caption: L("lcl_ins_controle_plandate"), content: fnPlandatum}));