Skip to content
Snippets Groups Projects
Commit b336d7cd authored by DiStXs's avatar DiStXs
Browse files

Merge branch 'develop'

parents 7982f65f 1a0ea40d
No related branches found
No related tags found
No related merge requests found
No preview for this file type
{
"format": 1,
"restore": {
"C:\\Dev\\Biomaterial\\Biomaterial.csproj": {}
"C:\\Git\\Biomaterial\\sources\\Biomaterial\\Biomaterial.csproj": {}
},
"projects": {
"C:\\Dev\\Biomaterial\\Biomaterial.csproj": {
"C:\\Git\\Biomaterial\\sources\\Biomaterial\\Biomaterial.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Dev\\Biomaterial\\Biomaterial.csproj",
"projectUniqueName": "C:\\Git\\Biomaterial\\sources\\Biomaterial\\Biomaterial.csproj",
"projectName": "Biomaterial",
"projectPath": "C:\\Dev\\Biomaterial\\Biomaterial.csproj",
"projectPath": "C:\\Git\\Biomaterial\\sources\\Biomaterial\\Biomaterial.csproj",
"packagesPath": "C:\\Users\\dicks\\.nuget\\packages\\",
"outputPath": "C:\\Dev\\Biomaterial\\obj\\",
"outputPath": "C:\\Git\\Biomaterial\\sources\\Biomaterial\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
......
No preview for this file type
No preview for this file type
......@@ -14,11 +14,11 @@
"project": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Dev\\Biomaterial\\Biomaterial.csproj",
"projectUniqueName": "C:\\Git\\Biomaterial\\sources\\Biomaterial\\Biomaterial.csproj",
"projectName": "Biomaterial",
"projectPath": "C:\\Dev\\Biomaterial\\Biomaterial.csproj",
"projectPath": "C:\\Git\\Biomaterial\\sources\\Biomaterial\\Biomaterial.csproj",
"packagesPath": "C:\\Users\\dicks\\.nuget\\packages\\",
"outputPath": "C:\\Dev\\Biomaterial\\obj\\",
"outputPath": "C:\\Git\\Biomaterial\\sources\\Biomaterial\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
......
{
"version": 2,
"dgSpecHash": "tf883UGzkxFOr2M2sBlDBXYCPnaF10vV+0Lc9wQjUOWPmwSSXLtw0/G94KawI822lO8iB1s7FfSpkz6p+fNZCw==",
"dgSpecHash": "1pCfp7HQMITq4tIOUMRCxV9vAgtvggg8NBHzRo4AOybckg4+43DLWN/IobVQRv4AIl5817QevUq3inIHEXioPw==",
"success": true,
"projectFilePath": "C:\\Dev\\Biomaterial\\Biomaterial.csproj",
"projectFilePath": "C:\\Git\\Biomaterial\\sources\\Biomaterial\\Biomaterial.csproj",
"expectedPackageFiles": [],
"logs": []
}
\ No newline at end of file
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<xs:schema targetNamespace="http://tempuri.org/XMLSchema.xsd"
elementFormDefault="qualified"
xmlns="http://tempuri.org/XMLSchema.xsd"
xmlns:tns="http://tempuri.org/XMLSchema.xsd"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
xmlns="http://tempuri.org/XMLSchema.xsd"
xmlns:tns="http://tempuri.org/XMLSchema.xsd"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
>
<xs:element name="biomaterial" type ="tns:BiomaterialType"/>
<xs:complexType name="BiomaterialType">
<xs:sequence>
<xs:element name="biomaterialId" type="xs:ID"/>
<xs:element name="eLabJournalData" type="tns:ElabJournalDataType" minOccurs="0" maxOccurs="1"/>
<xs:element name="myProjectsData" type="tns:MyProjectsDataType" minOccurs="0" maxOccurs="1"/>
<xs:element name="planonIntakeData" type="tns:PlanonIntakeDataType"/>
......@@ -16,7 +17,6 @@
<xs:element name="gmoProcessingData" type="tns:GmoProcessingType" minOccurs="0" maxOccurs="1"/>
<xs:element name="sendProcessingData" type="tns:TransportProcessingType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="biomaterialId" type="xs:ID"/>
</xs:complexType>
......@@ -24,21 +24,22 @@
<xs:complexType name="ElabJournalDataType">
<xs:sequence>
<xs:element name="sampleId" type="xs:ID"/>
<xs:element name="naamBusinessUnitOrLeerstoelgroep" type="xs:string"/>
<xs:element name="primaireOnderzoeker" type="xs:string"/>
</xs:sequence>
<xs:attribute name="sampleId" type="xs:ID"/>
</xs:complexType>
<xs:complexType name="MyProjectsDataType">
<xs:sequence>
<xs:element name="projectId" type="xs:ID"/>
<xs:element name="projectNaamOfAcronym" type="xs:string"/>
</xs:sequence>
<xs:attribute name="projectId" type="xs:ID"/>
</xs:complexType>
<xs:complexType name="PlanonIntakeDataType">
<xs:sequence>
<xs:element name="planonTicketId" type="xs:ID"/>
<xs:element name="soort" type="xs:string"/>
<xs:element name="type" type="tns:GeneticResourceType"/>
<xs:element name="gebruik" type="xs:string"/>
......@@ -47,7 +48,6 @@
<xs:element name="isHorizonOfTkiProject" type="xs:boolean"/>
<xs:element name="wordtMateriaalGedeeld" type="xs:boolean"/>
</xs:sequence>
<xs:attribute name="planonTicketId" type="xs:ID"/>
</xs:complexType>
<xs:complexType name="NagoyaProcessingDataType">
......@@ -60,7 +60,7 @@
<xs:element name="docSpecifiekeAfspraken" type="tns:CorsaNextStoredDocumentType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="docAdditioneel" type="tns:CorsaNextStoredDocumentType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="docGepasteZorgvuldigheid" type="tns:CorsaNextStoredDocumentType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="euDeclareID" type="xs:ID" minOccurs="0" maxOccurs="1"/>
<xs:element name="euDeclareID" type="xs:ID" minOccurs="0" maxOccurs="1"/>
<xs:element name="docEuDeclare" type="tns:CorsaNextStoredDocumentType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
......@@ -390,9 +390,9 @@
<xs:complexType name="InstantieType">
<xs:choice>
<xs:element name="instantie1" fixed="Bedrijf"/>
<xs:element name="instantie2" fixed="Instituut"/>
<xs:element name="instantie3" fixed="Universiteit"/>
<xs:element name="bedrijf" fixed="Bedrijf"/>
<xs:element name="instituut" fixed="Instituut"/>
<xs:element name="universiteit" fixed="Universiteit"/>
</xs:choice>
</xs:complexType>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment