Changed OpenDataDK keywords-input to be multi-select dropdown..

Author: Fritsen

src/app/applications/datatarget/datatarget.service.ts

@@ -77,11 +77,6 @@ export class DatatargetService {
     if (!datatarget.setToOpendataDk) {
       datatarget.openDataDkDataset = null;
     }
-    if (datatarget.setToOpendataDk) {
-      //TODO: Probably not needed if we have multi-select drop-down..?
-      datatarget.openDataDkDataset.keywords = datatarget.openDataDkDataset?.keywordsInput?.split(',');
-      datatarget.openDataDkDataset.keywordsInput = undefined;
-    }
   }
 
   private mapToDatatarget(dataTargetResponse: DatatargetResponse): Datatarget {

src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.html

@@ -243,44 +243,42 @@
   </div>
 
   <!-- Keywords -->
-  <!-- TODO: Change to multi-select dropdown?? -->
   <div class="row mb-2">
     <div class="form-group mt-3 col-12">
       <label class="form-label" for="openDataDkDataset.keywordsInput">
         {{'OPENDATADK.QUESTION.GIVE-OPENDATADK-KEYWORDS' | translate}}
       </label>
-      <input
-        type="text"
-        class="form-control"
-        id="openDataDkDataset.keywordsInput"
-        name="openDataDkDataset.keywordsInput"
-        [placeholder]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-KEYWORDS-PLACEHOLDER' | translate"
+      <mat-select
+        multiple
         required
-        [(ngModel)]="datatarget.openDataDkDataset.keywordsInput"
+        id="openDataDkDataset.keywords"
+        name="openDataDkDataset.keywords"
+        [(value)]="datatarget.openDataDkDataset.keywords"
+        [placeholder]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-KEYWORDS-PLACEHOLDER' | translate"
+        class="form-control"
         [ngClass]="{
-          'is-invalid':
-            formFailedSubmit &&
-            errorFields.includes('openDataDkDataset.keywordsInput'),
-          'is-valid':
-            formFailedSubmit &&
-            !errorFields.includes('openDataDkDataset.keywordsInput')
-        }"
-      />
+              'is-invalid':
+                formFailedSubmit &&
+                errorFields.includes('openDataDkDataset.keywords'),
+              'is-valid':
+                formFailedSubmit &&
+                !errorFields.includes('openDataDkDataset.keywords')
+            }">
+        <mat-option *ngFor="let kw of selectableKeyword" [value]="kw">{{kw}}</mat-option>
+      </mat-select>
     </div>
   </div>
 
   <!-- Terms and conditions checkmark -->
-  <!-- TODO: Find out exactly what we want here? -->
   <div class="row mt-3">
     <div class="col-12">
       <mat-checkbox [(ngModel)]="datatarget.openDataDkDataset.acceptTerms" name="acceptTerms">
         <p>
           {{ 'OPENDATADK.QUESTION.ACCEPT-TERMS-PART-ONE' | translate }}
-          <a href="https://portal.opendata.dk/dataset/76b7c4cb-2e29-43aa-9b50-eec22b5c3b5e/resource/05e25340-ac7b-460f-a427-41eccb6c36ae/download/open-data-dk-vilkaar-og-betingelser.12.06.18.pdf">
+          <a href=" https://creativecommons.org/publicdomain/zero/1.0/deed.da">
             {{ 'OPENDATADK.QUESTION.TERMS-AND-CONDITIONS' | translate }}
           </a>
         </p>
-        <p>{{ 'OPENDATADK.QUESTION.ACCEPT-TERMS-PART-TWO' | translate }}</p>
       </mat-checkbox>
     </div>
   </div>

src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.ts

@@ -43,6 +43,23 @@ export class OpendatadkEditComponent implements DatatargetEdit, OnDestroy {
 
   title = 'FORM.CREATE-NEW-DATATARGET';
 
+  selectableKeyword = [
+    'Befolkning og samfund',
+    'Energi',
+    'Internationale spørgsmål',
+    'Landbrug, fiskeri, skovbrug og fødevarer',
+    'Midlertidige data',
+    'Miljø',
+    'Regeringen og den offentlige sektor',
+    'Regioner og byer',
+    'Retfærdighed, retssystem og offentlig sikkerhed',
+    'Sundhed',
+    'Transport',
+    'Uddannelse, kultur og sport',
+    'Videnskab og teknologi',
+    'Økonomi og finanser',
+  ];
+
   errorMessages: any[];
   errorFields: string[];
 

src/assets/i18n/da.json

@@ -287,21 +287,20 @@
       "GIVE-OPENDATADK-DESCRIPTION": "Beskrivelse",
       "GIVE-OPENDATADK-DESCRIPTION-PLACEHOLDER": "Beskrivelse",
       "GIVE-OPENDATADK-KEYWORDS": "Angiv emneord",
-      "GIVE-OPENDATADK-KEYWORDS-PLACEHOLDER": "IOT, sensor, LoRaWAN, temeratur",
+      "GIVE-OPENDATADK-KEYWORDS-PLACEHOLDER": "Vælg nøgleord fra drop-down",
       "GIVE-OPENDATADK-AUTHORNAME": "Dataejer",
       "GIVE-OPENDATADK-AUTHORNAME-PLACEHOLDER": "Jens Jensen",
       "GIVE-OPENDATADK-AUTHORNAME-INFO": "Ansvarlig afdeling eller person",
       "GIVE-OPENDATADK-AUTHOR-EMAIL": "Dataejers e-mail",
       "GIVE-OPENDATADK-AUTHOR-EMAIL-PLACEHOLDER": "[email protected]",
-      "ACCEPT-TERMS-PART-ONE": "Jeg accepterer hermed de",
-      "ACCEPT-TERMS-PART-TWO": "Heriblandt at data ikke indeholder følsomme personoplysninger eller personhenførbare informationer.",
-      "TERMS-AND-CONDITIONS": "Gældende vilkår og betingelser for OpenDataDK"
+      "ACCEPT-TERMS-PART-ONE": "Jeg accepterer hermed, at datasættet udgives under en",
+      "TERMS-AND-CONDITIONS": "Creative Commons CC0 1.0 Universel (CC0 1.0) licens"
     },
     "DETAILS": {
       "NAME": "Datasæt titel",
       "RESOURCETITLE": "Datakilde titel",
       "DESCRIPTION": "Beskrivelse",
-      "KEYWORDS": "Keywords",
+      "KEYWORDS": "Emneord",
       "LICENSE": "Licens",
       "AUTHORNAME": "Forfatterens navn",
       "AUTHOREMAIL": "Forfatterens email",