diff --git a/docs/_static/i18n.csv b/docs/_static/i18n.csv index 05ba3e5f..f4a76053 100644 --- a/docs/_static/i18n.csv +++ b/docs/_static/i18n.csv @@ -370,20 +370,20 @@ 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/address,Address,False, +lobbyingMeetings/address,Address,False, +lobbyingMeetings/address/streetAddress,Street address,True, +lobbyingMeetings/address/locality,Locality,True, +lobbyingMeetings/address/region,Region,True, +lobbyingMeetings/address/postalCode,Postal code,True, +lobbyingMeetings/address/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/organization,Organization,False, +lobbyingMeetings/publicOfficial/organization,Organization reference,False, +lobbyingMeetings/publicOfficial/organization/name,Organization name,True, +lobbyingMeetings/publicOfficial/organization/id,Organization ID,True, lobbyingMeetings/publicOfficial/jobTitle,Job title,True, diff --git a/docs/examples/blank.json b/docs/examples/blank.json index aaa3a110..659e1772 100644 --- a/docs/examples/blank.json +++ b/docs/examples/blank.json @@ -431,11 +431,11 @@ "numberOfParticipants": "integer", "publicOfficial": { "person": { - "name": "string", - "organization": { - "id": "string", - "name": "string" - } + "name": "string" + }, + "organization": { + "id": "string", + "name": "string" }, "jobTitle": "string" } diff --git a/docs/examples/example.json b/docs/examples/example.json index c99264be..b8dd76cc 100644 --- a/docs/examples/example.json +++ b/docs/examples/example.json @@ -974,11 +974,11 @@ "numberOfParticipants": 4, "publicOfficial": { "person": { - "name": "Brett Gliddon", - "organization": { - "name": "Motorways UK", - "id": "GB-GOR-XX1234" - } + "name": "Brett Gliddon" + }, + "organization": { + "name": "Motorways UK", + "id": "GB-GOR-XX1234" }, "jobTitle": "Group General Manager Transport Services" } diff --git a/docs/reference/changelog.md b/docs/reference/changelog.md index 0ddd3c3d..a96852fc 100644 --- a/docs/reference/changelog.md +++ b/docs/reference/changelog.md @@ -28,10 +28,7 @@ * `.transactions` * `.milestones` * `ContractingProcesses.milestones` -* [#428](https://github.com/open-contracting/infrastructure/pull/428) - add objects: - * `Meeting` - * `lobbyingMeetings` - * `PublicOfficial` +* [#428](https://github.com/open-contracting/infrastructure/pull/428) - add `lobbyingMeetings` field. ### Codelists diff --git a/docs/reference/schema.md b/docs/reference/schema.md index 5b1baf93..54a9045a 100644 --- a/docs/reference/schema.md +++ b/docs/reference/schema.md @@ -489,7 +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) +* [`PublicOfficial/organization`](project-schema.json,/definitions/PublicOfficial,organization) Each `OrganizationReference` has the following fields: @@ -558,8 +558,8 @@ Each `OrganizationReference` has the following fields: ``` ```{jsoninclude} ../../docs/examples/example.json -:jsonpointer: /projects/0/lobbyingMeetings/0/publicOfficial/person/organization -:title: lobbyingMeetings/0/publicOfficial/person/organization +:jsonpointer: /projects/0/lobbyingMeetings/0/publicOfficial/organization +:title: lobbyingMeetings/0/publicOfficial/organization ``` ```` @@ -580,7 +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) +* [`Meeting/address`](project-schema.json,/definitions/Meeting,address) Each `Address` has the following fields: @@ -609,8 +609,8 @@ Each `Address` has the following fields: ``` ```{jsoninclude} ../../docs/examples/example.json -:jsonpointer: /projects/0/lobbyingMeetings/0/location -:title: lobbyingMeetings/0/location +:jsonpointer: /projects/0/lobbyingMeetings/0/address +:title: lobbyingMeetings/0/address ``` ```` @@ -1107,7 +1107,7 @@ Each `Meeting` has the following fields: ```{jsonschema} ../../build/current_lang/project-schema.json :pointer: /definitions/Meeting -:collapse: id,date,location,numberOfParticipants,publicOfficial +:collapse: id,date,address,numberOfParticipants,publicOfficial :addtargets: ``` @@ -1142,7 +1142,7 @@ Each `PublicOfficial` has the following fields: ```{jsonschema} ../../build/current_lang/project-schema.json :pointer: /definitions/PublicOfficial -:collapse: jobTitle +:collapse: organization,jobTitle :addtargets: ``` diff --git a/schema/project-level/project-schema.json b/schema/project-level/project-schema.json index 0954facd..233d2a99 100644 --- a/schema/project-level/project-schema.json +++ b/schema/project-level/project-schema.json @@ -2029,9 +2029,9 @@ ], "format": "date-time" }, - "location": { - "title": "Location", - "description": "The location of the meeting.", + "address": { + "title": "Address", + "description": "The address of the meeting.", "$ref": "#/definitions/Address" }, "numberOfParticipants": { @@ -2064,14 +2064,14 @@ "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" } } }, + "organization": { + "title": "Organization", + "description": "The organization in respect of which the person is a public official.", + "$ref": "#/definitions/OrganizationReference" + }, "jobTitle": { "title": "Job title", "description": "The job title of the person with respect to the organization.",