Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: odscjen <[email protected]>
  • Loading branch information
duncandewhurst and odscjen authored Nov 23, 2023
1 parent 76e8e3f commit 34ec0e3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions schema/project-level/codelists/costCategory.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Code,Title,Description
acquisition,Acquisition costs,"All payments or considerations required to acquire/lease/purchase the land, property or existing asset, and all other expenses associated with the acquisition, excluding physical construction."
construction,Construction costs,"Expenditures incurred as a direct result of construction including labour, materials, plant, equipment, site and head office overheads and profits as well as taxes and levies. They are the total price payable for all permanent and temporary works normally included in construction contracts, including goods or materials supplied by the public authority for the supplier to install."
construction,Construction costs,"Expenditures incurred as a direct result of construction including labor, materials, plant, equipment, site and head office overheads and profits as well as taxes and levies. They are the total price payable for all permanent and temporary works normally included in construction contracts, including goods or materials supplied by the public authority for the supplier to install."
renewal,Renewal costs,"The costs of replacing an asset and/or major components once they reach the end of their life, and which the public authority decides are to be included in the capital rather than the revenue budget."
operation,Operation costs,"Costs incurred in running and managing an asset during occupation, including administrative support services, rent, insurances, energy and other environmental/regulatory inspection costs, taxes and charges."
maintenance,Maintenance costs,"The total cost of labour, material and other related costs to retain an asset or its parts so that it can perform its required functions (ISO 15686-5. Maintenance includes conducting corrective, responsive and preventative maintenance on an asset or its parts and all associated management, cleaning, services, repainting, repairing or replacing of parts as needed for the asset to be used for its intended purpose. It does not include renewal costs."
maintenance,Maintenance costs,"The total cost of labor, material and other related costs to retain an asset or its parts so that it can perform its required functions (ISO 15686-5. Maintenance includes conducting corrective, responsive and preventative maintenance on an asset or its parts and all associated management, cleaning, services, repainting, repairing or replacing of parts as needed for the asset to be used for its intended purpose. It does not include renewal costs."
endOfLife,End-of-life costs,"The net costs or fees for disposing of an asset at the end of its service life after deducting the salvage value and other income due to disposal, including costs resulting from disposal inspection, decommissioning and decontamination, demolition and reclamation, reinstatement, asset transfer obligations, recycling, recovery, disposal of components and materials, and transport and regulatory costs."
24 changes: 12 additions & 12 deletions schema/project-level/project-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
},
"budget": {
"title": "Total project value",
"description": "Specify the allocated budget for the infrastructure project (currency and amount). This cost should include land and property acquisition, environmental mitigation measures, health and safety provisions, client, consultant and contractor costs, as well as applicable taxes. Where this value includes costs incurred directly by the project owner or other agencies, which are not subject to procurement, then this value is likely to be higher than the sum of all the linked contracting processes. To indicate the profile of a budget over time, or the budget coming from different sources, the extended budgetBreakdown section may be used.",
"description": "Specify the allocated budget for the infrastructure project (currency and amount). This cost should include land and property acquisition, environmental mitigation measures, health and safety provisions, client, consultant and supplier costs, as well as applicable taxes. Where this value includes costs incurred directly by the project owner or other agencies, which are not subject to procurement, then this value is likely to be higher than the sum of all the linked contracting processes. To indicate the profile of a budget over time, or the budget coming from different sources, the extended budgetBreakdown section may be used.",
"type": "object",
"properties": {
"description": {
Expand Down Expand Up @@ -172,7 +172,7 @@
},
"costMeasurements": {
"title": "Cost measurements",
"description": "Information about cost measurements for this project.",
"description": "Information about cost measurements for the project.",
"type": "array",
"items": {
"$ref": "#/definitions/CostMeasurement"
Expand Down Expand Up @@ -2354,19 +2354,19 @@
"properties": {
"id": {
"title": "Local identifier",
"description": "A local identifier for this cost measurement.",
"description": "A local identifier for the cost measurement.",
"type": "string",
"minLength": 1
},
"date": {
"title": "Date",
"description": "The date on which this cost measurement was reported.",
"description": "The date on which the cost measurement was reported.",
"type": "string",
"format": "date-time"
},
"lifeCycleCosting": {
"title": "Life-cycle costing",
"description": "Information about life-cycle costing for this cost measurement.",
"description": "Information about life-cycle costing for the cost measurement.",
"type": "object",
"properties": {
"value": {
Expand All @@ -2379,7 +2379,7 @@
},
"costGroups": {
"title": "Cost groups",
"description": "The cost groups included in this cost measurement.",
"description": "The cost groups included in the cost measurement.",
"type": "array",
"items": {
"$ref": "#/definitions/CostGroup"
Expand All @@ -2400,21 +2400,21 @@
"properties": {
"id": {
"title": "Local identifier",
"description": "A local identifier for this cost group.",
"description": "A local identifier for the cost group.",
"type": "string",
"minLength": 1
},
"category": {
"title": "Category",
"description": "The category of costs included in this cost group, from the open [costCategory](https://standard.open-contracting.org/infrastructure/{{version}}/{{lang}}/reference/codelists/#costcategory) codelist.",
"description": "The category of costs included in the cost group, using the open [costCategory](https://standard.open-contracting.org/infrastructure/{{version}}/{{lang}}/reference/codelists/#costcategory) codelist.",
"type": "string",
"codelist": "costCategory.csv",
"openCodelist": true,
"minLength": 1
},
"costs": {
"title": "Costs",
"description": "The costs included in this cost group.",
"description": "The costs included in the cost group.",
"type": "array",
"items": {
"$ref": "#/definitions/Cost"
Expand All @@ -2435,18 +2435,18 @@
"properties": {
"id": {
"title": "Local Identifier",
"description": "A local identifier for this cost.",
"description": "A local identifier for the cost.",
"type": "string",
"minLength": 1
},
"classification": {
"title": "Classification",
"description": "A classification of this cost.",
"description": "A classification of the cost.",
"$ref": "#/definitions/Classification"
},
"value": {
"title": "Value",
"description": "The monetary value of this cost.",
"description": "The monetary value of the cost.",
"$ref": "#/definitions/Value"
}
},
Expand Down

0 comments on commit 34ec0e3

Please sign in to comment.