Skip to content

IOT-1610: Added new metadata fields for ODDK #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fcv-iteratorIt merged 4 commits into from
Nov 25, 2025
Merged

IOT-1610: Added new metadata fields for ODDK #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3015cc8
Added new metadata fields for ODDK
fcv-iteratorIt Nov 20, 2025
19aea6a
Fix scroll to top
fcv-iteratorIt Nov 21, 2025
7ef663a
PR changes
fcv-iteratorIt Nov 21, 2025
a30a329
Merge pull request #211 from OS2iot/bugfix/#206-Gateway-metadata-error
fcv-iteratorIt Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 52 additions & 46 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/app/app-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { PreloadAllModules, RouterModule, Routes } from "@angular/router";
import { NewUserComponent } from "./admin/users/new-kombit-user-page/new-user.component";
import { UserPageComponent } from "./admin/users/user-page/user-page.component";
import { AuthGuardService as AuthGuard } from "./auth/auth-guard.service";
import { AuthComponent } from "./auth/auth.component";
import { AuthComponent } from "@auth/auth.component";
import { ErrorPageComponent } from "./error-page/error-page.component";

const routes: Routes = [
Expand Down
4 changes: 4 additions & 0 deletions src/app/applications/datatarget/opendatadk/opendatadk-dataset.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ export class OpenDataDkDataset {
resourceTitle: string;
description: string;
keywords: string[];
keywordTags: string;
keywordsInput: string;
license = "https://creativecommons.org/publicdomain/zero/1.0/";
authorName: string; //required
authorEmail: string; //reqired
url: string; // autogenerated with orgid as input
acceptTerms = false;
updateFrequency: string;
documentationUrl: string;
dataDirectory: boolean = false;
}
20 changes: 20 additions & 0 deletions ...app/applications/datatarget/opendatadk/opendatadk-detail/opendatadk-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
{{ openDataDkDataset.keywords ? openDataDkDataset.keywords : ("OPENDATADK.DETAILS.NA" | translate) }}
</p>

<p>
<strong>{{ "OPENDATADK.DETAILS.TAGS" | translate }}</strong>
{{ openDataDkDataset.keywordTags ?? ("OPENDATADK.DETAILS.NA" | translate) }}
</p>

<p>
<strong>{{ "OPENDATADK.DETAILS.AUTHORNAME" | translate }}</strong>
{{ openDataDkDataset.authorName }}
Expand All @@ -28,6 +33,21 @@
{{ openDataDkDataset.authorEmail }}
</p>

<p>
<strong>{{ "OPENDATADK.DETAILS.UPDATE-FREQUENCY" | translate }}</strong>
{{ openDataDkDataset.updateFrequency ? ("OPENDATADK.QUESTION.UPDATE-FREQUENCY-OPTIONS." + openDataDkDataset.updateFrequency | translate) : ("OPENDATADK.DETAILS.NA" | translate) }}
</p>

<p>
<strong>{{ "OPENDATADK.DETAILS.DOCUMENTATION-URL" | translate }}</strong>
{{ openDataDkDataset.documentationUrl ?? ("OPENDATADK.DETAILS.NA" | translate) }}
</p>

<p>
<strong>{{ "OPENDATADK.DETAILS.DATA-DIRECTORY" | translate }}</strong>
{{ openDataDkDataset.dataDirectory | yesNo }}
</p>

<p>
<strong>{{ "OPENDATADK.DETAILS.URL" | translate }}</strong>
{{ openDataDkDataset.url }}
Expand Down
221 changes: 163 additions & 58 deletions src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ <h3>{{ (datatargetId ? "FORM.EDIT-DATATARGET" : "FORM.CREATE-NEW-DATATARGET") |
matTooltipHideDelay="2000"
matTooltipPosition="above"
matTooltipShowDelay="600"
>
</fa-icon>
/>
<input
[(ngModel)]="datatarget.openDataDkDataset.resourceTitle"
[ngClass]="{
Expand Down Expand Up @@ -240,19 +239,27 @@ <h3>{{ (datatargetId ? "FORM.EDIT-DATATARGET" : "FORM.CREATE-NEW-DATATARGET") |
</div>
</div>

<!-- Keywords -->
<!-- Theme -->
<div class="row mb-2">
<div class="form-group mt-3 col-12">
<label class="form-label" for="openDataDkDataset.keywords">
{{ "OPENDATADK.QUESTION.GIVE-OPENDATADK-KEYWORDS" | translate }}
{{ "OPENDATADK.QUESTION.GIVE-OPENDATADK-THEME" | translate }}
</label>
<fa-icon
[icon]="faQuestionCircle"
[matTooltip]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-THEME-INFO' | translate"
class="form-info-icon"
matTooltipHideDelay="2000"
matTooltipPosition="above"
matTooltipShowDelay="600"
/>
<mat-select
[(value)]="datatarget.openDataDkDataset.keywords"
[ngClass]="{
'is-invalid': formFailedSubmit && errorFields.includes('openDataDkDataset.keywords'),
'is-valid': formFailedSubmit && !errorFields.includes('openDataDkDataset.keywords')
}"
[placeholder]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-KEYWORDS-PLACEHOLDER' | translate"
[placeholder]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-THEME-PLACEHOLDER' | translate"
class="form-control"
id="openDataDkDataset.keywords"
multiple
Expand All @@ -266,13 +273,111 @@ <h3>{{ (datatargetId ? "FORM.EDIT-DATATARGET" : "FORM.CREATE-NEW-DATATARGET") |
</div>
</div>

<!-- Keywords tags -->
<div class="row mb-2">
<div class="form-group mt-3 col-12">
<label class="form-label" for="openDataDkDataset.keyWordTags">
{{ "OPENDATADK.QUESTION.GIVE-OPENDATADK-TAGS" | translate }}
</label>
<fa-icon
[icon]="faQuestionCircle"
[matTooltip]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-TAGS-INFO' | translate"
class="form-info-icon"
matTooltipHideDelay="2000"
matTooltipPosition="above"
matTooltipShowDelay="600"
/>
<input
[(ngModel)]="datatarget.openDataDkDataset.keywordTags"
[ngClass]="{
'is-invalid': formFailedSubmit && errorFields.includes('openDataDkDataset.keywordTags'),
'is-valid': formFailedSubmit && !errorFields.includes('openDataDkDataset.keywordTags')
}"
[placeholder]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-TAGS-PLACEHOLDER' | translate"
class="form-control"
id="openDataDkDataset.keyWordTags"
name="openDataDkDataset.keyWordTags"
type="text"
/>
</div>
</div>

<!-- Update frequency -->
<div class="row mb-2">
<div class="form-group mt-3 col-12">
<label class="form-label" for="openDataDkDataset.updateFrequency">
{{ "OPENDATADK.QUESTION.GIVE-UPDATE-FREQUENCY" | translate }}
</label>
<mat-select
[(value)]="datatarget.openDataDkDataset.updateFrequency"
[ngClass]="{
'is-invalid': formFailedSubmit && errorFields.includes('openDataDkDataset.updateFrequency'),
'is-valid': formFailedSubmit && !errorFields.includes('openDataDkDataset.updateFrequency')
}"
[placeholder]="'OPENDATADK.QUESTION.GIVE-UPDATE-FREQUENCY-PLACEHOLDER' | translate"
class="form-control"
id="openDataDkDataset.updateFrequency"
>
@for (frequency of selectableUpdateFrequencies; track frequency) {
<mat-option
[value]="frequency">{{ "OPENDATADK.QUESTION.UPDATE-FREQUENCY-OPTIONS." + frequency | translate }}
</mat-option>
}
</mat-select>
</div>
</div>

<!-- Documentation url -->
<div class="row mb-2">
<div class="form-group mt-3 col-12">
<label class="form-label" for="openDataDkDataset.documentationUrl">
{{ "OPENDATADK.QUESTION.GIVE-OPENDATADK-DOCUMENTATION-URL" | translate }}
</label>
<fa-icon
[icon]="faQuestionCircle"
[matTooltip]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-DOCUMENTATION-URL-INFO' | translate"
class="form-info-icon"
matTooltipHideDelay="2000"
matTooltipPosition="above"
matTooltipShowDelay="600"
/>
<input
[(ngModel)]="datatarget.openDataDkDataset.documentationUrl"
[ngClass]="{
'is-invalid': formFailedSubmit && errorFields.includes('openDataDkDataset.documentationUrl'),
'is-valid': formFailedSubmit && !errorFields.includes('openDataDkDataset.documentationUrl')
}"
[placeholder]="'OPENDATADK.QUESTION.GIVE-OPENDATADK-DOCUMENTATION-URL-PLACEHOLDER' | translate"
class="form-control"
id="openDataDkDataset.documentationUrl"
name="openDataDkDataset.documentationUrl"
type="text"
/>
</div>
</div>

<!-- Datavejviser checkmark -->
<div class="row mt-3">
<div class="col-12">
<mat-checkbox [(ngModel)]="datatarget.openDataDkDataset.dataDirectory" name="openDataDkDataset.dataDirectory">
<p>
{{ "OPENDATADK.QUESTION.DATA-DIRECTORY-DESCRIPTION" | translate }}
<a
href="https://datavejviser.dk/om-datavejviser#vilkaar-for-anvendelse-af-data-og-datasaetbeskrivelser-i-datavejviseren">
Datavejviser
</a>
</p>
</mat-checkbox>
</div>
</div>

<!-- Terms and conditions checkmark -->
<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://creativecommons.org/publicdomain/zero/1.0/deed.da">
<a href=" https://creativecommons.org/publicdomain/zero/1.0/deed.da" target="_blank">
{{ "OPENDATADK.QUESTION.TERMS-AND-CONDITIONS" | translate }}
</a>
</p>
Expand All @@ -295,60 +400,60 @@ <h6 class="mt-3">{{ "QUESTION.DATATARGET.RELATIONS" | translate }}</h6>
@if (devices && payloadDecoders && payloadDeviceDatatarget?.length > 0) {
<table class="table table-striped table-bordered">
<tbody>
@for (element of payloadDeviceDatatarget; track element; let i = $index) {
<tr [attr.data-index]="i">
<td>
<div class="row">
<mat-form-field appearance="fill">
<mat-label>{{ "QUESTION.DATATARGET.SELECT-DEVICES" | translate }}</mat-label>
<mat-select
[(value)]="element.iotDeviceIds"
[compareWith]="payloadDevicesDropdownCompare"
multiple
name="devices"
>
<mat-option class="filter-option" disabled="disabled">
<button (click)="selectAllDevices(i)" class="mat-primary fill text-sm" mat-raised-button>
{{ "QUESTION.DATATARGET.SELECTALLDEVICES" | translate }}
</button>
<button (click)="deSelectAllDevices(i)" class="mat-primary fill text-sm" mat-raised-button>
{{ "QUESTION.DATATARGET.DESELECTALLDEVICES" | translate }}
</button>
</mat-option>
@for (device of devices; track device) {
<mat-option [value]="device.id">{{ device.name }}</mat-option>
}
</mat-select>
</mat-form-field>
</div>
</td>
<td>
<div class="row">
<mat-form-field appearance="fill">
<mat-label>{{ "QUESTION.DATATARGET.SELECT-PAYLOADDECODER" | translate }}</mat-label>
<mat-select [(value)]="element.payloadDecoderId" matNativeControl name="payloadDecoderId">
<mat-option [value]="0">
{{ "QUESTION.DATATARGET.NO-PAYLOAD-DECODER-SELECTED" | translate }}
</mat-option>
@for (payloadDecoder of payloadDecoders; track payloadDecoder) {
<mat-option [value]="payloadDecoder.id">
{{ payloadDecoder.name }}
@for (element of payloadDeviceDatatarget; track element; let i = $index) {
<tr [attr.data-index]="i">
<td>
<div class="row">
<mat-form-field appearance="fill">
<mat-label>{{ "QUESTION.DATATARGET.SELECT-DEVICES" | translate }}</mat-label>
<mat-select
[(value)]="element.iotDeviceIds"
[compareWith]="payloadDevicesDropdownCompare"
multiple
name="devices"
>
<mat-option class="filter-option" disabled="disabled">
<button (click)="selectAllDevices(i)" class="mat-primary fill text-sm" mat-raised-button>
{{ "QUESTION.DATATARGET.SELECTALLDEVICES" | translate }}
</button>
<button (click)="deSelectAllDevices(i)" class="mat-primary fill text-sm" mat-raised-button>
{{ "QUESTION.DATATARGET.DESELECTALLDEVICES" | translate }}
</button>
</mat-option>
@for (device of devices; track device) {
<mat-option [value]="device.id">{{ device.name }}</mat-option>
}
</mat-select>
</mat-form-field>
</div>
</td>
<td>
<div class="row">
<mat-form-field appearance="fill">
<mat-label>{{ "QUESTION.DATATARGET.SELECT-PAYLOADDECODER" | translate }}</mat-label>
<mat-select [(value)]="element.payloadDecoderId" matNativeControl name="payloadDecoderId">
<mat-option [value]="0">
{{ "QUESTION.DATATARGET.NO-PAYLOAD-DECODER-SELECTED" | translate }}
</mat-option>
}
</mat-select>
</mat-form-field>
</div>
</td>
<td>
<a (click)="openDeleteDialog(i)">
<div class="text-center m-2">
<fa-icon [icon]="faTimesCircle"></fa-icon>
<p>{{ "DATATARGET.DELETE" | translate }}</p>
@for (payloadDecoder of payloadDecoders; track payloadDecoder) {
<mat-option [value]="payloadDecoder.id">
{{ payloadDecoder.name }}
</mat-option>
}
</mat-select>
</mat-form-field>
</div>
</a>
</td>
</tr>
}
</td>
<td>
<a (click)="openDeleteDialog(i)">
<div class="text-center m-2">
<fa-icon [icon]="faTimesCircle"></fa-icon>
<p>{{ "DATATARGET.DELETE" | translate }}</p>
</div>
</a>
</td>
</tr>
}
</tbody>
</table>
}
Expand Down
33 changes: 33 additions & 0 deletions src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,39 @@ export class OpendatadkEditComponent implements DatatargetEdit, OnDestroy {
"Økonomi og finanser",
];

selectableUpdateFrequencies = [
"CONT",
"1MIN",
"5MIN",
"10MIN",
"15MIN",
"TRIHOURLY",
"30MIN",
"HOURLY",
"BIHOURLY",
"12HRS",
"DAILY",
"WEEKLY",
"BIWEEKLY",
"MONTHLY",
"BIMONTHLY",
"QUARTERLY",
"ANNUAL",
"NEVER",
"UNKNOWN",
"OTHER",
// Unused options from specificaion
// "TRIENNIAL",
// "QUADRENNIAL",
// "QUINQUENNIAL",
// "AS_NEEDED",
// "NOT_PLANNED",
// "TRIDECENNIAL",
// "BIDECENNIAL",
// "DECENNIAL",
// "BIENNIAL",
];

errorMessages: any[];
errorFields: string[];

Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/services/scroll-to-top.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class ScrollToTopService {
const currentScroll = document.documentElement.scrollTop || document.body.scrollTop;
if (currentScroll > 0) {
window.requestAnimationFrame(smoothscroll);
window.scrollTo(0, currentScroll - currentScroll / 5);
window.scrollTo(0, 0);
}
})();
}
Expand Down
Loading