Merge branch 'master' of ssh://git.graphdefined.com:5001/OpenCharging…

…Cloud/ChargyWebApp
OpenChargingCloud · Jun 17, 2024 · 4f91e62 · 4f91e62
2 parents ef49c6a + 14547f0
commit 4f91e62
Show file tree

Hide file tree

Showing 10 changed files with 445 additions and 79 deletions.
diff --git a/...mentation/Alfen/ALFEN-Testdatensatz-10_newChargeITContainer_externalCostsAndTariff.chargy b/...mentation/Alfen/ALFEN-Testdatensatz-10_newChargeITContainer_externalCostsAndTariff.chargy
@@ -26,7 +26,41 @@
   "meterInfo": {
     "firmwareVersion": "123",
     "type": "eHZ IW8E EMH",
-    "manufacturer": "EMH"
+    "manufacturer": "EMH",
+    "publicKeySignatures": [
+      {
+        "signer":           "Open Charging Cloud",
+        "publicKey":        "04a8ff0d82107922522e004a167cc658f0eef408c5020f98e7a2615be326e61852666877335f4f8d9a0a756c26f0c9fb3f401431416abb5317cc0f5d714d3026fe",
+        "timestamp":        "2019-06-30T00:00:00Z",
+        "comment":          { "en": "Hello world!" },
+        "notBefore":        "2018-11-04T16:47:01Z",
+        "notAfter":         "2023-03-12T13:54:12Z",
+        "operations": {
+            "signCertificates":  false,
+            "signMeterValues":   true
+        },
+        "revocationURIs":   [],
+        "algorithm":        "secp256k1",
+        "format":           "DER",
+        "value":            "303502181dce9223416d64e5362bc8eb46eddf23adcb74382b602e1f021900eca85b1a48bc1f64d25951e947c7e48fa0b070b82e2cae41"
+      },
+      {
+        "signer":           "chargeIT mobility",
+        "publicKey":        "04a8ff0d82107922522e004a167cc658f0eef408c5020f98e7a2615be326e61852666877335f4f8d9a0a756c26f0c9fb3f401431416abb5317cc0f5d714d3026fe",
+        "timestamp":        "2019-06-30T00:00:00Z",
+        "comment":          { "en": "Hello world!" },
+        "notBefore":        "2018-11-04T16:47:01Z",
+        "notAfter":         "2023-03-12T13:54:12Z",
+        "operations": {
+            "signCertificates":  false,
+            "signMeterValues":   true
+        },
+        "revocationURIs":   [],
+        "algorithm":        "secp256k1",
+        "format":           "DER",
+        "value":            "303502181dce9223416d64e5362bc8eb46eddf23adcb74382b602e1f021900eca85b1a48bc1f64d25951e947c7e48fa0b070b82e2cae41"
+      }
+    ]
   },
   "connectorInfo": {
     "type": "Typ-2 Socket",

diff --git a/src/i18n.json b/src/i18n.json
@@ -36,6 +36,16 @@
         "en": "No charge transparency records found!"
     },
 
+    "Invalid number of signed meter values!" : {
+        "de": "Ungültige Anzahl signierter Messwerte!",
+        "en": "Invalid number of signed meter values!"
+    },
+
+    "Invalid charging session format!": {
+        "de": "Ungültiges Ladevorgangsformat!",
+        "en": "Invalid charging session format!"
+    },
+
     "Unknown or invalid charge transparency record!": {
         "de": "Unbekannter oder ungültiger Transparenzdatensatz!",
         "en": "Unknown or invalid charge transparency record!"
@@ -61,6 +71,11 @@
         "en": "Unknown or invalid charging session format!"
     },
 
+    "Inconsistent public keys!": {
+        "de": "Inkonsistente öffentliche Schlüssel!",
+        "en": "Inconsistent public keys!"
+    },
+
     "ValidChargingSession": {
         "de": "Gültiger Ladevorgang",
         "en": "Valid charging session"
@@ -98,6 +113,11 @@
         "en": "OBIS code"
     },
 
+    "Inconsistent OBIS code!": {
+        "de": "Inkonsistente OBIS-Kennzahl!",
+        "en": "Inconsistent OBIS code!"
+    },
+
     "Plain text": {
         "de": "Klartext",
         "en": "Plain text"
@@ -271,6 +291,11 @@
         "en": "Missing or invalid meter information within the %p. signed meter value!"
     },
 
+    "Inconsistent meter identification!": {
+        "de": "Inkonsistente Zähleridentifikation!",
+        "en": "Inconsistent meter identification!"
+    },
+
     "MissingOrInvalid_SignedMeterValue_MeterInfo_MeterIdP": {
         "de": "Fehlende oder ungültige Zähleridentifikation im %p. signierten Messwert!",
         "en": "Missing or invalid meter identification within the %p. signed meter value!"
@@ -531,6 +556,7 @@
     },
 
 
+
     "Charging Tariffs": {
         "de": "Ladetarife",
         "en": "Charging Tariffs"
@@ -541,9 +567,6 @@
         "en": "Charging Tariff Id"
     },
 
-
-
-
     "Total Costs": {
         "de": "Gesamtkosten",
         "en": "Total Costs"
@@ -670,6 +693,11 @@
         "en": "Unknown charge transparency data format!"
     },
 
+    "Invalid energy meter": {
+        "de": "Ungültiger Energiezähler",
+        "en": "Invalid energy meter"
+    },
+
     "Energy meter not found": {
         "de": "Energiezähler nicht gefunden",
         "en": "Energy meter not found"
@@ -745,6 +773,141 @@
         "en": "End value"
     },
 
+    "Inconsistent Alfen adapter identification!": {
+        "de": "Inkonsistente Alfen-Adapter-Identifikation!",
+        "en": "Inconsistent Alfen adapter identification!"
+    },
+
+    "Inconsistent Alfen adapter firmware version!": {
+        "de": "Inkonsistente Alfen-Adapter-Firmwareversion!",
+        "en": "Inconsistent Alfen adapter firmware version!"
+    },
+
+    "Inconsistent Alfen adapter firmware checksum!": {
+        "de": "Inkonsistente Alfen-Adapter-Firmware-Prüfsumme!",
+        "en": "Inconsistent Alfen adapter firmware checksum!"
+    },
+
+    "Inconsistent unit (encoded) value!" : {
+        "de": "Inkonsistenter (enkodierter) Einheitenwert!",
+        "en": "Inconsistent unit (encoded) value!"
+    },
+
+    "Inconsistent measurement scalar!" : {
+        "de": "Inkonsistenter Messwert-Skalierungsfaktor!",
+        "en": "Inconsistent measurement scalar!"
+    },
+
+    "Inconsistent user identification!" : {
+        "de": "Inkonsistente Benutzeridentifikation!",
+        "en": "Inconsistent user identification!"
+    },
+
+    "Inconsistent internal charging session identification!" : {
+        "de": "Inkonsistente interne Ladevorgangsidentifikation!",
+        "en": "Inconsistent internal charging session identification!"
+    },
+
+    "Inconsistent timestamps!": {
+        "de": "Inkonsistente Zeitstempel!",
+        "en": "Inconsistent timestamps!"
+    },
+
+    "Exception occured: ": {
+        "de": "Ausnahmefehler aufgetreten: ",
+        "en": "Exception occured: "
+    },
+
+    "Hashed plain text": {
+        "de": "Gehashter Klartext",
+        "en": "Hashed plain text"
+    },
+
+    "Autorisierung":
+    {
+        "de": "Autorisierung",
+        "en": "Authorization"
+    },
+
+    "Invalid meter status!": {
+        "de": "Ungültiger Zählerstatus!",
+        "en": "Invalid meter status!"
+    },
+
+    "RTC error": {
+        "de": "RTC-Fehler",
+        "en": "RTC error"
+    },
+
+    "EEPROM error": {
+        "de": "EEPROM-Fehler",
+        "en": "EEPROM error"
+    },
+
+    "Dataflash error": {
+        "de": "Dataspeicher-Fehler",
+        "en": "Dataflash error"
+    },
+
+    "Phase L1 failure": {
+        "de": "Phasenausfall L1",
+        "en": "Phase L1 failure"
+    },
+
+    "Phase L2 failure": {
+        "de": "Phasenausfall L2",
+        "en": "Phase L2 failure"
+    },
+
+    "Phase L3 failure": {
+        "de": "Phasenausfall L3",
+        "en": "Phase L3 failure"
+    },
+
+    "Phase sequence wrong": {
+        "de": "Falsche Phasenfolge",
+        "en": "Phase sequence wrong"
+    },
+
+    "Adapter fatal error": {
+        "de": "Schwerer Adapter-Fehler",
+        "en": "Adapter fatal error"
+    },
+
+    "Stop and Start Meter reading mismatch": {
+        "de": "Start- und Endzählerstand stimmen nicht überein",
+        "en": "Stop and Start Meter reading mismatch"
+    },
+
+    "Intermediate command": {
+        "de": "Zwischenbefehl",
+        "en": "Intermediate command"
+    },
+
+    "Stop charge command": {
+        "de": "Ladevorgang beenden",
+        "en": "Stop charge command"
+    },
+
+    "Start charge command": {
+        "de": "Ladevorgang starten",
+        "en": "Start charge command"
+    },
+
+    "Adapter memory error": {
+        "de": "Adapter-Speicherfehler",
+        "en": "Adapter memory error"
+    },
+
+    "Meter communication error": {
+        "de": "Zählerkommunikationsfehler",
+        "en": "Meter communication error"
+    },
+
+    "Invalid status!": {
+        "de": "Ungültiger Status!",
+        "en": "Invalid status!"
+    },
 
     "Adapter Id": {
         "de": "Adapter-Id",
@@ -822,4 +985,5 @@
         "en": "Charging Periods"
     }
 
+
 }
diff --git a/src/index.html b/src/index.html
@@ -528,6 +528,34 @@ <h1>Datenschutzerklärung für diesen Mängelmelder</h1>
                 </div>
             </div>
 
+            <div id="pkiDetails" class="overlay">
+                <div class="overlayText">
+
+                    <div class="headline">
+
+                        <div class="error"></div>
+
+                        <div class="intro">
+                            Public Key Infrastructure
+                        </div>
+
+                    </div>
+
+                    <div class="data">
+                    </div>
+
+                    <div class="spacer">
+
+                    </div>
+
+                    <div class="footer">
+                        <button class="overlayLeftButton"><i class="fas fa-arrow-alt-circle-left"></i></button>
+                    </div>
+
+                </div>
+
+            </div>
+
         </div>
 
     </body>

diff --git a/src/scss/chargy.scss b/src/scss/chargy.scss
@@ -268,6 +268,9 @@ body {
                                 font-family:        monospace;
                                 font-size:          110%;
                                 margin-top:         3px;
+                                background-color:   rgb(192 192 192 / 30%);
+                                padding:            6px 8px;
+                                border-radius:      4px;
                             }
 
                             #sigHead {
@@ -495,7 +498,7 @@ body {
                                                 .signer {
                                                     display:            table-cell;
                                                     padding:            2px 0px 2px 5px;
-                                                    vertical-align:     middle;                                                
+                                                    vertical-align:     middle;
                                                     font-size:          85%;
                                                 }
 
@@ -2046,13 +2049,20 @@ body {
                         .signatures {
 
                             display:            flex;
-                            padding:            3px 0px 0px 0px;
+                            padding-left:       5px;
                             font-family:        sans-serif;
                             font-size:          70%;
                             color:              #6d6d6d;
 
-                            i {
-                                padding:            0px 3px 0px 10px;
+                            .signature {
+
+                                padding:            3px 7px 2px 5px;
+                                cursor:             zoom-in;
+
+                                i {
+                                    padding-right:      4px;
+                                }
+
                             }
 
                         }
@@ -2102,6 +2112,7 @@ body {
 
                 form {
 
+                    flex-grow:          2;
                     padding:            5px 20px 20px 20px;
 
                     .label {
@@ -2209,6 +2220,24 @@ body {
 
         }
 
+        #pkiDetails {
+
+            display:    none;
+
+            .overlayText {
+
+                .footer {
+
+                    .overlayRightButton {
+                        visibility:         hidden;
+                    }
+
+                }
+
+            }
+
+        }
+
     }
 
     .fullScreen {