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

add .summary.social and laborObligations codelist #433

Merged
merged 12 commits into from
Nov 28, 2023

Conversation

odscjen
Copy link
Contributor

@odscjen odscjen commented Nov 16, 2023

Related issues
closes #404
closes #406

Description

altered the descriptions in the laborObligations codelist to use non-normative language as suggested in the issue.

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.

'will' isn't a normative keyword so I suggested reverting most of the changes to the code descriptions to reinstate it because the 'needs to' alternatives didn't read as well. If I understood it correctly, #404 (comment), was only about changing instances of 'must', 'shall' etc. and pointing out that most code descriptions already used 'will'.

Please update the mapping for labor obligations to add a link to the codelist and to reference the common operation for adding a contracting process document.

schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
schema/project-level/codelists/laborObligations.csv Outdated Show resolved Hide resolved
mapping/sustainability.yaml Outdated Show resolved Hide resolved
@odscjen
Copy link
Contributor Author

odscjen commented Nov 21, 2023

ah, I'd read it as saying that "will" should be removed, I've reverted them all back as suggested.

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 my comments are 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
@jpmckinney
Copy link
Member

Please re-request review from me after Duncan's review is resolved.

@odscjen odscjen requested review from jpmckinney and removed request for jpmckinney November 23, 2023 11:54
@jpmckinney jpmckinney merged commit 1e0e615 into 0.9-dev Nov 28, 2023
9 of 10 checks passed
@jpmckinney jpmckinney deleted the 404_social_contractingProcesses branch November 28, 2023 20:38
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