[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4c92d095da106a4c2a54bf26e392d5ad57938f4d

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  4c92d095da106a4c2a54bf26e392d5ad57938f4d (commit)
      from  ea375b03f1e7c06d7de3f9b9ec5f4ff01b1d8f40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4c92d095da106a4c2a54bf26e392d5ad57938f4d
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Tue Apr 26 11:47:27 2016 -0400

    LP#1575177 Add text informing users they cannot add survey questions
    
    Survey questions cannot be added or modified once a survey has started, so
    let's add some warning text in the interface letting them know why they can't
    perform these actions.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/web/js/dojo/openils/conify/nls/conify.js b/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
index 608b998..961f9ef 100644
--- a/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
+++ b/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
@@ -86,6 +86,7 @@
     "SURVEY_QUESTION": "Question:",
     "SURVEY_ID": "Survey ID # ${0}",
     "SURVEY_FOOT_LABEL": "Questions & Answers",
+    "SURVEY_WARN_TEXT": "No questions can be modified or added at this time. The survey Start Date must be set for the future to add new questions or modify existing questions.",
     "EVENT_DEF_LABEL" : "${0}: ${1}",
     "ACQ_DISTRIB_FORMULA_NAME_PROMPT" : "Enter new formula name",
     "ACQ_DISTRIB_FORMULA_NAME_CLONE" : "${0} (Clone)",
diff --git a/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js b/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js
index 5dc659d..0993f0e 100644
--- a/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js
+++ b/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js
@@ -43,7 +43,12 @@ function drawSurvey(svyId) {
     var surveyFoot = dojo.create('tfoot', { id: "survey_foot"}, surveyTable);
     var footRow = dojo.create('tr', {id: "foot_row"}, surveyFoot);  
     var footLabel = dojo.create('td', {id: "foot_label", innerHTML: "<h3>"+localeStrings.SURVEY_FOOT_LABEL+"</h3>"}, footRow);
-    var footCell = dojo.create('td', {innerHTML: "<hr>", id: "foot_cell"}, footRow);
+    if (startDate <= today) {
+      var warnRow = dojo.create('tr', {id: "warn_row"}, surveyFoot);
+      var warnText = dojo.create('td', {id: "warn_text", style: "padding: 5px", innerHTML: localeStrings.SURVEY_WARN_TEXT}, warnRow);
+    }
+    var footRule = dojo.create('tr', {id:"foot_rule"}, surveyFoot);
+    var footCell = dojo.create('td', {innerHTML: "<hr>", id: "foot_cell"}, footRule);
     getQuestions(svyId, survey);
 
 }

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/dojo/openils/conify/nls/conify.js  |    1 +
 .../ui/default/conify/global/action/survey/edit.js |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS