Revert "add finalStatus and finalStatusDetails"

README.md

@@ -8,7 +8,7 @@ If a contracting process is divided into lots, then you should add each lot to t
 
 If a contracting process is not divided into lots, then you should nonetheless add a single, virtual lot. If a data element can be mapped to either a `tender` field or a `tender.lots` field, you should map it to the `tender.lots` field. In this way, information is accessible at the same location for all contracting processes, regardless of whether the process is actually divided into lots.
 
-## Modeling
+## Modelling
 
 The lots extension maintains the overall structure of an OCDS release, with items, documents and milestones nested immediately within `tender`, `awards` and `contracts` sections, 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.
 
@@ -40,15 +40,15 @@ Documents and milestones may have a `relatedLots` field. Those without this fiel
 
 The items within an award should have a `relatedLot` field. Publishers may also reference all the lots an award relates to at the award level using `relatedLots`.
 
-## How to set the `tender.finalStatus` field if the lots' final statuses differ?
+## How to set `tender.status` if lots' statuses differ?
 
-The `tender.finalStatus` and `tender.lots.finalStatus` fields use the closed `tenderFinalStatus.csv` codelist. This codelist covers the possible end result statuses ('complete', 'cancelled', 'unsuccessful').  Prior to reaching a result, the statuses of the tender and its lots can be inferred from the relevant date fields.
+`tender.status` and `tender.lots.status` use the closed tenderStatus.csv codelist. This codelist progresses from planning statuses ('planning', 'planned'), to 'active' status, and then result statuses ('complete', 'cancelled', 'unsuccessful').
 
-* If any lot has no final status, then `tender.finalStatus` should not be set, to indicate that some lots are awaiting results.
-* If all lots have a final status, then `tender.finalStatus` describes the aggregate result:
-  * If at least one lot's final status is 'complete', then `tender.finalStatus` should be 'complete', to indicate that there is at least one award.
-  * Otherwise, if at least one lot's final status is 'unsuccessful', then `tender.finalStatus` should be 'unsuccessful', to indicate that the procedure was completed but unsuccessfully.
-  * Otherwise, If all lots' final status are 'cancelled', then `tender.finalStatus` should be 'cancelled', to indicate that the procedure was discontinued as a whole.
+* If any lot's status is 'active', then `tender.status` should be 'active', to indicate that some lots are awaiting results.
+* If all lots' status are a result status, then `tender.status` describes the aggregate result:
+  * If at least one lot's status is 'complete', then `tender.status` should be 'complete', to indicate that there is at least one award.
+  * Otherwise, if at least one lot's status is 'unsuccessful', then `tender.status` should be 'unsuccessful', to indicate that the procedure was completed but unsuccessfully.
+  * Otherwise, If all lots' status are 'cancelled', then `tender.status` should be 'cancelled', to indicate that the procedure was discontinued as a whole.
 
 ## Examples
 
@@ -121,6 +121,7 @@ Although part of the same tender, the buyer is willing to award these different
         ],
         "title": "Architectural services",
         "description": "For architectural services delivered in the project",
+        "status": "active",
         "value": {
           "currency": "GBP",
           "amount": 200000
@@ -168,6 +169,7 @@ Although part of the same tender, the buyer is willing to award these different
         ],
         "title": "Civil engineering services",
         "description": "For civil engineering services delivered in the project",
+        "status": "active",
         "value": {
           "currency": "GBP",
           "amount": 400000
@@ -215,6 +217,7 @@ Although part of the same tender, the buyer is willing to award these different
         ],
         "title": "Structural engineering",
         "description": "For structural engineering consultancy delivered in the project",
+        "status": "active",
         "value": {
           "currency": "GBP",
           "amount": 600000
@@ -299,13 +302,6 @@ Report issues for this extension in the [ocds-extensions repository](https://git
 
 ## Changelog
 
-### v1.2
-
-* Add fields:
-  * `Lot.finalStatus`
-  * `Lot.finalStatusDetails`
-* Deprecate `Lot.status`
-
 ### Unreleased
 
 * Add fields:

release-schema.json

@@ -202,34 +202,6 @@
             "complete",
             "withdrawn",
             null
-          ],
-          "deprecated": {
-            "description": "This field is deprecated, because the same information can be provided by filling in the relevant date fields.",
-            "deprecatedVersion": "1.2"
-          }
-        },
-        "finalStatus": {
-          "title": "Final status",
-          "description": "The final status of the lot, using the closed [tenderFinalStatus](https://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-final-status) codelist.",
-          "type": [
-            "string",
-            "null"
-          ],
-          "codelist": "tenderFinalStatus.csv",
-          "openCodelist": false,
-          "enum": [
-            "complete",
-            "cancelled",
-            "unsuccessful",
-            null
-          ]
-        },
-        "finalStatusDetails": {
-          "title": "Final status details",
-          "description": "Additional details on the final status of the lot. This field can be used to provide the local name of the final status.",
-          "type": [
-            "string",
-            "null"
           ]
         },
         "value": {