Add charging periods and charging tariff summary

OpenChargingCloud · May 3, 2024 · a8e7350 · a8e7350
1 parent b3f1c97
commit a8e7350
Show file tree

Hide file tree

Showing 8 changed files with 1,234 additions and 452 deletions.
diff --git a/...mentation/Alfen/ALFEN-Testdatensatz-10_newChargeITContainer_externalCostsAndTariff.chargy b/...mentation/Alfen/ALFEN-Testdatensatz-10_newChargeITContainer_externalCostsAndTariff.chargy
@@ -32,44 +32,23 @@
     "type": "Typ-2 Socket",
     "losses": 2.1
   },
-  "chargingCostsInfo": {
-    "total": 2.05,
-    "currency": "€",
-    "reservation": {
-       "amount": 12.1,
-       "unit": "min",
-       "cost": 0.2
-    },
-    "energy": {
-       "amount": 12.0,
-       "unit": "kWh",
-       "cost": 1.23
-    },
-    "time": {
-       "amount": 253,
-       "unit": "min",
-       "cost": 0.74
-    },
-    "idle": {
-       "amount": 12,
-       "unit": "min",
-       "cost": 0.3
-    },
-    "flat": {
-       "cost": 0.3
-    }
-  },
   "chargingTariffs": [
     {
-      "id": "DE*GDF*T12345678",
+      "@id": "DE*GDF*T12345678",
       "@context": "https://open.charging.cloud/ctx/chargingTariffs/OCPIv2.1.1",
       "currency": "EUR",
-      "tariff_alt_text": [
-        {
-          "language": "en",
-          "text": "Adhoc 0.44€/kWh + 0.3€ Session fee; 8,4ct/min after 3 hours"
-        }
-      ],
+      "shortName": {
+          "de": "Adhoc",
+          "en": "Adhoc"
+      },
+      "summary": {
+          "de": "0.44€/kWh + 0.3€ Startgebühr; 8,4ct/min nach 3 Stunden",
+          "en": "0.44€/kWh + 0.3€ Session fee; 8,4ct/min after 3 hours"
+      },
+      "description": {
+          "de": "Adhoc Standardtarif mit einer Blockadegebühr nach 3 Stunden",
+          "en": "Adhoc standard tariff having a blocking fee after 3 hours"
+      },
       "elements": [
         {
           "price_components": [
@@ -130,5 +109,43 @@
   } ],
   "signatures": [
 
-  ]
+  ],
+  "chargingPeriods": [
+    {
+      "startTimestamp": "2020-02-18T07:13:25.000Z",
+      "costs": {}
+    },
+    {
+      "startTimestamp": "2020-02-18T10:13:25.000Z",
+      "endTimestamp": "2020-02-18T11:25:42.000Z",
+      "costs": {}
+    }
+  ],
+  "totalCosts": {
+    "total": 2.05,
+    "currency": "€",
+    "reservation": {
+       "amount": 12.1,
+       "unit": "min",
+       "cost": 0.2
+    },
+    "energy": {
+       "amount": 12.0,
+       "unit": "kWh",
+       "cost": 1.23
+    },
+    "time": {
+       "amount": 253,
+       "unit": "min",
+       "cost": 0.74
+    },
+    "idle": {
+       "amount": 12,
+       "unit": "min",
+       "cost": 0.3
+    },
+    "flat": {
+       "cost": 0.3
+    }
+  }
 }
diff --git a/i18n.json b/i18n.json
@@ -557,9 +557,19 @@
 
 
 
-    "Costs and Tariffs": {
-        "de": "Kosten und Tarife",
-        "en": "Costs and Tariffs"
+    "Charging Tariffs": {
+        "de": "Ladetarife",
+        "en": "Charging Tariffs"
+    },
+
+    "Charging Tariff Id": {
+        "de": "Ladetarif-Id",
+        "en": "Charging Tariff Id"
+    },
+
+    "Total Costs": {
+        "de": "Gesamtkosten",
+        "en": "Total Costs"
     },
 
     "Total": {
@@ -813,77 +823,12 @@
         "en": "Hashed plain text"
     },
 
-    "Adapter Id": {
-        "de": "Adapter-Identifikation",
-        "en": "Adapter Id"
-    },
-
-    "Adapter Firmware Version": {
-        "de": "Adapter-Firmware-Version",
-        "en": "Adapter Firmware Version"
-    },
-
-    "Adapter Firmware Checksum": {
-        "de": "Adapter-Firmware-Prüfsumme",
-        "en": "Adapter Firmware Checksum"
-    },
-
-    "Meter number": {
-        "de": "Zählernummer",
-        "en": "Meter number"
-    },
-
-    "Meter status": {
-        "de": "Zählerstatus",
-        "en": "Meter status"
-    },
-
-    "Adapter status": {
-        "de": "Adapterstatus",
-        "en": "Adapter status"
-    },
-
-    "Seconds index": {
-        "de": "Sekundenindex",
-        "en": "Seconds index"
-    },
-
-    "Timestamp": {
-        "de": "Zeitstempel",
-        "en": "Timestamp"
-    },
-
-    "Unit (encoded)": {
-        "de": "Einheit (codiert)",
-        "en": "Unit (encoded)"
-    },
-
-    "Scaling": {
-        "de": "Skalierung",
-        "en": "Scaling"
-    },
-
-    "Measurement Value": {
-        "de": "Messwert",
-        "en": "Measurement Value"
-    },
-
     "Autorisierung":
     {
         "de": "Autorisierung",
         "en": "Authorization"
     },
 
-    "SessionId": {
-        "de": "SessionId",
-        "en": "SessionId"
-    },
-
-    "Pagination counter": {
-        "de": "Paginierungszähler",
-        "en": "Pagination counter"
-    },
-
     "Invalid meter status!": {
         "de": "Ungültiger Zählerstatus!",
         "en": "Invalid meter status!"
@@ -962,6 +907,83 @@
     "Invalid status!": {
         "de": "Ungültiger Status!",
         "en": "Invalid status!"
+    },
+
+    "Adapter Id": {
+        "de": "Adapter-Id",
+        "en": "Adapter Id"
+    },
+
+    "Adapter Firmware Version": {
+        "de": "Adapter-Firmware-Version",
+        "en": "Adapter Firmware Version"
+    },
+
+    "Adapter Firmware Checksum": {
+        "de": "Adapter-Firmware-Checksumme",
+        "en": "Adapter Firmware Checksum"
+    },
+
+    "Meter number": {
+        "de": "Zählernummer",
+        "en": "Meter number"
+    },
+
+    "Meter status": {
+        "de": "Zählerstatus",
+        "en": "Meter status"
+    },
+
+    "Adapter status": {
+        "de": "Adapterstatus",
+        "en": "Adapter status"
+    },
+
+    "Seconds index": {
+        "de": "Sekundenindex",
+        "en": "Seconds index"
+    },
+
+    "Timestamp": {
+        "de": "Zeitstempel",
+        "en": "Timestamp"
+    },
+
+    "Unit (encoded)": {
+        "de": "Einheit (kodiert)",
+        "en": "Unit (encoded)"
+    },
+
+    "Scaling": {
+        "de": "Skalierung",
+        "en": "Scaling"
+    },
+
+    "Measurement Value": {
+        "de": "Messwert",
+        "en": "Measurement Value"
+    },
+
+    "Authorization": {
+        "de": "Autorisierung",
+        "en": "Authorization"
+    },
+
+    "SessionId": {
+        "de": "SessionId",
+        "en": "SessionId"
+    },
+
+    "Pagination counter": {
+        "de": "Paginierungszähler",
+        "en": "Pagination counter"
+    },
+
+
+    "Charging Periods": {
+        "de": "Ladeperioden",
+        "en": "Charging Periods"
     }
 
+
 }