UI: update dependencies; update names to "OpenEMS Edge"; always allow…

… kWh values
OpenEMS · Oct 8, 2020 · b46743c · b46743c
1 parent a690266
commit b46743c
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 193 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -15,20 +15,20 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^10.1.3",
-    "@angular/common": "^10.1.3",
-    "@angular/core": "^10.1.3",
-    "@angular/forms": "^10.1.3",
-    "@angular/platform-browser": "^10.1.3",
-    "@angular/platform-browser-dynamic": "^10.1.3",
-    "@angular/router": "^10.1.3",
-    "@angular/service-worker": "^10.1.3",
+    "@angular/animations": "^10.1.5",
+    "@angular/common": "^10.1.5",
+    "@angular/core": "^10.1.5",
+    "@angular/forms": "^10.1.5",
+    "@angular/platform-browser": "^10.1.5",
+    "@angular/platform-browser-dynamic": "^10.1.5",
+    "@angular/router": "^10.1.5",
+    "@angular/service-worker": "^10.1.5",
     "@ionic-native/core": "^5.28.0",
     "@ionic-native/splash-screen": "^5.28.0",
     "@ionic-native/status-bar": "^5.28.0",
-    "@ionic/angular": "^5.3.3",
-    "@ngx-formly/core": "^5.10.1",
-    "@ngx-formly/ionic": "^5.10.1",
+    "@ionic/angular": "^5.3.5",
+    "@ngx-formly/core": "^5.10.3",
+    "@ngx-formly/ionic": "^5.10.3",
     "@ngx-translate/core": "^11.0.1",
     "angular-mydatepicker": "^0.10.2",
     "angular2-uuid": "^1.1.1",
@@ -46,26 +46,26 @@
     "roboto-fontface": "0.10.0",
     "rxjs": "^6.6.3",
     "semver-compare-multi": "^1.0.3",
-    "tslib": "^1.13.0",
+    "tslib": "^1.14.0",
     "zone.js": "^0.10.3"
   },
   "devDependencies": {
     "@angular-devkit/architect": "^0.803.29",
     "@angular-devkit/build-angular": "^0.1000.8",
-    "@angular-devkit/core": "^10.1.3",
-    "@angular-devkit/schematics": "^10.1.3",
-    "@angular/cli": "^10.1.3",
-    "@angular/compiler": "^10.1.3",
-    "@angular/compiler-cli": "^10.1.3",
-    "@angular/language-service": "^10.1.3",
+    "@angular-devkit/core": "^10.1.5",
+    "@angular-devkit/schematics": "^10.1.5",
+    "@angular/cli": "^10.1.5",
+    "@angular/compiler": "^10.1.5",
+    "@angular/compiler-cli": "^10.1.5",
+    "@angular/language-service": "^10.1.5",
     "@ionic/angular-toolkit": "^2.3.3",
     "@types/jasmine": "^3.5.14",
     "@types/jasminewd2": "~2.0.8",
-    "@types/node": "^12.12.62",
-    "codelyzer": "^6.0.0",
+    "@types/node": "^12.12.64",
+    "codelyzer": "^6.0.1",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "^5.2.2",
+    "karma": "^5.2.3",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~2.1.1",
     "karma-jasmine": "~2.0.1",

diff --git a/ui/src/app/shared/service/service.ts b/ui/src/app/shared/service/service.ts
@@ -411,10 +411,10 @@ export class Service implements ErrorHandler {
   }
 
   /**
-   * checks if fems is allowed to show kWh
+   * Checks if this Edge is allowed to show kWh values
    */
   public isKwhAllowed(edge: Edge): boolean {
-    return false;
+    return true;
   }
 
   /**

diff --git a/ui/src/app/shared/translate/cz.ts b/ui/src/app/shared/translate/cz.ts
@@ -86,12 +86,12 @@ export const TRANSLATION = {
     },
     Menu: {
         aboutUI: 'About OpenEMS UI',
-        edgeSettings: 'FEMS Předvolby',
+        edgeSettings: 'OpenEMS Edge Předvolby',
         generalSettings: 'Obecné Nastavení',
         index: 'Přehled',
         logout: 'Odhlásit',
         menu: 'Menu',
-        overview: 'FEMS Přehled',
+        overview: 'OpenEMS Edge Přehled',
     },
     Index: {
         allConnected: 'Všechna připojení aktivní.',

diff --git a/ui/src/app/shared/translate/de.ts b/ui/src/app/shared/translate/de.ts
@@ -88,12 +88,12 @@ export const TRANSLATION = {
     },
     Menu: {
         aboutUI: 'Über OpenEMS UI',
-        edgeSettings: 'FEMS Einstellungen',
+        edgeSettings: 'OpenEMS Edge Einstellungen',
         generalSettings: 'Allgemeine Einstellungen',
         index: 'Übersicht',
         logout: 'Abmelden',
         menu: 'Menü',
-        overview: 'FEMS Übersicht',
+        overview: 'OpenEMS Edge Übersicht',
     },
     Index: {
         allConnected: 'Alle Verbindungen hergestellt.',

diff --git a/ui/src/app/shared/translate/en.ts b/ui/src/app/shared/translate/en.ts
@@ -87,12 +87,12 @@ export const TRANSLATION = {
     },
     Menu: {
         aboutUI: 'About OpenEMS UI',
-        edgeSettings: 'FEMS Settings',
+        edgeSettings: 'OpenEMS Edge Settings',
         generalSettings: 'General Settings',
         index: 'Index',
         logout: 'Sign Out',
         menu: 'Menu',
-        overview: 'FEMS Overview',
+        overview: 'OpenEMS Edge Overview',
     },
     Index: {
         allConnected: 'All connections established.',

diff --git a/ui/src/app/shared/translate/es.ts b/ui/src/app/shared/translate/es.ts
@@ -83,12 +83,12 @@ export const TRANSLATION = {
     },
     Menu: {
         aboutUI: 'Sobre OpenEMS-UI',
-        edgeSettings: 'Configuración FEMS',
+        edgeSettings: 'Configuración OpenEMS Edge',
         generalSettings: 'Configuración general',
         index: 'Visión general',
         logout: 'Desuscribirse',
         menu: 'Menú',
-        overview: 'estudio FEMS',
+        overview: 'estudio OpenEMS Edge',
     },
     Index: {
         allConnected: 'Todas las conexiones establecidas.',

diff --git a/ui/src/app/shared/translate/nl.ts b/ui/src/app/shared/translate/nl.ts
@@ -82,12 +82,12 @@ export const TRANSLATION = {
     },
     Menu: {
         aboutUI: 'Over OpenEMS UI',
-        edgeSettings: 'FEMS instellingen',
+        edgeSettings: 'OpenEMS Edge instellingen',
         generalSettings: 'Algemene instellingen',
         index: 'Overzicht',
         logout: 'Uitloggen',
         menu: 'Menu',
-        overview: 'FEMS overzicht',
+        overview: 'OpenEMS Edge overzicht',
     },
     Index: {
         allConnected: 'Alle verbindingen gemaakt.',