Merge pull request #72 from OS2iot/feature/1284_application-metadata

Optional metadata fields when managing an application

Author: AramAlsabti

package-lock.json

@@ -19,6 +19,7 @@
     "@angular/forms": "~9.1.11",
     "@angular/localize": "^9.1.11",
     "@angular/material": "^9.2.4",
+    "@angular/material-moment-adapter": "^9.2.4",
     "@angular/platform-browser": "~9.1.11",
     "@angular/platform-browser-dynamic": "~9.1.11",
     "@angular/router": "~9.1.11",

package.json

@@ -9,11 +9,23 @@
           <div *ngIf="errorMessage" class="error-messages p-3 my-3">
             {{errorMessage | translate}}
           </div>
-          <h3>Detaljer</h3>
+          <h3>{{ 'APPLICATION.DETAILS' | translate }}</h3>
           <app-general-details [data]="application"></app-general-details>
           <p *ngIf="application.description">
             <strong>{{ 'APPLICATION.DESCRIPTION' | translate }}</strong></p>
           <pre><p>{{application.description}}</p></pre>
+          <app-metadata-details [status]="application.status" [startDate]="application.startDate"
+          [endDate]="application.endDate"
+          [category]="application.category"
+          [owner]="application.owner"
+          [contactPerson]="application.contactPerson"
+          [contactEmail]="application.contactEmail"
+          [contactPhone]="application.contactPhone"
+          [personalData]="application.personalData"
+          [hardware]="application.hardware"
+          [controlledProperties]="application.controlledProperties"
+          [deviceTypes]="application.deviceTypes"
+          ></app-metadata-details>
         </div>
       </div>
     </div>
@@ -81,4 +93,4 @@ <h3>Detaljer</h3>
       </mat-tab>
     </mat-tab-group>
   </div>
-</div>
+</div>

src/app/applications/application-detail/application-detail.component.html

@@ -1,5 +1,10 @@
+import { ControlledPropertyTypes } from '@app/device-model/Enums/controlled-propperty.enum';
+import { ApplicationDeviceTypeUnion } from '@shared/enums/device-type';
+import { ControlledProperty } from '@shared/models/controlled-property.model';
 import { Organisation } from '../admin/organisation/organisation.model';
+import { ApplicationStatus } from './enums/status.enum';
 import { IotDevice } from './iot-devices/iot-device.model';
+import { ApplicationDeviceType } from './models/application-device-type.model';
 
 export class Application {
   public id: number;
@@ -13,12 +18,36 @@ export class Application {
   public updatedBy: number;
   public createdByName: string;
   public updatedByName: string;
+  public status?: ApplicationStatus;
+  public startDate?: Date;
+  public endDate?: Date;
+  public category?: string;
+  public owner?: string;
+  public contactPerson?: string;
+  public contactEmail?: string;
+  public contactPhone?: string;
+  public personalData?: boolean;
+  public hardware?: string;
+  public controlledProperties?: ControlledProperty[];
+  public deviceTypes?: ApplicationDeviceType[];
 }
 
 export class ApplicationRequest {
   public name: string;
   public description: string;
   public organizationId: number;
+  public status?: ApplicationStatus;
+  public startDate?: Date;
+  public endDate?: Date;
+  public category?: string;
+  public owner?: string;
+  public contactPerson?: string;
+  public contactEmail?: string;
+  public contactPhone?: string;
+  public personalData?: boolean;
+  public hardware?: string;
+  public controlledProperties?: ControlledPropertyTypes[];
+  public deviceTypes?: ApplicationDeviceTypeUnion[];
 }
 
 export interface ApplicationData {

src/app/applications/application.model.ts

@@ -8,7 +8,7 @@ export class BulkMapping {
         switch (data.type.toUpperCase()) {
           case DeviceType.LORAWAN:
             return this.lorawanMapper(data, applicationId);
-          case DeviceType.GENERICHTTP:
+          case DeviceType.GENERIC_HTTP:
             return this.baseMapper(data, applicationId);
           default:
             break;
@@ -53,7 +53,7 @@ export class BulkMapping {
             location: undefined,
             commentOnLocation: data.commentOnLocation,
             comment: data.comment,
-            type: DeviceType.GENERICHTTP,
+            type: DeviceType.GENERIC_HTTP,
             receivedMessagesMetadata: undefined,
             metadata: undefined,
             apiKey: undefined,

src/app/applications/bulk-import/bulkMapping.ts

@@ -0,0 +1,11 @@
+import { recordToEntries } from '@shared/helpers/record.helper';
+
+export enum ApplicationStatus {
+  'NONE' = 'NONE',
+  'IN-OPERATION' = 'IN-OPERATION',
+  'PROJECT' = 'PROJECT',
+  'PROTOTYPE' = 'PROTOTYPE',
+  'OTHER' = 'OTHER',
+}
+
+export const ApplicationStatusEntries = recordToEntries(ApplicationStatus);

src/app/applications/enums/status.enum.ts

@@ -230,7 +230,7 @@ export class IotDeviceEditComponent implements OnInit, OnDestroy {
             this.iotDevice.deviceModelId = null
         }
         switch (this.iotDevice.type) {
-            case DeviceType.GENERICHTTP: {
+            case DeviceType.GENERIC_HTTP: {
                 this.iotDevice.lorawanSettings = undefined;
                 this.iotDevice.sigfoxSettings = undefined;
                 break;

src/app/applications/iot-devices/iot-device-edit/iot-device-edit.component.ts

@@ -13,7 +13,7 @@ export class IotDevice {
   location: JsonLocation;
   commentOnLocation: string;
   comment: string;
-  type: DeviceType = DeviceType.GENERICHTTP;
+  type: DeviceType = DeviceType.GENERIC_HTTP;
   receivedMessagesMetadata: ReceivedMessageMetadata[];
   metadata?: string;
   apiKey?: string;

src/app/applications/iot-devices/iot-device.model.ts

@@ -0,0 +1,7 @@
+import { Application } from '@applications/application.model';
+import { ApplicationDeviceTypeUnion } from '@shared/enums/device-type';
+
+export class ApplicationDeviceType {
+  public applications: Application[];
+  public type: ApplicationDeviceTypeUnion;
+}

src/app/applications/models/application-device-type.model.ts

@@ -1,4 +1,4 @@
-export enum ControlledPropperty {
+export enum ControlledPropertyTypes {
     AIRPOLLUTION = "airPollution",
     ATMOSPHERICPRESSURE = "atmosphericPressure",
     CDOM = "cdom",