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

FZKH#91268 Optie 'Verwijderen' ontbreekt bij opdrachten onder sjabloon-melding in Facilitor

Browse Source 
svn path=/Website/trunk/; revision=70925
This commit is contained in:
Erik Groener
2025-11-13 09:44:15 +00:00
parent 819119b93c
commit 38924f71c9
9 changed files with 86 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/FAC/job.asp
View File

@@ -22,6 +22,7 @@ FCLTHeader.Requires({ plugins: ["suggest", "jQuery"],
var job_key = getQParamInt("job_key", -1);
var template = getQParamInt("template", 0);
var urole = getQParam("urole", "");
var act_xmlnode = "";
var act_omschr = "";
if (job_key > -1)
@@ -129,7 +130,7 @@ if (job_key > -1)
var this_job = job.func_enabled_job(job_key);
jobFrameSrc = "job_show_job.asp";
pageHeader = act_omschr || pageHeader;
jobFrameSrc += (template == 1 ? "?template=1" : "");
jobFrameSrc += (template == 1 ? "?template=1&urole=" + urole : "");
var plannedEntityPage, plannedTitle, frameName;
switch (act_xmlnode) {
@@ -148,7 +149,7 @@ if (job_key > -1)
plannedEntityPage = "../mld/mld_melding.asp?urole=xx&act_key=" + job_key;
} else {
plannedTitle = (template == 1 ? L("lcl_mld_frame_algemeen_sjabloon") : L("lcl_mld_frame_algemeen_actie"));
plannedEntityPage = "../mld/mld_show_melding.asp?urole=xx&act_key=" + job_key + "&mld_key=" + this_job.ref_key + (template == 1 ? "&template=1" : "");
plannedEntityPage = "../mld/mld_show_melding.asp?urole=xx&act_key=" + job_key + "&mld_key=" + this_job.ref_key + (template == 1 ? "&template=1&urole=" + urole : "");
}
break;
case "opdracht":
@@ -241,7 +242,7 @@ if (job_key > -1)
IFRAMER(frameName, plannedEntityPage, { FcltClose: "closeEntityFrame", title: plannedTitle } );
if (template == 1) {
// 2b. opdrachten bij meldingsjabloon
page = "../mld/opdr_list.asp?tiny=1&embedded=1&urole=bo&act_key="+job_key+"&mld_key=" + this_job.ref_key;
page = "../mld/opdr_list.asp?tiny=1&embedded=1&urole="+urole+"&act_key="+job_key+"&mld_key=" + this_job.ref_key;
IFRAMER("opdrlistframe", page, { title: L("lcl_ord_frame_algemeen_sjabloon"), refreshOnActivate: true, refreshOnClose: true, icon: "fa-list" } );
}
}

22
APPL/FAC/job_list.inc
View File

@@ -14,15 +14,6 @@
<%
FCLTHeader.Requires({ plugins:["jQuery"] })
function fnrowData(oRs) {
var data = { job_key: oRs("fac_activiteit_key").Value
, eenheid: oRs("fac_activiteit_eenheid").Value
, template_key: oRs("rkey").Value
};
return JSON.stringify(data);
}
%>
<script type="text/javascript">
function jobDelete(rowArray, isMulti)
@@ -44,7 +35,7 @@ function fnrowData(oRs) {
{
var jobData = JSON.parse(row.getAttribute("ROWDATA"));
var isTemplate = (jobData.eenheid == 5);
var url = "appl/fac/job.asp?job_key=" + jobData.job_key + (isTemplate ? "&template=1" : "");
var url = "appl/fac/job.asp?job_key=" + jobData.job_key + (isTemplate ? "&template=1&urole=" + jobData.urole : "");
FcltMgr.openDetail(url, (isTemplate ? L("lcl_job_template") : L("lcl_job_title")) + " " + jobData.job_key);
}
function jobStart(row)
@@ -314,6 +305,15 @@ function job_list(pautfunction, params)
+ " ORDER BY fa.fac_activiteit_key DESC ";
function fnrowData(oRs) {
var data = { job_key: oRs("fac_activiteit_key").Value
, eenheid: oRs("fac_activiteit_eenheid").Value
, template_key: oRs("rkey").Value
, urole: params.urole
};
return JSON.stringify(data);
}
function fncolEenheid(oRs)
{
var eenheid = oRs("fac_activiteit_eenheid").Value;
@@ -349,7 +349,7 @@ function job_list(pautfunction, params)
if (isTemplate)
{
if (!fronto) {
var addurl = "appl/fac/job.asp?template=1";
var addurl = "appl/fac/job.asp?template=1&urole=" + params.urole;
addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }];
}
}

3
APPL/FAC/job_show_job.asp
View File

@@ -20,6 +20,7 @@
<%
var job_key = getQParamInt("job_key");
var urole = getQParam("urole", "");
var this_job = job.func_enabled_job(job_key);
user.auth_required_or_abort(this_job.canReadAny);
@@ -108,7 +109,7 @@ if (eenheid_key === -1) { // 1-malig
<body class="showmode">
<%SUBFRAME_START();
var buttons = [];
if (isTemplate ? this_job.canWriteTemplate : this_job.canWrite) {
if (isTemplate ? (this_job.canWriteTemplate && urole != "fo") : this_job.canWrite) {
var buttons = [ {title: L("lcl_change"), action: "job_change()", icon: "fa-fclt-edit" },
{title: L("lcl_delete"), action: "job_delete()", icon: "fa-trash-alt" }
];

2
APPL/MLD/mld_edit_melding.asp
View File

@@ -838,7 +838,7 @@ SUBFRAME_START();
if (lBestaandeMelding && (this_mld_rights.canBOwrite || this_mld_rights.canFOwrite))
buttons.push({ icon: "fa-lightbulb-on", title: L("lcl_mld_similarcalls"), action: goegel });
}
if (mld_key > 0 || this_mld_info.act_key == -1 || this_mld_info.template == 1) {) {
if (mld_key > 0 || this_mld_info.act_key == -1 || this_mld_info.template == 1) {
buttons.push ({ title: L("lcl_cancel"), icon: "fa-fclt-cancel", action:"mld_cancel()" });
}

14
APPL/MLD/mld_edit_opdr.asp
View File

@@ -547,7 +547,19 @@ var url_get_mld_info_ajax = "../mld/get_mld_info_ajax.asp?mld_key=" + mld_key;
buttons.push({title: L("lcl_cancel"), icon: "fa-fclt-cancel", action:"mld_cancel()"});
}
IFRAMER_HEADER((mld_opdr.act_key > 0? L("lcl_opdr_frame_algemeen_actie") : L("lcl_opdr_frame_algemeen")), buttons);
var iframe_header_label = L("lcl_opdr_frame_algemeen");
if (mld_opdr.act_key > 0)
{
var sql = "SELECT fac_activiteit_eenheid"
+ " FROM fac_activiteit"
+ " WHERE fac_activiteit_key = " + mld_opdr.act_key;
var oRs = Oracle.Execute(sql);
var isTemplate = (oRs("fac_activiteit_eenheid").Value == 5);
oRs.Close();
iframe_header_label = (isTemplate ? L("lcl_opdr_frame_algemeen_sjabloon") : L("lcl_opdr_frame_algemeen_actie"));
}
IFRAMER_HEADER(iframe_header_label, buttons);
%>
<form name="u2" method="post"

2
APPL/MLD/mld_show_melding.asp
View File

@@ -285,7 +285,7 @@ SUBFRAME_START();
if (isTemplate)
{
if (this_job.canWriteTemplate)
if (this_job.canWriteTemplate && !fronto)
buttons.push({ title: L("lcl_change"), icon: "fa-fclt-edit", action: "mld_change('" + this_mld.canChangeUrole + "')" });
// else: geen buttons.
}

28
APPL/MLD/mld_show_opdr.asp
View File

@@ -33,8 +33,22 @@ FCLTHeader.Requires({ plugins:["jQuery"],
js: ["date.js", "./mld.js", "../fac/faq.js", "./mld_show_opdr.js", "jQuery-ui.js"]
})
function add_enabled_template(p_template, p_ord)
{
if (p_template)
{ // Heeft de gebruiker MGT rechten voor sjablonen.
var levels = user.has("WEB_MLDMGT");
var canRead = (levels ? (levels.ALGreadlevel < 9 || levels.PRSreadlevel < 9) : false);
var canWrite = (levels ? (levels.ALGwritelevel < 9 || levels.PRSwritelevel < 9) : false) && !fronto;
p_ord.isTemplate = { canRead: canRead
, canWrite: canWrite
}
}
}
// AUTORISATIEPARAMETERS
var urole = getQParamSafe("urole");
var template = getQParamInt("template", 0) == 1;
// Om nog even compatible te blijven zodat alles nog even blijft werken. Moet er straks uit, natuurlijk.
var fronto = urole == "fo";
@@ -50,7 +64,8 @@ user.auth_required_or_abort(this_opdr.canReadAny);
// INITIALISATIE MET DE INITIEEL WEER TE GEVEN GEGEVENS
// Haal de opdrachtgegevens op van de opdracht
mld_opdr = this_opdr.mld_opdr;
mld_opdr.isTemplate = (getQParamInt("template", 0) == 1);
add_enabled_template(template, mld_opdr);
if (mld_opdr.uitv_type == "B")
{ // toevoegen leverancier opmerking. Kan ook in query mld.mld_opdr_info()
var sql = "SELECT prs_bedrijf_opmerking"
@@ -320,7 +335,7 @@ for (i in faq_info.fixed_faq)
SUBFRAME_START();
var buttons = [];
if (this_opdr.canChange)
if ((!mld_opdr.isTemplate && this_opdr.canChange) || (mld_opdr.isTemplate && mld_opdr.isTemplate.canWrite))
buttons.push({ title: L("lcl_change"), icon: "fa-fclt-edit", action: "opdr_change('" + this_opdr.canChangeUrole + "')" });
if (!mld_opdr.isTemplate)
@@ -403,7 +418,14 @@ for (i in faq_info.fixed_faq)
buttons.push({ title: /* lcl */ "Leverancierscherm*", icon: "fa-user-bounty-hunter", action: "testafmeldscherm()" });
}
IFRAMER_HEADER((mld_opdr.act_key > 0? L("lcl_opdr_frame_algemeen_actie") : L("lcl_opdr_frame_algemeen")), buttons);
var iframe_header_label = L("lcl_opdr_frame_algemeen");
if (mld_opdr.act_key > 0) {
if (mld_opdr.isTemplate)
iframe_header_label = L("lcl_opdr_frame_algemeen_sjabloon");
else
iframe_header_label = L("lcl_opdr_frame_algemeen_actie")
}
IFRAMER_HEADER(iframe_header_label, buttons);
shared.notificatie_fail_BLOCK(opdr_key, 'opdracht');
if (mld_opdr.recentgewijzigd)

40
APPL/MLD/opdr_list.inc
View File

@@ -188,19 +188,34 @@ function opdr_list(params)
// var hasFOBOread = this_mld.canFOread || this_mld.canBOread;
}
oRs.Close();
// Als de melding een fac_activiteit_key heeft dan is de melding een sjabloon of een geplande actie.
if (mld_melding.act_key > -1)
{
var sql = "SELECT fac_activiteit_eenheid"
+ " FROM fac_activiteit"
+ " WHERE fac_activiteit_key = " + mld_melding.act_key;
var oRs = Oracle.Execute(sql);
mld_melding.isTemplate = (oRs("fac_activiteit_eenheid").Value == 5);
oRs.Close();
}
add_enabled_template(mld_melding); // Voeg template gegevens toe als deze aanwezig zijn.
}
params.isTemplate = mld_melding.isTemplate;
function add_enabled_template(p_mld)
{
var isTemplate = false;
if (p_mld.act_key > -1)
{ // Als de melding een fac_activiteit_key heeft dan is de melding een sjabloon of een geplande actie.
var sql = "SELECT fac_activiteit_eenheid"
+ " FROM fac_activiteit"
+ " WHERE fac_activiteit_key = " + p_mld.act_key;
var oRs = Oracle.Execute(sql);
isTemplate = (oRs("fac_activiteit_eenheid").Value == 5);
oRs.Close();
}
if (isTemplate)
{ // Heeft de gebruiker MGT rechten voor sjablonen.
var levels = user.has("WEB_MLDMGT");
var canRead = (levels ? (levels.ALGreadlevel < 9 || levels.PRSreadlevel < 9) : false);
var canWrite = (levels ? (levels.ALGwritelevel < 9 || levels.PRSwritelevel < 9) : false) && !fronto;
p_mld.isTemplate = { canRead: canRead
, canWrite: canWrite
}
}
}
if (params.withflex && !excel && !print)
{
// Fast check to see if we have any listable flex at all, to prevent superfluous empty column
@@ -598,7 +613,7 @@ function opdr_list(params)
if (addallowed)
{
if (!params.opdr_parent_key)
if ((!mld_melding.isTemplate && !params.opdr_parent_key) || (mld_melding.isTemplate && mld_melding.isTemplate.canWrite))
buttons.push({ icon: "fa-plus", title: L("lcl_add"), action: "add_opdracht("+(canAccept?1:0)+")" });
if (!inline)
buttons.push({ icon: "fa-fclt-refresh", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
@@ -970,7 +985,8 @@ function opdr_list(params)
rst.addAction({ action: "opdr_edit", caption: L("lcl_details"), isDefault: true });
if (mld_melding.isTemplate)
{
rst.addAction({ action: "opdr_delete", caption: L("lcl_delete"), enabler: "eDelete", multi: true, single: false, multiOnce: true});
if (mld_melding.isTemplate.canWrite)
rst.addAction({ action: "opdr_delete", caption: L("lcl_delete"), enabler: "eDelete", multi: true, single: false, multiOnce: true});
}
else
{

2
APPL/MLD/opdr_list.js
View File

@@ -11,7 +11,7 @@ function opdr_edit(row, finish)
var mldData = JSON.parse(row.getAttribute("ROWDATA"));
if (mldData.act_key > -1)
{ // sjaboon
var url = "appl/mld/mld_show_opdr.asp?urole=bo&template=1&opdr_key=" + opdr_key;
var url = "appl/mld/mld_show_opdr.asp?urole=" + urole + "&template=1&opdr_key=" + opdr_key;
}
else
{