chore: Add ddm-pooled hook to ui/vue components.

uzh · Aug 28, 2023 · cf0d53a · cf0d53a
1 parent f55cb58
commit cf0d53a
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 17 deletions.
diff --git a/ddm/static/ddm/vue/css/vue_uploader.css b/ddm/static/ddm/vue/css/vue_uploader.css
diff --git a/ddm/static/ddm/vue/js/vue_uploader.js b/ddm/static/ddm/vue/js/vue_uploader.js
diff --git a/ddm/static/ddm/vue/js/vue_uploader.js.map b/ddm/static/ddm/vue/js/vue_uploader.js.map
diff --git a/frontend/src/UploaderApp.vue b/frontend/src/UploaderApp.vue
@@ -11,6 +11,7 @@
       :blueprints="uploadConfig.blueprints"
       :instructions="uploadConfig.instructions"
       :exception-url="this.exceptionUrl"
+      :pooled="this.pooled"
       @changedData="updatePostData"
   ></FileUploader>
 
@@ -72,6 +73,7 @@ export default {
     actionUrl: String,
     exceptionUrl: String,
     language: String,
+    pooled: Boolean
   },
   data() {
     this.$i18n.locale = this.language;

diff --git a/frontend/src/components/FileUploader.vue b/frontend/src/components/FileUploader.vue
@@ -167,6 +167,7 @@
               </div>
             </div>
 
+            <template v-if="this.pooled === 'false'"> <!-- Check for ddm_pooled integration -->
             <div class="row">
               <div class="col feedback-col pb-5 pt-1">
                 <p class="fw-bold">{{ $t('donation-question') }}</p>
@@ -186,6 +187,7 @@
                 </div>
               </div>
             </div>
+            </template>
 
           </template>
 
@@ -222,6 +224,29 @@
         </template>
         </div>
       </div>
+
+        <!-- Part for ddm_pooled integration -->
+        <template v-if="this.pooled === 'true' && (uploadStatus === 'success' || uploadStatus === 'partial')">
+          <div class="row mt-5">
+            <div class="col feedback-col pb-5 pt-1">
+              <p class="fw-bold">{{ $t('pool-submit-question') }}</p>
+              <div class="consent-question-container">
+                <div class="question-choice-item">
+                  <label class="form-check-label rb-cb-label" for="pool-donate-agree">
+                    <input type="radio" id="pool-donate-agree" value="1" v-model="poolDonate" @change="emitToParent" required>
+                    {{ $t('donation-agree-pooled') }}
+                  </label>
+                </div>
+                <div class="question-choice-item">
+                  <label class="form-check-label rb-cb-label" for="pool-donate-disagree">
+                    <input type="radio" id="pool-donate-disagree" value="0" v-model="poolDonate" @change="emitToParent">
+                    {{ $t('donation-disagree-pooled') }}
+                  </label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </template>
     </div>
   </div>
 
@@ -266,7 +291,8 @@ export default {
     instructions: Array,
     componentId: Number,
     name: String,
-    exceptionUrl: String
+    exceptionUrl: String,
+    pooled: String
   },
   emits: ['changedData'],
   data() {
@@ -276,7 +302,8 @@ export default {
       uploadAttempts: 0,
       generalErrors: [],
       ulModalInfoMsg: '',
-      ulModalInfoTitle: ''
+      ulModalInfoTitle: '',
+      poolDonate: '0'
     }
   },
   created() {
@@ -603,18 +630,32 @@ export default {
     emitToParent() {
       let dataToEmit = JSON.parse(JSON.stringify(this.blueprintData));
 
-      Object.keys(dataToEmit).forEach(key => {
-        if (dataToEmit[key].consent === '') {
-          dataToEmit[key].consent = null;
-          dataToEmit[key].extracted_data = [];
-        }
-        else if (dataToEmit[key].consent === 'false') {
-          dataToEmit[key].extracted_data = [];
-          dataToEmit[key].consent = false;
-        } else {
-          dataToEmit[key].consent = true;
-        }
-      })
+      if (this.pooled === 'false') {
+        Object.keys(dataToEmit).forEach(key => {
+          if (dataToEmit[key].consent === '') {
+            dataToEmit[key].consent = null;
+            dataToEmit[key].extracted_data = [];
+          }
+          else if (dataToEmit[key].consent === 'false') {
+            dataToEmit[key].extracted_data = [];
+            dataToEmit[key].consent = false;
+          } else {
+            dataToEmit[key].consent = true;
+          }
+        })
+      } else {
+        // Added for ddm_pooled integration.
+        let consent = this.poolDonate;
+        Object.keys(dataToEmit).forEach(key => {
+          if (consent === '0') {
+            dataToEmit[key].consent = false;
+            dataToEmit[key].extracted_data = [];
+          } else {
+            dataToEmit[key].consent = true;
+          }
+        })
+      }
+
       this.$emit('changedData', dataToEmit);
     },
 

diff --git a/frontend/src/translations/file_uploader.json b/frontend/src/translations/file_uploader.json
@@ -18,6 +18,9 @@
     "donation-question": "Do you agree to donate and submit the data listed above?",
     "donation-agree": "Yes, I agree to submit these data",
     "donation-disagree": "No, I do not want to submit these data",
+    "pool-submit-question": "Do you agree to submit these data and receive a personalized analysis?",
+    "donation-agree-pooled": "Yes, I agree to my data being analyzed",
+    "donation-disagree-pooled": "No, I do not want my data to be analyzed",
     "extracted-data-intro": "The following data have been extracted and will be transmitted to the researchers with your consent",
     "file": "file",
     "error-multiple-files": "More than one file uploaded, but only one is expected.",
@@ -63,6 +66,9 @@
     "donation-question": "Sind Sie damit einverstanden, diese Daten zu spenden?",
     "donation-agree": "Ja, ich bin damit einverstanden, diese Daten zu spenden und an die Forschenden zu übermitteln.",
     "donation-disagree": "Nein, ich möchte diese Daten nicht spenden.",
+    "pool-submit-question": "Sind Sie damit einverstanden Ihre Daten für eine personalisierte Auswertung zu übermitteln?",
+    "donation-agree-pooled": "Ja, ich bin damit einverstanden, meine Daten für eine personalisierte Auswertung zu übermitteln",
+    "donation-disagree-pooled": "Nein, ich möchte meine Daten nicht übermitteln",
     "extracted-data-intro": "Die folgenden Daten wurden ausgelesen und werden bei Ihrer Zustimmung an die Forschenden übermittelt",
     "file": "Datei",
     "error-multiple-files": "Mehr als eine Datei hochgeladen, aber nur eine wird erwartet",