Merge pull request #3184 from dzhw/cschwartze/issue3182

#3182 field Foerderlinie added to sponsors
dzhw · Dec 14, 2022 · aaf6682 · aaf6682
2 parents 16b6420 + b706e49
commit aaf6682
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 6 deletions.
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/common/domain/Sponsor.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/common/domain/Sponsor.java
@@ -43,4 +43,11 @@ public class Sponsor implements Serializable {
    * May be a number or a combination of numbers, letters and/or special characters.
    */
   private String fundingRef;
+
+  /**
+   * The funding program.
+   * 
+   * May be a any description using letters and/or numbers.
+   */
+  private String fundingProgram;
 }
diff --git a/src/main/webapp/scripts/analysispackagemanagement/configuration/translations-de.js b/src/main/webapp/scripts/analysispackagemanagement/configuration/translations-de.js
@@ -56,6 +56,7 @@ angular.module('metadatamanagementApp').config(
             'scripts': 'Skripte',
             'sponsors': 'Gefördert von',
             'fundingRef': 'Förderkennzeichen',
+            'fundingProgram': 'Zugehörige Förderlinie',
             'version': 'Version',
             'published-at': 'veröffentlicht am',
             'published': 'Veröffentlicht am',
@@ -182,6 +183,7 @@ angular.module('metadatamanagementApp').config(
             'institution': 'Institution',
             'sponsor': 'Geldgeber:in',
             'fundingRef': 'Förderkennzeichen',
+            'fundingProgram': 'Zugehörige Förderlinie',
             'version': 'Version',
             'script': {
               'used-language': 'Skriptsprache',
@@ -242,7 +244,8 @@ angular.module('metadatamanagementApp').config(
             'sponsor': {
               'de': 'Geben Sie den deutschen Namen der Geldgeber:in für dieses Analysepaket ein.',
               'en': 'Geben Sie den englischen Namen der Geldgeber:in für dieses Analysepaket ein.',
-              'funding-ref': 'Geben Sie das Förderkennzeichen der Geldgeber:in für dieses Analysepaket ein.'
+              'funding-ref': 'Geben Sie das Förderkennzeichen der Geldgeber:in für dieses Analysepaket ein.',
+              'funding-prg': 'Geben Sie die zugehörige Förderlinie an.'
             },
             'title': {
               'de': 'Geben Sie den Titel des Analysepakets auf Deutsch ein.',

diff --git a/src/main/webapp/scripts/analysispackagemanagement/configuration/translations-en.js b/src/main/webapp/scripts/analysispackagemanagement/configuration/translations-en.js
@@ -56,6 +56,7 @@ angular.module('metadatamanagementApp').config(
             'scripts': 'Scripts',
             'sponsors': 'Sponsored by',
             'fundingRef': 'Funding reference',
+            'fundingProgram': 'Associated funding program',
             'version': 'Version',
             'published-at': 'published at',
             'published': 'Published at',
@@ -180,6 +181,7 @@ angular.module('metadatamanagementApp').config(
             'institution': 'Institution',
             'sponsor': 'Sponsor',
             'fundingRef': 'Funding reference',
+            'fundingProgram': 'Associated funding program',
             'version': 'Version',
             'script': {
               'used-language': 'Script Language',
@@ -239,7 +241,8 @@ angular.module('metadatamanagementApp').config(
             'sponsor': {
               'de': 'Enter the German name of the sponsor of this analysis package.',
               'en': 'Enter the English name of the sponsor of this analysis package.',
-              'funding-ref': 'Enter the funding reference of the sponsor of this analysis package.'
+              'funding-ref': 'Enter the funding reference of the sponsor of this analysis package.',
+              'funding-prg': 'Enter the associated funding program.'
             },
             'title': {
               'de': 'Please enter the title of this analysis package in German.',

diff --git a/src/main/webapp/scripts/analysispackagemanagement/templates/common-details.html.tmpl b/src/main/webapp/scripts/analysispackagemanagement/templates/common-details.html.tmpl
@@ -28,7 +28,7 @@
         <md-list-item ng-if="$ctrl.options.analysisPackage.sponsors">
           <h5>{{'analysis-package-management.detail.label.sponsors' | translate }}:</h5>
           <div class="md-secondary">
-	    <div style="white-space:pre-wrap" ng-repeat="sponsor in $ctrl.options.analysisPackage.sponsors"><ul style="margin-bottom:5px;padding-left:0px;list-style-type: none;"><li>{{sponsor.name[$ctrl.lang]}}<br ng-if="sponsor.fundingRef ? true : false" /><h5 ng-if="sponsor.fundingRef ? true : false" style="display:inline">{{'analysis-package-management.detail.label.fundingRef' | translate }}: </h5>{{sponsor.fundingRef}}</li></ul></div>
+	    <div style="white-space:pre-wrap" ng-repeat="sponsor in $ctrl.options.analysisPackage.sponsors"><ul style="margin-bottom:5px;padding-left:0px;list-style-type: none;"><li>{{sponsor.name[$ctrl.lang]}}<br ng-if="sponsor.fundingRef ? true : false" /><h5 ng-if="sponsor.fundingRef ? true : false" style="display:inline">{{'analysis-package-management.detail.label.fundingRef' | translate }}: </h5>{{sponsor.fundingRef}}<br ng-if="sponsor.fundingProgram ? true : false" /><h5 ng-if="sponsor.fundingProgram ? true : false" style="display:inline">{{'analysis-package-management.detail.label.fundingProgram' | translate }}: </h5>{{sponsor.fundingProgram}}</li></ul></div>
 	  </div>
         </md-list-item>
         <md-list-item ng-if="$ctrl.options.analysisPackage.projectContributors">

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
@@ -362,6 +362,17 @@
               </div>
             </md-input-container>
           </div>
+          <div layout="row" layout-align="start center">
+            <md-input-container flex="50" ng-style="{'margin-left': ctrl.analysisPackage.sponsors.length > 1 ? '40px' : '0px'}" class="mt0">
+              <label>{{'analysis-package-management.edit.label.fundingProgram' | translate}}</label>
+              <input name="sponsorFundingProgram_{{$index}}" ng-model="ctrl.analysisPackage.sponsors[$index].fundingProgram" autocomplete="off">
+              <div
+                class="fdz-input-hint"
+                ng-if="!analysisPackageForm['fundPrg_' + $parent.$index].$dirty && !analysisPackageForm['fundPrg_' + $parent.$index].$touched">
+                {{'analysis-package-management.edit.hints.sponsor.funding-prg' | translate}}
+              </div>
+            </md-input-container>
+          </div>
           </div>
         </md-card-content>
         <md-card-actions layout="row" layout-align="begin center" class="mb12">

diff --git a/src/main/webapp/scripts/datapackagemanagement/configuration/translations-de.js b/src/main/webapp/scripts/datapackagemanagement/configuration/translations-de.js
@@ -16,6 +16,7 @@ angular.module('metadatamanagementApp').config(
             'data-curators': 'Datenkuratierung',
             'sponsors': 'Gefördert von',
             'fundingRef': 'Förderkennzeichen',
+            'fundingProgram': 'Zugehörige Förderlinie',
             'version': 'Version',
             'surveyDesign': 'Erhebungsdesign',
             'annotations': 'Anmerkungen',
@@ -229,6 +230,7 @@ angular.module('metadatamanagementApp').config(
             'institution': 'Institution',
             'sponsor': 'Geldgeber:in',
             'fundingRef': 'Förderkennzeichen',
+            'fundingProgram': 'Zugehörige Förderlinie',
             'location': 'Ort',
             'additional-links': {
               'url': 'URL',
@@ -286,7 +288,8 @@ angular.module('metadatamanagementApp').config(
             'sponsor': {
               'de': 'Geben Sie den deutschen Namen der Geldgeber:in für dieses Datenpaket ein.',
               'en': 'Geben Sie den englischen Namen der Geldgeber:in für dieses Datenpaket ein.',
-              'funding-ref': 'Geben Sie das Förderkennzeichen der Geldgeber:in für dieses Datenpaket ein.'
+              'funding-ref': 'Geben Sie das Förderkennzeichen der Geldgeber:in für dieses Datenpaket ein.',
+              'funding-prg': 'Geben Sie die zugehörige Förderlinie an.'
             },
             'survey-design': 'Wählen Sie das Erhebungsdesign dieses Datenpakets aus.',
             'annotations': {

diff --git a/src/main/webapp/scripts/datapackagemanagement/configuration/translations-en.js b/src/main/webapp/scripts/datapackagemanagement/configuration/translations-en.js
@@ -16,6 +16,7 @@ angular.module('metadatamanagementApp').config(
             'data-curators': 'Data Curation',
             'sponsors': 'Sponsored by',
             'fundingRef': 'Funding reference',
+            'fundingProgram': 'Associated funding program',
             'version': 'Version',
             'surveyDesign': 'Survey Design',
             'annotations': 'Annotations',
@@ -229,6 +230,7 @@ angular.module('metadatamanagementApp').config(
             'institution': 'Institution',
             'sponsor': 'Sponsor',
             'fundingRef': 'Funding reference',
+            'fundingProgram': 'Associated funding program',
             'location': 'Location',
             'additional-links': {
               'url': 'URL',
@@ -284,7 +286,8 @@ angular.module('metadatamanagementApp').config(
             'sponsor': {
               'de': 'Enter the German name of the sponsor of this data package.',
               'en': 'Enter the English name of the sponsor of this data package.',
-              'funding-ref': 'Enter the funding reference of the sponsor of this data package.'
+              'funding-ref': 'Enter the funding reference of the sponsor of this data package.',
+              'funding-prg': 'Enter the associated funding program.'
             },
             'survey-design': 'Choose the survey design of this data package.',
             'annotations': {

diff --git a/src/main/webapp/scripts/datapackagemanagement/templates/common-details.html.tmpl b/src/main/webapp/scripts/datapackagemanagement/templates/common-details.html.tmpl
@@ -43,7 +43,7 @@
         <md-list-item ng-if="$ctrl.options.dataPackage.sponsors">
           <h5>{{'data-package-management.detail.label.sponsors' | translate }}:</h5>
 	  <div class="md-secondary">
-	    <div style="white-space:pre-wrap" ng-repeat="sponsor in $ctrl.options.dataPackage.sponsors"><ul style="margin-bottom:5px;padding-left:0px;list-style-type: none;"><li>{{sponsor.name[$ctrl.lang]}}<br ng-if="sponsor.fundingRef ? true : false" /><h5 ng-if="sponsor.fundingRef ? true : false" style="display:inline">{{'data-package-management.detail.label.fundingRef' | translate }}: </h5>{{sponsor.fundingRef}}</li></ul></div>
+	    <div style="white-space:pre-wrap" ng-repeat="sponsor in $ctrl.options.dataPackage.sponsors"><ul style="margin-bottom:5px;padding-left:0px;list-style-type: none;"><li>{{sponsor.name[$ctrl.lang]}}<br ng-if="sponsor.fundingRef ? true : false" /><h5 ng-if="sponsor.fundingRef ? true : false" style="display:inline">{{'data-package-management.detail.label.fundingRef' | translate }}: </h5>{{sponsor.fundingRef}}<br ng-if="sponsor.fundingProgram ? true : false" /><h5 ng-if="sponsor.fundingProgram ? true : false" style="display:inline">{{'data-package-management.detail.label.fundingProgram' | translate }}: </h5>{{sponsor.fundingProgram}}</li></ul></div>
 	  </div>
         </md-list-item>
         <md-list-item ng-if="$ctrl.options.dataPackage.projectContributors">

diff --git a/src/main/webapp/scripts/datapackagemanagement/views/data-package-edit-or-create.html.tmpl b/src/main/webapp/scripts/datapackagemanagement/views/data-package-edit-or-create.html.tmpl
@@ -437,6 +437,17 @@
               </div>
             </md-input-container>
           </div>
+          <div layout="row" layout-align="start center">
+            <md-input-container flex="50" ng-style="{'margin-left': ctrl.dataPackage.sponsors.length > 1 ? '40px' : '0px'}" class="mt0">
+              <label>{{'data-package-management.edit.label.fundingProgram' | translate}}</label>
+              <input name="sponsorFundingProgram_{{$index}}" ng-model="ctrl.dataPackage.sponsors[$index].fundingProgram" autocomplete="off">
+              <div
+                class="fdz-input-hint"
+                ng-if="!dataPackageForm['fundPrg_' + $parent.$index].$dirty && !dataPackageForm['fundPrg_' + $parent.$index].$touched">
+                {{'data-package-management.edit.hints.sponsor.funding-prg' | translate}}
+              </div>
+            </md-input-container>
+          </div>
         </div>
         </md-card-content>
         <md-card-actions layout="row" layout-align="begin center" class="mb12">