Merge pull request #3179 from dzhw/ewolf47/issue3151consentHintsAnaly…

…sisForm #3151: added consent hints to analysispackage-form
dzhw · Dec 9, 2022 · 3d2bd4e · 3d2bd4e
2 parents de248b5 + 37b1ba9
commit 3d2bd4e
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 0 deletions.
diff --git a/.../webapp/scripts/analysispackagemanagement/views/analysis-package-edit-or-create.html.tmpl b/.../webapp/scripts/analysispackagemanagement/views/analysis-package-edit-or-create.html.tmpl
@@ -46,6 +46,14 @@
                    ng-if="ctrl.analysisPackage.annotations.de == null || ctrl.analysisPackage.annotations.de == ''">
                 {{'analysis-package-management.edit.hints.annotations.de' | translate}}
               </div>
+              <div class="fdz-input-hint">
+                {{'data-package-management.edit.hints.consent.part1' | translate}}<a
+                  href="{{'data-package-management.edit.hints.consent.link1' | translate}}"
+                  target="_blank">{{'data-package-management.edit.hints.consent.link1' |
+                  translate}}</a>{{'data-package-management.edit.hints.consent.part2' | translate}}<a
+                  href="{{'data-package-management.edit.hints.consent.link2' | translate}}"
+                  target="_blank">{{'data-package-management.edit.hints.consent.link2' | translate}}</a>
+              </div>
               <div multiple
                    ng-messages="analysisPackageForm.annotationsDe.$error">
                 <div ng-message="md-maxlength">
@@ -68,6 +76,14 @@
                    ng-if="ctrl.analysisPackage.annotations.en == null || ctrl.analysisPackage.annotations.en == ''">
                 {{'analysis-package-management.edit.hints.annotations.en' | translate}}
               </div>
+              <div class="fdz-input-hint">
+                {{'data-package-management.edit.hints.consent.part1' | translate}}<a
+                  href="{{'data-package-management.edit.hints.consent.link1' | translate}}"
+                  target="_blank">{{'data-package-management.edit.hints.consent.link1' |
+                  translate}}</a>{{'data-package-management.edit.hints.consent.part2' | translate}}<a
+                  href="{{'data-package-management.edit.hints.consent.link2' | translate}}"
+                  target="_blank">{{'data-package-management.edit.hints.consent.link2' | translate}}</a>
+              </div>
               <div multiple
                    ng-messages="analysisPackageForm.annotationsEn.$error">
                 <div ng-message="md-maxlength">

diff --git a/src/main/webapp/scripts/common/text/text-bilingual.html.tmpl b/src/main/webapp/scripts/common/text/text-bilingual.html.tmpl
@@ -24,6 +24,15 @@
       )">
     {{$ctrl.translationKeyManagement + '.edit.hints.' + $ctrl.translationKeyPackage + '.' + $ctrl.translationKeyName + '.de' | translate}}
   </div>
+  <div ng-if="$ctrl.translationKeyManagement == 'analysis-package-management' && $ctrl.translationKeyPackage == 'external-data-package' && 
+    ($ctrl.translationKeyName == 'description' || $ctrl.translationKeyName == 'annotations')" class="fdz-input-hint">
+    {{'data-package-management.edit.hints.consent.part1' | translate}}<a
+      href="{{'data-package-management.edit.hints.consent.link1' | translate}}"
+      target="_blank">{{'data-package-management.edit.hints.consent.link1' |
+      translate}}</a>{{'data-package-management.edit.hints.consent.part2' | translate}}<a
+      href="{{'data-package-management.edit.hints.consent.link2' | translate}}"
+      target="_blank">{{'data-package-management.edit.hints.consent.link2' | translate}}</a>
+  </div>
   <div multiple
        ng-messages="$ctrl.currentForm[$ctrl.controlName + 'De_' + $ctrl.index].$error">
     <div
@@ -62,6 +71,15 @@
       )">
     {{$ctrl.translationKeyManagement + '.edit.hints.' + $ctrl.translationKeyPackage + '.' + $ctrl.translationKeyName + '.en' | translate}}
   </div>
+  <div ng-if="$ctrl.translationKeyManagement == 'analysis-package-management' && $ctrl.translationKeyPackage == 'external-data-package' && 
+    ($ctrl.translationKeyName == 'description' || $ctrl.translationKeyName == 'annotations')" class="fdz-input-hint">
+    {{'data-package-management.edit.hints.consent.part1' | translate}}<a
+      href="{{'data-package-management.edit.hints.consent.link1' | translate}}"
+      target="_blank">{{'data-package-management.edit.hints.consent.link1' |
+      translate}}</a>{{'data-package-management.edit.hints.consent.part2' | translate}}<a
+      href="{{'data-package-management.edit.hints.consent.link2' | translate}}"
+      target="_blank">{{'data-package-management.edit.hints.consent.link2' | translate}}</a>
+  </div>
   <div
     multiple
     ng-messages="$ctrl.currentForm[$ctrl.controlName + 'En_' + $ctrl.index].$error">

diff --git a/src/main/webapp/scripts/common/textsection/edit-text-section.bilingual.html.tmpl b/src/main/webapp/scripts/common/textsection/edit-text-section.bilingual.html.tmpl
@@ -33,6 +33,14 @@
           ng-if="!$ctrl.currentForm[$ctrl.translationKeyName + 'De'].$dirty && !$ctrl.currentForm[$ctrl.translationKeyName + 'De'].$touched">
           {{$ctrl.translationKeyPackage + '-management.edit.hints.' + $ctrl.translationKeyName + '.de' | translate}}
         </div>
+        <div ng-if="$ctrl.translationKeyPackage == 'analysis-package' && $ctrl.translationKeyName == 'description'" class="fdz-input-hint">
+          {{'data-package-management.edit.hints.consent.part1' | translate}}<a
+            href="{{'data-package-management.edit.hints.consent.link1' | translate}}"
+            target="_blank">{{'data-package-management.edit.hints.consent.link1' |
+            translate}}</a>{{'data-package-management.edit.hints.consent.part2' | translate}}<a
+            href="{{'data-package-management.edit.hints.consent.link2' | translate}}"
+            target="_blank">{{'data-package-management.edit.hints.consent.link2' | translate}}</a>
+        </div>
         <div multiple ng-messages="$ctrl.currentForm[$ctrl.translationKeyName + 'De'].$error">
           <div
             ng-if="$ctrl.notNull"
@@ -68,6 +76,14 @@
           ng-if="!$ctrl.currentForm[$ctrl.translationKeyName+ 'En'].$dirty && !$ctrl.currentForm[$ctrl.translationKeyName+ 'En'].$touched">
           {{$ctrl.translationKeyPackage + '-management.edit.hints.' + $ctrl.translationKeyName + '.en' | translate}}
         </div>
+        <div ng-if="$ctrl.translationKeyPackage == 'analysis-package' && $ctrl.translationKeyName == 'description'" class="fdz-input-hint">
+          {{'data-package-management.edit.hints.consent.part1' | translate}}<a
+            href="{{'data-package-management.edit.hints.consent.link1' | translate}}"
+            target="_blank">{{'data-package-management.edit.hints.consent.link1' |
+            translate}}</a>{{'data-package-management.edit.hints.consent.part2' | translate}}<a
+            href="{{'data-package-management.edit.hints.consent.link2' | translate}}"
+            target="_blank">{{'data-package-management.edit.hints.consent.link2' | translate}}</a>
+        </div>
         <div
           multiple
           ng-messages="$ctrl.currentForm[$ctrl.translationKeyName+ 'En'].$error">