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

ASFC#34371: Start en stopmoment bij schoonmaak via inspecties kunnen vastleggen.

Browse Source 
AKZA#35599: Showmode voor inspecties (detailscherm).

svn path=/Website/trunk/; revision=28882
This commit is contained in:
Maykel Geerdink
2016-04-13 06:28:27 +00:00
parent 2498b20438
commit e02fbba22d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/INS/ins.inc
View File

@@ -504,10 +504,13 @@ ins = {checkAutLevel:
alg_key, // alg_key
null); // hier zou alleen een prs_key in mogen, we testen zo afzonderlijk
iresult.readslebof = iresult.canRead("WEB_SLEBOF");
var readslebof = iresult.canRead("WEB_SLEBOF");
iresult.readslebof = readslebof;
iresult.canRead = readslebof; // Lezen
var writeslebof = iresult.canWrite("WEB_SLEBOF");
var writeslefof = iresult.canWrite("WEB_SLEFOF");
iresult.writeslebof = writeslebof;
iresult.canChange = readslebof; // Wijzigen
iresult.writeslefof = writeslefof;
iresult.canDelete = writeslebof; // Verwijderen
iresult.canChange = writeslebof; // Wijzigen

10
APPL/INS/ins_inspect_list.asp
View File

@@ -353,14 +353,12 @@ var authparams = user.checkAutorisation("WEB_INSUSE");
// Gedaande inspecties kunnen alleen geedit worden.
// Ik zie alleen objecten waar ik read rechten (3d) op heb. Dan mag ik ze ook verder inzien.
var eEdit = istatus >= 0 && istatus < 6;
var eShow = istatus == 6;
var eShow = istatus >= 0;
var ePlan = !vervallen && this_ins.canInspect && (istatus < 0);
var eStart = !vervallen && this_ins.canInspect && (istatus <= 0);
var eClose = this_ins.canInspect && (istatus < 5);
var eFinish = (this_ins.canInspect && istatus == 5);
__Log("eEdit = " + eEdit)
__Log("eShow = " + eShow)
var data = {eEdit: eEdit, eShow: eShow, ePlan: ePlan, eStart: eStart, eClose: eClose, eFinish: eFinish};
return data;
}
@@ -523,11 +521,13 @@ __Log("eShow = " + eShow)
rst.addColumn(new Column({caption: L("lcl_ins_controle_cat"), content: "ins_srtcontrole_groep"}));
rst.addColumn(new Column({caption: L("lcl_ins_controle_opm"), content: "ins_srtcontrole_opmerking"}));
}
__Log("this_ins.canChange = " + this_ins.canChange);
if (this_ins.canRead || this_ins.canChange)
{
rst.addAction({ action: "insShow", caption: L("lcl_edit"), enabler: "eShow", isDefault: true });
}
if (this_ins.canChange)
{
rst.addAction({ action: "insEditInsp", caption: L("lcl_edit"), enabler: "eEdit", isDefault: true });
rst.addAction({ action: "insShow", caption: L("lcl_edit"), enabler: "eShow", isDefault: true });
rst.addAction({ action: "insPlan", caption: L("lcl_ins_schedule"), enabler: "ePlan" });
rst.addAction({ action: "insStart", caption: L("lcl_ins_start"), enabler: "eStart" });
rst.addAction({ action: "insClose", caption: L("lcl_ins_close") + "/" + L("lcl_ins_finish"), enabler: "eClose" });