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#33160: Inspecties: kunnen zoeken op van/tot-datums ipv "binnenkort/voorlopig niet".

svn path=/Website/trunk/; revision=28940
This commit is contained in:
Maykel Geerdink
2016-04-14 11:22:51 +00:00
parent 646329ec5a
commit c31961a4ca
7 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
APPL/INS/ins_inspect_list.asp
View File

@@ -352,8 +352,8 @@ 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 >= 0;
var eEdit = istatus >= 0 && istatus < 6 && this_ins.canChange;
var eShow = istatus >= 0 && this_ins.canRead && !eEdit;
var ePlan = !vervallen && this_ins.canInspect && (istatus < 0);
var eStart = !vervallen && this_ins.canInspect && (istatus <= 0);
var eClose = this_ins.canInspect && (istatus < 5);
@@ -521,18 +521,12 @@ var authparams = user.checkAutorisation("WEB_INSUSE");
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"}));
}
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: "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" });
rst.addAction({ action: "insFinish", caption: L("lcl_ins_finish"), enabler: "eFinish" });
}
rst.addAction({ action: "insShow", caption: L("lcl_edit"), enabler: "eShow", isDefault: true });
rst.addAction({ action: "insEditInsp", caption: L("lcl_edit"), enabler: "eEdit", 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" });
rst.addAction({ action: "insFinish", caption: L("lcl_ins_finish"), enabler: "eFinish" });
var cnt = rst.processResultset();
%>

60
APPL/INS/ins_list.inc
View File

@@ -582,8 +582,8 @@ function ins_list (pautfunction, params)
+ " AND idsc.ins_deel_key = di.ins_deel_key)"
+ " AND (xcp.ins_srtcontroledl_xcp_eind(+) IS NULL OR xcp.ins_srtcontroledl_xcp_eind(+) > TRUNC(SYSDATE, 'DD'))"
+ " ORDER BY inspectie_date)"
: (!params.inspBusy
? " SELECT 1 rn" // inspecties die nog nooit zijn uitgevoerd. Er is nog geen ins_deelsrtcontrole regel aanwezig en dus ook geen plandatum/respijtdatum.
: (params.inspSoon
? " SELECT 1 rn" // inspecties die nog nooit zijn uitgevoerd/ingepland. Er is nog geen ins_deelsrtcontrole regel aanwezig en dus ook geen plandatum/respijtdatum.
+ " , di.ins_deel_key"
+ " , fac.nextcyclusdate(di.ins_deel_aanmaak"
+ " , di.ins_srtcontrole_mode"
@@ -1192,7 +1192,7 @@ function ins_list (pautfunction, params)
sql = "SELECT * FROM (" + sql + ") x WHERE " + (sqlBC != ""? sqlBC : "1 = 1");
}
else // Onderhanden (params.inspBusy), vervolgactie vereist (params.inspClosed) of geen checkbox aangevinkt.
sql = "SELECT * FROM (" + sql + ") x WHERE " + (sqlBC != ""? sqlBC : "1 = 1");
sql = "SELECT * FROM (" + sql + ") x WHERE 1 = 1"; // Alles tonen onafhankelijk van sqlBC
if (params.cnt_bedrijf_key > 0) // alleen bedrijven met een (onderhouds)contract op deze soorten
{
@@ -1464,6 +1464,8 @@ function ins_list (pautfunction, params)
if (istatus == 2)
lclass = "pending";
if (istatus == 5)
lclass = "unsolved";
if (params.inspDone) return lclass;
var dt = new Date(oRs("inspectie_next").Value);
@@ -1620,7 +1622,7 @@ function ins_list (pautfunction, params)
else
var dttxt = toDateString(inspectie);
return dttxt;
return "<span style='white-space: nowrap'>"+dttxt+"</span>";
}
function fnPlandatum(oRs)
@@ -1636,7 +1638,7 @@ function ins_list (pautfunction, params)
else
var dttxt = toDateString(plandatum);
return dttxt;
return "<span style='white-space: nowrap'>"+dttxt+"</span>";
}
function fnSrtControleType(oRs)
@@ -1698,7 +1700,9 @@ function ins_list (pautfunction, params)
if (isbinnen) // ja, deze overschrijft het array
buttons = [{ icon: "plus.png", title: L("lcl_add"), action: "insCheckOutNewItem(" + (cpersoon_key > 0? cpersoon_key + ", 'C'" : persoon_key + ", 'P'") + ")" }]
}
if (params.inspect) {
buttons.push({ icon: "legenda.png", title: L("lcl_mld_legenda"), action: "openLegenda()" });
}
/***************************************************
* End callback functies ResultsetTable for FO en BO
**************************************************/
@@ -1716,7 +1720,7 @@ function ins_list (pautfunction, params)
multiple: true,
filterParams: params,
outputmode: outputmode,
title: (parent_key? L("lcl_subobjects") : (koppel_key? L("lcl_ins_koppelobjects") : L("lcl_ins_objects"))),
title: (parent_key? L("lcl_subobjects") : (koppel_key? L("lcl_ins_koppelobjects") : (params.inspect? L("lcl_ins_planned_activities"): L("lcl_ins_objects")))),
showAll: showall,
buttons: buttons
});
@@ -1742,7 +1746,7 @@ function ins_list (pautfunction, params)
if (params.inspect && controletype == -1)
rst.addColumn(new Column({caption: L("lcl_ins_srtcontrole_type"), content: fnSrtControleType}));
rst.addColumn(new Column({caption: L("lcl_obj_identification"), content: "ins_deel_omschrijving"}));
rst.addColumn(new Column({caption: L("lcl_ins_opmerking"), content: "ins_deel_opmerking"}));
rst.addColumn(new Column({caption: L("lcl_ins_opmerking"), content: "ins_deel_opmerking", combine: params.inspect}));
}
if (koppel_key)
@@ -1804,7 +1808,45 @@ function ins_list (pautfunction, params)
}
var count = rst.processResultset();
} %>
if (!excel && !print)
{
%>
<!-- LEGENDA -->
<script type="text/javascript">
function openLegenda()
{
params = { width: 250,
minWidth: 250,
minHeight: 10,
resizable: false,
position: {my: "right top", at: "right top+30"},
title: "<%=L("lcl_ins_controle_legenda")%>"
}
$('div#legenda').dialog(params).dialog('open');
FcltMgr.resized();
}
</script>
<div id="legenda" style="display:none; line-height: 30px;">
<table id="inslegenda">
<tr class="pending">
<td title="<%= L("lcl_ins_controle_busy") %>"><%= L("lcl_ins_controle_busy") %></td>
</tr>
<tr class="unsolved">
<td title="<%= L("lcl_ins_controle_act_req") %>"><%= L("lcl_ins_controle_act_req") %></td>
</tr>
<tr class="expired1">
<td title="<%= L("lcl_ins_controle_soon") %>"><%= L("lcl_ins_controle_soon") %></td>
</tr>
<tr class="expired2">
<td title="<%= L("lcl_ins_controle_soon") %>"><%= L("lcl_ins_controle_late") %></td>
</tr>
</table>
</div>
<%
}
}
%>
</body>
</html>
<%

2
APPL/MLD/mld_list.inc
View File

@@ -859,7 +859,7 @@ if (!excel && !print)
//height: 130,
minHeight: 10,
resizable: false,
position: ['right','top'],
position: {my: "right top", at: "right top+30"},
title: "<%=L("lcl_mld_legenda")%>"
}
$('div#legenda').dialog(params).dialog('open');

2
APPL/MLD/opdr_list.inc
View File

@@ -1095,7 +1095,7 @@ function opdr_list (params)
//height: 130,
minHeight: 10,
resizable: false,
position: ['right','top'],
position: {my: "right top", at: "right top+30"},
title: "<%=L("lcl_mld_legenda")%>"
}
$('div#legenda').dialog(params).dialog('open');

2
APPL/RES/res_edit_objcat.asp
View File

@@ -368,7 +368,7 @@ var new_item_key = 0; // Globaal
{
params = { width: 125,
resizable: false,
position: ['right','top'],
position: {my: "right top", at: "right top+30"},
title: '<%=L("lcl_res_legenda")%>'
}
$('div#legenda').dialog(params).dialog('open');

2
APPL/RES/res_search_plan_obj.asp
View File

@@ -272,7 +272,7 @@ IFRAMER_HEADER(L("lcl_res_frame_voorziening"), buttons);
{
params = { width: 140,
resizable: false,
position: ['right','top'],
position: {my: "right top", at: "right top+30"},
title: "<%=L("lcl_res_legenda")%>"
}
$('div#legenda').dialog(params).dialog('open');

2
APPL/RES/res_search_plan_room.asp
View File

@@ -350,7 +350,7 @@ while (nnregels < 8)
{
params = { width: 170,
resizable: false,
position: {my: "right top", at: "right top+35"},
position: {my: "right top", at: "right top+30"},
title: "<%=L("lcl_res_legenda")%>"
}
$('div#legenda').dialog(params).dialog('open');