Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

project-schema.json: add lobbyingMeetings,Meetings,PublicOfficial obj… #428

Merged
merged 22 commits into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f187b85
project-schema.json: add lobbyingMeetings,Meetings,PublicOfficial obj…
odscjen Nov 13, 2023
6026cab
manage.py pre-commit
odscjen Nov 13, 2023
3fb8899
update examples/
odscjen Nov 13, 2023
7c0e55b
update changelog.md
odscjen Nov 13, 2023
1d7214b
fix build errors, change Meeting.location to ref Address
odscjen Nov 13, 2023
b14f927
fix example errors
odscjen Nov 13, 2023
47d03b2
apply review suggestions
odscjen Nov 14, 2023
9d35ec7
add social.consultationMeetings and update sustainability.yaml
odscjen Nov 14, 2023
02a752e
update examples
odscjen Nov 14, 2023
7afce35
fix typo
odscjen Nov 14, 2023
9d6158e
fix examples
odscjen Nov 14, 2023
f6657ab
Merge branch '0.9-dev' into 412_lobbying_transparency
duncandewhurst Nov 14, 2023
435d3d0
docs/examples/example.json: Remove consultationMeetings.publicOfficial
duncandewhurst Nov 14, 2023
118c5bf
mapping/sustainability.yaml: Link public consultation meetings
duncandewhurst Nov 14, 2023
029ba2b
docs/cost/ids/sustainability.md: Remove empty examples
duncandewhurst Nov 14, 2023
8ddf00d
Apply suggestions from code review
odscjen Nov 16, 2023
3afee97
Merge branch '0.9-dev' into 412_lobbying_transparency
odscjen Nov 21, 2023
a3b7f90
Update manage.py
duncandewhurst Nov 21, 2023
1f84cef
Apply suggestions from code review
odscjen Nov 23, 2023
6ecc6df
apply rest of review suggestions and remove duplications in sustainab…
odscjen Nov 23, 2023
afa9d8b
Merge branch '0.9-dev' into 412_lobbying_transparency
odscjen Nov 23, 2023
c6a70b9
Apply suggestions from code review
duncandewhurst Nov 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions docs/_static/i18n.csv
Original file line number Diff line number Diff line change
Expand Up @@ -366,3 +366,24 @@ completion/finalValueDetails,Final value details,True,
completion/finalScope,Final scope,True,
completion/finalScopeDetails,Final scope details,True,
language,Language,True,
lobbyingMeetings,Lobbying meetings,False,
lobbyingMeetings,Meeting,False,
lobbyingMeetings/id,ID,True,
lobbyingMeetings/date,Date,False,
lobbyingMeetings/location,Location,False,
lobbyingMeetings/location,Address,False,
lobbyingMeetings/location/streetAddress,Street address,True,
lobbyingMeetings/location/locality,Locality,True,
lobbyingMeetings/location/region,Region,True,
lobbyingMeetings/location/postalCode,Postal code,True,
lobbyingMeetings/location/countryName,Country name,True,
lobbyingMeetings/numberOfParticipants,Participant count,False,
lobbyingMeetings/publicOfficial,Public official,False,
lobbyingMeetings/publicOfficial,Public official,False,
lobbyingMeetings/publicOfficial/person,Person.,False,
lobbyingMeetings/publicOfficial/person/name,Name,True,
lobbyingMeetings/publicOfficial/person/organization,Organization,False,
lobbyingMeetings/publicOfficial/person/organization,Organization reference,False,
lobbyingMeetings/publicOfficial/person/organization/name,Organization name,True,
lobbyingMeetings/publicOfficial/person/organization/id,Organization ID,True,
lobbyingMeetings/publicOfficial/jobTitle,Job title,True,
26 changes: 25 additions & 1 deletion docs/examples/blank.json
Original file line number Diff line number Diff line change
Expand Up @@ -416,5 +416,29 @@
"finalValueDetails": "",
"finalScope": "",
"finalScopeDetails": ""
}
},
"lobbyingMeetings": [
{
"id": "string",
"location": {
"streetAddress": "string",
"locality": "string",
"region": "string",
"postalCode": "string",
"countryName": "string"
},
"date": "date-time",
"numberOfParticipants": "integer",
"publicOfficial": {
"person": {
"name": "string",
"organization": {
"id": "string",
"name": "string"
}
},
"jobTitle": "string"
}
}
]
}
26 changes: 25 additions & 1 deletion docs/examples/example.json
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,31 @@
"finalValueDetails": "Budget increase due to construction delay.",
"finalScope": "Upgrade of Junctions 4 and 5 and repairs to the watercourse at Junction 5.",
"finalScopeDetails": "Scope was expanded to include repairs to a watercourse damaged during construction excavation."
}
},
"lobbyingMeetings": [
{
"id": "1",
"date": "2024-01-01T00:00:00Z",
"location": {
"streetAddress": "1600 Amphitheatre Pkwy",
"locality": "London",
"region": "London",
"postalCode": "WC1 8HG",
"countryName": "United Kingdom"
},
"numberOfParticipants": 4,
"publicOfficial": {
"person": {
"name": "Brett Gliddon",
"organization": {
"name": "Motorways UK",
"id": "GB-GOR-XX1234"
}
},
"jobTitle": "Group General Manager Transport Services"
}
}
]
}
]
}
4 changes: 4 additions & 0 deletions docs/reference/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
* `.transactions`
* `.milestones`
* `ContractingProcesses.milestones`
* [#428](https://github.com/open-contracting/infrastructure/pull/428) - add objects:
* `Meeting`
* `lobbyingMeetings`
* `PublicOfficial`
odscjen marked this conversation as resolved.
Show resolved Hide resolved

### Codelists

Expand Down
82 changes: 82 additions & 0 deletions docs/reference/schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@ This sub-schema is referenced by the following properties:
* [`BudgetBreakdown/sourceParty`](project-schema.json,/definitions/BudgetBreakdown,sourceParty)
* [`Transaction/payer`](project-schema.json,/definitions/Transaction,payer)
* [`Transaction/payee`](project-schema.json,/definitions/Transaction,payee)
* [`PublicOfficial/person/organization`](project-schema.json,/definitions/PublicOfficial,person/organization)

Each `OrganizationReference` has the following fields:

Expand Down Expand Up @@ -556,6 +557,11 @@ Each `OrganizationReference` has the following fields:
:title: transactions/0/payee
```

```{jsoninclude} ../../docs/examples/example.json
:jsonpointer: /projects/0/lobbyingMeetings/0/publicOfficial/person/organization
:title: lobbyingMeetings/0/publicOfficial/person/organization
```

````

`````
Expand All @@ -574,6 +580,7 @@ When working with data, users ought to be aware that addresses might not always
This sub-schema is referenced by the following properties:
* [`Location/address`](project-schema.json,/definitions/Location,address)
* [`Organization/address`](project-schema.json,/definitions/Organization,address)
* [`Meeting/location`](project-schema.json,/definitions/Meeting,location)

Each `Address` has the following fields:

Expand Down Expand Up @@ -601,6 +608,11 @@ Each `Address` has the following fields:
:title: parties/0/address
```

```{jsoninclude} ../../docs/examples/example.json
:jsonpointer: /projects/0/lobbyingMeetings/0/location
:title: lobbyingMeetings/0/location
```

````

`````
Expand Down Expand Up @@ -1076,3 +1088,73 @@ Each `MilestoneReference` has the following fields:
````

`````

### Meeting

`Meeting` is defined as:

```{field-description} ../../build/current_lang/project-schema.json /definitions/Meeting
```

This sub-schema is referenced by the following properties:
* [`lobbyingMeetings`](project-schema.json,,lobbyingMeetings)

Each `Meeting` has the following fields:

`````{tab-set}

````{tab-item} Schema

```{jsonschema} ../../build/current_lang/project-schema.json
:pointer: /definitions/Meeting
:collapse: id,date,location,numberOfParticipants,publicOfficial
:addtargets:
```

````

````{tab-item} Examples

```{jsoninclude} ../../docs/examples/example.json
:jsonpointer: /projects/0/lobbyingMeetings
:title: lobbyingMeetings
```

````

`````

### PublicOfficial

`PublicOfficial` is defined as:

```{field-description} ../../build/current_lang/project-schema.json /definitions/PublicOfficial
```

This sub-schema is referenced by the following properties:
* [`Meeting/publicOfficial`](project-schema.json,/definitions/Meeting,publicOfficial)

Each `PublicOfficial` has the following fields:

`````{tab-set}

````{tab-item} Schema

```{jsonschema} ../../build/current_lang/project-schema.json
:pointer: /definitions/PublicOfficial
:collapse: jobTitle
:addtargets:
```

````

````{tab-item} Examples

```{jsoninclude} ../../docs/examples/example.json
:jsonpointer: /projects/0/lobbyingMeetings/0/publicOfficial
:title: lobbyingMeetings/0/publicOfficial
```

````

`````
1 change: 1 addition & 0 deletions schema/project-level/codelists/documentType.csv
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,4 @@ contractAmendment,Contract amendment,A legal document that changes or adds to th
designReport,Project design report,"A record of the justification for the design approach adopted in the project, typically issued before the works start, by the consultant or firm that will supervise the works.",OC4IDS
paymentCertificate,Payment certificate,A document certifying that the work specified on a supplier's estimate or invoice is complete and that payment to the supplier is approved.,OC4IDS
escalationApproval,Escalation approval,Documentation of one or more approved escalations of the contract price during the project life-cycle.,OC4IDS
minutes.lobbyingMeeting,Lobbying meeting minutes,"A record of the issues discussed, agreements reached and decisions taken at a lobbying meeting.",OC4IDS
80 changes: 80 additions & 0 deletions schema/project-level/project-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,16 @@
],
"default": "en",
"minLength": 1
},
"lobbyingMeetings": {
"title": "Lobbying meetings",
"description": "Information about lobbying meetings in relation to the project. That is, meetings with public officials that are made, managed or directed with the purpose of influencing public decision-making in relation to the project, whether for private, public or collective ends, whether for compensation or without. Public decision-making is the creation and amendment of legislation or any other regulatory measures; the development, modification and implementation of public policies, strategies and programmes; and the awarding of government contracts or grants, administrative decisions or any other public spending decisions.",
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"type": "array",
"items": {
"$ref": "#/definitions/Meeting"
},
"uniqueItems": true,
"minItems": 1
}
},
"definitions": {
Expand Down Expand Up @@ -1998,6 +2008,76 @@
}
},
"minProperties": 1
},
"Meeting": {
"title": "Meeting",
"description": "The details of a meeting.",
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"type": "object",
"properties": {
"id": {
"title": "ID",
"description": "A locally unique identifier for the meeting.",
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"type": [
"string"
]
},
"date": {
"title": "Date",
"description": "The date of the meeting.",
"type": [
"string"
],
"format": "date-time"
},
"location": {
"title": "Location",
"description": "The location of the meeting.",
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"$ref": "#/definitions/Address"
},
"numberOfParticipants": {
"title": "Participant count",
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"description": "The number of people in attendance at the meeting.",
"type": "integer"
},
"publicOfficial": {
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"title": "Public official",
"description": "A position held by a person (or advisor to a person) with decision-making powers, who is elected, appointed or employed within the executive or legislative branches of power at national, sub-national, or supra-national levels; within private bodies performing public functions; and within public international organizations domiciled or operational in the country concerned.",
"$ref": "#/definitions/PublicOfficial"
}
},
"required": [
"id"
],
"minProperties": 1
},
"PublicOfficial": {
"title": "Public official",
"description": "A position held by a person (or advisor to a person) with decision-making powers, who is elected, appointed or employed within the executive or legislative branches of power at national, sub-national, or supra-national levels; within private bodies performing public functions; and within public international organizations domiciled or operational in the country concerned.",
"type": "object",
"properties": {
"person": {
"title": "Person.",
duncandewhurst marked this conversation as resolved.
Show resolved Hide resolved
"description": "The person.",
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"type": "object",
"properties": {
"name": {
"title": "Name",
"description": "The full name of the person.",
"type": "string"
},
"organization": {
"title": "Organization",
"description": "The organization in respect of which the person is a public official.",
"$ref": "#/definitions/OrganizationReference"
odscjen marked this conversation as resolved.
Show resolved Hide resolved
}
}
},
"jobTitle": {
"title": "Job title",
"description": "The job title of the person with respect to the organization.",
odscjen marked this conversation as resolved.
Show resolved Hide resolved
"type": "string"
}
}
}
},
"minProperties": 1
Expand Down