From 9df9fdffd37495b8bad40dc5d166172e7ae63eb4 Mon Sep 17 00:00:00 2001 From: Peter Feij Date: Thu, 29 Sep 2016 17:31:48 +0000 Subject: [PATCH] FSN#37825 terminolgie fijnslijperij svn path=/Website/branches/v2016.2/; revision=30924 --- APPL/INS/ins_edit_inspect.asp | 4 ++-- APPL/INS/ins_inspect_list.asp | 2 +- APPL/INS/ins_list.js | 6 +++--- APPL/INS/ins_show_inspect.asp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/APPL/INS/ins_edit_inspect.asp b/APPL/INS/ins_edit_inspect.asp index 7a9a0fce68..6194673bbf 100644 --- a/APPL/INS/ins_edit_inspect.asp +++ b/APPL/INS/ins_edit_inspect.asp @@ -463,7 +463,7 @@ if (ins_key_arr.length == 1) <% } %> -<% var blocktext = (insPlan? L("lcl_ins_schedule") : (insClose? L("lcl_ins_close") + "/" + L("lcl_ins_finish") : L("lcl_details") )); +<% var blocktext = (insPlan? L("lcl_ins_schedule") : (insClose? L("lcl_ins_stop") : L("lcl_details") )); BLOCK_START("insMultiEdit", blocktext); if (ins_key_arr.length == 1) { @@ -633,7 +633,7 @@ if (ins_key_arr.length == 1) if (insPlan || (insEdit && (insstatus == 0 || insstatus == 2))) FCLTcalendar("plandatum", - { label: L("lcl_opdr_plandate"), + { label: L("lcl_ins_controle_plandate"), datum: minDate > inspect_data.deelsrtcontrole_plandatum? minDate : inspect_data.deelsrtcontrole_plandatum, trclass: "invoerinsp", minDate: minDate, diff --git a/APPL/INS/ins_inspect_list.asp b/APPL/INS/ins_inspect_list.asp index b71fc46199..c525a3be27 100644 --- a/APPL/INS/ins_inspect_list.asp +++ b/APPL/INS/ins_inspect_list.asp @@ -528,7 +528,7 @@ var authparams = user.checkAutorisation("WEB_INSUSE"); rst.addAction({ action: "insStart", caption: L("lcl_ins_start"), enabler: "eStartD", isDefault: true }); rst.addAction({ action: "insPlan", caption: L("lcl_ins_schedule"), enabler: "ePlan" }); rst.addAction({ action: "insStart", caption: L("lcl_ins_start"), enabler: "eStart" }); - rst.addAction({ action: "insClose", caption: L("lcl_ins_close") + "/" + L("lcl_ins_finish"), enabler: "eClose" }); + rst.addAction({ action: "insClose", caption: L("lcl_ins_stop"), enabler: "eClose" }); rst.addAction({ action: "insFinish", caption: L("lcl_ins_finish"), enabler: "eFinish" }); var cnt = rst.processResultset(); diff --git a/APPL/INS/ins_list.js b/APPL/INS/ins_list.js index 3101444136..6a72bbd3c8 100644 --- a/APPL/INS/ins_list.js +++ b/APPL/INS/ins_list.js @@ -226,7 +226,7 @@ function insPlan(rowArray) function insStart(rowArray, isMulti) { - if (isMulti || confirm(L("lcl_ins_starting"))) + if (isMulti || confirm(rowArray.length == 1 ? L("lcl_ins_starting"): L("lcl_ins_starting_m"))) { var insKeyString = getKeyString(rowArray); var srtcontrolekeyArray = new Array(); @@ -266,12 +266,12 @@ function insClose(rowArray) // var url = "appl/ins/ins_inspect.asp?close=1&ins_keys=" + insKeyString + "&srtcont_keys=" + srtcontrolekeyArray.join(",") + "&deelsrtcont_key=" + deelsrtcontrkeyArray.join(","); //else var url = "appl/ins/ins_edit_inspect.asp?close=1&ins_keys=" + insKeyString + "&srtcont_keys=" + srtcontrolekeyArray.join(",") + "&deelsrtcont_keys=" + deelsrtcontrkeyArray.join(","); - FcltMgr.openDetail(url, L("lcl_ins_close")); + FcltMgr.openDetail(url, L("lcl_ins_stop")); } function insFinish(rowArray, isMulti) { - if (isMulti || confirm(L("lcl_ins_finishing"))) + if (isMulti || confirm(rowArray.length == 1 ? L("lcl_ins_finishing") : L("lcl_ins_finishing_m"))) { var insKeyString = getKeyString(rowArray); var deelsrtcontrkeyArray = new Array(); diff --git a/APPL/INS/ins_show_inspect.asp b/APPL/INS/ins_show_inspect.asp index 6f867ba6ea..32ed76cc79 100644 --- a/APPL/INS/ins_show_inspect.asp +++ b/APPL/INS/ins_show_inspect.asp @@ -229,7 +229,7 @@ switch(sctype) if (canEdit) buttons.push({title: L("lcl_change"), action: "ins_edit()", icon: "wijzigen.png" }); if (canClose) - buttons.push({title: L("lcl_ins_close") + "/" + L("lcl_ins_finish"), action: "ins_edit('C')", icon: "close.png" }); + buttons.push({title: L("lcl_ins_stop"), action: "ins_edit('C')", icon: "close.png" }); if (canFinish) buttons.push({title: L("lcl_ins_finish"), action: "ins_finish()", icon: "close.png" }); if (canMelding)