diff --git a/APPL/ALG/alg_district_list.inc b/APPL/ALG/alg_district_list.inc index eebac63e82..62357fd305 100644 --- a/APPL/ALG/alg_district_list.inc +++ b/APPL/ALG/alg_district_list.inc @@ -54,14 +54,16 @@ function fnrowData(oRs) function doDelete(rowArray, isMulti) { - var disKeyString = getKeyString(rowArray); - 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") - }); + FcltMgr.confirm(L("lcl_alg_del_txt_district"), { autoconfirm: isMulti }, + function() { + var disKeyString = getKeyString(rowArray); + var data = { key: disKeyString, + level: "D" + }; + <% protectRequest.dataToken("data"); %>+ + $.post("alg_delete.asp", data, FcltCallbackRefresh, "json"); + } + ); } diff --git a/APPL/ALG/alg_edit_wp.asp b/APPL/ALG/alg_edit_wp.asp index 0ea9b5b673..de7a58ade4 100644 --- a/APPL/ALG/alg_edit_wp.asp +++ b/APPL/ALG/alg_edit_wp.asp @@ -75,7 +75,7 @@ else if (S("prs_werkplek_implicit") == 1) } function alg_next() { - alert("TODO: Next nog niet ondersteund") + FcltMgr.alert("TODO: Next nog niet ondersteund") } function process_host_info(data) diff --git a/APPL/ALG/alg_gebouw_list.inc b/APPL/ALG/alg_gebouw_list.inc index d490bc9462..d25941601e 100644 --- a/APPL/ALG/alg_gebouw_list.inc +++ b/APPL/ALG/alg_gebouw_list.inc @@ -86,13 +86,13 @@ function fnrowClass(oRs) function doDelete(rowArray, isMulti) { - var bldKeyString = getKeyString(rowArray); - 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") + FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), { autoconfirm: isMulti }, function() { + var bldKeyString = getKeyString(rowArray); + var data = { key: bldKeyString, + level: "G" + }; + <% protectRequest.dataToken("data"); %> + $.post("alg_delete.asp", data, FcltCallbackRefresh, "json"); }); } diff --git a/APPL/ALG/alg_locatie_list.inc b/APPL/ALG/alg_locatie_list.inc index 29e9a56de7..5bb86ce81f 100644 --- a/APPL/ALG/alg_locatie_list.inc +++ b/APPL/ALG/alg_locatie_list.inc @@ -93,13 +93,13 @@ function fnrowClass(oRs) function doDelete(rowArray, isMulti) { - var locKeyString = getKeyString(rowArray); - 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") + FcltMgr.confirm(L("lcl_alg_del_txt_locatie"), { autoconfirm: isMulti }, function() { + var locKeyString = getKeyString(rowArray); + var data = { key: locKeyString, + level: "L" + }; + <% protectRequest.dataToken("data"); %> + $.post("alg_delete.asp", data, FcltCallbackRefresh, "json"); }); } diff --git a/APPL/ALG/alg_regio_list.inc b/APPL/ALG/alg_regio_list.inc index fdb79b8010..84dc40c7c7 100644 --- a/APPL/ALG/alg_regio_list.inc +++ b/APPL/ALG/alg_regio_list.inc @@ -52,13 +52,13 @@ function fnrowData(oRs) function doDelete(rowArray, isMulti) { - var regKeyString = getKeyString(rowArray); - 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") + FcltMgr.confirm(L("lcl_alg_del_txt_regio"), { autoconfirm: isMulti }, function() { + var regKeyString = getKeyString(rowArray); + var data = { key: regKeyString, + level: "RE" + }; + <% protectRequest.dataToken("data"); %> + $.post("alg_delete.asp", data, FcltCallbackRefresh, "json"); }); } diff --git a/APPL/ALG/alg_ruimte_list.inc b/APPL/ALG/alg_ruimte_list.inc index b30e3e7455..6121012943 100644 --- a/APPL/ALG/alg_ruimte_list.inc +++ b/APPL/ALG/alg_ruimte_list.inc @@ -100,14 +100,14 @@ function ruimte_list(pautfunction, params) function doDelete(row, isMulti) { - $(row).addClass('dirty'); - var room_key = row.getAttribute("ROWKEY"); - 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") + FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), { autoconfirm: isMulti }, function() { + $(row).addClass('dirty'); + var room_key = row.getAttribute("ROWKEY"); + var data = { key: room_key, + level: "R" + }; + <% protectRequest.dataToken("data"); %> + $.post("alg_delete.asp", data, FcltCallbackRefresh, "json"); }); } diff --git a/APPL/ALG/alg_ruimteafdeling.js b/APPL/ALG/alg_ruimteafdeling.js index 52a2b9c229..00738ab48c 100644 --- a/APPL/ALG/alg_ruimteafdeling.js +++ b/APPL/ALG/alg_ruimteafdeling.js @@ -93,7 +93,7 @@ function alg_submit() if (oppPerc > 100) { percValid = false; - alert(L("lcl_alg_bezetting_ongeldig")); + FcltMgr.alert(L("lcl_alg_bezetting_ongeldig")); $("#bez"+i).select(); $("#bez"+i).focus(); } @@ -132,7 +132,7 @@ function changeOppervlak(prowIndex) if (!isGoodNumber($("#bezopp"+prowIndex).val(), false,false,8,2)) { bereken = false; - alert(L("lcl_alg_bezetting_ongeldig")); + FcltMgr.alert(L("lcl_alg_bezetting_ongeldig")); $("#bezopp"+prowIndex).select(); $("#bezopp"+prowIndex).focus(); } @@ -156,7 +156,7 @@ function changeBezetting(prowIndex) { if (!isGoodNumber($("#bez"+prowIndex).val(), false,false,8,2) || parseFloat($("#bez"+prowIndex).val().replace(',', '.')) > 100) { - alert(L("lcl_alg_bezetting_ongeldig")); + FcltMgr.alert(L("lcl_alg_bezetting_ongeldig")); $("#bez"+prowIndex).select(); $("#bez"+prowIndex).focus(); } diff --git a/APPL/ALG/alg_ruimtefunctie_list.inc b/APPL/ALG/alg_ruimtefunctie_list.inc index bc09b04681..65c3590275 100644 --- a/APPL/ALG/alg_ruimtefunctie_list.inc +++ b/APPL/ALG/alg_ruimtefunctie_list.inc @@ -53,13 +53,13 @@ function ruimtefunctie_list(pautfunction, params) function ruimtefunctie_delete(row, isMulti) { - $(row).addClass('dirty'); - var srtruimte_lg_key = row.getAttribute("ROWKEY"); - 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") + FcltMgr.confirm(L("lcl_alg_del_txt_ruimtefunctie"), { autoconfirm: isMulti }, function() { + $(row).addClass('dirty'); + var srtruimte_lg_key = row.getAttribute("ROWKEY"); + var data = { key: srtruimte_lg_key + }; + <% protectRequest.dataToken("data"); %> + $.post("alg_ruimtefunctie_delete.asp", data, FcltCallbackRefresh, "json"); }); } diff --git a/APPL/ALG/alg_srtruimte.asp b/APPL/ALG/alg_srtruimte.asp index 095fe8f11c..0d7a8023b0 100644 --- a/APPL/ALG/alg_srtruimte.asp +++ b/APPL/ALG/alg_srtruimte.asp @@ -119,7 +119,7 @@ if (mode == "save") { %> <% } @@ -171,7 +171,9 @@ else if (srtruimte_key > 0 && mode == "delete") function alg_delete() { - FcltMgr.confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>", function() { + FcltMgr.confirm("<%=safe.jsstring(L(" + lcl_R_U_sure "))%>", + function() { window.location.href = "alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>"; }); } diff --git a/APPL/ALG/alg_terreinsector_list.inc b/APPL/ALG/alg_terreinsector_list.inc index 0803728161..2c7e377ae8 100644 --- a/APPL/ALG/alg_terreinsector_list.inc +++ b/APPL/ALG/alg_terreinsector_list.inc @@ -49,13 +49,13 @@ function fnrowData(oRs) function doDelete(rowArray, isMulti) { - var terKeyString = getKeyString(rowArray); - 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") + FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), { autoconfirm: isMulti }, function() { + var terKeyString = getKeyString(rowArray); + var data = { key: terKeyString, + level: "T" + }; + <% protectRequest.dataToken("data"); %> + $.post("alg_delete.asp", data, FcltCallbackRefresh, "json"); }); } diff --git a/APPL/ALG/alg_verdieping_list.inc b/APPL/ALG/alg_verdieping_list.inc index 553965e473..a611c2cc73 100644 --- a/APPL/ALG/alg_verdieping_list.inc +++ b/APPL/ALG/alg_verdieping_list.inc @@ -54,13 +54,13 @@ function fnrowData(oRs) function doDelete(rowArray, isMulti) { - var flrKeyString = getKeyString(rowArray); - 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") + FcltMgr.confirm(L("lcl_alg_del_txt_verdieping"), { autoconfirm: isMulti }, function() { + var flrKeyString = getKeyString(rowArray); + var data = { key: flrKeyString, + level: "V" + }; + <% protectRequest.dataToken("data"); %> + $.post("alg_delete.asp", data, FcltCallbackRefresh, "json"); }); } diff --git a/APPL/ALG/alg_werkplek_list.inc b/APPL/ALG/alg_werkplek_list.inc index 45155d0129..6ee7933d01 100644 --- a/APPL/ALG/alg_werkplek_list.inc +++ b/APPL/ALG/alg_werkplek_list.inc @@ -67,13 +67,13 @@ FCLTHeader.Requires({ plugins:["jQuery"], function doDelete(rowArray, isMulti) { - var wpKeyString = getKeyString(rowArray); - 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") + FcltMgr.confirm(L("lcl_alg_del_txt_werkplek"), { autoconfirm: isMulti }, function() { + var wpKeyString = getKeyString(rowArray); + var data = { key: wpKeyString, + level: "W" + }; + <% protectRequest.dataToken("data"); %> + $.post("alg_delete.asp", data, FcltCallbackRefresh, "json"); }); } diff --git a/APPL/API2/TESTER/tester.js b/APPL/API2/TESTER/tester.js index 9d6be08ffd..4dc4e0e801 100644 --- a/APPL/API2/TESTER/tester.js +++ b/APPL/API2/TESTER/tester.js @@ -19,7 +19,7 @@ function callbackDone(data, textStatus, jqXHR) } function callbackFail(jqXHR, textStatus, errorThrown) { - // alert("FAIL: " + (typeof errorThrown == "string"?errorThrown:errorThrown.message)); + // FcltMgr.alert("FAIL: " + (typeof errorThrown == "string"?errorThrown:errorThrown.message)); $("#Status").text(jqXHR.status + " " + (typeof errorThrown == "string"?errorThrown:errorThrown.message)).css("background-color", "red"); $("#StatusText").text(textStatus); var txt = String(jqXHR.responseText); diff --git a/APPL/BES/bes_bedrijfproduct_search_list.asp b/APPL/BES/bes_bedrijfproduct_search_list.asp index 7349f4330b..8f277133a2 100644 --- a/APPL/BES/bes_bedrijfproduct_search_list.asp +++ b/APPL/BES/bes_bedrijfproduct_search_list.asp @@ -79,7 +79,7 @@ var authparams = user.checkAutorisation("WEB_BESMSU"); { if (str != "" && !isGoodCurrency(str.replace(',', '.'))) { - alert(L("lcl_shared_invalid_format")); + FcltMgr.alert(L("lcl_shared_invalid_format")); field.select(); field.focus(); return false; diff --git a/APPL/BES/bes_edit_bestelling.asp b/APPL/BES/bes_edit_bestelling.asp index a028185ed9..d60fb8404b 100644 --- a/APPL/BES/bes_edit_bestelling.asp +++ b/APPL/BES/bes_edit_bestelling.asp @@ -248,7 +248,7 @@ else // nieuwe bestelling. Defaults bepalen <% @@ -474,7 +474,7 @@ else // nieuwe bestelling. Defaults bepalen function favouriteAdd(bes_item_info) { if (!bes_item_info || bes_item_info.srtdeel_key < 0) { - alert(L("lcl_shared_choose_item_first")); + FcltMgr.alert(L("lcl_shared_choose_item_first")); return; } @@ -743,13 +743,13 @@ else // nieuwe bestelling. Defaults bepalen BLOCK_END(); } %> - - - - - - - + + + + + + + <% // ======== BLOCK om itemregels toe te voegen ======== if (this_bes.canItemsChange) @@ -792,9 +792,11 @@ else // nieuwe bestelling. Defaults bepalen RWFIELDTR("aantal_text", "fld", L("lcl_bes_amount"), "", { required: true, maxlength: 10 }); %> - - - +
<% + buttons = []; + buttons.push({tooltip: L("lcl_bes_add_btn"), icon: "fa-cart-plus", xclass: "bescart", action:"AddFreeArticleItem('"+urole+"')"}); + CreateButtons(buttons, { showIcons: true }) + %>
<% @@ -865,7 +867,7 @@ else // nieuwe bestelling. Defaults bepalen " id="srtdeel_omschrijving"> - " id="srtdeel_opmerking"> + " id="srtdeel_opmerking"> "> @@ -875,10 +877,12 @@ else // nieuwe bestelling. Defaults bepalen - - - - +
<% + buttons = []; + buttons.push({tooltip: L("lcl_bes_favour_add"), icon: "fa-star-o", action:"favouriteAdd(bes_item_info)"}); + buttons.push({tooltip: L("lcl_bes_add_btn"), icon: "fa-cart-plus", xclass: "bescart", action:"AddSuggestItem(bes_item_info, parseInt($('#aantal_text').val(), 10), '"+urole+"')"}); + CreateButtons(buttons, { showIcons: true }) + %>
@@ -908,7 +912,6 @@ else // nieuwe bestelling. Defaults bepalen -
<% if (bes_key > 0) totaal = bes_bestelling.totaal - bes_bestelling.rfoBesKosten + bes_bestelling.rfoLevKosten; @@ -933,7 +936,7 @@ else // nieuwe bestelling. Defaults bepalen
> - +
<%=S("currency_pref")%> <%=safe.curr(totaal)%>
diff --git a/APPL/BES/bes_edit_opdr.asp b/APPL/BES/bes_edit_opdr.asp index 1e6d4c64ae..e2871f04bc 100644 --- a/APPL/BES/bes_edit_opdr.asp +++ b/APPL/BES/bes_edit_opdr.asp @@ -149,7 +149,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key); var m_count_ontv = parseInt(document.u2['cnt'+key].getAttribute("aantalontv")); if (m_count < m_count_ontv) { - alert(L("lcl_bes_aantontv_mess").format(m_count_ontv)); + FcltMgr.alert(L("lcl_bes_aantontv_mess").format(m_count_ontv)); document.u2['cnt'+key].value = m_count_ontv; document.u2['cnt'+key].focus() m_count = m_count_ontv; @@ -159,7 +159,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key); var m_count_max = parseInt(document.u2['max' + key].value); if (m_count > m_count_max) { - alert(L("lcl_bes_verhogen_mess")); + FcltMgr.alert(L("lcl_bes_verhogen_mess")); document.u2['cnt'+key].value = m_count_max; document.u2['cnt'+key].focus() m_count = m_count_max; diff --git a/APPL/BES/bes_list.js b/APPL/BES/bes_list.js index 5052be0749..61ff463168 100644 --- a/APPL/BES/bes_list.js +++ b/APPL/BES/bes_list.js @@ -30,15 +30,12 @@ function besOpdrShow(row) function besAccept(rowArray, isMulti) { - var besKeyString = getKeyString(rowArray); - isMulti ? $.post("bes_accept.asp", { - urole: urole, - bes_key: besKeyString - }, FcltCallbackRefresh, "json") : FcltMgr.confirm(L("lcl_bes_accepteren"), function() { + FcltMgr.confirm(L("lcl_bes_accepteren"), { autoconfirm: isMulti }, function() { + var besKeyString = getKeyString(rowArray); $.post("bes_accept.asp", { urole: urole, bes_key: besKeyString - }, FcltCallbackRefresh, "json") + }, FcltCallbackRefresh, "json"); }); } @@ -63,7 +60,7 @@ function besSubmitCallback(json, textStatus) FcltCallbackRefresh(json, textStatus); } else - alert(textStatus); + FcltMgr.alert(textStatus); }; function besSubmit(rowArray, isMulti) diff --git a/APPL/BES/bes_retour.asp b/APPL/BES/bes_retour.asp index 9bfbb0a9f0..8fa2b792e9 100644 --- a/APPL/BES/bes_retour.asp +++ b/APPL/BES/bes_retour.asp @@ -59,7 +59,7 @@ user.auth_required_or_abort(this_bes.canRetourBES); document.forms.u2.submit(); return true; // disable button } else { - alert(L("lcl_bes_no_retour")); + FcltMgr.alert(L("lcl_bes_no_retour")); } } @@ -82,7 +82,7 @@ user.auth_required_or_abort(this_bes.canRetourBES); } return true; } - alert(L("lcl_bes_bad_value")); + FcltMgr.alert(L("lcl_bes_bad_value")); obj.focus(); return false; } diff --git a/APPL/BES/bes_search.asp b/APPL/BES/bes_search.asp index fd6a128b02..cc99c4e570 100644 --- a/APPL/BES/bes_search.asp +++ b/APPL/BES/bes_search.asp @@ -158,7 +158,7 @@ oRs.Close(); { if ($('#disc').val() == -1) { - alert(L("lcl_bes_nocat_selected")); + FcltMgr.alert(L("lcl_bes_nocat_selected")); return; } diff --git a/APPL/BES/bes_show_bestelling.asp b/APPL/BES/bes_show_bestelling.asp index ad025cdd24..f1b237cbca 100644 --- a/APPL/BES/bes_show_bestelling.asp +++ b/APPL/BES/bes_show_bestelling.asp @@ -70,12 +70,16 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], }); function bes_change() { - - <% if (bes_bestelling.rfoStatus == 5) { %> // extra waarschuwing - FcltMgr.confirm(L("lcl_bes_confirm_embargo"), function() {}); - <% } %> - if (FcltMgr.startEdit(window)) + var autoConf = true; +<% if (bes_bestelling.rfoStatus == 5) { %> // extra waarschuwing + autoConf = false; +<% } %> + FcltMgr.confirm(L("lcl_bes_confirm_embargo"), { autoconfirm: autoConf }, function() { + if (FcltMgr.startEdit(window)) + { window.location.href = "bes_edit_bestelling.asp?urole=<%=urole%>&bes_key=<%=bes_key%>&embedded=1" + } + }); } function bes_delete() { diff --git a/APPL/BES/bes_srtdeel_search_list.asp b/APPL/BES/bes_srtdeel_search_list.asp index e06259b706..c944700bc3 100644 --- a/APPL/BES/bes_srtdeel_search_list.asp +++ b/APPL/BES/bes_srtdeel_search_list.asp @@ -39,7 +39,7 @@ var authparams = user.checkAutorisation("WEB_BESMSU"); function bes_new() { <% if (disc_key<0) { %> - alert(L("lcl_bes_srtdeel_need_cat")); + FcltMgr.alert(L("lcl_bes_srtdeel_need_cat")); <% } else { var addurl = "appl/bes/bes_srtdeel.asp?disc_key=" + disc_key; %> diff --git a/APPL/BES/bes_voorraad_list.inc b/APPL/BES/bes_voorraad_list.inc index d31fe0e29b..1b3aa44525 100644 --- a/APPL/BES/bes_voorraad_list.inc +++ b/APPL/BES/bes_voorraad_list.inc @@ -58,11 +58,11 @@ function bes_voorraad_list (pautfunction, params) <% if (authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9) { %> if (catalogus_key < 0) - alert(L("lcl_bes_select_cataloque")); + FcltMgr.alert(L("lcl_bes_select_cataloque")); else { if (haskenmerk) - alert(L("lcl_bes_not_copy_articles")); + FcltMgr.alert(L("lcl_bes_not_copy_articles")); var bestelurl = "appl/bes/bes_bestelling.asp?voorraad=1&urole=fo&dis_key=<%=params.catalogus_key%>"; bestelurl += "&ps=" + ps + "&pn=" + pn; FcltMgr.openDetail(bestelurl, L("lcl_bes_bestellen")); diff --git a/APPL/BES/opdr_delivery.js b/APPL/BES/opdr_delivery.js index dd64bbd3d9..9fd8437aae 100644 --- a/APPL/BES/opdr_delivery.js +++ b/APPL/BES/opdr_delivery.js @@ -28,7 +28,7 @@ function checkInput(evt) } return true; } - alert(L("lcl_bes_bad_value")); + FcltMgr.alert(L("lcl_bes_bad_value")); obj.focus(); return false; } diff --git a/APPL/BES/opdr_list.js b/APPL/BES/opdr_list.js index e46408d466..08e39e4698 100644 --- a/APPL/BES/opdr_list.js +++ b/APPL/BES/opdr_list.js @@ -24,48 +24,34 @@ function opdrReject(rowArray, isMulti) function opdrAccept(rowArray, isMulti) { - var opdrKeyString = getKeyString(rowArray); var opdrData = eval('(' + rowArray[0].getAttribute("ROWDATA") + ')'); - var data = { urole: urole - , opdr_key: opdrKeyString - }; - protectRequest.dataToken(data); - if (isMulti) + if (isMulti || opdrData) { - $.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") - }); - } + FcltMgr.confirm(L("lcl_bes_confirm_accept").format(opdrData.opdrId), { autoconfirm: isMulti }, function() { + var opdrKeyString = getKeyString(rowArray); + var data = { urole: urole + , opdr_key: opdrKeyString + }; + protectRequest.dataToken(data); + $.post("opdr_accept.asp", data, FcltCallbackRefresh, "json"); + }); } } function opdrSent(rowArray, isMulti) { - var opdrKeyString = getKeyString(rowArray); var opdrData = eval('(' + rowArray[0].getAttribute("ROWDATA") + ')'); - var opdrId = opdrData.opdrId; - var data = { urole: urole - , opdr_key: opdrKeyString - }; - protectRequest.dataToken(data); - if (isMulti) + if (isMulti || opdrData) { - $.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") - }); - } + FcltMgr.confirm(L("lcl_bes_confirm_sent").format(opdrData.opdrId), { autoconfirm: isMulti }, function() { + var opdrKeyString = getKeyString(rowArray); + var opdrId = opdrData.opdrId; + var data = { urole: urole + , opdr_key: opdrKeyString + }; + protectRequest.dataToken(data); + $.post("opdr_sent.asp", data, FcltCallbackRefresh, "json"); + }); } } diff --git a/APPL/BES/sel_items_tab.js b/APPL/BES/sel_items_tab.js index 41c789b73d..c5912b194d 100644 --- a/APPL/BES/sel_items_tab.js +++ b/APPL/BES/sel_items_tab.js @@ -109,7 +109,7 @@ function AddSuggestItem(bes_item_info, aantal, urole) { if (!bes_item_info || bes_item_info.srtdeel_key < 0) { - alert(L("lcl_shared_choose_item_first")); + FcltMgr.alert(L("lcl_shared_choose_item_first")); return; } @@ -125,23 +125,23 @@ function AddSuggestItem(bes_item_info, aantal, urole) var stock_veelvoud = window.stock_info.stock - (window.stock_info.stock % bes_item_info.veelvoud); if (window.stock_info.stock < bes_item_info.bestelminimum || stock_veelvoud < bes_item_info.bestelminimum) { - alert(L("lcl_bes_stock_too_low")); + FcltMgr.alert(L("lcl_bes_stock_too_low")); return false; } } if (window.stock_info.stock == 0) - alert(L("lcl_bes_out_of_stock")); + FcltMgr.alert(L("lcl_bes_out_of_stock")); else if (window.stock_info.stock && aantal > window.stock_info.stock) { if (window.stock_info.maxbestel == 1) { aantal = window.stock_info.stock; // Aantal verlagen naar het aantal dat in voorraad is. - alert(L("lcl_bes_reduced_to_max").format(aantal)); + FcltMgr.alert(L("lcl_bes_reduced_to_max").format(aantal)); } else - alert(L("lcl_bes_exceed_stock")); + FcltMgr.alert(L("lcl_bes_exceed_stock")); } } AddItem(bes_item_info, aantal, urole, true); @@ -484,7 +484,7 @@ function checkInput() if (!filled_lines) { - alert(L("lcl_bes_noItems")); // Er zijn geen volledig ingevulde factuurregels. + FcltMgr.alert(L("lcl_bes_noItems")); // Er zijn geen volledig ingevulde factuurregels. return false; } @@ -517,7 +517,7 @@ function checkInput() if (!p) { - alert(L("lcl_bes_noItems")); + FcltMgr.alert(L("lcl_bes_noItems")); return false; } @@ -529,43 +529,38 @@ function checkInput() $("#flexdeel_string").val(flexdeel_string.join(",")); $("#flexitem_string").val(flexitem_string.join(",")); - var cal = $('#calendar'); - if (cal.length) - { - var levDate = new Date(parseInt($('#calendar').val())); - if (cal_isVrijeDag(levDate)) { - FcltMgr.antiConfirm(L("lcl_bes_date_holiday"), function() { - return false; - }); - } - } return true; } function MakeOrder (newOrder) { - // Standaard checks op verplichte velden, datum formaat, numeriek en float formaat, currency formaat. + // Standaard checks op verplichte velden, datum formaat, numeriek en float formaat, currency formaat. if (!validateForm("u2", { checkNot: jqFreeFields })) - return false; + return false; // Formulier specifieke checks if (!checkInput()) return false; - var submitOrder = true; - 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. - FcltMgr.antiConfirm(L("lcl_bes_confirm_order"), function() { - submitOrder = false; - return false; - }); - } - if (submitOrder) + var cal = $('#calendar'); + var autoConf = true; + + if (cal.length) { - document.forms.u2.submit(); - return true; // disables button + levDate = new Date(parseInt(cal.val())); + autoConf = !cal_isVrijeDag(levDate); } + + FcltMgr.confirm(L("lcl_bes_date_holiday"), { autoconfirm: autoConf, fnCancel: function() { iface.button.enable("btn_bes_submit") } }, function() { + + // Alleen als op de vrachtwagen geklikt is, en de setting aan staat + // om bevestiging van de bestelopdracht vragen. + var autoConfirm = !(confirm_order_before_submit && (newOrder == 0)); + + FcltMgr.confirm(L("lcl_bes_confirm_order"), { autoconfirm: autoConfirm, fnCancel: function() { iface.button.enable("btn_bes_submit") } } , function() { + document.forms.u2.submit(); + }); + }); } // UWVA#13497 Ooit bedacht om klachten over leveranciers in DAMO te registreren @@ -640,7 +635,7 @@ function showStaffelKortingResult( json) // Als sgnaamstring dan zijn er groepsstaffels if (sgnaamstring && (sgkeystring.length != sgnaamstring.length || sgkeystring.length != sgkortingstring.length || sgkeystring.length != sgaantalstring.length)) { - //alert(L("lcl_internal_error") + ": showStaffelKortingResult.asp, aantal staffelgroepen komt niet overeen met het aantal kortingen!"); + // FcltMgr.alert(L("lcl_internal_error") + ": showStaffelKortingResult.asp, aantal staffelgroepen komt niet overeen met het aantal kortingen!"); } var tabeltext = ""; @@ -771,7 +766,7 @@ function checkAmount(aantal_cell) !isGoodNumber(aantal_cell.value, true,false,-1,-1) || amount > 99999) { - alert(L("lcl_bes_invalidAmount")); + FcltMgr.alert(L("lcl_bes_invalidAmount")); aantal_cell.focus(); return; } @@ -788,14 +783,14 @@ function checkAmount(aantal_cell) if (window.stock_info.maxbestel > 0 && besteld > voorraad) { // Aantal verlagen naar het aantal dat in voorraad is min het aantal dat in andere regels in bestelling is. new_amount = voorraad - (besteld - amount); - alert(L("lcl_bes_reduced_to_max").format(voorraad, new_amount)); + FcltMgr.alert(L("lcl_bes_reduced_to_max").format(voorraad, new_amount)); aantal_cell.value = new_amount; } var bestelminimum = tr.bes_item_info.bestelminimum; if (amount < bestelminimum) { amount = bestelminimum; - alert(L("lcl_bes_bestelminimum") + bestelminimum); + FcltMgr.alert(L("lcl_bes_bestelminimum") + bestelminimum); aantal_cell.value = amount; } @@ -806,7 +801,7 @@ function checkAmount(aantal_cell) // Het kan zijn dat nu het aantal groter is als de voorraad en dat het niet mag. if (window.stock_info.maxbestel > 0 && amount > voorraad) amount = amount - veelvoud; - alert(L("lcl_bes_matchedveelvoud") + veelvoud); + FcltMgr.alert(L("lcl_bes_matchedveelvoud") + veelvoud); aantal_cell.value = amount; } @@ -815,7 +810,7 @@ function checkAmount(aantal_cell) if ((amount < tr.bes_item_info.received && tr.orgAmount >= 0) || (amount > tr.bes_item_info.received && tr.orgAmount <= 0)) { - alert(L("lcl_bes_exceed_delivered")); + FcltMgr.alert(L("lcl_bes_exceed_delivered")); aantal_cell.focus(); return; } diff --git a/APPL/BEZ/bez.js b/APPL/BEZ/bez.js index 0044a70a48..2a4c866880 100644 --- a/APPL/BEZ/bez.js +++ b/APPL/BEZ/bez.js @@ -84,7 +84,7 @@ function process_freeprk_info(data, textStatus) } } else - alert("process_freeprk_info: " + textStatus); + FcltMgr.alert("process_freeprk_info: " + textStatus); } function get_freeprk_info() diff --git a/APPL/BEZ/bez_edit_afspraak.js b/APPL/BEZ/bez_edit_afspraak.js index 013272e43f..5932c05864 100644 --- a/APPL/BEZ/bez_edit_afspraak.js +++ b/APPL/BEZ/bez_edit_afspraak.js @@ -177,12 +177,12 @@ function bez_submit() if (dt > dt2) { - alert(L("lcl_vis_bad_period")); + FcltMgr.alert(L("lcl_vis_bad_period")); return false } else if (dt.getTime() == dt2.getTime()) // Datums vergelijken werkt niet. Aantal milliseconden since middennacht 01/01/1970 vergelijken. { - alert(L("lcl_vis_same_time")); + FcltMgr.alert(L("lcl_vis_same_time")); return false; } @@ -200,7 +200,7 @@ function bez_submit() } if (find == 0) { - alert(L("lcl_bez_geef_bezoeker")); + FcltMgr.alert(L("lcl_bez_geef_bezoeker")); return false; } @@ -214,7 +214,7 @@ function bez_submit() // Maar niet een reeks die begint in het weekend if ((sunday || isHoliday) && days > 0) { - alert(L("lcl_holiday_not_ok_bes")); // Repeteren mag niet op een zaterdag, zondag of vrije dag + FcltMgr.alert(L("lcl_holiday_not_ok_bes")); // Repeteren mag niet op een zaterdag, zondag of vrije dag return false; } diff --git a/APPL/BEZ/bez_list.js b/APPL/BEZ/bez_list.js index 942029c294..2ceb6f8baf 100644 --- a/APPL/BEZ/bez_list.js +++ b/APPL/BEZ/bez_list.js @@ -9,18 +9,19 @@ function bezDelete(row) { $(row).addClass('dirty'); var bez_key = row.getAttribute("ROWKEY"); - if (confirm(L("lcl_bez_confirm_delete_bezoeker"))) - { - var data = { bez_key: bez_key - , urole: urole - , level: "B" - }; - protectRequest.dataToken(data); - $.post("bez_delete.asp", - data, - FcltCallbackAndThen(function () { $(row).hide(); } ), - "json"); - } + var data = { bez_key: bez_key + , urole: urole + , level: "B" + }; + protectRequest.dataToken(data); + FcltMgr.confirm(L("lcl_bez_confirm_delete_bezoeker"), function() { + $.post("bez_delete.asp", + data, + FcltCallbackAndThen(function() { + $(row).hide(); + }), + "json"); + }); } function bezEdit(row) @@ -72,7 +73,7 @@ function CheckInCallback(json, textStatus) } } // Is er nog een message die weergegeven moet worden? - if (json.message) alert(json.message); + if (json.message) FcltMgr.alert(json.message); } function doCheckIn(evt, bezKeyString, undo_check_in) @@ -160,10 +161,10 @@ function CheckOutCallback(json, textStatus) } // Is er nog een message die weergegeven moet worden? - if (json.message) alert(json.message); + if (json.message) FcltMgr.alert(json.message); } else - alert("CheckOutCallback: " + textStatus); + FcltMgr.alert("CheckOutCallback: " + textStatus); } function doCheckOut(evt, bezKeyString, undo_check_out) diff --git a/APPL/BEZ/bez_multi.asp b/APPL/BEZ/bez_multi.asp index b70179173e..e1aef53548 100644 --- a/APPL/BEZ/bez_multi.asp +++ b/APPL/BEZ/bez_multi.asp @@ -79,7 +79,7 @@ var np = $("#n_periods").val(); if (isNaN(np) || np < 1) { - alert(L("lcl_bez_period_error")) + FcltMgr.alert(L("lcl_bez_period_error")) return; } var nextDate = new Date(parseInt($('#date_from0').val())); @@ -92,7 +92,7 @@ nextDate.setDate(nextDate.getDate() + interval); if (nextDate.getTime() > <%=maxday.getTime()%>) { - alert(L("lcl_bez_multi_limit_reached") + toDateString(nextDate)); + FcltMgr.alert(L("lcl_bez_multi_limit_reached") + toDateString(nextDate)); break; } if($("#withWeekends:checked").val()=="on" && @@ -125,7 +125,7 @@ function multi_submit () { if (!dates.length) { - alert(L("lcl_bez_multi_none")); + FcltMgr.alert(L("lcl_bez_multi_none")); return false; } diff --git a/APPL/CAD/3Dize.asp b/APPL/CAD/3Dize.asp index 831a91011d..7a58d9db37 100644 --- a/APPL/CAD/3Dize.asp +++ b/APPL/CAD/3Dize.asp @@ -168,7 +168,7 @@ function noAutoResize() var distance = - camera.position.z / dir.z; var pos = camera.position.clone().add( dir.multiplyScalar( distance ) ); - //alert("Image pos.X=" + pos.x + " pos.Y=" + pos.y); + // FcltMgr.alert("Image pos.X=" + pos.x + " pos.Y=" + pos.y); var imgX = pos.x + hpix / 2; var imgY = vpix / 2 - pos.y; @@ -340,17 +340,17 @@ function noAutoResize() // var werkplekSymbol = result.scene; // allCast(werkplekSymbol); - //alert(werkplekSymbol.scale.x); // default is 0.0254 ? + // FcltMgr.alert(werkplekSymbol.scale.x); // default is 0.0254 ? // werkplekSymbol.scale.set(25.4 / gSLNKEvent.scaleX , 25.4 / gSLNKEvent.scaleX, 25.4 / gSLNKEvent.scaleX); // werkplekSymbol.rotation.set(0, 0, Math.PI / 4); - //var mat = new THREE.MeshLambertMaterial( { map: modelTex }); + // var mat = new THREE.MeshLambertMaterial( { map: modelTex }); // Coordinaten werkplekken $.getJSON("get_wp_info_ajax.asp?bordlabel=<%=bordlabel_key%>" + gCustomParameters, { }, function (wpjson) { var image = texturePainting.image; - //alert(wpjson.werkplekken.length); + // FcltMgr.alert(wpjson.werkplekken.length); for (var ar in areas) { @@ -484,7 +484,7 @@ function noAutoResize() function callbackClicked(data) { - //alert(data.ContourLabel); + // FcltMgr.alert(data.ContourLabel); data.Param = "onclick"; parent.MMap_onClick(data); } @@ -498,7 +498,7 @@ function noAutoResize() var imgX = xy.x; var imgY = xy.y; - //alert("Image imgX=" + imgX + " imgX=" + imgY); + // FcltMgr.alert("Image imgX=" + imgX + " imgX=" + imgY); $.getJSON(gimgurl + "&AsFND=1&findX=" + imgX + "&findY=" + imgY, callbackClicked ); } diff --git a/APPL/CAD/SelectRoom.asp b/APPL/CAD/SelectRoom.asp index 378c627708..7851833a0d 100644 --- a/APPL/CAD/SelectRoom.asp +++ b/APPL/CAD/SelectRoom.asp @@ -62,7 +62,7 @@ function MMap_onClick(SlnkEvent) { if (done) return; // Workaround for nasty recursion? We komen hier twee keer? done=true; - //alert("Geklikt op X=" + SlnkEvent.dwgX + " Y=" + SlnkEvent.dwgY + " ik denk ruimte " + SlnkEvent.ContourKey) + // FcltMgr.alert("Geklikt op X=" + SlnkEvent.dwgX + " Y=" + SlnkEvent.dwgY + " ik denk ruimte " + SlnkEvent.ContourKey) FcltMgr.closeDetail( window, { rui_key: SlnkEvent.Key, rui_txt: SlnkEvent.DbLabel diff --git a/APPL/CAD/ShowGoogleMap.asp b/APPL/CAD/ShowGoogleMap.asp index 006428d79c..7d2b350d22 100644 --- a/APPL/CAD/ShowGoogleMap.asp +++ b/APPL/CAD/ShowGoogleMap.asp @@ -111,7 +111,7 @@ } else { - alert(L("lcl_fg_nomaps")); + FcltMgr.alert(L("lcl_fg_nomaps")); window.close(); } } diff --git a/APPL/CAD/cad_contour_list.inc b/APPL/CAD/cad_contour_list.inc index 16a282ff0f..a6a6a5814b 100644 --- a/APPL/CAD/cad_contour_list.inc +++ b/APPL/CAD/cad_contour_list.inc @@ -125,7 +125,7 @@ function contour_list(pautfunction, params) { if (anyDouble) { - alert(L("lcl_fg_tek_meerdere_disable")); + FcltMgr.alert(L("lcl_fg_tek_meerdere_disable")); return; } diff --git a/APPL/CAD/default.asp b/APPL/CAD/default.asp index 7cf3b192a2..e63a7d1812 100644 --- a/APPL/CAD/default.asp +++ b/APPL/CAD/default.asp @@ -313,28 +313,24 @@ if (scenario_key != 0) function DoMoveSymbol(deelKey, orgX, orgY, dwgX, dwgY, lblContour) { - if (true || confirm("Object ("+deelKey+") verplaatsen naar: " + dwgX + "," + dwgY + "?")) + var params; + if (orgX) { - var params; - if (orgX) - { - params = "&newX=" + dwgX + "&newY=" + dwgY; - params += "&orgX=" + orgX + "&orgY=" + orgY; - params += "&Contour=" + lblContour; - } - else - params = "&clearXY=1" - - ChangeSymbol(deelKey, params) + params = "&newX=" + dwgX + "&newY=" + dwgY; + params += "&orgX=" + orgX + "&orgY=" + orgY; + params += "&Contour=" + lblContour; } + else + params = "&clearXY=1" + + ChangeSymbol(deelKey, params) } function RemoveSymbol(deelKey) { - if (confirm(L("lcl_obj_del_confirm"))) - { - ChangeSymbol(deelKey, "&delete=1") - } + FcltMgr.confirm(L("lcl_obj_del_confirm"), function() { + ChangeSymbol(deelKey, "&delete=1"); + }); } var _symbolKey; // wordt gezet in MMap_onPickcontextmenu @@ -373,7 +369,7 @@ if (scenario_key != 0) if (scenario_key > 0) { // TODO: Hier willen we eigenlijk ins_info.asp van het originele symbool tonen - alert("Niet in scenario mode"); + FcltMgr.alert("Niet in scenario mode"); return intKey; } if (_symbolKey.match(/^IW:/)) // INS_DEEL aan werkplek @@ -426,10 +422,10 @@ if (scenario_key != 0) * or INS_DEEL_KEY \************************************************************/ function MMap_onClick(SlnkEvent) - { // alert("Geklikt op dwgXY=" + SlnkEvent.dwgX + "," + SlnkEvent.dwgY + - // " \nik denk ruimte " + SlnkEvent.ContourKey + " op laag: " + SlnkEvent.ContourLayer + - // " \nof object " + SlnkEvent.TextLabel + " op laag: " + SlnkEvent.TextLayer + - // " \nmet ruimte/object key=" + SlnkEvent.Key) + { // FcltMgr.alert("Geklikt op dwgXY=" + SlnkEvent.dwgX + "," + SlnkEvent.dwgY + + // " \nik denk ruimte " + SlnkEvent.ContourKey + " op laag: " + SlnkEvent.ContourLayer + + // " \nof object " + SlnkEvent.TextLabel + " op laag: " + SlnkEvent.TextLayer + + // " \nmet ruimte/object key=" + SlnkEvent.Key) switch (SlnkEvent.Param) { case "onclick": @@ -1008,7 +1004,7 @@ if (scenario_key != 0) // Geklikt op een legendawaarde tekst. Highlight bijbehorende ruimtes function selectfromLegenda(evt, tekst) { - //alert("Geklikt op 'kleur': {0}, tijd om die te highlighten".format(tekst)); + // FcltMgr.alert("Geklikt op 'kleur': {0}, tijd om die te highlighten".format(tekst)); var url = "cad_selectbylegend.asp?legenddesc=" + escape(tekst); url += getCustomParameters(); $.post(url, {}, FcltCallbackAndThen(selectLegendaCallback), "json"); @@ -1072,7 +1068,7 @@ if (scenario_key != 0) var ruimteKey = SlnkEvent.Key; if (!ruimteKey || (SlnkEvent.ContourLayer != "SLNK Contours" && !ruimteKey.match(/^W:/))) { - alert(L("lcl_fg_obj_firstnew")); // Eerst in ruimte of op werkplek + FcltMgr.alert(L("lcl_fg_obj_firstnew")); // Eerst in ruimte of op werkplek return; } diff --git a/APPL/CAD/js/loaders/ColladaLoader.js b/APPL/CAD/js/loaders/ColladaLoader.js index eab8ef2492..0ec4f5b2cc 100644 --- a/APPL/CAD/js/loaders/ColladaLoader.js +++ b/APPL/CAD/js/loaders/ColladaLoader.js @@ -110,7 +110,7 @@ THREE.ColladaLoader = function () { } else { - alert( "Don't know how to parse XML!" ); + FcltMgr.alert( "Don't know how to parse XML!" ); } diff --git a/APPL/CAD/main.js b/APPL/CAD/main.js index 058fa2cd5a..9ebd32838c 100644 --- a/APPL/CAD/main.js +++ b/APPL/CAD/main.js @@ -75,17 +75,16 @@ function updatePRJRooms(floor_key, scenario_key) { if ($("#rooms")[0].options.length==1) // alleen de lege is er nog maar { - if (confirm(L("lcl_prj_addfloor"))) - { - $.getJSON("../prj/scenario_init.asp?scenario_key="+scenario_key+"&floor_key=" + floor_key, - function (data) // Tweede poging + FcltMgr.confirm(L("lcl_prj_addfloor"), function() { + $.getJSON("../prj/scenario_init.asp?scenario_key=" + scenario_key + "&floor_key=" + floor_key, + function(data) // Tweede poging { if (data.warning) - alert(data.warning) + FcltMgr.alert(data.warning) if (data.success) $("#rooms").load(loadUrl, myRefresh); }); - } + }); } else { diff --git a/APPL/CNT/cnt_edit_contract.asp b/APPL/CNT/cnt_edit_contract.asp index 9ac1306988..c8ac7f3f25 100644 --- a/APPL/CNT/cnt_edit_contract.asp +++ b/APPL/CNT/cnt_edit_contract.asp @@ -162,7 +162,7 @@ else // nieuw contract if( value.length > klen ) valid = false; } if( show && ! valid ) { - alert(err); + FcltMgr.alert(err); field.focus(); } return valid; diff --git a/APPL/CNT/cnt_edit_scope.js b/APPL/CNT/cnt_edit_scope.js index 3ffd33e00a..823a11a87d 100644 --- a/APPL/CNT/cnt_edit_scope.js +++ b/APPL/CNT/cnt_edit_scope.js @@ -445,7 +445,7 @@ function checkWeight(evt) retVal = true; if ( !retVal ) { - alert(L("lcl_cnt_invalid_kenmerk_value")); + FcltMgr.alert(L("lcl_cnt_invalid_kenmerk_value")); obj.focus(); } return retVal; diff --git a/APPL/CNT/cnt_list.js b/APPL/CNT/cnt_list.js index 281dd2ac75..f56750d2fc 100644 --- a/APPL/CNT/cnt_list.js +++ b/APPL/CNT/cnt_list.js @@ -21,15 +21,14 @@ function reloadList(json, textStatus) function cntForApproval(rowArray, isMulti) { - var cntKeyString = getKeyString(rowArray); var cntData = eval("(" + rowArray[0].getAttribute("ROWDATA") + ")"); - if (isMulti || confirm(L("lcl_cnt_forward_forapproval").format(cntData.cntNummerIntern))) - { - var data = { cnt_key: cntKeyString }; - protectRequest.dataToken(data); - $.post("../cnt/cnt_forapproval.asp", - data, - FcltCallbackAndThen(reloadList), - "json"); - } + FcltMgr.confirm(L("lcl_cnt_forward_forapproval").format(cntData.cntNummerIntern), { autoconfirm: isMulti }, function() { + var cntKeyString = getKeyString(rowArray); + var data = { cnt_key: cntKeyString }; + protectRequest.dataToken(data); + $.post("../cnt/cnt_forapproval.asp", + data, + FcltCallbackAndThen(reloadList), + "json"); + }); } diff --git a/APPL/CNT/cnt_search.asp b/APPL/CNT/cnt_search.asp index ac5b970513..edb853837b 100644 --- a/APPL/CNT/cnt_search.asp +++ b/APPL/CNT/cnt_search.asp @@ -159,7 +159,7 @@ var authparams = user.checkAutorisation(autfunction, true) || {}; { if ($('#disc').val() == -1) { - alert(L("lcl_cnt_nosrttype_selected")); + FcltMgr.alert(L("lcl_cnt_nosrttype_selected")); return; } diff --git a/APPL/CNT/cnt_show_contract.asp b/APPL/CNT/cnt_show_contract.asp index fbe773b8b1..e650b07224 100644 --- a/APPL/CNT/cnt_show_contract.asp +++ b/APPL/CNT/cnt_show_contract.asp @@ -65,16 +65,16 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke function cnt_delete() { - if (confirm(L("lcl_cnt_delete").format("<%=safe.jsstring(cnt_info.nummer_intern+(cnt_info.versie?'.'+cnt_info.versie:''))%>"))) - { - var data = { cnt_key: cnt_key - }; - <% protectRequest.dataToken("data"); %> - $.post("cnt_delete.asp", - data, - FcltCallbackClose, - "json"); - } + FcltMgr.confirm(L("lcl_cnt_delete").format("<%=safe.jsstring(cnt_info.nummer_intern+(cnt_info.versie?'.'+cnt_info.versie:''))%>"), function() { + var data = { + cnt_key: cnt_key + }; + <% protectRequest.dataToken("data"); %> + $.post("cnt_delete.asp", + data, + FcltCallbackClose, + "json"); + }); } function cnt_change() @@ -117,30 +117,30 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke function cnt_inactivate() { - if (confirm(L("lcl_cnt_inactivate_upd").format("<%=safe.jsstring(cnt_info.nummer_intern)%>"))) - { - var data = { cnt_key: cnt_key - }; - <% protectRequest.dataToken("data"); %> - $.post("cnt_inactivate.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_cnt_inactivate_upd").format("<%=safe.jsstring(cnt_info.nummer_intern)%>"), function() { + var data = { + cnt_key: cnt_key + }; + <% protectRequest.dataToken("data"); %> + $.post("cnt_inactivate.asp", + data, + FcltCallbackRefresh, + "json"); + }); } function cnt_approve() { - if (confirm(L("lcl_cnt_approve").format("<%=safe.jsstring(cnt_info.nummer_intern)%>"))) - { - var data = { cnt_key: cnt_key - }; - <% protectRequest.dataToken("data"); %> - $.post("cnt_approve.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_cnt_approve").format("<%=safe.jsstring(cnt_info.nummer_intern)%>"), function() { + var data = { + cnt_key: cnt_key + }; + <% protectRequest.dataToken("data"); %> + $.post("cnt_approve.asp", + data, + FcltCallbackRefresh, + "json"); + }); } function cnt_reject() @@ -154,23 +154,23 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke function cnt_forapproval() { - if (confirm(L("lcl_cnt_forward_forapproval").format("<%=safe.jsstring(cnt_info.nummer_intern)%>"))) - { - var data = { cnt_key: cnt_key - }; - <% protectRequest.dataToken("data"); %> - $.post("cnt_forapproval.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_cnt_forward_forapproval").format("<%=safe.jsstring(cnt_info.nummer_intern)%>"), function() { + var data = { + cnt_key: cnt_key + }; + <% protectRequest.dataToken("data"); %> + $.post("cnt_forapproval.asp", + data, + FcltCallbackRefresh, + "json"); + }); } function cnt_mail() { function cntMailCallback(data) { - alert(L("lcl_cnt_is_cntmai") + data.emails); + FcltMgr.alert(L("lcl_cnt_is_cntmai") + data.emails); } var subject = "<%=safe.jsstring(subjectMail)%>"; diff --git a/APPL/FAC/Facilitor.asp b/APPL/FAC/Facilitor.asp index 040817a995..5bfdc8b915 100644 --- a/APPL/FAC/Facilitor.asp +++ b/APPL/FAC/Facilitor.asp @@ -129,7 +129,7 @@ if (device.test(device.isTouch)) { %> if (!device.test(device.isSupported) && S("checkBrowser")==1) { %> <% } @@ -143,7 +143,7 @@ if (device.test(device.isTouch)) { %> diff --git a/APPL/FAC/fac_edit_xsl.asp b/APPL/FAC/fac_edit_xsl.asp index 4e73eb6443..569a944737 100644 --- a/APPL/FAC/fac_edit_xsl.asp +++ b/APPL/FAC/fac_edit_xsl.asp @@ -51,17 +51,15 @@ if (xmlnode) // safety check // We laten het testen altijd door de server doen. function revertXSL() { - if (confirm(L("lcl_xsl_revert") + "?")) - { + FcltMgr.confirm(L("lcl_xsl_revert") + "?", function() { $.post($("form[name=xsledit]")[0].action + "?revert=1", $("[name=xsledit]").serialize(), FcltCallbackRefresh, "json"); - } + }); } function saveXSL(promote) { - if (!promote || confirm(L("lcl_xsl_doorvoeren_confirm"))) - { - $.post($("form[name=xsledit]")[0].action + (promote?"?promote=1":""), $("[name=xsledit]").serialize(), FcltCallbackRefresh, "json"); - } + FcltMgr.confirm(L("lcl_xsl_doorvoeren_confirm"), { autoconfirm: !promote }, function() { + $.post($("form[name=xsledit]")[0].action + (promote ? "?promote=1" : ""), $("[name=xsledit]").serialize(), FcltCallbackRefresh, "json"); + }); } function previewXSL() { diff --git a/APPL/FAC/fac_fiattering_list.asp b/APPL/FAC/fac_fiattering_list.asp index a987d0ab6d..9f79c7dbb1 100644 --- a/APPL/FAC/fac_fiattering_list.asp +++ b/APPL/FAC/fac_fiattering_list.asp @@ -263,36 +263,42 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] }); var theData = eval('(' + rowArray[0].getAttribute("ROWDATA") + ')'); var module = theData.module; - if (isMulti || module == "OFFERTE" || - (module != "FIN2" && module != "GOED" && confirm(L("lcl_approve") + "?")) || - ((module == "FIN2" || module == "GOED") && goedkeuren)) - //if (isMulti || module == "OFFERTE" || confirm(L("lcl_approve") + "?")) - { - for (var i = 0; i < rowArray.length; i++) - { - var item_key = rowArray[i].getAttribute("ROWKEY") - theData = eval('(' + rowArray[i].getAttribute("ROWDATA") + ')'); - module = theData.module; - todo_list[module].push(item_key); - } - var data = {}; - if (goedkeuren && !(<%=S("mld_opdr_refiat_preference")%> == 0 && isMulti)) - { - var fiat = $("#has_sendforapproval").length == 0 || ($("#has_sendforapproval").length && $("#sendforapproval")[0].checked)? 1 : 0; - data.nofiat = (fiat == 1? 0 : 1); - } + var autoConf = isMulti || module == "OFFERTE" || ((module == "FIN2" || module == "GOED") && goedkeuren); + var moduleBoo = (module == "FIN2" || module == "GOED"); // !moduleBoo == (module != "FIN2" && module != "GOED") - // Parallel opstarten - one_post("bes_key", {}, "../bes/bes_approve.asp", "BES"); - one_post("cnt_key", {}, "../cnt/cnt_approve.asp", "CNT"); - one_post("opdr_key", {}, "../mld/opdr_approve.asp", "MLD"); - one_post("opdr_key", data, "../mld/opdr_goedkeur.asp", "GOED"); - one_post("fin_key", {}, "../fin/fin_approve.asp?a=1", "FIN"); - one_post("fin_key", {}, "../fin/fin_goedkeur.asp?a=1", "FIN2"); + /* if (isMulti || module == "OFFERTE" || + ((module == "FIN2" || module == "GOED") && goedkeuren) || + ((module != "FIN2" && module != "GOED") && confirm(L("lcl_approve") + "?"))) + //if (isMulti || module == "OFFERTE" || confirm(L("lcl_approve") + "?")) */ - if (todo_list["OFFERTE"].length > 0) - off_accept(todo_list["OFFERTE"]); + if (autoConf || !moduleBoo) { + + FcltMgr.confirm(L("lcl_approve") + "?", { autoconfirm: autoConf }, function() { + for (var i = 0; i < rowArray.length; i++) { + var item_key = rowArray[i].getAttribute("ROWKEY") + theData = eval('(' + rowArray[i].getAttribute("ROWDATA") + ')'); + module = theData.module; + todo_list[module].push(item_key); + } + + var data = {}; + if (goedkeuren && !(<%=S("mld_opdr_refiat_preference")%> == 0 && isMulti)) { + var fiat = $("#has_sendforapproval").length == 0 || ($("#has_sendforapproval").length && $("#sendforapproval")[0].checked) ? 1 : 0; + data.nofiat = (fiat == 1 ? 0 : 1); + } + + // Parallel opstarten + one_post("bes_key", {}, "../bes/bes_approve.asp", "BES"); + one_post("cnt_key", {}, "../cnt/cnt_approve.asp", "CNT"); + one_post("opdr_key", {}, "../mld/opdr_approve.asp", "MLD"); + one_post("opdr_key", data, "../mld/opdr_goedkeur.asp", "GOED"); + one_post("fin_key", {}, "../fin/fin_approve.asp?a=1", "FIN"); + one_post("fin_key", {}, "../fin/fin_goedkeur.asp?a=1", "FIN2"); + + if (todo_list["OFFERTE"].length > 0) + off_accept(todo_list["OFFERTE"]); + }); } } diff --git a/APPL/FAC/fac_kenmerkdomein.asp b/APPL/FAC/fac_kenmerkdomein.asp index af61ddf73a..ad49b2757c 100644 --- a/APPL/FAC/fac_kenmerkdomein.asp +++ b/APPL/FAC/fac_kenmerkdomein.asp @@ -118,17 +118,17 @@ else function f_delete() { - if (confirm(L("lcl_R_U_sure"))) - { - var data = { key: <%=domein_key%>, - level: "KD" - }; - <% protectRequest.dataToken("data"); %> - $.post("fac_delete.asp", - data, - FcltCallbackClose, - "json"); - } + FcltMgr.confirm(L("lcl_R_U_sure"), function() { + var data = { + key: <%=domein_key%>, + level: "KD" + }; + <% protectRequest.dataToken("data"); %> + $.post("fac_delete.asp", + data, + FcltCallbackClose, + "json"); + }); } function f_cancel() diff --git a/APPL/FAC/fac_like.asp b/APPL/FAC/fac_like.asp index bfe26b979b..e0766c9f41 100644 --- a/APPL/FAC/fac_like.asp +++ b/APPL/FAC/fac_like.asp @@ -50,7 +50,7 @@ var TransitParam = buildTransitParam(["key", "node"]); { if (!$("[name=flike_oordeel]:checked").val()) { - alert("<%=L('lcl_fac_like_geenoordeel')%>"); + FcltMgr.alert("<%=L('lcl_fac_like_geenoordeel')%>"); return false; } $.post($("form[name=flike]")[0].action, $("[name=flike]").serialize(), FcltCallbackClose, "json"); diff --git a/APPL/FAC/fac_report.asp b/APPL/FAC/fac_report.asp index b8595b0d11..7d437fcc28 100644 --- a/APPL/FAC/fac_report.asp +++ b/APPL/FAC/fac_report.asp @@ -444,7 +444,7 @@ function fac_usrrap_list_graph (model, scf_params) var imgData = $('#myGraph').jqplotToImageStr({}); document.getElementById('myGraph').innerHTML = ""; $(".hasIcon").hide(); - alert(L("lcl_viewimagealert")); + FcltMgr.alert(L("lcl_viewimagealert")); } diff --git a/APPL/FAC/fac_reportx.js b/APPL/FAC/fac_reportx.js index 2b0e3aca67..62b87a1b47 100644 --- a/APPL/FAC/fac_reportx.js +++ b/APPL/FAC/fac_reportx.js @@ -38,9 +38,8 @@ function show_report(key) function clone_report(key) { - if (confirm(L("lcl_usrrap_clone_confirm"))) - { + FcltMgr.confirm(L("lcl_usrrap_clone_confirm"), function() { var url = "appl/fac/fac_usrrapx_clone.asp?usrrap_key=" + key; FcltMgr.openDetail(url); - } + }); } diff --git a/APPL/FAC/fac_setenv.asp b/APPL/FAC/fac_setenv.asp index f17366d83a..ad3fd6090f 100644 --- a/APPL/FAC/fac_setenv.asp +++ b/APPL/FAC/fac_setenv.asp @@ -35,13 +35,13 @@ var authparams = user.checkAutorisation(autfunction); { oRs = Oracle.Execute("UPDATE fac_version SET fac_version_otap = " + safe.quoted_sql(newenv)); %> <% } else { %> <% } %> diff --git a/APPL/FAC/fac_setting.asp b/APPL/FAC/fac_setting.asp index 546a22b79a..64d5c4d87f 100644 --- a/APPL/FAC/fac_setting.asp +++ b/APPL/FAC/fac_setting.asp @@ -143,11 +143,11 @@ canChange = (!isProtected || { if (rtype == 1) { - alert("waarde moet van het type " +stype+ " zijn."); + FcltMgr.alert("waarde moet van het type " +stype+ " zijn."); } else { - alert("Unknown type " +stype+ "."); + FcltMgr.alert("Unknown type " +stype+ "."); } return false; } diff --git a/APPL/FAC/fac_show_adres.asp b/APPL/FAC/fac_show_adres.asp index c3a29e5ac9..e4f0021fac 100644 --- a/APPL/FAC/fac_show_adres.asp +++ b/APPL/FAC/fac_show_adres.asp @@ -100,17 +100,17 @@ oRs = Oracle.Execute(sql); function fac_delete() { - if (confirm(L("lcl_fac_del_txt_adres"))) - { - var data = { key: <%=adr_key%>, - level: "AD" - }; - <% protectRequest.dataToken("data"); %> - $.post("fac_delete.asp", - data, - FcltCallbackClose, - "json"); - } + FcltMgr.confirm(L("lcl_fac_del_txt_adres"), function() { + var data = { + key: <%=adr_key%>, + level: "AD" + }; + <% protectRequest.dataToken("data"); %> + $.post("fac_delete.asp", + data, + FcltCallbackClose, + "json"); + }); } diff --git a/APPL/FAC/fac_show_api.asp b/APPL/FAC/fac_show_api.asp index e46863874f..d2f7919250 100644 --- a/APPL/FAC/fac_show_api.asp +++ b/APPL/FAC/fac_show_api.asp @@ -51,18 +51,14 @@ if (oRs.Eof) function api_delete() { - if (confirm(L("lcl_fac_del_txt_api"))) - { - var data = { key: <%=api_key%> - , level: "AP" - }; - <% protectRequest.dataToken("data"); %> - $.post("fac_delete.asp" - , data - , FcltCallbackClose - , "json" - ); - } + FcltMgr.confirm(L("lcl_fac_del_txt_api"), function() { + var data = { + key: <%=api_key%>, + level: "AP" + }; + <% protectRequest.dataToken("data"); %> + $.post("fac_delete.asp", data, FcltCallbackClose, "json"); + }); } diff --git a/APPL/FAC/fac_show_bookmark.asp b/APPL/FAC/fac_show_bookmark.asp index cb7c2f9046..8357877be1 100644 --- a/APPL/FAC/fac_show_bookmark.asp +++ b/APPL/FAC/fac_show_bookmark.asp @@ -70,17 +70,17 @@ oRs.close(); function bkm_delete() { - if (confirm(L("lcl_R_U_sure"))) - { - var data = { key: "<%=safe.jsstring(bkm_id)%>", - level: "BM" - }; - <% protectRequest.dataToken("data"); %> - $.post("fac_delete.asp", - data, - FcltCallbackClose, - "json"); - } + FcltMgr.confirm(L("lcl_R_U_sure"), function() { + var data = { + key: "<%=safe.jsstring(bkm_id)%>", + level: "BM" + }; + <% protectRequest.dataToken("data"); %> + $.post("fac_delete.asp", + data, + FcltCallbackClose, + "json"); + }); } diff --git a/APPL/FAC/fac_show_faq.asp b/APPL/FAC/fac_show_faq.asp index 42d4a6c2f0..7dc75d096f 100644 --- a/APPL/FAC/fac_show_faq.asp +++ b/APPL/FAC/fac_show_faq.asp @@ -92,16 +92,16 @@ var canChange = canWriteFAQBOF || (canWriteFAQFOF && datum == null) function faq_delete() { - if (confirm(L("lcl_R_U_sure"))) - { - var data = { faq_key: <%=faq_key%> - }; - <% protectRequest.dataToken("data"); %> - $.post("faq_delete.asp", - data, - FcltCallbackClose, - "json"); - } + FcltMgr.confirm(L("lcl_R_U_sure"), function() { + var data = { + faq_key: <%=faq_key%> + }; + <% protectRequest.dataToken("data"); %> + $.post("faq_delete.asp", + data, + FcltCallbackClose, + "json"); + }); } jQuery(document).ready(function() { diff --git a/APPL/FAC/fac_show_menu.asp b/APPL/FAC/fac_show_menu.asp index f3336711cc..3ba0b77f7b 100644 --- a/APPL/FAC/fac_show_menu.asp +++ b/APPL/FAC/fac_show_menu.asp @@ -161,18 +161,18 @@ function fncolGroep(oRsvalue) } function menuDelete() { - var menu_key = <%=menu_key%>; - if (confirm(L("lcl_fac_del_txt_menu"))) - { - var data = { key: <%=menu_key%>, - level: "FM" - }; - <% protectRequest.dataToken("data"); %> - $.post("fac_delete.asp", - data, - FcltCallbackClose, - "json"); - } + FcltMgr.confirm(L("lcl_fac_del_txt_menu"), function() { + var menu_key = <%=menu_key%>; + var data = { + key: <%=menu_key%>, + level: "FM" + }; + <% protectRequest.dataToken("data"); %> + $.post("fac_delete.asp", + data, + FcltCallbackClose, + "json"); + }); } function edit_image() diff --git a/APPL/FAC/fac_stdmeldingfaq.js b/APPL/FAC/fac_stdmeldingfaq.js index 4ac9fb32f8..b7675f86ae 100644 --- a/APPL/FAC/fac_stdmeldingfaq.js +++ b/APPL/FAC/fac_stdmeldingfaq.js @@ -74,13 +74,12 @@ function CreateRow(disc_key, stdm_key, vakgroep, stdmelding) function delRow(img) { // Verwijder de aangeklikte afdeling uit de lijst (de regel) - if (!confirm(L("lcl_faq_del_stdmelding"))) - return; - var tr = $(img).closest("tr")[0]; - if (tr.myData.disc_key != null) - { - document.getElementById("stdmeldingfaqtable").deleteRow(tr.rowIndex); - } + FcltMgr.confirm(L("lcl_faq_del_stdmelding"), function() { + var tr = $(img).closest("tr")[0]; + if (tr.myData.disc_key != null) { + document.getElementById("stdmeldingfaqtable").deleteRow(tr.rowIndex); + } + }); } function fac_submit() diff --git a/APPL/FAC/fac_user_info.asp b/APPL/FAC/fac_user_info.asp index edff5cea3d..511e21bc33 100644 --- a/APPL/FAC/fac_user_info.asp +++ b/APPL/FAC/fac_user_info.asp @@ -114,7 +114,7 @@ oRs.Close(); // Idee om hier de apikey te laten wissen om deze user uit de xd-synchronisatie te halen // en niet daardoor als key-user te laten tellen. // Maar de aanduiding dat het een apiuser is, is ook al wat. - alert('<%=safe.jsstring(thisUser.prs_perslid_apikey().substr(0,4) +"..."+ thisUser.prs_perslid_apikey().substr(thisUser.prs_perslid_apikey().length-3))%>'); + FcltMgr.alert('<%=safe.jsstring(thisUser.prs_perslid_apikey().substr(0,4) +"..."+ thisUser.prs_perslid_apikey().substr(thisUser.prs_perslid_apikey().length-3))%>'); } <% } diff --git a/APPL/FAC/fac_user_messages.js b/APPL/FAC/fac_user_messages.js index 981a41ef31..529613bd89 100644 --- a/APPL/FAC/fac_user_messages.js +++ b/APPL/FAC/fac_user_messages.js @@ -26,9 +26,11 @@ function MarkAsRead(messKey, wasnew, dopurge) { function MarkAsReadAll() { - if (confirm(L("lcl_fac_delete_all_msg"))) - $.post("fac_user_messages_setReadFlag.asp", - { deleteall: 1 }, - FcltCallbackRefresh, - "json"); + FcltMgr.confirm(L("lcl_fac_delete_all_msg"), function() { + $.post("fac_user_messages_setReadFlag.asp", { + deleteall: 1 + }, + FcltCallbackRefresh, + "json"); + }); } \ No newline at end of file diff --git a/APPL/FAC/fac_usrgraph.inc b/APPL/FAC/fac_usrgraph.inc index 32dc596e88..982711aae0 100644 --- a/APPL/FAC/fac_usrgraph.inc +++ b/APPL/FAC/fac_usrgraph.inc @@ -309,7 +309,7 @@ function fac_graph_generate (usrgraph_key, fclt_key, params) { if (neighbor) { - //alert('x:' + neighbor.data[0] + ' y:' + neighbor.data[1]); + // FcltMgr.alert('x:' + neighbor.data[0] + ' y:' + neighbor.data[1]); if (l_data.arr_url[neighbor.pointIndex]) FcltMgr.openDetail(l_data.arr_url[neighbor.pointIndex], l_arr_x[neighbor.pointIndex]); } diff --git a/APPL/FAC/fac_verify.inc b/APPL/FAC/fac_verify.inc index 092356656c..7baa7ad3a2 100644 --- a/APPL/FAC/fac_verify.inc +++ b/APPL/FAC/fac_verify.inc @@ -1402,7 +1402,7 @@ checker("E-mail sending", message: "Subject: " + txt + "
Error: " + e.description + "
E-mail sending failed"}; } - txt = txt + "" + txt = txt + "" return { result: resultcodes.ok, message: txt }; } ) diff --git a/APPL/FAC/job.asp b/APPL/FAC/job.asp index ac054c4e76..e1c220bbe1 100644 --- a/APPL/FAC/job.asp +++ b/APPL/FAC/job.asp @@ -67,8 +67,8 @@ if (!(MLDFOF_read || MLDFOF_write || BESFOF_read || BESFOF_write || MLDBOF_read } if (!params.keepForm) { FcltMgr.setTitle("", {hot:false}); - //TODO het feitelijke aanmaken van de bijbehorende bestelling/melding of opdracht moet nog goed gemaakt worden iets voor JGL? - alert("Actienr " + params.job_key + " is aangemaakt"); + // TODO het feitelijke aanmaken van de bijbehorende bestelling/melding of opdracht moet nog goed gemaakt worden iets voor JGL? + FcltMgr.alert("Actienr " + params.job_key + " is aangemaakt"); if (params.rtable == "1") window.location.href = "../bes/bes_bestelling.asp?urole=fo&act_key="+params.job_key; if (params.rtable == "2") diff --git a/APPL/FAC/job_edit_job.asp b/APPL/FAC/job_edit_job.asp index 1e18d79017..c58e0b5c1c 100644 --- a/APPL/FAC/job_edit_job.asp +++ b/APPL/FAC/job_edit_job.asp @@ -221,17 +221,17 @@ function checkInput() { if (sgPerson.getValue()==-1) { - alert(L("lcl_job_requestor_empty")); + FcltMgr.alert(L("lcl_job_requestor_empty")); return false; } if (document.getElementById("show_firstdate").value == '') { - alert(L("lcl_job_firstdate_empty")); + FcltMgr.alert(L("lcl_job_firstdate_empty")); return false; } if ((document.getElementById("show_enddate").value == '') && (document.getElementById("action").value == '2')) { - alert(L("lcl_job_enddate_empty")); + FcltMgr.alert(L("lcl_job_enddate_empty")); return false; } @@ -241,7 +241,7 @@ function checkInput() { if (!isGoodInteger(interval_value) || (interval_value < 0)) { valid = false; if( ! valid ) { - alert(L("lcl_job_period_error")); + FcltMgr.alert(L("lcl_job_period_error")); return false; } } @@ -254,7 +254,7 @@ function checkInput() { if (!isGoodInteger(aantal_value) || (aantal_value<=0)) { valid = false; if( ! valid ) { - alert(L("lcl_job_n_times_error")); + FcltMgr.alert(L("lcl_job_n_times_error")); return false; } } diff --git a/APPL/FAC/job_list.js b/APPL/FAC/job_list.js index a24fcb82e2..44d9f5452b 100644 --- a/APPL/FAC/job_list.js +++ b/APPL/FAC/job_list.js @@ -12,11 +12,13 @@ function jobEdit(row) function jobDelete(row, isMulti) { - var job_key = row.getAttribute("ROWKEY"); - if (isMulti || confirm(L("lcl_job_del_txt_job"))) - $.post("job_delete.asp", - { key: job_key, - level: "J" }, - FcltCallbackRefresh, - "json"); + FcltMgr.confirm(L("lcl_job_del_txt_job"), { autoconfirm: isMulti }, function() { + var job_key = row.getAttribute("ROWKEY"); + $.post("job_delete.asp", { + key: job_key, + level: "J" + }, + FcltCallbackRefresh, + "json"); + }); } diff --git a/APPL/FAC/job_save.asp b/APPL/FAC/job_save.asp index 39e2816d05..c6569c94de 100644 --- a/APPL/FAC/job_save.asp +++ b/APPL/FAC/job_save.asp @@ -111,7 +111,7 @@ if (act_key != -1) { <% if (dosave == '1') { %> <% if (act_key != -1) { %> // MOD <% } else { %> // ADD - alert(L("lcl_job_nr") + ' ' + <%=act_key_new%> + ' is aangemaakt'); + FcltMgr.alert(L("lcl_job_nr") + ' ' + <%=act_key_new%> + ' is aangemaakt'); <% } %> <% } %> diff --git a/APPL/FAC/job_show_job.asp b/APPL/FAC/job_show_job.asp index b6702e12e0..62554cf032 100644 --- a/APPL/FAC/job_show_job.asp +++ b/APPL/FAC/job_show_job.asp @@ -145,17 +145,17 @@ if (xmlnode == "opdracht") } function job_delete() { - if (confirm(L("lcl_job_del_txt_job"))) - { - var data = { key: <%=job_key%>, - level: "J" - }; - <% protectRequest.dataToken("data"); %> - $.post("job_delete.asp", - data, - FcltCallbackClose, - "json"); - } + FcltMgr.confirm(L("lcl_job_del_txt_job"), function() { + var data = { + key: <%=job_key%>, + level: "J" + }; + <% protectRequest.dataToken("data"); %> + $.post("job_delete.asp", + data, + FcltCallbackClose, + "json"); + }); } function job_bes() { diff --git a/APPL/FIN/fin_edit_factuur.js b/APPL/FIN/fin_edit_factuur.js index 06f291f659..8594735589 100644 --- a/APPL/FIN/fin_edit_factuur.js +++ b/APPL/FIN/fin_edit_factuur.js @@ -8,16 +8,10 @@ var dateInputs = new Object(); function checkFactuurExistCallback(json, textStatus) { - if (json.aantal > 0) - if (confirm(L("lcl_fin_invoice_number") + " " + json.fac_nr + L("lcl_fin_is_al") + json.aantal + L("lcl_fin_register_total") + currency_pref + num2currEditable(parseFloat(json.totaalbedrag)) + ". " + L("lcl_fin_toch_doorgaan"))) + var label = L("lcl_fin_invoice_number") + " " + json.fac_nr + L("lcl_fin_is_al") + json.aantal + L("lcl_fin_register_total") + currency_pref + num2currEditable(parseFloat(json.totaalbedrag)) + ". " + L("lcl_fin_toch_doorgaan"); + FcltMgr.confirm(label, { autoconfirm: json.aantal <= 0, fncancel: function() { iface.button.enable("btn_fin_submit"); } }, function() { document.forms.u2.submit(); - else - { - iface.button.enable("btn_fin_submit"); - return false; - } - else - document.forms.u2.submit(); + }); } function checkInput() @@ -37,7 +31,7 @@ function checkInput() { // Er zijn geen volledig ingevulde factuurregels. if (blank_lines == 0) AddItem(); - alert(L("lcl_fin_no_complete_invoice_rows")); + FcltMgr.alert(L("lcl_fin_no_complete_invoice_rows")); return false; } @@ -92,7 +86,7 @@ function checkVerlegd() // Dus een verlegd- en normaal-tarief mag niet. if (key_shift == -1 || mixed_mode == 3) { - alert(L("lcl_fin_gbedrag_validate")); + FcltMgr.alert(L("lcl_fin_gbedrag_validate")); valid = false; } } @@ -160,7 +154,7 @@ function checkDP(show) } if (show && !valid) { - alert(err); + FcltMgr.alert(err); $("#finboekm").focus(); } return valid; @@ -206,7 +200,7 @@ function FcltGetRefInfoCallback(json) { if (json.message) { - alert(json.message); + FcltMgr.alert(json.message); $("#referentienr").val($("#referentienr_old").val()); referenceChanged(true); // Geef de juiste referentiegegevens weer goed weer. Oude waarde is zeker een goede waarde. } @@ -216,9 +210,9 @@ function FcltGetRefInfoCallback(json) // Referentie (Bestelling) heeft voor verschillende artikelen, verschillende kostensoorten. // Hierdoor is een goede keuze niet mogelijk en kan het kostensoort veld leeg blijven. // Echter in dit geval is het kostensoort veld hidden en kan dus niet gevuld worden. - alert(L("lcl_fin_invalid_multi_ks")); + FcltMgr.alert(L("lcl_fin_invalid_multi_ks")); else - alert(L("lcl_fin_invalid_ref_ks")); + FcltMgr.alert(L("lcl_fin_invalid_ref_ks")); $("#referentienr").val($("#referentienr_old").val()); referenceChanged(true); // Geef de juiste referentiegegevens weer goed weer. Oude waarde is zeker een goede waarde. } @@ -232,7 +226,7 @@ function FcltGetRefInfoCallback(json) // Als er door de referenties verschillende btw tabellen wordt gebruikt terwijl er factuurregels zijn, dan wijziging niet accepteren en melding geven if (count > 0 && window.btwtabel_key != json.btwtabel_key) { - alert(L("lcl_fin_ref_btw_diff")); + FcltMgr.alert(L("lcl_fin_ref_btw_diff")); $("#referentienr").val($("#referentienr_old").val()); } else @@ -654,27 +648,27 @@ function AddItem(nofocus) // als je hieronder iets aanpast controleer dan ook fi // < -1: een bestaande factuurregel die met het kruisje is weggehaald (hidden gemaakt) function DeleteOrderLine(row) { - if (!confirm(L("lcl_fin_cancelfac"))) - return; + FcltMgr.confirm(L("lcl_fin_cancelfac"), function() { - var regel_key = $("#regel_key" + row); - if (regel_key.val() == -1) - regel_key.val(0); // signal delete for new visitor - else - regel_key.val(-regel_key.val()); // signal delete - var tr = $("#trfin" + row); - tr.hide(); - // Haal de required class overal af als deze erop zit. - $("#trfin" + row).find("*").removeClass("required"); // Required zit nu nog niet op deze regel. - tr = $("#trfin" + row + "inline"); - tr.hide(); - // Haal de required class overal af als deze erop zit. - $("#trfin" + row + "inline").find("*").removeClass("required"); // Required kan op flexkenmerken zitten. + var regel_key = $("#regel_key" + row); + if (regel_key.val() == -1) + regel_key.val(0); // signal delete for new visitor + else + regel_key.val(-regel_key.val()); // signal delete + var tr = $("#trfin" + row); + tr.hide(); + // Haal de required class overal af als deze erop zit. + $("#trfin" + row).find("*").removeClass("required"); // Required zit nu nog niet op deze regel. + tr = $("#trfin" + row + "inline"); + tr.hide(); + // Haal de required class overal af als deze erop zit. + $("#trfin" + row + "inline").find("*").removeClass("required"); // Required kan op flexkenmerken zitten. - // Verwijder van de totalBTW - $("#sum" + row).val(0); - $("#sumBTW" + row).val(0); - setPrice(null); + // Verwijder van de totalBTW + $("#sum" + row).val(0); + $("#sumBTW" + row).val(0); + setPrice(null); + }); } function SumChanged(obj) @@ -686,7 +680,7 @@ function SumChanged(obj) if (obj.value == '' || isNaN(sum) || !isGoodNumber(obj.value + "", false,false,8,2)) { - alert(L("lcl_fin_invalidSum")); + FcltMgr.alert(L("lcl_fin_invalidSum")); obj.focus(); return; } diff --git a/APPL/FIN/fin_list.js b/APPL/FIN/fin_list.js index 8d873f8c5f..e8fa973a2d 100644 --- a/APPL/FIN/fin_list.js +++ b/APPL/FIN/fin_list.js @@ -37,105 +37,105 @@ function finOrder(row) function finApprove(rowArray, isMulti) { - var finKeyString = getKeyString(rowArray); - - if (isMulti || confirm(L("lcl_fin_approve_select"))) - { - var data = { fin_key: finKeyString }; - protectRequest.dataToken(data); - $.post("fin_approve.asp?a=1", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_approve_select"), { autoconfirm: isMulti }, function() { + var finKeyString = getKeyString(rowArray); + var data = { + fin_key: finKeyString + }; + protectRequest.dataToken(data); + $.post("fin_approve.asp?a=1", + data, + FcltCallbackRefresh, + "json"); + }); } function finGoedkeur(rowArray, isMulti) { - var finKeyString = getKeyString(rowArray); - - if (isMulti || confirm(L("lcl_fin_goedkeur_select"))) - { - var data = { fin_key: finKeyString }; - protectRequest.dataToken(data); - $.post("fin_goedkeur.asp?a=1", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_goedkeur_select"), { autoconfirm: isMulti }, function() { + var finKeyString = getKeyString(rowArray); + var data = { + fin_key: finKeyString + }; + protectRequest.dataToken(data); + $.post("fin_goedkeur.asp?a=1", + data, + FcltCallbackRefresh, + "json"); + }); } function finUnapprove(rowArray, isMulti) { - var finKeyString = getKeyString(rowArray); - - if (isMulti || confirm(L("lcl_fin_unapprove_select"))) - { - var data = { fin_key: finKeyString }; - protectRequest.dataToken(data); - $.post("fin_unapprove.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_unapprove_select"), { autoconfirm: isMulti }, function() { + var finKeyString = getKeyString(rowArray); + var data = { + fin_key: finKeyString + }; + protectRequest.dataToken(data); + $.post("fin_unapprove.asp", + data, + FcltCallbackRefresh, + "json"); + }); } function finRejectApprove(rowArray, isMulti) { - var finKeyString = getKeyString(rowArray); - - if (isMulti || confirm(L("lcl_fin_reject_select"))) - { - var data = { fin_key: finKeyString }; - protectRequest.dataToken(data); - $.post("fin_approve.asp?r=1", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_reject_select"), { autoconfirm: isMulti }, function() { + var finKeyString = getKeyString(rowArray); + var data = { + fin_key: finKeyString + }; + protectRequest.dataToken(data); + $.post("fin_approve.asp?r=1", + data, + FcltCallbackRefresh, + "json"); + }); } function finRejectGoedkeur(rowArray, isMulti) { - var finKeyString = getKeyString(rowArray); - - if (isMulti || confirm(L("lcl_fin_reject_select"))) - { - var data = { fin_key: finKeyString }; - protectRequest.dataToken(data); - $.post("fin_goedkeur.asp?r=1", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_reject_select"), { autoconfirm: isMulti }, function() { + var finKeyString = getKeyString(rowArray); + var data = { + fin_key: finKeyString + }; + protectRequest.dataToken(data); + $.post("fin_goedkeur.asp?r=1", + data, + FcltCallbackRefresh, + "json"); + }); } function finUnreject(rowArray, isMulti) { - var finKeyString = getKeyString(rowArray); - - if (isMulti || confirm(L("lcl_fin_unreject_select"))) - { - var data = { fin_key: finKeyString }; - protectRequest.dataToken(data); - $.post("fin_unreject.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_unreject_select"), { autoconfirm: isMulti }, function() { + var finKeyString = getKeyString(rowArray); + var data = { + fin_key: finKeyString + }; + protectRequest.dataToken(data); + $.post("fin_unreject.asp", + data, + FcltCallbackRefresh, + "json"); + }); } function finDelete(rowArray, isMulti) { - var finKeyString = getKeyString(rowArray); - - if (isMulti || confirm(L("lcl_shared_row_delete_confirm"))) - { - var data = { fin_key: finKeyString }; - protectRequest.dataToken(data); - $.post("fin_delete.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_shared_row_delete_confirm"), { autoconfirm: isMulti }, function() { + var finKeyString = getKeyString(rowArray); + var data = { + fin_key: finKeyString + }; + protectRequest.dataToken(data); + $.post("fin_delete.asp", + data, + FcltCallbackRefresh, + "json"); + }); } diff --git a/APPL/FIN/fin_show_factuur.js b/APPL/FIN/fin_show_factuur.js index ffd279d5b2..777e52aced 100644 --- a/APPL/FIN/fin_show_factuur.js +++ b/APPL/FIN/fin_show_factuur.js @@ -6,10 +6,10 @@ */ function fin_change(fin_status) { - if (fin_status == 6 && !confirm(L("lcl_fin_approve_again"))) - return; - if (FcltMgr.startEdit(window)) - window.location.href = "fin_edit_factuur.asp?fin_key=" + fin_key + "&embedded=1"; + FcltMgr.confirm(L("lcl_fin_approve_again"), { autoconfirm: fin_status != 6 }, function() { + if (FcltMgr.startEdit(window)) + window.location.href = "fin_edit_factuur.asp?fin_key=" + fin_key + "&embedded=1"; + }); } function fin_print() @@ -19,87 +19,93 @@ function fin_print() function finMailCallback(data) { - alert(L("lcl_fin_inv_mailed") + data.emails); + FcltMgr.alert(L("lcl_fin_inv_mailed") + data.emails); } function fin_approve() { - if (confirm(L("lcl_fin_approve_factuur").format(fin_key))) - { - // Goedkeuren scherm - var data = { fin_key: fin_key }; - protectRequest.dataToken(data); - $.post("fin_approve.asp?a=1", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_approve_factuur").format(fin_key), function() { + // Goedkeuren scherm + var data = { + fin_key: fin_key + }; + protectRequest.dataToken(data); + $.post("fin_approve.asp?a=1", + data, + FcltCallbackRefresh, + "json"); + }); } function fin_goedkeuren() { - if (confirm(L("lcl_fin_goedkeuren_factuur").format(fin_key))) - { - var data = { fin_key: fin_key }; - protectRequest.dataToken(data); - $.post("fin_goedkeur.asp?a=1", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_goedkeuren_factuur").format(fin_key), function() { + var data = { + fin_key: fin_key + }; + protectRequest.dataToken(data); + $.post("fin_goedkeur.asp?a=1", + data, + FcltCallbackRefresh, + "json"); + }); } function fin_unapprove() { - if (confirm(L("lcl_fin_unapprove_factuur").format(fin_key))) - { - var data = { fin_key: fin_key }; - protectRequest.dataToken(data); - $.post("fin_unapprove.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_unapprove_factuur").format(fin_key), function() { + var data = { + fin_key: fin_key + }; + protectRequest.dataToken(data); + $.post("fin_unapprove.asp", + data, + FcltCallbackRefresh, + "json"); + }); } function fin_reject(mode) { - if (confirm(L("lcl_fin_reject_factuur").format(fin_key))) - { - var data = { fin_key: fin_key }; - protectRequest.dataToken(data); - $.post((mode == "F"? "fin_approve.asp?r=1" : "fin_goedkeur.asp?r=1"), // Afwijzen bij het Fiatteren(F) of Goedkeuren(G). - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_reject_factuur").format(fin_key), function() { + var data = { + fin_key: fin_key + }; + protectRequest.dataToken(data); + $.post((mode == "F" ? "fin_approve.asp?r=1" : "fin_goedkeur.asp?r=1"), // Afwijzen bij het Fiatteren(F) of Goedkeuren(G). + data, + FcltCallbackRefresh, + "json"); + }); } function fin_unreject() { - if (confirm(L("lcl_fin_unreject_factuur").format(fin_key))) - { - // Goedkeuren scherm - var data = { fin_key: fin_key }; - protectRequest.dataToken(data); - $.post("fin_unreject.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_fin_unreject_factuur").format(fin_key), function() { + // Goedkeuren scherm + var data = { + fin_key: fin_key + }; + protectRequest.dataToken(data); + $.post("fin_unreject.asp", + data, + FcltCallbackRefresh, + "json"); + }); } function fin_delete() { - if (confirm(L("lcl_fin_delete_factuur").format(fin_key))) - { - var data = { fin_key: fin_key }; + FcltMgr.confirm(L("lcl_fin_delete_factuur").format(fin_key), function() { + var data = { + fin_key: fin_key + }; protectRequest.dataToken(data); $.post("fin_delete.asp", - data, - FcltCallbackClose, - "json"); - } + data, + FcltCallbackClose, + "json"); + }); } function fin_copy() diff --git a/APPL/INS/ins_edit_deel.asp b/APPL/INS/ins_edit_deel.asp index 53d7be524e..4700ca040b 100644 --- a/APPL/INS/ins_edit_deel.asp +++ b/APPL/INS/ins_edit_deel.asp @@ -576,7 +576,7 @@ var ins_deel_aantal = 1; f.submit(); return true; } - alert(msg); + FcltMgr.alert(msg); return false; } diff --git a/APPL/INS/ins_edit_inspect.asp b/APPL/INS/ins_edit_inspect.asp index 39917789aa..a7fbad304b 100644 --- a/APPL/INS/ins_edit_inspect.asp +++ b/APPL/INS/ins_edit_inspect.asp @@ -297,7 +297,7 @@ if (ins_key_arr.length == 1) // Bij dagen, maanden en jaren eenheid kan vandaag niet ingevuld worden. Alleen vanaf morgen kan ingevuld worden. if (eenheid == 0 && new Date(parseInt($("#plandatum").val())) <= new Date()) { - alert(L("lcl_ins_controle_not_past")); // Plandatum mag niet in het verleden liggen! + FcltMgr.alert(L("lcl_ins_controle_not_past")); // Plandatum mag niet in het verleden liggen! return false; } <% } @@ -307,7 +307,7 @@ if (ins_key_arr.length == 1) // Bij multi geldt de laatste uitvoerdatum van alle objecten. if (lastinspectdatum && new Date(parseInt($("#deelsrtcontrole_datum").val())) <= lastinspectdatum) { - alert(L("lcl_ins_controle_after_lastinspect")); + FcltMgr.alert(L("lcl_ins_controle_after_lastinspect")); return false; } @@ -317,7 +317,7 @@ if (ins_key_arr.length == 1) // Alleen controleren als eenheid is uren. Bij invoer kies je dan ook een bepaald uur. if (eenheid == 0 && new Date(parseInt($("#deelsrtcontrole_datum").val())) > new Date()) { // Invoeren inspecteren. - alert(L("lcl_ins_controle_not_future")); // Controledatum mag niet in de toekomst liggen! + FcltMgr.alert(L("lcl_ins_controle_not_future")); // Controledatum mag niet in de toekomst liggen! return false; } @@ -337,14 +337,14 @@ if (ins_key_arr.length == 1) inspected_srtcontroles[i].eenheid > 0 && inspected_srtcontroles[i].mode == 0) // Geldt alleen voor momentmodus. { // Op dezelfde dag mag niet. - alert(L("lcl_ins_double_inspection_today")); + FcltMgr.alert(L("lcl_ins_double_inspection_today")); return false; } else if (controle_datum_uur == new Date(new Date(parseInt(inspected_srtcontroles[i].datum)).setMinutes(0,0,0)).getTime() && inspected_srtcontroles[i].eenheid == 0 && inspected_srtcontroles[i].mode == 0) // Geldt alleen voor momentmodus. { // In hetzelfde uur mag niet. - alert(L("lcl_ins_double_inspection_hour")); + FcltMgr.alert(L("lcl_ins_double_inspection_hour")); return false; } else if (controle_datum_min == new Date(parseInt(inspected_srtcontroles[i].datum)).getTime() && @@ -353,7 +353,7 @@ if (ins_key_arr.length == 1) // De geplande _org tijd is dan hetzelfde als de laatste inspectie omdat de volgende inspectie dan niet opgeschoven is. // Inspecties op dezelfde datumtijd moeten dus afgevangen worden. // Dit kan alleen voorkomen in de interval mode. - alert(L("lcl_ins_double_inspection")); + FcltMgr.alert(L("lcl_ins_double_inspection")); return false; } } diff --git a/APPL/INS/ins_history_add.asp b/APPL/INS/ins_history_add.asp index 5d54c43409..e40827053d 100644 --- a/APPL/INS/ins_history_add.asp +++ b/APPL/INS/ins_history_add.asp @@ -37,9 +37,8 @@ var new_value = ""; { if (!isGoodNumber($("#new_value").val(),true,true,-1,-1)) { - alert(L("lcl_ins_bad_value")); + FcltMgr.alert(L("lcl_ins_bad_value")); return false; - } document.activeElement.blur(); // trigger laatste onChanges diff --git a/APPL/INS/ins_inspect_list.asp b/APPL/INS/ins_inspect_list.asp index 08283e34c9..e1e3f30ee9 100644 --- a/APPL/INS/ins_inspect_list.asp +++ b/APPL/INS/ins_inspect_list.asp @@ -75,26 +75,21 @@ var authparams = user.checkAutorisation("WEB_INSUSE"); function insStart(row) { - if (confirm(L("lcl_ins_starting"))) - { - var inskey = row.getAttribute("ROWKEY"); - var rowdata = eval("(" + row.getAttribute("ROWDATA") + ")"); - if (rowdata) - { - srtcontrolekey = rowdata.insSrtControleKey; + FcltMgr.confirm(L("lcl_ins_starting"), function() { + var inskey = row.getAttribute("ROWKEY"); + var rowdata = eval("(" + row.getAttribute("ROWDATA") + ")"); + if (rowdata) { + srtcontrolekey = rowdata.insSrtControleKey; - var data = { ins_keys: inskey, - srtcont_key_arr: srtcontrolekey - }; + var data = { + ins_keys: inskey, + srtcont_key_arr: srtcontrolekey + }; - protectRequest.dataToken(data); - $.post( "ins_inspect_start.asp" - , data - , FcltCallbackRefresh - , "json" - ); - } - } + protectRequest.dataToken(data); + $.post("ins_inspect_start.asp", data, FcltCallbackRefresh, "json"); + } + }); } function insClose(row) @@ -113,26 +108,21 @@ var authparams = user.checkAutorisation("WEB_INSUSE"); function insFinish(row) { - if (confirm(L("lcl_ins_finishing"))) - { - var inskey = row.getAttribute("ROWKEY"); - var rowdata = eval("(" + row.getAttribute("ROWDATA") + ")"); - if (rowdata) - { - deellsrtcontkey = rowdata.insDeelSrtContrKey; + FcltMgr.confirm(L("lcl_ins_finishing"), function() { + var inskey = row.getAttribute("ROWKEY"); + var rowdata = eval("(" + row.getAttribute("ROWDATA") + ")"); + if (rowdata) { + deellsrtcontkey = rowdata.insDeelSrtContrKey; - var data = { ins_keys: inskey, - dlsrtcont_key_arr: deellsrtcontkey - }; + var data = { + ins_keys: inskey, + dlsrtcont_key_arr: deellsrtcontkey + }; - protectRequest.dataToken(data); - $.post( "ins_inspect_finish.asp" - , data - , FcltCallbackRefresh - , "json" - ); - } - } + protectRequest.dataToken(data); + $.post("ins_inspect_finish.asp", data, FcltCallbackRefresh, "json"); + } + }); } diff --git a/APPL/INS/ins_list.js b/APPL/INS/ins_list.js index 6a72bbd3c8..18bd55180e 100644 --- a/APPL/INS/ins_list.js +++ b/APPL/INS/ins_list.js @@ -74,21 +74,21 @@ function checkInput(evt) if (new_val == "") new_val = last_value; if (new_val < last_value) { - alert(L("lcl_obj_value_to_low")); + FcltMgr.alert(L("lcl_obj_value_to_low")); obj.focus(); inslist.action = 'javascript:0'; return false; } else if (!isNaN(sk_nmin) && new_val < sk_nmin) { - alert(L("lcl_obj_value_below_nmin")); + FcltMgr.alert(L("lcl_obj_value_below_nmin")); obj.focus(); inslist.action = 'javascript:0'; return false; } else if (!isNaN(sk_nmax) && new_val > sk_nmax) { - alert(L("lcl_obj_value_below_nmax")); + FcltMgr.alert(L("lcl_obj_value_below_nmax")); obj.focus(); inslist.action = 'javascript:0'; return false; @@ -96,7 +96,7 @@ function checkInput(evt) inslist.action = 'ins_search_list.asp'; return true; } - alert(L("lcl_obj_bad_value")); + FcltMgr.alert(L("lcl_obj_bad_value")); obj.focus(); inslist.action = 'javascript:0'; return false; @@ -104,7 +104,7 @@ function checkInput(evt) else { // yet, only numerical kenmerktypes are supported - // alert(L("lcl_obj_only_num")); + // FcltMgr.alert(L("lcl_obj_only_num")); obj.value = ""; } } @@ -132,17 +132,18 @@ function insEdit(row) function insDelete(rowArray, isMulti) { - var insKeyString = getKeyString(rowArray); - if (isMulti || confirm(L("lcl_ins_del_txt_deel"))) - { - var data = { key: insKeyString - , level: "D" }; - protectRequest.dataToken(data); - $.post("../ins/ins_delete.asp", - data, - FcltCallbackRefresh, - "json"); - } + FcltMgr.confirm(L("lcl_ins_del_txt_deel"), { autoconfirm: isMulti }, function() { + var insKeyString = getKeyString(rowArray); + var data = { + key: insKeyString, + level: "D" + }; + protectRequest.dataToken(data); + $.post("../ins/ins_delete.asp", + data, + FcltCallbackRefresh, + "json"); + }); } function refreshall(data) @@ -226,26 +227,21 @@ function insPlan(rowArray) function insStart(rowArray, isMulti) { - if (isMulti || confirm(rowArray.length == 1 ? L("lcl_ins_starting"): L("lcl_ins_starting_m"))) - { - var insKeyString = getKeyString(rowArray); - var srtcontrolekeyArray = new Array(); - for (var i = 0; i < rowArray.length; i++) - { - rowdata = eval('(' + rowArray[i].getAttribute("ROWDATA") + ')'); - srtcontrolekeyArray[i] = rowdata.insSrtControleKey; - } + FcltMgr.confirm(rowArray.length == 1 ? L("lcl_ins_starting") : L("lcl_ins_starting_m"), { autoconfirm: isMulti }, function() { + var insKeyString = getKeyString(rowArray); + var srtcontrolekeyArray = new Array(); + for (var i = 0; i < rowArray.length; i++) { + rowdata = eval('(' + rowArray[i].getAttribute("ROWDATA") + ')'); + srtcontrolekeyArray[i] = rowdata.insSrtControleKey; + } - var data = { ins_keys: insKeyString, - srtcont_key_arr: srtcontrolekeyArray.join(",") - }; - protectRequest.dataToken(data); - $.post( "../ins/ins_inspect_start.asp" - , data - , FcltCallbackRefresh - , "json" - ); - } + var data = { + ins_keys: insKeyString, + srtcont_key_arr: srtcontrolekeyArray.join(",") + }; + protectRequest.dataToken(data); + $.post("../ins/ins_inspect_start.asp", data, FcltCallbackRefresh, "json"); + }); } function insClose(rowArray) @@ -271,26 +267,21 @@ function insClose(rowArray) function insFinish(rowArray, isMulti) { - if (isMulti || confirm(rowArray.length == 1 ? L("lcl_ins_finishing") : L("lcl_ins_finishing_m"))) - { - var insKeyString = getKeyString(rowArray); - var deelsrtcontrkeyArray = new Array(); - for (var i = 0; i < rowArray.length; i++) - { - rowdata = eval('(' + rowArray[i].getAttribute("ROWDATA") + ')'); - deelsrtcontrkeyArray[i] = rowdata.insDeelSrtContrKey; - } + FcltMgr.confirm(rowArray.length == 1 ? L("lcl_ins_finishing") : L("lcl_ins_finishing_m"), { autoconfirm: isMulti }, function() { + var insKeyString = getKeyString(rowArray); + var deelsrtcontrkeyArray = new Array(); + for (var i = 0; i < rowArray.length; i++) { + rowdata = eval('(' + rowArray[i].getAttribute("ROWDATA") + ')'); + deelsrtcontrkeyArray[i] = rowdata.insDeelSrtContrKey; + } - var data = { ins_keys: insKeyString, - dlsrtcont_key_arr: deelsrtcontrkeyArray.join(",") - }; - protectRequest.dataToken(data); - $.post( "../ins/ins_inspect_finish.asp" - , data - , FcltCallbackRefresh - , "json" - ); - } + var data = { + ins_keys: insKeyString, + dlsrtcont_key_arr: deelsrtcontrkeyArray.join(",") + }; + protectRequest.dataToken(data); + $.post("../ins/ins_inspect_finish.asp", data, FcltCallbackRefresh, "json"); + }); } function insMultiMove(rowArray) diff --git a/APPL/INS/ins_show_deel.asp b/APPL/INS/ins_show_deel.asp index dacfbdf81a..d4c0639dea 100644 --- a/APPL/INS/ins_show_deel.asp +++ b/APPL/INS/ins_show_deel.asp @@ -239,17 +239,17 @@ oRs.Close(); function ins_delete() { - if (confirm(L("lcl_ins_del_txt_deel"))) - { - var data = { key: <%=ins_key%>, - level: "D" - }; - <% protectRequest.dataToken("data"); %> - $.post("ins_delete.asp", - data, - FcltCallbackClose, - "json"); - } + FcltMgr.confirm(L("lcl_ins_del_txt_deel"), function() { + var data = { + key: <%=ins_key%>, + level: "D" + }; + <% protectRequest.dataToken("data"); %> + $.post("ins_delete.asp", + data, + FcltCallbackClose, + "json"); + }); } function ins_copy() diff --git a/APPL/INS/ins_show_inspect.asp b/APPL/INS/ins_show_inspect.asp index c02e394533..26c653033e 100644 --- a/APPL/INS/ins_show_inspect.asp +++ b/APPL/INS/ins_show_inspect.asp @@ -133,19 +133,15 @@ user.auth_required_or_abort(this_ins.canInspShow); @@ -148,31 +148,31 @@ oRs.close(); if (fso.FileExists(symbolFile)) { BLOCK_START("insSymbol", L("lcl_obj_symbol") + ": " + safe.html(srtdeel.srtdeel_acadsymbol)); -%> +%> -<% +<% BLOCK_END(); } } - + if (srtdeel.srtdeel_image) { var imageFile = S("ins_image_path") + srtdeel.srtdeel_image; if (fso.FileExists(Server.MapPath(imageFile))) { BLOCK_START("insImage", L("lcl_ins_image") + ": " + safe.html(srtdeel.srtdeel_image)); -%> +%> -<% +<% BLOCK_END(); } } diff --git a/APPL/INS/ins_verbruik.js b/APPL/INS/ins_verbruik.js index 9645b9d24c..a48ecfefbb 100644 --- a/APPL/INS/ins_verbruik.js +++ b/APPL/INS/ins_verbruik.js @@ -21,29 +21,29 @@ function checkInput(evt) last_value = parseInt(document.getElementById("last_val"+i).value,10); if( new_val == "" ) new_val = last_value; if( new_val < last_value ){ - alert(L("lcl_ins_value_to_low")); + FcltMgr.alert(L("lcl_ins_value_to_low")); obj.focus(); return false; } else if( !isNaN(sk_nmin) && new_val < sk_nmin ){ - alert(L("lcl_ins_value_below_nmin")); + FcltMgr.alert(L("lcl_ins_value_below_nmin")); obj.focus(); return false; } else if( !isNaN(sk_nmax) && new_val > sk_nmax ){ - alert(L("lcl_ins_value_below_nmax")); + FcltMgr.alert(L("lcl_ins_value_below_nmax")); obj.focus(); return false; } return true; } - alert(L("lcl_ins_bad_value")); + FcltMgr.alert(L("lcl_ins_bad_value")); obj.focus(); return false; } else { // yet, only numerical kenmerktypes are supported - // alert(L("lcl_obj_only_num")); + // FcltMgr.alert(L("lcl_obj_only_num")); obj.value = ""; } } diff --git a/APPL/INS/ins_verbruik_history.asp b/APPL/INS/ins_verbruik_history.asp index 2fe14c40f0..3a5f368c1d 100644 --- a/APPL/INS/ins_verbruik_history.asp +++ b/APPL/INS/ins_verbruik_history.asp @@ -91,7 +91,7 @@ if (!oRs.eof) errormsg = data.message; // is er een error message om te laten zien? if (errormsg != "") - alert(errormsg); + FcltMgr.alert(errormsg); // reload inhoud history schem //window.location.reload(); window.location.href = "ins_verbruik_history.asp?urole=<%=urole%>&consumption_reg=1&insdeelkey=<%=insdeelkey%>"; diff --git a/APPL/INS/ins_verbruik_search_list.asp b/APPL/INS/ins_verbruik_search_list.asp index fd6c8d6834..66fd2ef849 100644 --- a/APPL/INS/ins_verbruik_search_list.asp +++ b/APPL/INS/ins_verbruik_search_list.asp @@ -61,7 +61,7 @@ if (submitting) var ins_deel_omschrijving = "'" + oRs("ins_deel_omschrijving").value + "'"; %> <% } diff --git a/APPL/INS/ins_xcp.asp b/APPL/INS/ins_xcp.asp index 0ca1612ad9..cc7462155c 100644 --- a/APPL/INS/ins_xcp.asp +++ b/APPL/INS/ins_xcp.asp @@ -234,7 +234,7 @@ if (srtcont_key > 0) var srtcontr_key = $("#sel_srtcontrole").val(); if (srtcontr_key < 0) { - alert("<%=L("lcl_ins_controle_srt_verplicht")%>"); + FcltMgr.alert("<%=L("lcl_ins_controle_srt_verplicht")%>"); $("#sel_srtcontrole").addClass("missing"); return false; } diff --git a/APPL/INS/load_owkenmerk.asp b/APPL/INS/load_owkenmerk.asp index a791e764ff..27e1e44e48 100644 --- a/APPL/INS/load_owkenmerk.asp +++ b/APPL/INS/load_owkenmerk.asp @@ -394,7 +394,7 @@ function checkK<%=i%><%=serienr%>(show){ %> } if( show && ! valid ) { - alert(err); + FcltMgr.alert(err); field.focus(); } parent.u2.action = valid ? 'outlet.asp' : 'javascript:0'; diff --git a/APPL/INS/outlet.asp b/APPL/INS/outlet.asp index 61960777cf..e2ff1df344 100644 --- a/APPL/INS/outlet.asp +++ b/APPL/INS/outlet.asp @@ -187,35 +187,40 @@ var srtdeel_key_wallplate = oRs(0).value; function CheckPort() { - ///var opts = document.forms.u2.outlet.options; - var o_key = sgOutlet.getValue(); - var o_txt = document.getElementById("sgOutlet").value; var portidvalue = '' + document.forms.u2.portid.value; - - var portpart = document.forms.u2[portidvalue + "part"].options; - var port = portpart(portpart.selectedIndex).text; - var portcon = document.forms.u2[portidvalue + "con"].value; if (portcon == 1) { - alert(L("lcl_out_port_in_use")); + FcltMgr.alert(L("lcl_out_port_in_use")); return false; } - if (port != '' && port.substring(0, 4) != replace(o_txt, '-', '').substring(0, 4)) - { - if (confirm(L("lcl_out_port") + " " + port + L("lcl_out_same_building") + o_txt + ". " + L("lcl_out_proceed"))) - return true; - else - return false; - } - // else Controle OK of niets ingevuld + + ///var opts = document.forms.u2.outlet.options; + // var o_key = sgOutlet.getValue(); // Unused + return true; } function doSubmit() { + var o_txt = document.getElementById("sgOutlet").value; + + var portpart = document.forms.u2[portidvalue + "part"].options; + var port = portpart(portpart.selectedIndex).text; + var label = "placeholder"; + if (CheckPort()) - document.forms.u2.submit(); + { + var autoConf = !(port != '' && port.substring(0, 4) != replace(o_txt, '-', '').substring(0, 4)); + + if (port != null && o_txt != null) + label = L("lcl_out_port") + " " + port + L("lcl_out_same_building") + o_txt + ". " + L("lcl_out_proceed"); + + // autoConf must be true so execute confirm with placeholder label + FcltMgr.confirm(label, { autoconfirm: autoConf }, function() { + document.forms.u2.submit(); + }); + } } function doResign() @@ -225,12 +230,11 @@ var srtdeel_key_wallplate = oRs(0).value; if (!isNaN(o_key) && o_key > 0) { - if (confirm("Opzeggen Outlet " + o_txt)) - { + FcltMgr.confirm("Opzeggen Outlet " + o_txt, function() { document.forms.u2.update.value = 0; document.forms.u2.resign.value = 1; document.forms.u2.submit(); - } + }); } } diff --git a/APPL/Localscripts/FcltJquery.js b/APPL/Localscripts/FcltJquery.js index a3db02568f..1af8fa473a 100644 --- a/APPL/Localscripts/FcltJquery.js +++ b/APPL/Localscripts/FcltJquery.js @@ -15,8 +15,8 @@ function FcltCallbackAndThen(afterAction) { return function (json, textStatus) { - if (json.message) alert(json.message); - if (json.warning) alert(json.warning); + if (json.message) FcltMgr.alert(json.message); + if (json.warning) FcltMgr.alert(json.warning); if (json.toaster) FcltMgr.topmanager().window.$.toast({ text: json.toaster, icon: "success", position : 'top-center', loaderBg: '#fff'}); json.message = null; json.warning = null; @@ -32,8 +32,8 @@ function FcltCallbackAndThenAlways(afterAction) { return function (json, textStatus) { - if (json.message) alert(json.message); - if (json.warning) alert(json.warning); + if (json.message) FcltMgr.alert(json.message); + if (json.warning) FcltMgr.alert(json.warning); if (json.toaster) FcltMgr.topmanager().window.$.toast({ text: json.toaster, icon: "success", position : 'top-center', loaderBg: '#fff'}); json.message = null; json.warning = null; @@ -83,9 +83,9 @@ function FcltSyncgetJSON(url, data) success: function (data, textStatus) { globalData = data; globalData.textStatus = textStatus; } }); if (globalData && globalData.warning) - alert(globalData.warning); + FcltMgr.alert(globalData.warning); if (globalData && globalData.error) - alert(globalData.error); + FcltMgr.alert(globalData.error); if (globalData && globalData.toaster) FcltMgr.topmanager().window.$.toast({ text: globalData.toaster, icon: "success", position : 'top-center', loaderBg: '#fff'});; return globalData; @@ -103,18 +103,18 @@ $.ajaxSetup( { if (XMLHttpRequest.responseText.match(/^FCLTFriendly:/)) // Friendly tekst uit shared/500_error.asp { - alert(XMLHttpRequest.responseText.substring(13)); + FcltMgr.alert(XMLHttpRequest.responseText.substring(13)); } else if (XMLHttpRequest.responseText.match(/^FCLTExpired:/)) // Expired tekst uit common.inc { if (FcltMgr.getData('expired')) FcltMgr.getData('expired')(); else - alert(XMLHttpRequest.responseText.substring(12)); + FcltMgr.alert(XMLHttpRequest.responseText.substring(12)); } else { - alert("JQuery Ajax Error: " + textStatus + FcltMgr.alert("JQuery Ajax Error: " + textStatus + "\n" + XMLHttpRequest.status + ": " + XMLHttpRequest.statusText + (errorThrown && errorThrown != XMLHttpRequest.statusText? "\n" + errorThrown:"") + "\n\n" + this.type + " " + this.url diff --git a/APPL/Localscripts/FcltMgr.js b/APPL/Localscripts/FcltMgr.js index 55434fef7e..b0c8608cd2 100644 --- a/APPL/Localscripts/FcltMgr.js +++ b/APPL/Localscripts/FcltMgr.js @@ -165,7 +165,7 @@ var FcltMgr = var active = this._$tabshost.tabs('option', 'active'); if (active == 0 || FcltMgr._pageManager._panelHot(active)) { - alert(L("lcl_tabs_nosave")); + FcltMgr.alert(L("lcl_tabs_nosave")); return; } } @@ -175,7 +175,7 @@ var FcltMgr = if (a.length) { var href = $( a ).attr( "href" ); - var ttl = $( a ).find("span:first").text(); + var ttl = $( a ).find("span:first").attr("ttl"); if (href.indexOf("#" > 0)) href = "#" + href.split("#")[1]; var panel = $(href); @@ -219,7 +219,7 @@ var FcltMgr = } } else - alert(L("lcl_tabs_nosave")); + FcltMgr.alert(L("lcl_tabs_nosave")); } }, @@ -606,18 +606,18 @@ var FcltMgr = } catch (e) { - //alert("Bad resizing"); + // FcltMgr.alert("Bad resizing"); return; // IE9 soms als dialoog net gesloten is } // Hoeveel extra moeten we rekenen voor jQuery dialog var dialogborderHeight = $(frm).closest(".ui-dialog").outerHeight() - $(frm).height(); - //var dialogborderWidth = $(frm).closest(".ui-dialog").outerWidth() - $(frm).closest(".ui-dialog").width(); + // var dialogborderWidth = $(frm).closest(".ui-dialog").outerWidth() - $(frm).closest(".ui-dialog").width(); $(frm).height('10px'); // Voor verkleinde/ kleine frames. Anders default minimaal 150px var newHeight = Math.min(frmcontent.outerHeight(), $(window).height()-100); - //alert("W:" + $(window).height()); - //alert("N:" + newHeight); + // FcltMgr.alert("W:" + $(window).height()); + // FcltMgr.alert("N:" + newHeight); // Omdat onze