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.

Sign up for GitHub

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

Consistent indentation of 2 spaces everywhere #344

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Consistent indentation of 2 spaces everywhere #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
789e355
Consistent indentation of 2 spaces everywhere
Bjwebb Dec 14, 2022
296f710
Merge branch 'master' into consistent-indentation
mrshll1001 Jun 12, 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
188 changes: 100 additions & 88 deletions schema/360-giving-package-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,104 +1,116 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema for a 360Giving Data Grant Package",
"type": "object",
"required": ["grants"],
"properties": {
"grants": {
"title": "Grants",
"type": "array",
"minItems": 1,
"items": { "$ref": "https://raw.githubusercontent.com/ThreeSixtyGiving/standard/master/schema/360-giving-schema.json" },
"uniqueItems": true
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Schema for a 360Giving Data Grant Package",
"type": "object",
"required": [
"grants"
],
"properties": {
"grants": {
"title": "Grants",
"type": "array",
"minItems": 1,
"items": {
"$ref": "https://raw.githubusercontent.com/ThreeSixtyGiving/standard/master/schema/360-giving-schema.json"
},
"uniqueItems": true
},
"version": {
"title": "Version",
"description": "The version of the 360Giving schema used in this package, expressed as major.minor For example: 1.1",
"type": "string",
"pattern": "^(\\d+\\.)(\\d+)$"
},
"title": {
"title": "Title",
"description": "The title of the 360Giving data package. Should be a human readable version of information contained in the filename of the data and should be unique ",
"type": "string"
},
"description": {
"title": "Description",
"description": "Full description of the information contained in the 360Giving data package.",
"type": "string"
},
"issued": {
"title": "Issued",
"description": "The date that this data package was issued. The date must be written as YYYY-MM-DD, or in full date-time format",
"type": "string",
"oneOf": [
{
"format": "date-time"
},
"version": {
"title": "Version",
"description": "The version of the 360Giving schema used in this package, expressed as major.minor For example: 1.1",
"type": "string",
"pattern": "^(\\d+\\.)(\\d+)$"
},
"title": {
"title": "Title",
"description": "The title of the 360Giving data package. Should be a human readable version of information contained in the filename of the data and should be unique ",
"type": "string"
},
"description": {
"title": "Description",
"description": "Full description of the information contained in the 360Giving data package.",
"type": "string"
},
"issued": {
"title": "Issued",
"description": "The date that this data package was issued. The date must be written as YYYY-MM-DD, or in full date-time format",
"type": "string",
"oneOf": [
{"format": "date-time"},
{"pattern":"^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$"}
]
},
"modified": {
"title": "Modified",
"description": "The date that this data package was last modified. A full date-time format must be used.",
"type": "string",
"oneOf": [
{"format": "date-time"},
{"pattern":"^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$"}
]
{
"pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$"
}
]
},
"modified": {
"title": "Modified",
"description": "The date that this data package was last modified. A full date-time format must be used.",
"type": "string",
"oneOf": [
{
"format": "date-time"
},
{
"pattern": "^[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$"
}
]
},
"identifier": {
"title": "Identifier",
"description": "A unique identifier for this data package. This should be unique for a particular publisher.",
"type": "string"
},
"publisher": {
"title": "Publisher",
"description": "Information to uniquely identify the publisher of this package.",
"type": "object",
"required": [
"name"
],
"properties": {
"identifier": {
"title": "Identifier",
"description": "A unique identifier for this data package. This should be unique for a particular publisher.",
"description": "The organisation identifier as described by [Organisation Identifier Standard](https://standard.threesixtygiving.org/en/latest/technical/identifiers/#organisation-identifier)",
"type": "string"
},
"publisher": {
"title": "Publisher",
"description": "Information to uniquely identify the publisher of this package.",
"type": "object",
"required": [
"name"
],
"properties": {
"identifier": {
"title": "Identifier",
"description": "The organisation identifier as described by [Organisation Identifier Standard](https://standard.threesixtygiving.org/en/latest/technical/identifiers/#organisation-identifier)",
"type": "string"
},
"name": {
"title": "Name",
"description": "The name of the entity responsible for publishing this data.",
"type": "string"
},
"website": {
"title": "Website",
"description": "URL of the website of the publishing entity.",
"type": "string",
"format": "uri"
},
"logo": {
"title": "Logo",
"description": "URL of the logo of the publishing entity.",
"type": "string",
"format": "uri"
}
}
},
"downloadURL": {
"title": "Download URL",
"description": "URL of where this data package can be downloaded.",
"type": "string",
"format": "uri"
"name": {
"title": "Name",
"description": "The name of the entity responsible for publishing this data.",
"type": "string"
},
"accessURL": {
"title": "Access URL",
"description": "URL of the website where this data package can be found.",
"website": {
"title": "Website",
"description": "URL of the website of the publishing entity.",
"type": "string",
"format": "uri"
},
"license": {
"title": "License",
"description": "A link to the license that applies to the data in this package. A Public Domain Dedication or [Open Definition Conformant](http://opendefinition.org/licenses/) license is strongly recommended. The canonical URI of the license should be used. Documents linked from this file may be under other license conditions.",
"logo": {
"title": "Logo",
"description": "URL of the logo of the publishing entity.",
"type": "string",
"format": "uri"
}
}
},
"downloadURL": {
"title": "Download URL",
"description": "URL of where this data package can be downloaded.",
"type": "string",
"format": "uri"
},
"accessURL": {
"title": "Access URL",
"description": "URL of the website where this data package can be found.",
"type": "string",
"format": "uri"
},
"license": {
"title": "License",
"description": "A link to the license that applies to the data in this package. A Public Domain Dedication or [Open Definition Conformant](http://opendefinition.org/licenses/) license is strongly recommended. The canonical URI of the license should be used. Documents linked from this file may be under other license conditions.",
"type": "string",
"format": "uri"
}
}
}
68 changes: 34 additions & 34 deletions schema/360-giving-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,19 +888,19 @@
"type": "object",
"required": [
"id",
"name"
"name"
],
"properties": {
"id": {
"type": "string",
"description": "A unique identifier which identifies the person in the dataset",
"title": "Identifier"
},
"name": {
"type": "string",
"description": "The Person's full name or a generic name such as \"Individual Recipient\" ",
"title": "Name"
}
"type": "string",
"description": "A unique identifier which identifies the person in the dataset",
"title": "Identifier"
},
"name": {
"type": "string",
"description": "The Person's full name or a generic name such as \"Individual Recipient\" ",
"title": "Name"
}
}
},
"Organization": {
Expand Down Expand Up @@ -1108,7 +1108,7 @@
"id",
"title",
"description",
"currency",
"currency",
"amountAwarded",
"awardDate",
"recipientOrganization",
Expand Down Expand Up @@ -1222,29 +1222,29 @@
"title": "To Individuals Details",
"properties": {
"primaryGrantReason": {
"type": "string",
"title": "Primary Grant Reason",
"description": "A code referring to the reason(s) for a grant to an individual. The value for this field should be drawn from the Grant to Individuals Reason codelist",
"codelist": "grantToIndividualsReason.csv",
"openCodelist": false
},
"secondaryGrantReason": {
"type": "string",
"title": "Secondary Grant Reason",
"description": "A code referring to the reason(s) for a grant to an individual. The value for this field should be drawn from the Grant to Individuals Reason codelist",
"codelist": "grantToIndividualsReason.csv",
"openCodelist": false
},
"grantPurpose": {
"type": "array",
"title": "Grant Purpose",
"description": "A code referring to the purpose(s) for a grant to an individual. The value(s) for this field should be drawn from the Grant to Individuals Purpose codelist",
"items": {
"type": "string",
"codelist": "grantToIndividualsPurpose.csv",
"openCodelist": false
}
}
"type": "string",
"title": "Primary Grant Reason",
"description": "A code referring to the reason(s) for a grant to an individual. The value for this field should be drawn from the Grant to Individuals Reason codelist",
"codelist": "grantToIndividualsReason.csv",
"openCodelist": false
},
"secondaryGrantReason": {
"type": "string",
"title": "Secondary Grant Reason",
"description": "A code referring to the reason(s) for a grant to an individual. The value for this field should be drawn from the Grant to Individuals Reason codelist",
"codelist": "grantToIndividualsReason.csv",
"openCodelist": false
},
"grantPurpose": {
"type": "array",
"title": "Grant Purpose",
"description": "A code referring to the purpose(s) for a grant to an individual. The value(s) for this field should be drawn from the Grant to Individuals Purpose codelist",
"items": {
"type": "string",
"codelist": "grantToIndividualsPurpose.csv",
"openCodelist": false
}
}
}
},
"recipientOrganization": {
Expand Down