Merge pull request #386 from rdmorganiser/fix_values_in_project_quest…

…ions Resolve addtional values in project_questions
rdmorganiser · Oct 8, 2021 · e4a018d · e4a018d
2 parents 332bedb + 5c6898e
commit e4a018d
Show file tree

Hide file tree

Showing 15 changed files with 480 additions and 384 deletions.
diff --git a/rdmo/locale/de/LC_MESSAGES/django.mo b/rdmo/locale/de/LC_MESSAGES/django.mo
diff --git a/rdmo/locale/de/LC_MESSAGES/django.po b/rdmo/locale/de/LC_MESSAGES/django.po
diff --git a/rdmo/projects/static/projects/js/project_questions/services.js b/rdmo/projects/static/projects/js/project_questions/services.js
@@ -503,6 +503,7 @@ angular.module('project_questions')
                     future.values[question.attribute][valueset.set_prefix][valueset.set_index] = service.initCheckbox(question, future.values[question.attribute][valueset.set_prefix][valueset.set_index]);
                 }
 
+                // init the widget for every value
                 angular.forEach(future.values[question.attribute][valueset.set_prefix][valueset.set_index], function(value) {
                     service.initWidget(question, value);
                 });
@@ -1342,6 +1343,12 @@ angular.module('project_questions')
         }
     }
 
+    service.visibleValues = function(attribute, set_prefix, set_index) {
+        return $filter('filter')(service.values[attribute][set_prefix][set_index], function(value) {
+            return (angular.isUndefined(value.removed) || !value.removed)
+        });
+    }
+
     return service;
 
 }]);
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_autocomplete.html b/rdmo/projects/templates/projects/project_questions_form_group_autocomplete.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'autocomplete'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_checkbox.html b/rdmo/projects/templates/projects/project_questions_form_group_checkbox.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'checkbox'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div class="checkbox-control">
             <div class="checkbox" ng-repeat="option in question.options" ng-hide="valueset.hidden.optionsets[option.optionset]">

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_date.html b/rdmo/projects/templates/projects/project_questions_form_group_date.html
@@ -4,6 +4,7 @@
     <div class="form-group" ng-if="question.widget_type === 'date'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_file.html b/rdmo/projects/templates/projects/project_questions_form_group_file.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'file'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_radio.html b/rdmo/projects/templates/projects/project_questions_form_group_radio.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'radio'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_range.html b/rdmo/projects/templates/projects/project_questions_form_group_range.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'range'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_select.html b/rdmo/projects/templates/projects/project_questions_form_group_select.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'select'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_text.html b/rdmo/projects/templates/projects/project_questions_form_group_text.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'text'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_textarea.html b/rdmo/projects/templates/projects/project_questions_form_group_textarea.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'textarea'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_form_group_yesno.html b/rdmo/projects/templates/projects/project_questions_form_group_yesno.html
@@ -3,6 +3,7 @@
     <div class="form-group" ng-if="question.widget_type === 'yesno'">
         {% include 'projects/project_questions_question_label.html' %}
         {% include 'projects/project_questions_question_help.html' %}
+        {% include 'projects/project_questions_question_warning.html' %}
 
         <div ng-if="question.is_collection">
             {% include 'projects/project_questions_add_field_help.html' %}

diff --git a/rdmo/projects/templates/projects/project_questions_question_warning.html b/rdmo/projects/templates/projects/project_questions_question_warning.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+
+    <p class="text-warning"
+       ng-show="!question.is_collection && service.visibleValues(question.attribute, valueset.set_prefix, valueset.set_index).length > 1">
+        {% trans 'Warning: Multiple answers exist in the database. This can happen due some technical problem in the past. You can remove unwanted answers using the "Remove item" field (<i class="fa fa-times"></i>). Please contact support if the problem persists.' %}
+    </p>
diff --git a/rdmo/projects/templates/projects/project_questions_remove_field.html b/rdmo/projects/templates/projects/project_questions_remove_field.html
@@ -1,9 +1,9 @@
 {% load i18n %}
 
-    <a href="" class="close" tabindex="-1" ng-if="question.is_collection"
+    <a href="" class="close" tabindex="-1"
         title="{% blocktrans with name='{$ question.verbose_name $}' %}Remove {{ name }}{% endblocktrans %}"
         ng-click="service.removeValue(question.attribute, valueset.set_prefix, valueset.set_index, $index)"
-        ng-hide="!question.is_collection || service.project.read_only">
+        ng-show="(question.is_collection || service.visibleValues(question.attribute, valueset.set_prefix, valueset.set_index).length > 1) && !service.project.read_only">
 
         <i class="fa fa-times" aria-hidden="true"></i>
     </a>