Merge pull request #172 from amida-tech/feature/GREY-375

GREY-375 product form, survey required
amida-tech · Aug 12, 2016 · 4fc97f9 · 4fc97f9
2 parents 377908f + 01dd63a
commit 4fc97f9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git a/client/app/greyscale.tables/scripts/services/greyscale-project-products.js b/client/app/greyscale.tables/scripts/services/greyscale-project-products.js
@@ -46,7 +46,9 @@ angular.module('greyscale.tables')
             sortable: 'surveyId',
             dataFormat: 'option',
             cellTemplate: '<span ng-if="option.id">{{option.title}} <small>(<span ng-show="option.isDraft" translate="SURVEYS.IS_DRAFT"></span><span ng-show="!option.isDraft" translate="SURVEYS.IS_COMPLETE"></span>)</small></span>',
-            //dataRequired: true,
+            dataPlaceholder: tns + 'SELECT_SURVEY',
+            //dataNoEmptyOption: true,
+            dataRequired: true,
             dataSet: {
                 getData: _getSurveys,
                 keyField: 'id',
@@ -84,6 +86,7 @@ angular.module('greyscale.tables')
             title: tns + 'STATUS',
             dataFormat: 'option',
             dataNoEmptyOption: true,
+            dataRequired: true,
             dataSet: {
                 getData: _getStatus,
                 keyField: 'id',

diff --git a/client/app/scripts/directives/modal-form-field.js b/client/app/scripts/directives/modal-form-field.js
@@ -98,7 +98,7 @@ angular.module('greyscaleApp')
                                 'ng-model="modalFormFieldModel" ng-required="modalFormField.dataRequired" gs-model-validate="modalFormField.dataValidate">';
 
                             var hiddenAttr = clmn.dataNoEmptyOption && !clmn.dataPlaceholder ? ' style="display: none" ' : '';
-                            var disableAttr = clmn.dataNoEmptyOption ? ' disabled ' : '';
+                            var disableAttr = clmn.dataNoEmptyOption || clmn.dataPlaceholder ? ' disabled ' : '';
                             var placeholderAttr = clmn.dataPlaceholder ? ' translate="' + clmn.dataPlaceholder + '" ' : '';
                             field += '<option value="" ' + hiddenAttr + disableAttr + placeholderAttr + '></option>';
                             field += '</select>';

diff --git a/client/i18n/en.json b/client/i18n/en.json
@@ -397,6 +397,7 @@
             "PAUSE_PRODUCT": "Suspend Project",
             "PLANNING_NOT_FINISH": "Planning not finished yet. Please, set Survey, Subjects, Workflow Steps and Tasks for this Project.",
             "PRODUCT": "Project",
+            "SELECT_SURVEY": "Select survey...",
             "SETTINGS": "Settings",
             "START_PRODUCT": "Start Project",
             "STATUS": "Status",

diff --git a/client/i18n/es.json b/client/i18n/es.json
@@ -397,6 +397,7 @@
             "PAUSE_PRODUCT": "",
             "PLANNING_NOT_FINISH": "",
             "PRODUCT": "",
+            "SELECT_SURVEY": "",
             "SETTINGS": "",
             "START_PRODUCT": "",
             "STATUS": "",

diff --git a/client/i18n/fr.json b/client/i18n/fr.json
@@ -397,6 +397,7 @@
             "PAUSE_PRODUCT": "",
             "PLANNING_NOT_FINISH": "",
             "PRODUCT": "",
+            "SELECT_SURVEY": "",
             "SETTINGS": "",
             "START_PRODUCT": "",
             "STATUS": "",

diff --git a/client/i18n/ru.json b/client/i18n/ru.json
@@ -397,6 +397,7 @@
             "PAUSE_PRODUCT": "Приостановить проект",
             "PLANNING_NOT_FINISH": "Планирование не окончено",
             "PRODUCT": "Проект",
+            "SELECT_SURVEY": "",
             "SETTINGS": "Настройки",
             "START_PRODUCT": "Запустить проект",
             "STATUS": "Состояние",