Skip to content

Commit

Permalink
some problems fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@calmacx
calmacx committed Dec 6, 2023
1 parent f3cdf9f commit 816e33d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 158 deletions.
119 changes: 0 additions & 119 deletions hdr_schemata/models/HDRUK/2.1.2/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,125 +1217,6 @@
"default": null,
"description": "Please indicate if the organisation is an Alliance Member or a Hub.",
"title": "Organisation Membership"
},
"accessRights": {
"anyOf": [
{
"$ref": "#/$defs/Url"
},
{
"items": {
"anyOf": [
{
"$ref": "#/$defs/Url"
},
{
"type": "null"
}
]
},
"type": "array"
},
{
"type": "null"
}
],
"default": null,
"description": "The URL of a webpage where the data access request process and/or guidance is provided. If there is more than one access process i.e. industry vs academic please provide both.",
"title": "Organisation Default Access Rights"
},
"deliveryLeadTime": {
"anyOf": [
{
"$ref": "#/$defs/DeliveryLeadTime"
},
{
"type": "null"
}
],
"default": null,
"description": "Please provide an indication of the typical processing times based on the types of requests typically received. Note: This value will be used as default access request duration for all datasets submitted by the organisation. However, there will be the opportunity to overwrite this value for each dataset.",
"title": "Access Request Duration"
},
"accessService": {
"anyOf": [
{
"$ref": "#/$defs/LongDescription"
},
{
"type": "null"
}
],
"default": null,
"description": "Please provide a brief description of the data access services that are available including: environment that is currently available to researchers;additional consultancy and services;any indication of costs associated. If no environment is currently available, please indicate the current plans and timelines when and how data will be made available to researchers Note: This value will be used as default access environment for all datasets submitted by the organisation. However, there will be the opportunity to overwrite this value for each dataset.",
"examples": [
"https://cnfl.extge.co.uk/display/GERE/Research+Environment+User+Guide"
],
"title": "Organisation Access Service"
},
"accessRequestCost": {
"anyOf": [
{
"$ref": "#/$defs/ShortDescription"
},
{
"items": {
"anyOf": [
{
"$ref": "#/$defs/Url"
},
{
"type": "null"
}
]
},
"type": "array"
},
{
"type": "null"
}
],
"default": null,
"description": "Please provide link(s) to a webpage or a short description detailing the commercial model for processing data access requests for the organisation (if available) Definition: Indication of commercial model or cost (in GBP) for processing each data access request by the data custodian.",
"title": "Organisation Access Request Cost"
},
"dataUseLimitation": {
"anyOf": [
{
"$ref": "#/$defs/CommaSeparatedValues"
},
{
"items": {
"$ref": "#/$defs/DataUseLimitation"
},
"type": "array"
},
{
"type": "null"
}
],
"default": null,
"description": "Please provide an indication of consent permissions for datasets and/or materials, and relates to the purposes for which datasets and/or material might be removed, stored or used. Notes: where there are existing data-sharing arrangements such as the HDR UK HUB data sharing agreement or the NIHR HIC data sharing agreement this should be indicated within access rights. This value will be used as terms for all datasets submitted by the organisation. However, there will be the opportunity to overwrite this value for each dataset.",
"title": "Data Use Limitation"
},
"dataUseRequirements": {
"anyOf": [
{
"$ref": "#/$defs/CommaSeparatedValues"
},
{
"items": {
"$ref": "#/$defs/DataUseRequirements"
},
"type": "array"
},
{
"type": "null"
}
],
"default": null,
"description": "Please indicate fit here are any additional conditions set for use if any, multiple requirements may be provided. Please ensure that these restrictions are documented in access rights information.",
"title": "Data Use Requirements"
}
},
"required": [
Expand Down
39 changes: 0 additions & 39 deletions hdr_schemata/models/HDRUK/base/Organisation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,42 +32,3 @@ class Organisation(BaseModel):
description='Please indicate if the organisation is an Alliance Member or a Hub.',
title='Organisation Membership',
)
accessRights: Optional[Union[Optional[Url], List[Optional[Url]]]] = Field(
None,
description='The URL of a webpage where the data access request process and/or guidance is provided. If there is more than one access process i.e. industry vs academic please provide both.',
title='Organisation Default Access Rights',
)
deliveryLeadTime: Optional[DeliveryLeadTime] = Field(
None,
description='Please provide an indication of the typical processing times based on the types of requests typically received. Note: This value will be used as default access request duration for all datasets submitted by the organisation. However, there will be the opportunity to overwrite this value for each dataset.',
title='Access Request Duration',
)
accessService: Optional[LongDescription] = Field(
None,
description='Please provide a brief description of the data access services that are available including: environment that is currently available to researchers;additional consultancy and services;any indication of costs associated. If no environment is currently available, please indicate the current plans and timelines when and how data will be made available to researchers Note: This value will be used as default access environment for all datasets submitted by the organisation. However, there will be the opportunity to overwrite this value for each dataset.',
examples=[
'https://cnfl.extge.co.uk/display/GERE/Research+Environment+User+Guide'
],
title='Organisation Access Service',
)
accessRequestCost: Optional[
Union[Optional[ShortDescription], List[Optional[Url]]]
] = Field(
None,
description='Please provide link(s) to a webpage or a short description detailing the commercial model for processing data access requests for the organisation (if available) Definition: Indication of commercial model or cost (in GBP) for processing each data access request by the data custodian.',
title='Organisation Access Request Cost',
)
dataUseLimitation: Optional[
Union[Optional[CommaSeparatedValues], List[DataUseLimitation]]
] = Field(
None,
description='Please provide an indication of consent permissions for datasets and/or materials, and relates to the purposes for which datasets and/or material might be removed, stored or used. Notes: where there are existing data-sharing arrangements such as the HDR UK HUB data sharing agreement or the NIHR HIC data sharing agreement this should be indicated within access rights. This value will be used as terms for all datasets submitted by the organisation. However, there will be the opportunity to overwrite this value for each dataset.',
title='Data Use Limitation',
)
dataUseRequirements: Optional[
Union[Optional[CommaSeparatedValues], List[DataUseRequirements]]
] = Field(
None,
description='Please indicate fit here are any additional conditions set for use if any, multiple requirements may be provided. Please ensure that these restrictions are documented in access rights information.',
title='Data Use Requirements',
)

0 comments on commit 816e33d

Please sign in to comment.