From 1a868116614dd9996c78e69941b537e9da19460b Mon Sep 17 00:00:00 2001 From: Aijana Schumann Date: Tue, 1 Feb 2022 13:18:42 +0100 Subject: Update ODLUX Updated to Material-ui 5, updated dashboard view, removed NetworkMap, LinkCalculator and LineOfSightApp, small bugfixes Issue-ID: CCSDK-3580 Signed-off-by: Aijana Schumann Change-Id: Id0fc148673e23a755cafc2be1c489248c38ff47c --- .../odlux/apps/networkMapApp/src/model/Feature.ts | 25 ---------- .../wt/odlux/apps/networkMapApp/src/model/count.ts | 19 -------- .../apps/networkMapApp/src/model/historyEntry.ts | 22 --------- sdnr/wt/odlux/apps/networkMapApp/src/model/link.ts | 36 -------------- .../apps/networkMapApp/src/model/popupElements.ts | 22 --------- .../odlux/apps/networkMapApp/src/model/settings.ts | 34 ------------- sdnr/wt/odlux/apps/networkMapApp/src/model/site.ts | 50 ------------------- .../apps/networkMapApp/src/model/stadokOrder.ts | 56 ---------------------- .../apps/networkMapApp/src/model/stadokSite.ts | 54 --------------------- 9 files changed, 318 deletions(-) delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/Feature.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/count.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/historyEntry.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/link.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/popupElements.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/settings.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/site.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/stadokOrder.ts delete mode 100644 sdnr/wt/odlux/apps/networkMapApp/src/model/stadokSite.ts (limited to 'sdnr/wt/odlux/apps/networkMapApp/src/model') diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/Feature.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/Feature.ts deleted file mode 100644 index c4f9ad1cb..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/Feature.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -export type Feature = {type: "Feature", properties: {id: string, type?: string}, geometry: Geometry} - -export type Geometry = Point | LineString; - -type Point = {type: "Point", coordinates: number[]} - -type LineString ={type: "LineString", coordinates: number[][]} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/count.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/count.ts deleted file mode 100644 index 726e2ff76..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/count.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -export type elementCount ={sites: string, links: string} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/historyEntry.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/historyEntry.ts deleted file mode 100644 index d7197a4d1..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/historyEntry.ts +++ /dev/null @@ -1,22 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -import { Site } from "./site"; -import { link } from "./link"; - -export type HistoryEntry={id: string, data: Site|link}; \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/link.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/link.ts deleted file mode 100644 index c1612098d..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/link.ts +++ /dev/null @@ -1,36 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -type Antenna = { - name:string, - waveguideLossIndB: number, - gain: number -} - -export type link = {id: string, - name: string, - length: number, - calculatedLength: number, - type: string, - siteA: string, - siteB: string, - azimuthA: number | null, - azimuthB: number | null, - locationA: { lon: number, lat: number, amsl:number | null, antennaHeight: number | null, antenna: Antenna |null }, - locationB: { lon: number, lat: number, amsl:number | null, antennaHeight: number | null, antenna: Antenna |null }, - }; \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/popupElements.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/popupElements.ts deleted file mode 100644 index 320d7ca6e..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/popupElements.ts +++ /dev/null @@ -1,22 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -export type PopupElement = { - name: string, - id: string -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/settings.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/settings.ts deleted file mode 100644 index 521f47ccc..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/settings.ts +++ /dev/null @@ -1,34 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -export type NetworkMapSettings = { - networkMap: { - startupPosition: { latitude?: string, longitude?: string, zoom?: string }, - tileOpacity: string, - styling: { theme: string } } }; - -export type ThemeElement = { - key: string, - site: string, - selectedSite: string, - microwaveLink: string, - fiberLink: string}; - -export type NetworkMapThemes = {networkMapThemes: {themes: ThemeElement[]} }; - -export type NetworkSettings = NetworkMapSettings & NetworkMapThemes; \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/site.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/site.ts deleted file mode 100644 index 13a7361f6..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/site.ts +++ /dev/null @@ -1,50 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -import { link } from "./link"; - -export type Site = { - id: string, - name: string, - address: Address, - heightAmslInMeters?: number, //AboveGroundLevel - antennaHeightAmslInMeters?: number, - type?: string, - operator: string, - location:{lon: number, lat: number}, - devices: Device[], - links: link[], - furtherInformation:string -} - -export type Address={ - streetAndNr: string, - city: string, - zipCode: string | null, - country: string -} - -export class Device { - id: string; - type: string; - name: string; - manufacturer: string; - owner: string; - status?: string; - port: number[]; -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/stadokOrder.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/stadokOrder.ts deleted file mode 100644 index 1aad3aa97..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/stadokOrder.ts +++ /dev/null @@ -1,56 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -export type StadokOrder = { - date: Date, - assignedUser: string, - state: string, //todo: type restrict - tasks: Task[], - - -}; - -export class OrderToDisplay { - - static parse = (stadokOrder: StadokOrder) =>{ - let order = new OrderToDisplay(); - order.assignedUser=stadokOrder.assignedUser; - order.state=stadokOrder.state; - - const firstOpenTask = stadokOrder.tasks.find(task => !task.status); - - if(firstOpenTask){ - order.currentTask=firstOpenTask.description; - }else{ - order.currentTask="No task description available"; - } - - return order; - } - - state: string; - assignedUser: string; - currentTask: string; - -}; - -type Task = { - type: string, - description: string, - status: boolean -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/networkMapApp/src/model/stadokSite.ts b/sdnr/wt/odlux/apps/networkMapApp/src/model/stadokSite.ts deleted file mode 100644 index ed0ca397f..000000000 --- a/sdnr/wt/odlux/apps/networkMapApp/src/model/stadokSite.ts +++ /dev/null @@ -1,54 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property. All rights reserved. - * ================================================================================================= - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * ============LICENSE_END========================================================================== - */ - -import { Address } from "./site"; - -type StadokSite = { - - siteId: string; - createdBy: Contact; - updatedOn: Date; - location: { lat: number, lon: number }, - address: Address; - contacts: { manager: Contact, owner: Contact }; - safteyNotices: string[]; - images: string[]; - type: string; - devices: Device[]; - logs: Log[]; - -}; - -type Contact = { - firstName: string; - lastName: string; - email: string; - telephoneNumber: string; -}; -type Log = { - date: Date, //string? - person: string; - entry: string; -}; - -type Device = { - "device": string, - "antenna": string -}; - -export default StadokSite; \ No newline at end of file -- cgit 1.2.3-korg