Merge pull request #5 from yolile/patch-1

Fix lots.json to validate against the schema
open-contracting-extensions · Jun 17, 2017 · d046f2d · d046f2d
2 parents 108965a + 86d27bc
commit d046f2d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,33 +1,33 @@
-Lots 
+Lots
 ====
 
 When a single tender is broken down into parts that can be bid upon, and awarded, separately, this is modelled using the **lots extension**.
 
-The lots extension maintains the overall structure of an OCDS release, with items, documents and milestones nested immediately within ```tender```, ```award``` and ```contract``` items, but it introduces an array of Lots in the ```tender``` section, and the ability to cross-reference a specific ```relatedLot``` for each item, and an array of ```relatedLots``` for documents, milestones and awards. 
+The lots extension maintains the overall structure of an OCDS release, with items, documents and milestones nested immediately within ```tender```, ```award``` and ```contract``` items, but it introduces an array of Lots in the ```tender``` section, and the ability to cross-reference a specific ```relatedLot``` for each item, and an array of ```relatedLots``` for documents, milestones and awards.
 
-Optional ```lotDetails``` and ```lotGroups``` section allow more complex conditions around the award of lots to be expressed, such as the maximum value of a group of lots. 
+Optional ```lotDetails``` and ```lotGroups``` section allow more complex conditions around the award of lots to be expressed, such as the maximum value of a group of lots.
 
-This means that systems which are not 'lot aware' can still understand the overall value of contracting taking place, key events, and relationships between buyers and suppliers. At the same time, 'lot aware' systems can make use of the cross-referenced information to present a lot-centric view on the information to users, or to analyse contracting lot by lot. 
+This means that systems which are not 'lot aware' can still understand the overall value of contracting taking place, key events, and relationships between buyers and suppliers. At the same time, 'lot aware' systems can make use of the cross-referenced information to present a lot-centric view on the information to users, or to analyse contracting lot by lot.
 
 ## Related Lot
 
 The ```relatedLot``` (singular) property is available for:
 
-* items 
+* items
 
 An array of ```relatedLots``` (plural) can be provided for each of:
 
 * documents
 * milestones
-* awards 
+* awards
 
 When lots are used, **all** items should have a ```relatedLot``` property.
 
-Documents and milestones can optionally have a ```relatedLots``` property. Those without this property should be interpreted as applicable to the tender as a whole. 
+Documents and milestones can optionally have a ```relatedLots``` property. Those without this property should be interpreted as applicable to the tender as a whole.
 
 The items within an award should each have a ```relatedLot``` property, but publishers may choose to also reference all the lots an award relates to at the award level using ```relatedLots```
 
-Where the bid extension is also in use, each bid can also declare its related lots. 
+Where the bid extension is also in use, each bid can also declare its related lots.
 
 ## Worked example
 
@@ -38,7 +38,7 @@ A tender is issued for consultancy in the development of a new public building.
 * Civil engineering consultancy
 * Structural engineering consultancy
 
-Although part of the same tender, the buyer is willing to award these different items to different firms, and so divides the tender into three lots. 
+Although part of the same tender, the buyer is willing to award these different items to different firms, and so divides the tender into three lots.
 
 ```json
 {
@@ -51,6 +51,9 @@ Although part of the same tender, the buyer is willing to award these different
   },
   "license": "http://opendatacommons.org/licenses/pddl/1.0/",
   "publicationPolicy": "https://github.com/open-contracting/sample-data/",
+  "uri": "https://github.com/open-contracting/ocds_lots_extension/blob/master/examples/lots.json",
+  "extensions":["https://raw.githubusercontent.com/open-contracting/ocds_lots_extension/v1.1/extension.json"],
+  "version": "1.1",
   "releases": [
     {
       "language": "en",
@@ -153,7 +156,10 @@ Although part of the same tender, the buyer is willing to award these different
             "id":"lot-group-1",
             "relatedLots":["lot-2","lot-3"],
             "optionToCombine":true,
-            "maximumValue":1000000
+            "maximumValue":{
+              "currency":"GBP",
+              "amount":1000000
+            }
         }],
         "lotDetails":{
             "maximumLotsBidPerSupplier":4,
@@ -171,4 +177,4 @@ Although part of the same tender, the buyer is willing to award these different
 .. extensiontable::
     :extension: lots
     :definitions: Lots
-```
+```
diff --git a/examples/lots.json b/examples/lots.json
@@ -8,6 +8,9 @@
   },
   "license": "http://opendatacommons.org/licenses/pddl/1.0/",
   "publicationPolicy": "https://github.com/open-contracting/sample-data/",
+  "uri": "https://github.com/open-contracting/ocds_lots_extension/blob/master/examples/lots.json",
+  "extensions":["https://raw.githubusercontent.com/open-contracting/ocds_lots_extension/v1.1/extension.json"],
+  "version": "1.1",
   "releases": [
     {
       "language": "en",
@@ -37,7 +40,7 @@
               "id": "71210000",
               "description": "Advisory architectural services"
             },
-            "relatedLots":["lot-1"]
+            "relatedLot":"lot-1"
            },
            {
             "id": "0002",
@@ -47,7 +50,7 @@
               "id": "71220000",
               "description": "Architectural design services"
             },
-            "relatedLots":["lot-1"]
+            "relatedLot":"lot-1"
            },
            {
             "id": "0003",
@@ -57,7 +60,7 @@
               "id": "71311000",
               "description": "Civil engineering consultancy services"
             },
-            "relatedLots":["lot-2"]
+            "relatedLot":"lot-2"
            },
            {
             "id": "0004",
@@ -67,7 +70,7 @@
               "id": "71312000",
               "description": "Structural engineering consultancy services"
             },
-            "relatedLots":["lot-1"]
+            "relatedLot":"lot-1"
            }
         ],
         "value": {
@@ -110,7 +113,10 @@
             "id":"lot-group-1",
             "relatedLots":["lot-2","lot-3"],
             "optionToCombine":true,
-            "maximumValue":1000000
+            "maximumValue":{
+              "currency":"GBP",
+              "amount":1000000
+            }
         }],
         "lotDetails":{
             "maximumLotsBidPerSupplier":4,
@@ -119,4 +125,4 @@
       }
     }
   ]
-}
+}