From f23261fa5e5b345bb299c770c6f326fc78c511de Mon Sep 17 00:00:00 2001 From: Dante Date: Wed, 22 Feb 2017 12:04:12 -0400 Subject: [PATCH] HOR-2754 --- .../translations/english/processmaker.en.po | 25 +++++++++++++++++++ workflow/engine/data/mysql/insert.sql | 6 ++++- .../engine/templates/actionsByEmail/report.js | 18 ++++++------- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 82d77b67a..5e76ceede 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -27719,6 +27719,30 @@ msgstr "Email Account Settings" msgid "Assigned user" msgstr "Assigned user" +# TRANSLATION +# LABEL/ID_CASE_NUMBER_CAPITALIZED +#: LABEL/ID_CASE_NUMBER_CAPITALIZED +msgid "Case Number" +msgstr "Case Number" + +# TRANSLATION +# LABEL/ID_ANSWERED +#: LABEL/ID_ANSWERED +msgid "Answered" +msgstr "Answered" + +# TRANSLATION +# LABEL/ID_VIEW_RESPONSE +#: LABEL/ID_VIEW_RESPONSE +msgid "View Response" +msgstr "View Response" + +# TRANSLATION +# LABEL/ID_ERROR_MESSAGE +#: LABEL/ID_ERROR_MESSAGE +msgid "Error Message" +msgstr "Error Message" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME @@ -50936,3 +50960,4 @@ msgstr "Cancel" #: button - PME_ACCEPT msgid "[dynaforms/fields/yesno.xml?PME_ACCEPT] Save" msgstr "Save" + diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index b7f3c88ce..6ad70d66c 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -6159,7 +6159,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MAFE_4e357e7345689cff230335282b201a11','en','Enable camera','2016-08-12') , ( 'LABEL','ID_MAFE_5582ead0a9ee86a54da29c20caee6f57','en','Force user login','2016-08-12') , ( 'LABEL','ID_MAFE_f82e519e2e82239be5f49d78b24ea228','en','Supported Controls: Multiple File.','2016-08-12') , -( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default User Expiry Date (Years)','2017-02-21') ; +( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default User Expiry Date (Years)','2017-02-21') , +( 'LABEL','ID_CASE_NUMBER_CAPITALIZED','en','Case Number','2017-02-22') , +( 'LABEL','ID_ANSWERED','en','Answered','2017-02-22') , +( 'LABEL','ID_VIEW_RESPONSE','en','Error message','2017-02-22') , +( 'LABEL','ID_ERROR_MESSAGE','en','View response','2017-02-22') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , diff --git a/workflow/engine/templates/actionsByEmail/report.js b/workflow/engine/templates/actionsByEmail/report.js index 543b2baf2..015541e26 100644 --- a/workflow/engine/templates/actionsByEmail/report.js +++ b/workflow/engine/templates/actionsByEmail/report.js @@ -67,15 +67,15 @@ store = new Ext.data.GroupingStore( { }, columns: [ {id: "ABE_UID", dataIndex: "ABE_UID", hidden:true, hideable:false}, - {header: _("ID_DATE").toUpperCase(), width: 100, dataIndex: "ABE_REQ_DATE", sortable: true}, - {header: "Case Number".toUpperCase(), width: 70, dataIndex: "APP_NUMBER", sortable: true}, - {header: _("ID_SUBJECT").toUpperCase(), width: 150, dataIndex: "ABE_REQ_SUBJECT", sortable: true}, - {header: _("ID_FROM").toUpperCase(), width: 110, dataIndex: "USER", sortable: true}, - {header: _("ID_TO").toUpperCase(), width: 110, dataIndex: "ABE_REQ_SENT_TO", sortable: true}, - {header: _("ID_STATUS").toUpperCase(), width: 40, dataIndex: "ABE_REQ_STATUS", sortable: true}, - {header: "Answered".toUpperCase(), width: 60, dataIndex: "ABE_REQ_ANSWERED"}, - {header: "View Response".toUpperCase(), width: 80, sortable: false, align: 'center', renderer: function(val){ return '