100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Update mobile onboarding pages, minor demo assets and translation update
Dond0def63fe745
diff --git a/deployment/manager/shared/locales/de/or.json b/deployment/manager/shared/locales/de/or.jsonindex 262a178e5..573f5e8af 100644--- a/deployment/manager/shared/locales/de/or.json+++ b/deployment/manager/shared/locales/de/or.json@@ -84,6 +84,7 @@"cancel": "Abbrechen","createdOn": "Erstellt am:","createdOnWithDate": "Erstellt am: {{-date, LLLL}}",+ "updatedWithDate": "Aktualisiert am: {{-date, llll}}","accessPublicRead": "Alle dürfen lesen","type": "Typ","path": "Pfad",diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex 7e3fa0646..e56b522d1 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -84,7 +84,7 @@"cancel": "Cancel","createdOn": "Created on","createdOnWithDate": "Created on: {{-date, LLLL}}",- "updatedWithDate": "Updated on: {{-date, LLLL}}",+ "updatedWithDate": "Updated on: {{-date, llll}}","accessPublicRead": "Public read","type": "Type","path": "Path",@@ -177,10 +177,10 @@"oncePerWeek": "Once per week","reset": "Reset","noLongerMatches": "No longer matches",- "logs":"Logs",+ "logs": "Logs","addRemoveAttributes": "Add/remove attributes","email": "Email",- "push-notification":"Push notification",+ "push-notification": "Push notification","subject": "subject","openWebsiteUrl": "Website to be opend","openInBrowser": "Open in browser (for external websites)",diff --git a/deployment/manager/shared/locales/es/or.json b/deployment/manager/shared/locales/es/or.jsonindex 2941714f2..666faaea3 100644--- a/deployment/manager/shared/locales/es/or.json+++ b/deployment/manager/shared/locales/es/or.json@@ -84,6 +84,7 @@"cancel": "Cancelar","createdOn": "Creado en","createdOnWithDate": "Creado en: {{-date, LLLL}}",+ "updatedWithDate": "Actualizado: {{-date, llll}}","accessPublicRead": "Acceso público de lectura","type": "Tipo","path": "Ruta",diff --git a/deployment/manager/shared/locales/fr/or.json b/deployment/manager/shared/locales/fr/or.jsonindex bf939f2aa..e3ced4e8e 100644--- a/deployment/manager/shared/locales/fr/or.json+++ b/deployment/manager/shared/locales/fr/or.json@@ -81,6 +81,7 @@"cancel": "Annuler","createdOn": "Créé le","createdOnWithDate": "Créé le: {{-date, LLLL}}",+ "updatedWithDate": "Mise à jour: {{-date, llll}}","accessPublicRead": "Accès public en lecture","type": "Type","path": "Chemin",diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.jsonindex 9bd3c21b5..33baf9a1d 100644--- a/deployment/manager/shared/locales/nl/or.json+++ b/deployment/manager/shared/locales/nl/or.json@@ -84,7 +84,7 @@"cancel": "Annuleren","createdOn": "Aangemaakt op","createdOnWithDate": "Aangemaakt op: {{-date, LLLL}}",- "updatedWithDate": "Bijgewerkt op: {{-date, LLLL}}",+ "updatedWithDate": "Bijgewerkt op: {{-date, llll}}","accessPublicRead": "Publiek","type": "Type","path": "Pad",@@ -279,5 +279,42 @@"editAttribute": "Attribuut kiezen","editDelta": "Delta","editCurrentValue": "Decimalen",- "decimals": "Decimalen"+ "decimals": "Decimalen",+ "editAsset": "Asset aanpassen",+ "parent": "Parent",+ "none": "Geen",+ "properties": "Eigenschappen",+ "metaItemType": {+ "urn:openremote:asset:meta:label": "Label",+ "urn:openremote:asset:meta:description": "Beschrijving",+ "urn:openremote:asset:meta:storeDataPoints": "Datapunten opslaan",+ "urn:openremote:asset:meta:agentLink": "Agent link",+ "urn:openremote:asset:meta:attributeLink": "Attribuut link",+ "urn:openremote:asset:meta:showOnDashboard": "Tonen op dashboard",+ "urn:openremote:asset:meta:format": "Format",+ "urn:openremote:asset:meta:about": "Over",+ "urn:openremote:asset:meta:readOnly": "Readonly",+ "urn:openremote:asset:meta:accessRestrictedRead": "Restricted read",+ "urn:openremote:asset:meta:accessRestrictedWrite": "Restricted write",+ "urn:openremote:asset:meta:accessPublicRead": "Public read",+ "urn:openremote:asset:meta:accessPublicWrite": "Public write",+ "urn:openremote:asset:meta:rangeMin": "Min. waarde",+ "urn:openremote:asset:meta:rangeMax": "Max. waarde",+ "urn:openremote:asset:meta:step": "Waarde stap",+ "urn:openremote:asset:meta:pattern": "Waarde regex",+ "urn:openremote:asset:meta:multiline": "Waarde meerdere regels",+ "urn:openremote:asset:meta:dataPointsMaxAgeDays": "Datapunt max. behouden (dagen)",+ "urn:openremote:asset:meta:disabled": "Uitgeschakeld",+ "urn:openremote:asset:meta:executable": "Executable",+ "urn:openremote:asset:meta:allowedValues": "Toegestane waardes",+ "urn:openremote:asset:meta:unitType": "Eenheden",+ "urn:openremote:asset:meta:hasPredictedDatapoints": "Heeft voorspelling",+ "urn:openremote:asset:meta:secret": "Secret",+ "urn:openremote:asset:meta:ruleState": "Beschikbaar in regels",+ "urn:openremote:asset:meta:ruleEvent": "Event in regels",+ "urn:openremote:asset:meta:ruleEventExpires": "Event in regels verloopt",+ "urn:openremote:asset:meta:protocolConfiguration": "Protocol configuratie"+ },+ "addMetaItems": "Voeg configuratie item toe",+ "customAttribute": "Custom attribuut"}diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.javaindex 83517170e..40c61221f 100644--- a/model/src/main/java/org/openremote/model/asset/AssetType.java+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java@@ -556,37 +556,39 @@ public enum AssetType implements AssetDescriptor {new AttributeDescriptorImpl("levelledCostOfStorage", CURRENCY, null,LABEL.withInitialValue("Levelised cost of storage"),UNIT_TYPE.withInitialValue(UNITS_CURRENCY_EUR)),- new AttributeDescriptorImpl("maxCharge", POWER, null,+ new AttributeDescriptorImpl("maxCharge", NUMBER, null,LABEL.withInitialValue("Max charge"),+ UNIT_TYPE.withInitialValue(UNITS_ENERGY_KILOWATT_HOUR),READ_ONLY),new AttributeDescriptorImpl("maxDischarge", NUMBER, null,LABEL.withInitialValue("Max discharge"),+ UNIT_TYPE.withInitialValue(UNITS_ENERGY_KILOWATT_HOUR),READ_ONLY),- new AttributeDescriptorImpl("chargeState", PERCENTAGE, null,+ new AttributeDescriptorImpl("chargeState", CHARGE, null,LABEL.withInitialValue("Charge state"),READ_ONLY),- new AttributeDescriptorImpl("chargedCapacity", CHARGE, null,+ new AttributeDescriptorImpl("chargedCapacity", NUMBER, null,LABEL.withInitialValue("Charged capacity"),UNIT_TYPE.withInitialValue(UNITS_ENERGY_KILOWATT_HOUR),READ_ONLY),- new AttributeDescriptorImpl("freeCapacity", CHARGE, null,+ new AttributeDescriptorImpl("freeCapacity", NUMBER, null,LABEL.withInitialValue("Free capacity"),UNIT_TYPE.withInitialValue(UNITS_ENERGY_KILOWATT_HOUR),READ_ONLY),new AttributeDescriptorImpl("totalPower", POWER, null,LABEL.withInitialValue("Total power"),READ_ONLY),- new AttributeDescriptorImpl("setPointPower", NUMBER, null,+ new AttributeDescriptorImpl("setPointPower", POWER, null,LABEL.withInitialValue("Setpoint power"),DESCRIPTION.withInitialValue("Positive is consuming, negative is delivering to network")),new AttributeDescriptorImpl("command", NUMBER, null,LABEL.withInitialValue("Command"),DESCRIPTION.withInitialValue("0 = No command, 1 = Start, 2 = Stop")),- new AttributeDescriptorImpl("energyCharged", CHARGE, null,+ new AttributeDescriptorImpl("energyCharged", NUMBER, null,LABEL.withInitialValue("Energy charged"),UNIT_TYPE.withInitialValue(UNITS_ENERGY_KILOWATT_HOUR),READ_ONLY),- new AttributeDescriptorImpl("energyDischarged", CHARGE, null,+ new AttributeDescriptorImpl("energyDischarged", NUMBER, null,LABEL.withInitialValue("Energy discharged"),UNIT_TYPE.withInitialValue(UNITS_ENERGY_KILOWATT_HOUR),READ_ONLY),diff --git a/ui/app/mobile/images/logo-mobile.svg b/ui/app/mobile/images/logo-mobile.svgnew file mode 100644index 000000000..93bab486c--- /dev/null+++ b/ui/app/mobile/images/logo-mobile.svg@@ -0,0 +1 @@+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256"><path d="M128,251.42A123.56,123.56,0,0,1,4.58,128H30.42A97.58,97.58,0,1,0,128,30.42V4.58a123.42,123.42,0,0,1,0,246.84Z" fill="#c2d500"/><path d="M109.31,217.54a91.47,91.47,0,1,1,108.23-70.87l-25.29-5.26a65.63,65.63,0,1,0-77.65,50.83l-5.29,25.3Z" fill="#4c9c2e"/><path d="M128.08,187.3c-1,0-2,0-3-.06a59.33,59.33,0,0,1-56.29-62.18l25.81,1.28a33.46,33.46,0,1,0,35.07-31.76l1.29-25.81a59.3,59.3,0,0,1-2.86,118.53Z" fill="#1a5632"/></svg>\ No newline at end of filediff --git a/ui/app/mobile/images/onboarding-assets.svg b/ui/app/mobile/images/onboarding-assets.svgnew file mode 100644index 000000000..49f3d4966--- /dev/null+++ b/ui/app/mobile/images/onboarding-assets.svg@@ -0,0 +1 @@+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256"><text transform="translate(69.75 171.75)" font-size="116.5" fill="#27844f" font-family="MaterialDesignIconsDesktop, Material Design Icons Desktop"></text><text transform="translate(212.65 148)" font-size="40.39" fill="#66af50" font-family="MaterialDesignIcons, Material Design Icons"></text><text transform="translate(52.41 244)" font-size="40.39" fill="#66af50" font-family="MaterialDesignIconsDesktop, Material Design Icons Desktop"></text><text transform="translate(52.41 53)" font-size="40.39" fill="#66af50" font-family="MaterialDesignIcons, Material Design Icons"></text><text transform="translate(164.36 47.36)" font-size="40.39" fill="#66af50" font-family="MaterialDesignIconsDesktop, Material Design Icons Desktop"></text><text transform="translate(3.89 140.22)" font-size="40.39" fill="#66af50" font-family="MaterialDesignIconsDesktop, Material Design Icons Desktop"></text><text transform="translate(167.35 240.37)" font-size="40.39" fill="#66af50" font-family="MaterialDesignIconsDesktop, Material Design Icons Desktop"></text><line x1="76" y1="128" x2="74" y2="128" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="61.57" y1="128" x2="51.21" y2="128" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5" stroke-dasharray="4.14 12.43"/><line x1="45" y1="128" x2="43" y2="128" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="104.74" y1="87.22" x2="103.75" y2="85.48" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="96.91" y1="73.49" x2="91.21" y2="63.5" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5" stroke-dasharray="4.6 13.81"/><line x1="87.79" y1="57.5" x2="86.79" y2="55.77" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="151.42" y1="89.05" x2="152.45" y2="87.33" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="160.14" y1="74.54" x2="166.55" y2="63.88" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5" stroke-dasharray="4.98 14.93"/><line x1="170.39" y1="57.48" x2="171.42" y2="55.77" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="178" y1="128" x2="180" y2="128" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="192.74" y1="128" x2="203.36" y2="128" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5" stroke-dasharray="4.25 12.74"/><line x1="209.73" y1="128" x2="211.73" y2="128" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="156.41" y1="177.48" x2="157.41" y2="179.22" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="162.76" y1="188.54" x2="167.23" y2="196.32" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5" stroke-dasharray="3.59 10.76"/><line x1="169.91" y1="200.98" x2="170.9" y2="202.72" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="99.22" y1="177.48" x2="98.21" y2="179.21" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/><line x1="91.95" y1="189.98" x2="86.73" y2="198.94" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5" stroke-dasharray="4.15 12.45"/><line x1="83.6" y1="204.33" x2="82.6" y2="206.06" fill="none" stroke="#c2d500" stroke-linecap="round" stroke-miterlimit="10" stroke-width="5"/></svg>\ No newline at end of filediff --git a/ui/app/mobile/images/onboarding-geofence.svg b/ui/app/mobile/images/onboarding-geofence.svgnew file mode 100644index 000000000..fe37de020--- /dev/null+++ b/ui/app/mobile/images/onboarding-geofence.svg@@ -0,0 +1 @@+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256"><circle cx="128" cy="128" r="122.01" fill="#27844f"/><path d="M172.23,79.19h26.09a7.92,7.92,0,0,1,7.8,7.8v15.6a7.92,7.92,0,0,1-7.8,7.81H180L164.43,126V87a7.91,7.91,0,0,1,7.8-7.8Z" fill="#66af50"/><text transform="translate(45.41 194.02)" font-size="54.92" fill="#66af50" font-family="MaterialDesignIconsDesktop, Material Design Icons Desktop"></text><path d="M150.9,82.24a9.86,9.86,0,0,0-7.2-3H107.13a9.84,9.84,0,0,0-7.19,3,10.12,10.12,0,0,0-3,7.43v72.66a10.12,10.12,0,0,0,3,7.43,9.8,9.8,0,0,0,7.19,3.05H143.7a9.83,9.83,0,0,0,7.2-3.05,10.11,10.11,0,0,0,3-7.43V89.67A10.11,10.11,0,0,0,150.9,82.24Zm-7.2,69.85H107.13V99.91H143.7Z" fill="#fff"/></svg>\ No newline at end of filediff --git a/ui/app/mobile/src/index.ts b/ui/app/mobile/src/index.tsindex cd0c87821..eda441adb 100644--- a/ui/app/mobile/src/index.ts+++ b/ui/app/mobile/src/index.ts@@ -27,10 +27,10 @@ import {pageMobileGeofencesProvider, GeofencesConfig} from "@openremote/or-app/dconst onboardingConfig:OnboardingConfig = {pages: [{- title: "Your opinion matters",+ title: "The city assets in your pocket",type: "default",- description: "With this app we will involve you in developments within the city. We keep you up to date on current projects and will ask for your opinion.",- image: require("../images/logo-mobile.png"),+ description: "With this app you have all live asset data conveniently available. Handy when doing maintenance or installing new devices.",+ image: require("../images/onboarding-assets.svg"),enableProviders: [{name:"push",@@ -39,22 +39,16 @@ const onboardingConfig:OnboardingConfig = {],},{- title: "At the right time and place",+ title: "At the right time and the right place",type: "bottom-image",- description: "By sharing your location and allowing messages you receive useful info and surveys at the right time and place. Give your opinion and keep up to date on your favourite places.",+ description: "You can receive notifications that are created by workflow rules. Based on your location relevant messages can be sent to you.",enableProviders: [{name:"geofence",action:"PROVIDER_ENABLE"}],- image: require("../images/logo-mobile.png")- },- {- title: "View your messages",- type: "bottom-image",- description: "Use the menu at the bottom to find messages that are always available to you.",- image: require("../images/logo-mobile.png")+ image: require("../images/onboarding-geofence.svg")}],redirect: "/main/?realm=smartcity&consoleProviders=geofence push storage"@@ -63,7 +57,7 @@ const onboardingConfig:OnboardingConfig = {const splashConfig:SplashConfig = {redirect: "#!onboarding/",interval: 3000,- logoMobile: require("../images/logo-mobile.png")+ logoMobile: require("../images/logo-mobile.svg")}declare var MANAGER_URL: string;diff --git a/ui/app/or-app/src/or-header.ts b/ui/app/or-app/src/or-header.tsindex 082f6d17d..4bb11ed43 100644--- a/ui/app/or-app/src/or-header.ts+++ b/ui/app/or-app/src/or-header.ts@@ -153,7 +153,7 @@ class OrHeader extends LitElement {background: none;border: none;cursor: pointer;- padding: 0 6px;+ padding: 0 16px;height: 100%;}@@ -162,7 +162,7 @@ class OrHeader extends LitElement {}#menu-btn-desktop {- display: none;+ display: none;}#desktop-right {diff --git a/ui/app/or-app/src/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.tsindex 3fb262d25..0294533d6 100644--- a/ui/app/or-app/src/pages/page-assets.ts+++ b/ui/app/or-app/src/pages/page-assets.ts@@ -37,6 +37,16 @@ export const PAGE_ASSETS_DEFAULT_CONFIG: PageAssetsConfig = {}}},+ default: {+ panels: {+ "attributes": {+ exclude: ["location", "userNotes", "manufacturer", "model", "status"]+ },+ "info": {+ exclude: ["accessPublicRead"]+ }+ }+ },assetTypes: {// TODO: These need to move to custom project// "urn:openremote:asset:topic": {diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.tsindex 9f8e78390..32ee09376 100644--- a/ui/component/or-asset-viewer/src/style.ts+++ b/ui/component/or-asset-viewer/src/style.ts@@ -45,14 +45,6 @@ export const style = css`animation: fadein 0.3s;}- @media only screen and (max-width: 767px) {- #wrapper {- position: absolute;- left: 0;- right: 0;- }- }-@keyframes fadein {from { opacity: 0; }to { opacity: 1; }@@ -174,6 +166,12 @@ export const style = css`}@media screen and (max-width: 769px) {+ #wrapper {+ position: absolute;+ left: 0;+ right: 0;+ }+.back-navigation {display: block;}@@ -184,16 +182,9 @@ export const style = css`#asset-header {grid-area: auto!important;- }-- #asset-header {padding: 20px 15px 0;}- #container {- grid-auto-rows: auto;- }-.panel {border-radius: 0;border-right: none;@@ -218,10 +209,9 @@ export const style = css`}#container {+ grid-auto-rows: auto;grid-template-columns: 100% !important;padding: 20px 0;}--}`;\ No newline at end of file