FSN#36132 Alle ALG en BES omgezet (tussencommit)

svn path=/Website/trunk/; revision=31371
This commit is contained in:
2016-11-04 16:33:25 +00:00
parent 13e6a90555
commit a3d8cba082
30 changed files with 345 additions and 361 deletions

View File

@@ -55,18 +55,15 @@ function fnrowData(oRs)
function doDelete(rowArray, isMulti)
{
var disKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_alg_del_txt_district")))
{
var data = { key: disKeyString,
level: "D"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: disKeyString,
level: "D"
};
<% protectRequest.dataToken("data"); %>+
isMulti ? $.post("alg_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_district"), function() {
$.post("alg_delete.asp", data, FcltCallbackRefresh, "json")
});
}
</script>
<%

View File

@@ -87,17 +87,13 @@ function fnrowClass(oRs)
function doDelete(rowArray, isMulti)
{
var bldKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_alg_del_txt_gebouw")))
{
var data = { key: bldKeyString,
level: "G"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: bldKeyString,
level: "G"
};
<% protectRequest.dataToken("data"); %>
isMulti ? $.post("alg_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), function() {
$.post("alg_delete.asp", data, FcltCallbackRefresh, "json")
});
}
</script>
<%

View File

@@ -94,17 +94,13 @@ function fnrowClass(oRs)
function doDelete(rowArray, isMulti)
{
var locKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_alg_del_txt_locatie")))
{
var data = { key: locKeyString,
level: "L"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: locKeyString,
level: "L"
};
<% protectRequest.dataToken("data"); %>
isMulti ? $.post("alg_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_locatie"), function() {
$.post("alg_delete.asp", data, FcltCallbackRefresh, "json")
});
}
</script>
<%

View File

@@ -53,17 +53,13 @@ function fnrowData(oRs)
function doDelete(rowArray, isMulti)
{
var regKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_alg_del_txt_regio")))
{
var data = { key: regKeyString,
level: "RE"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: regKeyString,
level: "RE"
};
<% protectRequest.dataToken("data"); %>
isMulti ? $.post("alg_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_regio"), function() {
$.post("alg_delete.asp", data, FcltCallbackRefresh, "json")
});
}
</script>
<%

View File

@@ -102,17 +102,13 @@ function ruimte_list(pautfunction, params)
{
$(row).addClass('dirty');
var room_key = row.getAttribute("ROWKEY");
if (isMulti || confirm(L("lcl_alg_del_txt_ruimte")))
{
var data = { key: room_key,
level: "R"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: room_key,
level: "R"
};
<% protectRequest.dataToken("data"); %>
isMulti ? $.post("alg_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), function() {
$.post("alg_delete.asp", data, FcltCallbackRefresh, "json")
});
}
</script>
</head>

View File

@@ -73,13 +73,12 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
function delRow(img)
{
// Verwijder de aangeklikte afdeling uit de lijst (de regel)
if (!confirm(L("lcl_alg_cancelDepartment")))
return;
var tr = $(img).closest("tr")[0];
if (tr.myData.afd_key != null)
{
document.getElementById("afdbezettingtable").deleteRow(tr.rowIndex);
}
FcltMgr.confirm(L("lcl_alg_cancelDepartment"), function() {
var tr = $(img).closest("tr")[0];
if (tr.myData.afd_key != null) {
document.getElementById("afdbezettingtable").deleteRow(tr.rowIndex);
}
});
}
function alg_submit()

View File

@@ -55,16 +55,12 @@ function ruimtefunctie_list(pautfunction, params)
{
$(row).addClass('dirty');
var srtruimte_lg_key = row.getAttribute("ROWKEY");
if (isMulti || confirm(L("lcl_alg_del_txt_ruimtefunctie")))
{
var data = { key: srtruimte_lg_key
};
<% protectRequest.dataToken("data"); %>
$.post("alg_ruimtefunctie_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: srtruimte_lg_key
};
<% protectRequest.dataToken("data"); %>
isMulti ? $.post("alg_ruimtefunctie_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_ruimtefunctie"), function() {
$.post("alg_ruimtefunctie_delete.asp", data, FcltCallbackRefresh, "json")
});
}
</script>
</head>

View File

@@ -33,10 +33,10 @@ var ruimte_key_arr = getQParamIntArray("ruimte_keys");
{
if ($('select#objcatmulti option:selected').length == 0)
return;
if (!confirm(L(scopemode=="A"?"lcl_add":"lcl_delete") + "\n" + L("lcl_R_U_sure")))
return;
$('input#scopemode').val(scopemode);
$.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), FcltCallbackClose, "json");;
FcltMgr.confirm(L(scopemode == "A" ? "lcl_add" : "lcl_delete") + "\n" + L("lcl_R_U_sure"), function() {
$('input#scopemode').val(scopemode);
$.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), FcltCallbackClose, "json");;
});
}
</script>
</head>

View File

@@ -47,17 +47,17 @@ oRs.Close();
}
function dis_delete()
{
if (confirm(L("lcl_alg_del_txt_district")))
{
var data = { key: <%=dis_key%>,
level: "D"
};
FcltMgr.confirm(L("lcl_alg_del_txt_district"), function() {
var data = {
key: <%=dis_key%>,
level: "D"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
}
data,
FcltCallbackClose,
"json");
});
}
</script>
</head>

View File

@@ -74,17 +74,17 @@ oRs.Close();
}
function bld_delete()
{
if (confirm(L("lcl_alg_del_txt_gebouw")))
{
var data = { key: <%=bld_key%>,
level: "G"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
}
FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), function() {
var data = {
key: <%=bld_key%>,
level: "G"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
});
}
<% if (S("alg_fg_remote_maps") != "" && bld_x && bld_y) { %>
function openMaps(bldKey)

View File

@@ -71,17 +71,17 @@ oRs.Close();
function loc_delete()
{
if (confirm(L("lcl_alg_del_txt_locatie")))
{
var data = { key: <%=loc_key%>,
level: "L"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
}
FcltMgr.confirm(L("lcl_alg_del_txt_locatie"), function() {
var data = {
key: <%=loc_key%>,
level: "L"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
});
}
<% if (S("alg_fg_remote_maps") != "" && loc_x && loc_y) { %>
function openMaps(locKey)

View File

@@ -49,15 +49,16 @@ var regio_deleted = regio_exists && !!regio_data.deleted;
function reg_delete()
{
if (confirm(L("lcl_alg_del_txt_regio")))
{
var data = { action: "D" };
FcltMgr.confirm(L("lcl_alg_del_txt_regio"), function() {
var data = {
action: "D"
};
<% protectRequest.dataToken("data"); %>
$.post($("form[name=u2]")[0].action,
data,
FcltCallbackClose,
"json");
}
data,
FcltCallbackClose,
"json");
});
}
</script>
</head>

View File

@@ -54,15 +54,16 @@ if (!room_data.cadcontours.length)
}
function room_delete()
{
if (confirm(L("lcl_alg_del_txt_ruimte")))
{
var data = { room_action: "D" };
FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), function() {
var data = {
room_action: "D"
};
<% protectRequest.dataToken("data"); %>
$.post($("form[name=u2]")[0].action,
data,
FcltCallbackClose,
"json");
}
data,
FcltCallbackClose,
"json");
});
}
function openFG()
{

View File

@@ -87,18 +87,18 @@ oRs.Close();
}
function ter_delete()
{
if (confirm(L("lcl_alg_del_txt_terreinsector")))
{
var data = { key: <%=ter_key%>,
level: "T"
};
FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), function() {
var data = {
key: <%=ter_key%>,
level: "T"
};
<% protectRequest.dataToken("data"); %>
var ter_key = <%=ter_key%>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
}
data,
FcltCallbackClose,
"json");
});
}
</script>
</head>

View File

@@ -52,17 +52,17 @@ oRs.Close();
function flr_delete()
{
if (confirm(L("lcl_alg_del_txt_verdieping")))
{
var data = { key: <%=flr_key%>,
level: "V"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
}
FcltMgr.confirm(L("lcl_alg_del_txt_verdieping"), function() {
var data = {
key: <%=flr_key%>,
level: "V"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
});
}
</script>
</head>
@@ -104,14 +104,14 @@ oRs.Close();
oRs = Oracle.Execute(sql);
ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
oRs.Close();
}
}
BLOCK_END();
BLOCK_START("algLoc2", "&nbsp;");
var calcopp = alg.calc_algm2(flr_key, onrgoedlvl);
var calcopp = alg.calc_algm2(flr_key, onrgoedlvl);
ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
BLOCK_END();
generateFlexKenmerkBlock ({

View File

@@ -58,17 +58,17 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
function wp_delete()
{
var wp_key = <%=wp_key%>;
if (confirm(L("lcl_alg_del_txt_werkplek")))
{
var data = { key: <%=wp_key%>,
level: "W"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
}
FcltMgr.confirm(L("lcl_alg_del_txt_werkplek"), function() {
var data = {
key: <%=wp_key%>,
level: "W"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackClose,
"json");
});
}
</script>
</head>

View File

@@ -171,8 +171,9 @@ else if (srtruimte_key > 0 && mode == "delete")
function alg_delete()
{
if (confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>"))
window.location.href = "alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
FcltMgr.confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>", function() {
window.location.href = "alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
});
}
function alg_cancel()

View File

@@ -50,17 +50,13 @@ function fnrowData(oRs)
function doDelete(rowArray, isMulti)
{
var terKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_alg_del_txt_terreinsector")))
{
var data = { key: terKeyString,
level: "T"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: terKeyString,
level: "T"
};
<% protectRequest.dataToken("data"); %>
isMulti ? $.post("alg_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), function() {
$.post("alg_delete.asp", data, FcltCallbackRefresh, "json")
});
}
</script>
<%

View File

@@ -55,17 +55,13 @@ function fnrowData(oRs)
function doDelete(rowArray, isMulti)
{
var flrKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_alg_del_txt_verdieping")))
{
var data = { key: flrKeyString,
level: "V"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: flrKeyString,
level: "V"
};
<% protectRequest.dataToken("data"); %>
isMulti ? $.post("alg_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_verdieping"), function() {
$.post("alg_delete.asp", data, FcltCallbackRefresh, "json")
});
}
</script>

View File

@@ -68,17 +68,13 @@ FCLTHeader.Requires({ plugins:["jQuery"],
function doDelete(rowArray, isMulti)
{
var wpKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_alg_del_txt_werkplek")))
{
var data = { key: wpKeyString,
level: "W"
};
<% protectRequest.dataToken("data"); %>
$.post("alg_delete.asp",
data,
FcltCallbackRefresh,
"json");
}
var data = { key: wpKeyString,
level: "W"
};
<% protectRequest.dataToken("data"); %>
isMulti ? $.post("alg_delete.asp", data, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_alg_del_txt_werkplek"), function() {
$.post("alg_delete.asp", data, FcltCallbackRefresh, "json")
});
}
function doAddWP(room_key) // als impliciet==0

View File

@@ -31,14 +31,15 @@ function besOpdrShow(row)
function besAccept(rowArray, isMulti)
{
var besKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_bes_accepteren")))
{
$.post("bes_accept.asp",
{ urole: urole,
bes_key: besKeyString },
FcltCallbackRefresh,
"json");
}
isMulti ? $.post("bes_accept.asp", {
urole: urole,
bes_key: besKeyString
}, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_bes_accepteren"), function() {
$.post("bes_accept.asp", {
urole: urole,
bes_key: besKeyString
}, FcltCallbackRefresh, "json")
});
}
function besReject(rowArray, isMulti)
@@ -68,12 +69,13 @@ function besSubmitCallback(json, textStatus)
function besSubmit(rowArray, isMulti)
{
var besKeyString = getKeyString(rowArray);
if (isMulti || confirm(L("lcl_bes_dosubmit")))
{
$.post("bes_submit.asp",
{ urole: urole,
bes_key: besKeyString },
besSubmitCallback,
"json");
}
isMulti ? $.post("bes_submit.asp", {
urole: urole,
bes_key: besKeyString
}, besSubmitCallback, "json") : FcltMgr.confirm(L("lcl_bes_dosubmit"), function() {
$.post("bes_submit.asp", {
urole: urole,
bes_key: besKeyString
}, besSubmitCallback, "json")
});
}

View File

@@ -69,12 +69,11 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"],
$('textarea').autogrow();
});
function bes_change()
{
function bes_change() {
<% if (bes_bestelling.rfoStatus == 5) { %> // extra waarschuwing
if (confirm(L("lcl_bes_confirm_embargo")))
<% } %>
<% if (bes_bestelling.rfoStatus == 5) { %> // extra waarschuwing
FcltMgr.confirm(L("lcl_bes_confirm_embargo"), function() {});
<% } %>
if (FcltMgr.startEdit(window))
window.location.href = "bes_edit_bestelling.asp?urole=<%=urole%>&bes_key=<%=bes_key%>&embedded=1"
}
@@ -84,23 +83,26 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"],
<% if (bes_bestelling.rfoStatus == 5) { %> // extra waarschuwing
txt = L("lcl_bes_confirm_embargo") + "\n";
<% } %>
if (confirm(txt + "<%=L("lcl_bes_delete_1") + S("bes_bestelling_prefix") + bes_key + L("lcl_bes_delete_2")%>") )
{
var data = { urole: "<%=urole%>",
bes_key: <%=bes_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("bes_delete.asp",
data,
function(json, textStatus)
{
if (json.change)
FcltCallbackRefresh(json, textStatus); // Er is een change bestelling aangemaakt
else
FcltCallbackClose(json, textStatus); // Bestelling is verwijderd
},
"json");
}
FcltMgr.confirm(txt + "<%=L("
lcl_bes_delete_1 ") + S("
bes_bestelling_prefix ") + bes_key + L("
lcl_bes_delete_2 ")%>",
function() {
var data = {
urole: "<%=urole%>",
bes_key: <%=bes_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("bes_delete.asp",
data,
function(json, textStatus) {
if (json.change)
FcltCallbackRefresh(json, textStatus); // Er is een change bestelling aangemaakt
else
FcltCallbackClose(json, textStatus); // Bestelling is verwijderd
},
"json");
});
}
function bes_mail()
{
@@ -235,28 +237,28 @@ var inclBTW = <%=bes_bestelling.inclBTW%> == 1;
function bes_accept()
{
if (confirm(L("lcl_bes_accepteren1").format("<%=bes_key%>")))
{
$.post("bes_accept.asp",
{ urole: "<%=urole%>",
bes_key: <%=bes_key%> },
FcltCallbackRefresh,
"json");
}
FcltMgr.confirm(L("lcl_bes_accepteren1").format("<%=bes_key%>"), function() {
$.post("bes_accept.asp", {
urole: "<%=urole%>",
bes_key: <%=bes_key%>
},
FcltCallbackRefresh,
"json");
});
}
function bes_approve()
{
if (confirm(L("lcl_bes_approve").format("<%=bes_key%>")))
{
var data = { bes_key: <%=bes_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("bes_approve.asp",
data,
FcltCallbackRefresh,
"json");
}
FcltMgr.confirm(L("lcl_bes_approve").format("<%=bes_key%>"), function() {
var data = {
bes_key: <%=bes_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("bes_approve.asp",
data,
FcltCallbackRefresh,
"json");
});
}
function bes_reject()

View File

@@ -44,32 +44,34 @@ user.auth_required_or_abort(this_bestelopdr.canReadAny || this_bestelling.isVera
function bes_opdr_sent()
{
if (confirm(L("lcl_bes_confirm_sent").format("<%=S("bes_bestelopdr_prefix") + bes_bestelopdr.bestelopdr_id%>")))
{
var data = { urole: "<%=urole%>",
opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("opdr_sent.asp",
data,
FcltCallbackRefresh,
"json");
}
FcltMgr.confirm(L("lcl_bes_confirm_sent").format("<%=S("
bes_bestelopdr_prefix ") + bes_bestelopdr.bestelopdr_id%>"), function() {
var data = {
urole: "<%=urole%>",
opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("opdr_sent.asp",
data,
FcltCallbackRefresh,
"json");
});
}
function bes_opdr_accept()
{
if (confirm(L("lcl_bes_confirm_accept").format("<%=S("bes_bestelopdr_prefix") + bes_bestelopdr.bestelopdr_id%>")))
{
var data = { urole: "<%=urole%>",
opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("opdr_accept.asp",
data,
<%=bes_bestelling.parent_key? "FcltCallbackClose" : "FcltCallbackRefresh"%>,
"json");
}
FcltMgr.confirm(L("lcl_bes_confirm_accept").format("<%=S("
bes_bestelopdr_prefix ") + bes_bestelopdr.bestelopdr_id%>"), function() {
var data = {
urole: "<%=urole%>",
opdr_key: <%=opdr_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("opdr_accept.asp",
data,
<%=bes_bestelling.parent_key? "FcltCallbackClose" : "FcltCallbackRefresh"%>,
"json");
});
}
function bes_opdr_reject()

View File

@@ -105,16 +105,16 @@ oRs.Close();
function bes_delete()
{
var srtdeel_key = <%=srtdeel_key%>;
if (confirm(L("lcl_bes_del_srtdeel")))
{
var data = { bes_srtdeel_key: <%=srtdeel_key%>
};
<% protectRequest.dataToken("data"); %>
FcltMgr.confirm(L("lcl_bes_del_srtdeel"), function() {
var data = {
bes_srtdeel_key: <%=srtdeel_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("bes_srtdeel_delete.asp",
data,
FcltCallbackClose,
"json");
}
data,
FcltCallbackClose,
"json");
});
}
</script>
</head>

View File

@@ -78,16 +78,16 @@ oRs.Close();
function bes_delete()
{
var srtprod_key = <%=srtprod_key%>;
if (confirm(L("lcl_bes_del_srtprod")))
{
var data = { bes_srtprod_key: <%=srtprod_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("bes_srtprod_delete.asp",
data,
FcltCallbackClose,
"json");
}
FcltMgr.confirm(L("lcl_bes_del_srtprod"), function() {
var data = {
bes_srtprod_key: <%=srtprod_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("bes_srtprod_delete.asp",
data,
FcltCallbackClose,
"json");
});
}
</script>
</head>

View File

@@ -99,11 +99,10 @@ var authparams = user.checkAutorisation("WEB_PRDMSU");
function bes_newprod()
{
if (confirm(L("lcl_bes_newsrtprodQ")))
{
$("#createnew").val(1);
document.u2.submit();
}
FcltMgr.confirm(L("lcl_bes_newsrtprodQ"), function() {
$("#createnew").val(1);
document.u2.submit();
});
}
$(document).ready(function () {

View File

@@ -79,20 +79,19 @@ function CreateRow(fav_name, bes_item_info, recent_date, recent, fav_key)
function delFavourites(img)
{
// Verwijder het aangeklikte item uit de lijst (de regel) en de favorieten lijst (bes_favoriet tabel)
if (!confirm(L("lcl_bes_cancelfav")))
return;
var tr = $(img).closest("tr")[0];
if (tr.myData.fav_key != null)
{
fav_key = tr.myData.fav_key;
FcltMgr.confirm(L("lcl_bes_cancelfav"), function() {
var tr = $(img).closest("tr")[0];
if (tr.myData.fav_key != null) {
fav_key = tr.myData.fav_key;
document.getElementById("besfavtable").deleteRow(tr.rowIndex);
document.getElementById("besfavtable").deleteRow(tr.rowIndex);
document.getElementById("itemsInList").value = document.getElementById("itemsInList").value -1;
document.getElementById("item_in_list").innerHTML = document.getElementById("itemsInList").value + " " + L("lcl_bes_fac_items_inlist")
document.getElementById("itemsInList").value = document.getElementById("itemsInList").value - 1;
document.getElementById("item_in_list").innerHTML = document.getElementById("itemsInList").value + " " + L("lcl_bes_fac_items_inlist")
var data = {};
protectRequest.dataToken(data);
$.post("delFavourites.asp?fav_key=" + fav_key, data);
}
var data = {};
protectRequest.dataToken(data);
$.post("delFavourites.asp?fav_key=" + fav_key, data);
}
});
}

View File

@@ -26,16 +26,22 @@ function opdrAccept(rowArray, isMulti)
{
var opdrKeyString = getKeyString(rowArray);
var opdrData = eval('(' + rowArray[0].getAttribute("ROWDATA") + ')');
if (isMulti || (opdrData && confirm(L("lcl_bes_confirm_accept").format(opdrData.opdrId))))
var data = { urole: urole
, opdr_key: opdrKeyString
};
protectRequest.dataToken(data);
if (isMulti)
{
var data = { urole: urole
, opdr_key: opdrKeyString
};
protectRequest.dataToken(data);
$.post("opdr_accept.asp"
, data
, FcltCallbackRefresh
, "json");
$.post("opdr_accept.asp", data, FcltCallbackRefresh, "json");
}
else
{
if (opdrData)
{
FcltMgr.confirm(L("lcl_bes_confirm_accept").format(opdrData.opdrId), function() {
$.post("opdr_accept.asp", data, FcltCallbackRefresh, "json")
});
}
}
}
@@ -44,16 +50,22 @@ function opdrSent(rowArray, isMulti)
var opdrKeyString = getKeyString(rowArray);
var opdrData = eval('(' + rowArray[0].getAttribute("ROWDATA") + ')');
var opdrId = opdrData.opdrId;
if (isMulti || (opdrData && confirm(L("lcl_bes_confirm_sent").format(opdrData.opdrId))))
var data = { urole: urole
, opdr_key: opdrKeyString
};
protectRequest.dataToken(data);
if (isMulti)
{
var data = { urole: urole
, opdr_key: opdrKeyString
};
protectRequest.dataToken(data);
$.post("opdr_sent.asp"
, data
, FcltCallbackRefresh
, "json");
$.post("opdr_sent.asp", data, FcltCallbackRefresh, "json");
}
else
{
if (opdrData)
{
FcltMgr.confirm(L("lcl_bes_confirm_sent").format(opdrData.opdrId), function() {
$.post("opdr_sent.asp", data, FcltCallbackRefresh, "json")
});
}
}
}

View File

@@ -436,40 +436,37 @@ function CreateRow(bes_item_info, aantal, received, editable, objFlex, urole)
// Annuleer een item(regel)
function cancel_item(een_cell)
{
if (!confirm(L("lcl_bes_cancelItem")))
return;
FcltMgr.confirm(L("lcl_bes_cancelItem"), function() {
var maxreached = maxArtikelReached();
var maxreached = maxArtikelReached();
var tr = $(een_cell).closest("tr")[0];
var tr = $(een_cell).closest("tr")[0];
var index = tr.rowIndex;
var table = $("#sel_items")[0];
table.deleteRow(index);
var index = tr.rowIndex;
var table = $("#sel_items")[0];
table.deleteRow(index);
// Artikel veld nu zeker weer wijzigbaar.
$("#besitem_show").attr('disabled', false);
// Artikel veld nu zeker weer wijzigbaar.
$("#besitem_show").attr('disabled', false);
if (maxreached)
{ // De tekst lcl_bes_max_artikel_reached weer verwijderen
$("#srtgroep_text").html("");
}
if (maxreached) { // De tekst lcl_bes_max_artikel_reached weer verwijderen
$("#srtgroep_text").html("");
}
// Indien singlegroep is gezet kunnen binnen een catalogus uitsluitend artikelen uit dezelfde groep worden besteld. Alle artikelen in de bestellijst moeten dan uit dezelfde groep komen.
// Indien er geen bestelregels aanwezig zijn mag de artikelgroep worden gewijzigd.
if ($("#singlegroep").val() == 1)
{
// Indien readOnly (initieel) is gezet blijft de input box ook readonly. sgSrtgroep is dan ook niet gedefinieerd. $("#srtgroep_show")[0].style.display = "block" doet dan toch niets.
if (getAantalArtikelen() == 0 && !$("#srtgroep_show")[0].readOnly)
{
$("#srtgroep_ro")[0].style.display = "none";
$("#srtgroep_show")[0].style.display = "block";
}
}
if (getAantalArtikelen() == 0)
$("#lev_key_show").prop('disabled', false); // Je mag eventueel weer leverancier kiezen
// Indien singlegroep is gezet kunnen binnen een catalogus uitsluitend artikelen uit dezelfde groep worden besteld. Alle artikelen in de bestellijst moeten dan uit dezelfde groep komen.
// Indien er geen bestelregels aanwezig zijn mag de artikelgroep worden gewijzigd.
if ($("#singlegroep").val() == 1) {
// Indien readOnly (initieel) is gezet blijft de input box ook readonly. sgSrtgroep is dan ook niet gedefinieerd. $("#srtgroep_show")[0].style.display = "block" doet dan toch niets.
if (getAantalArtikelen() == 0 && !$("#srtgroep_show")[0].readOnly) {
$("#srtgroep_ro")[0].style.display = "none";
$("#srtgroep_show")[0].style.display = "block";
}
}
if (getAantalArtikelen() == 0)
$("#lev_key_show").prop('disabled', false); // Je mag eventueel weer leverancier kiezen
StaffelKortingResult();
StaffelKortingResult();
});
}
function checkInput()
@@ -536,11 +533,12 @@ function checkInput()
if (cal.length)
{
var levDate = new Date(parseInt($('#calendar').val()));
if( cal_isVrijeDag(levDate) && ! confirm( L("lcl_bes_date_holiday") ) )// Geen werkdag. Toch doorgaan?
return false;
if (cal_isVrijeDag(levDate)) {
FcltMgr.antiConfirm(L("lcl_bes_date_holiday"), function() {
return false;
});
}
}
return true;
}
@@ -558,11 +556,10 @@ function MakeOrder (newOrder)
if (confirm_order_before_submit && (newOrder == 0))
{ // Alleen als op de vrachtwagen geklikt is, en de setting aan staat
// om bevestiging van de bestelopdracht vragen.
if (!confirm(L("lcl_bes_confirm_order")))
{
submitOrder = false;
return false;
}
FcltMgr.antiConfirm(L("lcl_bes_confirm_order"), function() {
submitOrder = false;
return false;
});
}
if (submitOrder)
{

View File

@@ -1061,10 +1061,14 @@ var FcltMgr =
// disablen
confirm: function (tekst, fncallback)
{
// alert("test");
if (confirm(tekst))
fncallback();
},
antiConfirm: function (tekst, fncallback)
{
if (!confirm(tekst))
fncallback();
},
alert: function (tekst)
{
alert(tekst);