deploy: 6feaf94

w3c-ccg · Dec 14, 2023 · 4590af7 · 4590af7
1 parent 4237250
commit 4590af7
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 32 deletions.
diff --git a/contexts/traceability-v1.jsonld b/contexts/traceability-v1.jsonld
diff --git a/credentials-with-issuer-dependent-terms.json b/credentials-with-issuer-dependent-terms.json
@@ -229,7 +229,7 @@
   },
   {
     "type": "DeliveryScheduleCredential",
-    "count": 8
+    "count": 12
   },
   {
     "type": "DCSATransportDocumentCredential",

diff --git a/openapi/components/schemas/common/DeliverySchedule.yml b/openapi/components/schemas/common/DeliverySchedule.yml
@@ -90,20 +90,34 @@ properties:
     $linkedData:
       term: injectionVolume
       '@id': https://w3id.org/traceability#QuantitativeValue
-  injectionDate:
-    title: Injection Date
-    description: The planned time for crude oil injection starts
+  injectionStartDate:
+    title: Injection Start Date
+    description: The planned time for crude oil injection to start
     type: string
     $linkedData:
       term: injectionDate
       '@id': https://schema.org/departureTime
-  deliveryDate:
-    title: Delivery Date
-    description: The planned time for crude oil delivery starts
+  injectionEndDate:
+    title: Injection End Date
+    description: The planned time for crude oil injection to end
+    type: string
+    $linkedData:
+      term: injectionEndDate
+      '@id': https://schema.org/departureTime
+  deliveryStartDate:
+    title: Delivery Start Date
+    description: The planned time for crude oil delivery to start
     type: string
     $linkedData:
       term: deliveryDate
       '@id': https://schema.org/arrivalTime
+  deliveryEndDate:
+    title: Delivery End Date
+    description: The planned time for crude oil delivery to end
+    type: string
+    $linkedData:
+      term: deliveryEndDate
+      '@id': https://schema.org/arrivalTime
   portOfEntry:
     title: Port of Entry
     description: The port where the commodity crosses the border.
@@ -247,8 +261,10 @@ example: |-
         "unitCode":"bbl"
       }
     ],
-    "injectionDate":"2022-05-01  10:13:00 PM",
-    "deliveryDate":"2022-05-01  10:13:00 PM",
+    "injectionStartDate":"2022-05-01  10:13:00 PM",
+    "injectionEndDate":"2022-05-01  12:13:00 PM",
+    "deliveryStartDate":"2022-05-10  10:13:00 PM",
+    "deliveryEndDate":"2022-05-10  12:13:00 PM",
     "portOfEntry":{
       "type":[
         "Place"

diff --git a/openapi/components/schemas/credentials/DeliveryScheduleCredential.yml b/openapi/components/schemas/credentials/DeliveryScheduleCredential.yml
@@ -198,8 +198,10 @@ example: |-
           "unitCode": "bbl"
         }
       ],
-      "injectionDate": "2022-05-01  10:13:00 PM",
-      "deliveryDate": "2022-05-01  10:13:00 PM",
+      "injectionStartDate": "2022-05-01  10:13:00 PM",
+      "injectionEndDate": "2022-05-01  12:13:00 PM",
+      "deliveryStartDate": "2022-05-10  10:13:00 PM",
+      "deliveryEndDate": "2022-05-10  12:13:00 PM",
       "portOfEntry": {
         "type": [
           "Place"

diff --git a/openapi/openapi.bundled.json b/openapi/openapi.bundled.json
diff --git a/sections/credentials.html b/sections/credentials.html
@@ -2674,8 +2674,10 @@ <h2>Delivery Schedule Credential</h2>
         "unitCode": "bbl"
       }
     ],
-    "injectionDate": "2022-05-01  10:13:00 PM",
-    "deliveryDate": "2022-05-01  10:13:00 PM",
+    "injectionStartDate": "2022-05-01  10:13:00 PM",
+    "injectionEndDate": "2022-05-01  12:13:00 PM",
+    "deliveryStartDate": "2022-05-10  10:13:00 PM",
+    "deliveryEndDate": "2022-05-10  12:13:00 PM",
     "portOfEntry": {
       "type": [
         "Place"

diff --git a/sections/vocab.html b/sections/vocab.html
@@ -3244,8 +3244,10 @@ <h2>Delivery Schedule</h2>
       "unitCode":"bbl"
     }
   ],
-  "injectionDate":"2022-05-01  10:13:00 PM",
-  "deliveryDate":"2022-05-01  10:13:00 PM",
+  "injectionStartDate":"2022-05-01  10:13:00 PM",
+  "injectionEndDate":"2022-05-01  12:13:00 PM",
+  "deliveryStartDate":"2022-05-10  10:13:00 PM",
+  "deliveryEndDate":"2022-05-10  12:13:00 PM",
   "portOfEntry":{
     "type":[
       "Place"

diff --git a/testsuite/jest-html-reporters-attach/result.js b/testsuite/jest-html-reporters-attach/result.js