From dac67647971185030cc35da833924a39e28f86c7 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 30 Sep 2022 14:44:08 +0200 Subject: [PATCH] [New] Added environment to drawer view --- .../main/webapp/app/src/main/c-drawer.html | 15 +- .../src/main/webapp/locales.json | 25 ++- .../main/webapp/app/src/main/c-drawer.html | 15 +- .../src/main/webapp/locales.json | 21 ++- .../main/webapp/app/src/main/c-drawer.html | 15 +- .../src/main/webapp/locales.json | 145 ++++++++++-------- 6 files changed, 153 insertions(+), 83 deletions(-) diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/app/src/main/c-drawer.html b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/app/src/main/c-drawer.html index 82561dd..9f2b553 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/app/src/main/c-drawer.html +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/app/src/main/c-drawer.html @@ -89,12 +89,12 @@ [[localize('logout')]] - +

[[userConfig.firstname]] [[userConfig.lastname]] / [[userConfig.username]]

-

[[version.appVersion.artifactVersion]]

+

[[version.appVersion.artifactVersion]] @ [[environment]]

 - + Deutsch @@ -137,7 +137,11 @@ observer: "userLocaleChanged" }, version: { - type: Object + type: Object, + observer: "versionChanged" + }, + environment: { + type: String } }, @@ -162,6 +166,9 @@ this.fire('cx-logout'); }, + versionChanged: function (newValue) { + this.updateEnvironment(newValue); + }, userConfigChanged: function (newValue, oldValue) { if (newValue != null) { var userLocale = Strolch.getUserLocale(); diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/locales.json b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/locales.json index 747bf6e..4a865b0 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/locales.json +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-plc-web/src/main/webapp/locales.json @@ -5,6 +5,10 @@ "agent.service.failed.access.denied": "User {user} may not perform service {service}", "agent.query.failed.access.denied": "User {user} may not perform query {query}", "agent.search.failed.access.denied": "User {user} may not perform search {search}", + "demo-locations": "Demo Locations", + "demo-books": "Demo Books", + "title": "Titel", + "author": "Author", "logout": "Logout", "info": "Information", "keepAlive": "Stay logged in", @@ -58,7 +62,12 @@ "mode": "Mode", "user": "User", "i18n-editor": "Internationalization editor", - "login": "Login" + "login": "Login", + "production": "Production", + "testing": "Testing", + "staging": "Staging", + "development": "Development", + "demo": "Demo" }, "de": { "appTitle": "${appName} Steuerung", @@ -121,7 +130,12 @@ "info": "Information", "agent.service.failed.access.denied": "Benutzer {user} darf Service {service} nicht ausführen", "agent.query.failed.access.denied": "Benutzer {user} darf Abfrage {query} nicht ausführen", - "agent.search.failed.access.denied": "Benutzer {user} darf Suche {search} nicht ausführen" + "agent.search.failed.access.denied": "Benutzer {user} darf Suche {search} nicht ausführen", + "testing": "Testen", + "production": "Produktion", + "staging": "Staging", + "development": "Entwicklung", + "demo": "Demo" }, "fr": { "appTitle": "${appName} Controle", @@ -150,6 +164,11 @@ "errorOccurred": "Une erreur s'est produite", "agent.service.failed.access.denied": "Utilisateur {user} ne peut exécuter le service {service}", "agent.query.failed.access.denied": "Utilisateur {user} ne peut exécuter la demande {query}", - "agent.search.failed.access.denied": "Utilisateur {user} ne peut exécuter la recherche {search}" + "agent.search.failed.access.denied": "Utilisateur {user} ne peut exécuter la recherche {search}", + "testing": "Tester", + "production": "Production", + "staging": "Mémoriser", + "development": "Développement", + "demo": "Demo" } } \ No newline at end of file diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/app/src/main/c-drawer.html b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/app/src/main/c-drawer.html index 6792a43..7756c1e 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/app/src/main/c-drawer.html +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/app/src/main/c-drawer.html @@ -92,12 +92,12 @@ [[localize('logout')]] - +

[[userConfig.firstname]] [[userConfig.lastname]] / [[userConfig.username]]

-

[[version.appVersion.artifactVersion]]

+

[[version.appVersion.artifactVersion]] @ [[environment]]

 - + Deutsch @@ -140,7 +140,11 @@ observer: "userLocaleChanged" }, version: { - type: Object + type: Object, + observer: "versionChanged" + }, + environment: { + type: String } }, @@ -165,6 +169,9 @@ this.fire('cx-logout'); }, + versionChanged: function (newValue) { + this.updateEnvironment(newValue); + }, userConfigChanged: function (newValue, oldValue) { if (newValue != null) { var userLocale = Strolch.getUserLocale(); diff --git a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/locales.json b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/locales.json index 5810c75..e0c2d79 100644 --- a/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/locales.json +++ b/strolch.mvn.archetype.plc/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/locales.json @@ -67,7 +67,12 @@ "enableAutomaticModeConfirm": "Should the automatic mode be enabled?", "disableAutomaticMode": "Disable Automatic Mode", "disableAutomaticModeConfirm": "Should the automatic mode be disabled?", - "shop-floor": "Shop-Floor" + "shop-floor": "Shop-Floor", + "production": "Production", + "testing": "Testing", + "staging": "Staging", + "development": "Development", + "demo": "Demo" }, "de": { "shop-floor": "Fördertechnik", @@ -139,7 +144,12 @@ "info": "Information", "agent.service.failed.access.denied": "Benutzer {user} darf Service {service} nicht ausführen", "agent.query.failed.access.denied": "Benutzer {user} darf Abfrage {query} nicht ausführen", - "agent.search.failed.access.denied": "Benutzer {user} darf Suche {search} nicht ausführen" + "agent.search.failed.access.denied": "Benutzer {user} darf Suche {search} nicht ausführen", + "testing": "Testen", + "production": "Produktion", + "staging": "Staging", + "development": "Entwicklung", + "demo": "Demo" }, "fr": { "shop-floor": "Système de convoyage", @@ -178,6 +188,11 @@ "errorOccurred": "Une erreur s'est produite", "agent.service.failed.access.denied": "Utilisateur {user} ne peut exécuter le service {service}", "agent.query.failed.access.denied": "Utilisateur {user} ne peut exécuter la demande {query}", - "agent.search.failed.access.denied": "Utilisateur {user} ne peut exécuter la recherche {search}" + "agent.search.failed.access.denied": "Utilisateur {user} ne peut exécuter la recherche {search}", + "testing": "Tester", + "production": "Production", + "staging": "Mémoriser", + "development": "Développement", + "demo": "Demo" } } \ No newline at end of file diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/main/c-drawer.html b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/main/c-drawer.html index 38ff655..4f02b18 100644 --- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/main/c-drawer.html +++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/main/c-drawer.html @@ -93,12 +93,12 @@ [[localize('logout')]] - +

[[userConfig.firstname]] [[userConfig.lastname]] / [[userConfig.username]]

-

[[version.appVersion.artifactVersion]]

+

[[version.appVersion.artifactVersion]] @ [[environment]]

 - + Deutsch @@ -141,7 +141,11 @@ observer: "userLocaleChanged" }, version: { - type: Object + type: Object, + observer: "versionChanged" + }, + environment: { + type: String } }, @@ -166,6 +170,9 @@ this.fire('cx-logout'); }, + versionChanged: function (newValue) { + this.updateEnvironment(newValue); + }, userConfigChanged: function (newValue, oldValue) { if (newValue != null) { var userLocale = Strolch.getUserLocale(); diff --git a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/locales.json b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/locales.json index f7043f7..477dedc 100644 --- a/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/locales.json +++ b/strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/locales.json @@ -1,4 +1,72 @@ { + "en": { + "agent.service.failed.access.denied": "User {user} may not perform service {service}", + "agent.query.failed.access.denied": "User {user} may not perform query {query}", + "agent.search.failed.access.denied": "User {user} may not perform search {search}", + "demo-locations": "Demo Locations", + "demo-books": "Demo Books", + "title": "Titel", + "author": "Author", + "logout": "Logout", + "info": "Information", + "keepAlive": "Stay logged in", + "appTitle": "${appName}", + "language": "Language", + "reports": "Reports", + "operations-log": "Operation Logs", + "jobs": "Jobs", + "sessions": "Sessions", + "users": "Users", + "roles": "Roles", + "control": "Control", + "inspector": "Inspector", + "newVersionAvailableRefreshRequired": "A new version is available", + "refresh": "Refresh", + "close": "Close", + "cancel": "Cancel", + "ok": "Ok", + "reconnect": "Reconnect", + "serverNotAvailable": "Server not available", + "serverNotAvailableMsg": "The connection to the server is currently not available", + "privilegeDenied": "Action denied", + "privilegeDeniedText": "The action has been denied", + "sessionInvalid": "Session Invalid", + "sessionInvalidConfirmNavToLogin": "The session has expired or is invalid. Please logon again.", + "sessionInvalidLoggingBackIn": "The session is invalid or has expired, automatic logon has commenced...", + "enabled": "Active", + "severity": "Severity", + "true": "Yes", + "false": "No", + "Info": "Information", + "Exception": "Exception", + "clearInactiveMessages": "Remove inactive messages", + "clearInactiveMessagesConfirm": "Should all inactive messages be removed?", + "errorOccurred": "An error occurred", + "systemAction.failed": "SystemAction {action} failed: {reason}", + "Created": "Created", + "Planning": "Planning", + "Planned": "Planned", + "Execution": "Execution", + "Warning": "Warning", + "Error": "Error", + "Executed": "Executed", + "Closed": "Closed", + "date": "Date", + "deleted": "Deleted", + "id": "ID", + "status": "Status", + "enable": "Enable", + "disable": "Disable", + "mode": "Mode", + "user": "User", + "i18n-editor": "Internationalization editor", + "login": "Login", + "production": "Production", + "testing": "Testing", + "staging": "Staging", + "development": "Development", + "demo": "Demo" + }, "de": { "appTitle": "${appName}", "demo-locations": "Demo Locations", @@ -62,70 +130,12 @@ "info": "Information", "agent.service.failed.access.denied": "Benutzer {user} darf Service {service} nicht ausführen", "agent.query.failed.access.denied": "Benutzer {user} darf Abfrage {query} nicht ausführen", - "agent.search.failed.access.denied": "Benutzer {user} darf Suche {search} nicht ausführen" - }, - "en": { - "agent.service.failed.access.denied": "User {user} may not perform service {service}", - "agent.query.failed.access.denied": "User {user} may not perform query {query}", - "agent.search.failed.access.denied": "User {user} may not perform search {search}", - "demo-locations": "Demo Locations", - "demo-books": "Demo Books", - "title": "Titel", - "author": "Author", - "logout": "Logout", - "info": "Information", - "keepAlive": "Stay logged in", - "appTitle": "${appName}", - "language": "Language", - "reports": "Reports", - "operations-log": "Operation Logs", - "jobs": "Jobs", - "sessions": "Sessions", - "users": "Users", - "roles": "Roles", - "control": "Control", - "inspector": "Inspector", - "newVersionAvailableRefreshRequired": "A new version is available", - "refresh": "Refresh", - "close": "Close", - "cancel": "Cancel", - "ok": "Ok", - "reconnect": "Reconnect", - "serverNotAvailable": "Server not available", - "serverNotAvailableMsg": "The connection to the server is currently not available", - "privilegeDenied": "Action denied", - "privilegeDeniedText": "The action has been denied", - "sessionInvalid": "Session Invalid", - "sessionInvalidConfirmNavToLogin": "The session has expired or is invalid. Please logon again.", - "sessionInvalidLoggingBackIn": "The session is invalid or has expired, automatic logon has commenced...", - "enabled": "Active", - "severity": "Severity", - "true": "Yes", - "false": "No", - "Info": "Information", - "Exception": "Exception", - "clearInactiveMessages": "Remove inactive messages", - "clearInactiveMessagesConfirm": "Should all inactive messages be removed?", - "errorOccurred": "An error occurred", - "systemAction.failed": "SystemAction {action} failed: {reason}", - "Created": "Created", - "Planning": "Planning", - "Planned": "Planned", - "Execution": "Execution", - "Warning": "Warning", - "Error": "Error", - "Executed": "Executed", - "Closed": "Closed", - "date": "Date", - "deleted": "Deleted", - "id": "ID", - "status": "Status", - "enable": "Enable", - "disable": "Disable", - "mode": "Mode", - "user": "User", - "i18n-editor": "Internationalization editor", - "login": "Login" + "agent.search.failed.access.denied": "Benutzer {user} darf Suche {search} nicht ausführen", + "testing": "Testen", + "production": "Produktion", + "staging": "Staging", + "development": "Entwicklung", + "demo": "Demo" }, "fr": { "appTitle": "${appName}", @@ -156,6 +166,11 @@ "errorOccurred": "Une erreur s'est produite", "agent.service.failed.access.denied": "Utilisateur {user} ne peut exécuter le service {service}", "agent.query.failed.access.denied": "Utilisateur {user} ne peut exécuter la demande {query}", - "agent.search.failed.access.denied": "Utilisateur {user} ne peut exécuter la recherche {search}" + "agent.search.failed.access.denied": "Utilisateur {user} ne peut exécuter la recherche {search}", + "testing": "Tester", + "production": "Production", + "staging": "Mémoriser", + "development": "Développement", + "demo": "Demo" } } \ No newline at end of file