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

Conversation

odscjen
Copy link
Contributor

@odscjen odscjen commented Nov 13, 2023

…ects and minutes.lobbyingMeeting code

Related issues

closes #412
closes #409

Description

I used the Address object for meeting.location rather than Location as a meeting is going to happen at an address not a geometry or gazetteer entry.

Merge checklist

If there are changes to project-schema.json or project-package-schema.json:

  • Update the examples:
    • docs/examples/example.json
    • docs/examples/blank.json
  • Run ./manage.py pre-commit to update docs/_static/i8n.csv

If you added a new definition to the schema, run ./manage.py pre-commit.

If you added a new codelist:

  • Add an entry to docs/reference/codelists.md

Copy link
Contributor

@duncandewhurst duncandewhurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest addressing the remainder of #409 in this PR too.

Please check and update the mapping and example for the related CoST IDS elements in sustainability.yaml

schema/project-level/project-schema.json Outdated Show resolved Hide resolved
docs/reference/changelog.md Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
@odscjen
Copy link
Contributor Author

odscjen commented Nov 14, 2023

I've added the rest of #409, I've held off on that as it meant creating the parent Social object and I was waiting until all the related issues for that were agreed but I suppose it does make sense to do it as part of this. Also sorry for all the commits, I updated Chrome to the latest version but they've not realised a ChromeDriver version for it yet so I can't run the build tests on my local machine.

Copy link
Contributor

@duncandewhurst duncandewhurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy for you to request a review from James once you've resolved my comments.

I also added a few commits to remove consultationMeetings.publicOfficial from example.json, to link the public consultation meetings element in the climate finance module to the public consultation meetings element in the social module, and to remove empty examples from sustainability.md. I can respond to any comments from James on those changes.

mapping/sustainability.yaml Outdated Show resolved Hide resolved
mapping/sustainability.yaml Outdated Show resolved Hide resolved
mapping/sustainability.yaml Outdated Show resolved Hide resolved
mapping/sustainability.yaml Outdated Show resolved Hide resolved
Co-authored-by: Duncan Dewhurst <duncan.dewhurst@opendataservices.coop>
@duncandewhurst
Copy link
Contributor

@jpmckinney if you could prioritise this PR review above the other OC4IDS PR reviews that would be great, as it contains some changes to make it possible to link to individual CoST IDS elements in sustainability.md, which it would be helpful to make use of in other PRs.

schema/project-level/project-schema.json Outdated Show resolved Hide resolved
manage.py Outdated Show resolved Hide resolved
schema/project-level/codelists/documentType.csv Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
@duncandewhurst duncandewhurst mentioned this pull request Nov 22, 2023
6 tasks
@odscjen
Copy link
Contributor Author

odscjen commented Nov 23, 2023

@jpmckinney all suggestions now applied, are you ok for this to be merged or do you need to check again?

Copy link
Member

@jpmckinney jpmckinney left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some very small edits, then can be merged.

manage.py Outdated Show resolved Hide resolved
docs/examples/blank.json Outdated Show resolved Hide resolved
schema/project-level/project-schema.json Outdated Show resolved Hide resolved
Co-authored-by: James McKinney <26463+jpmckinney@users.noreply.github.com>
@duncandewhurst
Copy link
Contributor

Given that there are a few other PRs that depend on this one, I've committed the suggestions and will merge it, just to speed things along :-)

@duncandewhurst duncandewhurst merged commit c9f2a37 into 0.9-dev Nov 24, 2023
10 checks passed
@duncandewhurst duncandewhurst deleted the 412_lobbying_transparency branch November 24, 2023 00:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants