fix(catalogue): dcat semantics (#4509)

* remove dcat:contactPoint from contact email
* edit foaf:Agent for Organisations
* edit Resources and Catalogues semantics
* Update semantics Organisations.csv
* dct to dcterms
* add annotations for HRICore2.0/HealthDCAT-AP

data/_models/shared/Catalogues.csv

@@ -1,7 +1,7 @@
 tableName,tableExtends,columnName,columnType,key,required,refSchema,refTable,refLink,refBack,validation,semantics,description,profiles,visible,computed
 Catalogues,,,,,,,,,,,dcat:Catalog,A collection of resources within a network or consortium or about a common topic,DataCatalogueFlat,,
-Catalogues,,name,,1,true,,,,,,dct:title,The name given to the catalogue,DataCatalogueFlat,,
-Catalogues,,network,ref,1,true,,Resources,,,,,Network or consortium that publishes this catalogue,DataCatalogueFlat,,
-Catalogues,,type,ontology,,true,CatalogueOntologies,CatalogueTypes,,,,dcat:theme,Type of catalogue,DataCatalogueFlat,,
-Catalogues,,description,text,,true,,,,,,dct:description,Description of this catalogue,DataCatalogueFlat,,"network?.description"
-Catalogues,,publisher,,,,,,,,,dct:publisher,The organisation responsible for making the catalogue available,DataCatalogueFlat,,
+Catalogues,,name,,1,TRUE,,,,,,dcterms:title,The name given to the catalogue,DataCatalogueFlat,,
+Catalogues,,network,ref,1,TRUE,,Resources,,,,,Network or consortium that publishes this catalogue,DataCatalogueFlat,,
+Catalogues,,type,ontology,,TRUE,CatalogueOntologies,CatalogueTypes,,,,,Type of catalogue,DataCatalogueFlat,,
+Catalogues,,description,text,,TRUE,,,,,,dcterms:description,Description of this catalogue,DataCatalogueFlat,,network?.description
+Catalogues,,publisher,,,,,,,,,dcterms:publisher,The organisation responsible for making the catalogue available,DataCatalogueFlat,,

data/_models/shared/Contacts.csv

@@ -5,7 +5,7 @@ Contacts,,role,ontology_array,,,CatalogueOntologies,Contribution types,,,,vcard:
 Contacts,,role description,text,,,,,,,,,Description of the role,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCUCohorts,INTEGRATE",,
 Contacts,,first name,,1,TRUE,,,,,,foaf:firstName,First name of the contact person,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",,
 Contacts,,last name,,1,TRUE,,,,,,foaf:familyName,Last name of the contact person,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",,
-Contacts,,display name,,,TRUE,,,,,,"foaf:name,vcard:hasName",Display name of the contact person,DataCatalogueFlat,FALSE,firstName+' '+lastName
+Contacts,,display name,,,TRUE,,,,,,"foaf:name,vcard:hasName,vcard:fn",Display name of the contact person,DataCatalogueFlat,FALSE,firstName+' '+lastName
 Contacts,,statement of consent personal data,bool,,TRUE,,,,,,,"Indicate whether this person consents to display the following personal data in the catalogue (which is openly accessible): title, name, photo, orcid ID, institute, department, expertise, discipline and role within the resource. These data-items may partly be extracted from the UMCG and/or RUG employee pages. The consent also includes future linkages with other national and international catalogues and platforms to increase visibility and findability (e.g. BBMRI-ERIC, NARCIS) of UMCG-resources. Contributors without a positive statement of consent will not be shown in the UMCG Research Data Catalogue",UMCGCohortsStaging,,
 Contacts,,prefix,,,,,,,,,,"Surname prefix, if applicable","DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",,
 Contacts,,initials,,,,,,,,,,Initials of the contact person,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",,
@@ -14,6 +14,6 @@ Contacts,,organisation,ref,,,,Organisations,resource,,,foaf:Organization,Affilia
 Contacts,,email,,,,,,,,,"vcard:hasEmail,foaf:mbox",Contact's email address,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",,
 Contacts,,statement of consent email,bool,,TRUE,,,,,,,"Indicate whether this person consents to display their email address in the catalogue (which is openly accessible). The consent also includes future linkages with other national and international catalogues and platforms to increase visibility and findability (e.g. BBMRI-ERIC, NARCIS) of UMCG-resources. Contributors without a positive statement of consent for their email address will be shown without their email address in the UMCG Research Data Catalogue",UMCGCohortsStaging,,
 Contacts,,orcid,,,,,,,,,,Orcid of the contact person,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",,
-Contacts,,homepage,,,,,,,,,foaf:workplaceHomepage,Link to contact's homepage,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging",,
+Contacts,,homepage,,,,,,,,,"foaf:workplaceHomepage,vcard:hasURL",Link to contact's homepage,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,INTEGRATE",,
 Contacts,,photo,file,,,,,,,,foaf:img,Contact's photograph,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging",,
 Contacts,,expertise,,,,,,,,,,Description of contact's expertise,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,INTEGRATE",,

data/_models/shared/Organisations.csv

@@ -1,12 +1,12 @@
 tableName,tableExtends,columnName,columnType,key,required,refSchema,refTable,refLink,refBack,validation,semantics,description,profiles,visible
-Organisations,,,,,,,,,,,"org:Organization,foaf:Agent",Research departments and research groups. Null values will be generated from RoR,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
-Organisations,,resource,ref,1,TRUE,,Resources,,,,dcterms:isPartOf,Resource that this organisation is part of,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
-Organisations,,id,,1,TRUE,,,,,,dcterms:identifier,Internal identifier,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
-Organisations,,pid,hyperlink,,,,,,,,dcterms:identifier,"Persistent identifier, ideally from ROR","DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
-Organisations,,name,text,,TRUE,,,,,,"dcterms:title,foaf:name",Name used in (inter)national projects,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
-Organisations,,acronym,,,,,,,,,dcterms:identifier,"Acronym, if applicable","DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,,,,,,,,,,"foaf:Agent,org:Organization",Research departments and research groups. Null values will be generated from RoR,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,resource,ref,1,TRUE,,Resources,,,,,Resource that this organisation is part of,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,id,,1,TRUE,,,,,,"dcterms:identifier,org:identifier",Internal identifier,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,pid,hyperlink,,,,,,,,"dcterms:identifier,org:identifier","Persistent identifier, ideally from ROR","DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,name,text,,TRUE,,,,,,"foaf:name,skos:prefLabel",Name used in (inter)national projects,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,acronym,,,,,,,,,skos:altLabel,"Acronym, if applicable","DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
 Organisations,,logo,file,,,,,,,,,Logo of the organisation,"DataCatalogueFlat,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,INTEGRATE",
-Organisations,,country,ontology_array,,,CatalogueOntologies,Countries,,,,vcard:country-name,Country in which the institution head office or coordinating centre is located,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
-Organisations,,website,hyperlink,,,,,,,,dcat:landingPage,Link to the website or homepage,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
-Organisations,,role,ontology_array,,,CatalogueOntologies,Organisation roles,,,,vcard:hasRole,Type(s) of contribution or role in the resource,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,country,ontology_array,,,CatalogueOntologies,Countries,,,,dcterms:spatial,Country in which the institution head office or coordinating centre is located,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,website,hyperlink,,,,,,,,foaf:homepage,Link to the website or homepage,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
+Organisations,,role,ontology_array,,,CatalogueOntologies,Organisation roles,,,,dcterms:type,Type(s) of contribution or role in the resource,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",
 Organisations,,is lead organisation,bool,,,,,,,,,Whether the organisation is the lead organisation of this resource,"DataCatalogueFlat,EMA,CohortsStaging,RWEStaging,NetworksStaging,StudiesStaging,UMCGCohortsStaging,UMCUCohorts,INTEGRATE",