diff --git a/sources/Biomaterial/.vs/Biomaterial/v16/.suo b/sources/Biomaterial/.vs/Biomaterial/v16/.suo
index cf053b017a848f063847b2f221deee6f24686a86..35bf5b47ff96f9381ddab8595cdbda605b2105f1 100644
Binary files a/sources/Biomaterial/.vs/Biomaterial/v16/.suo and b/sources/Biomaterial/.vs/Biomaterial/v16/.suo differ
diff --git a/sources/Biomaterial/obj/Biomaterial.csproj.nuget.dgspec.json b/sources/Biomaterial/obj/Biomaterial.csproj.nuget.dgspec.json
index e85a221bcdf86121aa65f0e9eab794a760b3d9a9..f980e73185a65d950ff3ae13206227923cfee468 100644
--- a/sources/Biomaterial/obj/Biomaterial.csproj.nuget.dgspec.json
+++ b/sources/Biomaterial/obj/Biomaterial.csproj.nuget.dgspec.json
@@ -1,17 +1,17 @@
{
"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"
diff --git a/sources/Biomaterial/obj/Debug/net5.0/Biomaterial.assets.cache b/sources/Biomaterial/obj/Debug/net5.0/Biomaterial.assets.cache
index a071c80160846e1626ffded2391b60ddb3a348dc..a7faedbed68ce77a41222234e7ae01a7f30e3ed5 100644
Binary files a/sources/Biomaterial/obj/Debug/net5.0/Biomaterial.assets.cache and b/sources/Biomaterial/obj/Debug/net5.0/Biomaterial.assets.cache differ
diff --git a/sources/Biomaterial/obj/Debug/net5.0/Biomaterial.csprojAssemblyReference.cache b/sources/Biomaterial/obj/Debug/net5.0/Biomaterial.csprojAssemblyReference.cache
index ddd938e4a2e0524de7600f95f366d2c2e6970beb..1ea5c034527978a2a2a99d7fd2ea99f8b581039d 100644
Binary files a/sources/Biomaterial/obj/Debug/net5.0/Biomaterial.csprojAssemblyReference.cache and b/sources/Biomaterial/obj/Debug/net5.0/Biomaterial.csprojAssemblyReference.cache differ
diff --git a/sources/Biomaterial/obj/project.assets.json b/sources/Biomaterial/obj/project.assets.json
index e6d257cbe0192603e869341e9463212fc10fa5fc..93d57267e3357bbf087207839db21cc229ffb227 100644
--- a/sources/Biomaterial/obj/project.assets.json
+++ b/sources/Biomaterial/obj/project.assets.json
@@ -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"
diff --git a/sources/Biomaterial/obj/project.nuget.cache b/sources/Biomaterial/obj/project.nuget.cache
index c16408f9b69bb5f9afd4b730a139681ce1a9fd86..751f26357eb2bbd45301211c8d1017334555ad50 100644
--- a/sources/Biomaterial/obj/project.nuget.cache
+++ b/sources/Biomaterial/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"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
diff --git a/sources/Biomaterial/xml/Biomaterial.Designer.cs b/sources/Biomaterial/xml/Biomaterial.Designer.cs
index 05c8684063d0b2a809af8f8efcb68b16dee3d3d1..71b558fd628c4d992d10d81075b2433b34080316 100644
--- a/sources/Biomaterial/xml/Biomaterial.Designer.cs
+++ b/sources/Biomaterial/xml/Biomaterial.Designer.cs
@@ -1785,13 +1785,13 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitClass() {
- this.columnbiomaterialId = new global::System.Data.DataColumn("biomaterialId", typeof(string), null, global::System.Data.MappingType.Attribute);
+ this.columnbiomaterialId = new global::System.Data.DataColumn("biomaterialId", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnbiomaterialId);
this.columnbiomaterial_Id = new global::System.Data.DataColumn("biomaterial_Id", typeof(int), null, global::System.Data.MappingType.Hidden);
base.Columns.Add(this.columnbiomaterial_Id);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnbiomaterial_Id}, true));
- this.columnbiomaterialId.Namespace = "";
+ this.columnbiomaterialId.AllowDBNull = false;
this.columnbiomaterial_Id.AutoIncrement = true;
this.columnbiomaterial_Id.AllowDBNull = false;
this.columnbiomaterial_Id.Unique = true;
@@ -2079,7 +2079,7 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitClass() {
- this.columnsampleId = new global::System.Data.DataColumn("sampleId", typeof(string), null, global::System.Data.MappingType.Attribute);
+ this.columnsampleId = new global::System.Data.DataColumn("sampleId", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnsampleId);
this.columnnaamBusinessUnitOrLeerstoelgroep = new global::System.Data.DataColumn("naamBusinessUnitOrLeerstoelgroep", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnnaamBusinessUnitOrLeerstoelgroep);
@@ -2087,7 +2087,7 @@ namespace Biomaterial.xml {
base.Columns.Add(this.columnprimaireOnderzoeker);
this.columnbiomaterial_Id = new global::System.Data.DataColumn("biomaterial_Id", typeof(int), null, global::System.Data.MappingType.Hidden);
base.Columns.Add(this.columnbiomaterial_Id);
- this.columnsampleId.Namespace = "";
+ this.columnsampleId.AllowDBNull = false;
this.columnnaamBusinessUnitOrLeerstoelgroep.AllowDBNull = false;
this.columnprimaireOnderzoeker.AllowDBNull = false;
}
@@ -2362,13 +2362,13 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitClass() {
- this.columnprojectId = new global::System.Data.DataColumn("projectId", typeof(string), null, global::System.Data.MappingType.Attribute);
+ this.columnprojectId = new global::System.Data.DataColumn("projectId", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnprojectId);
this.columnprojectNaamOfAcronym = new global::System.Data.DataColumn("projectNaamOfAcronym", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnprojectNaamOfAcronym);
this.columnbiomaterial_Id = new global::System.Data.DataColumn("biomaterial_Id", typeof(int), null, global::System.Data.MappingType.Hidden);
base.Columns.Add(this.columnbiomaterial_Id);
- this.columnprojectId.Namespace = "";
+ this.columnprojectId.AllowDBNull = false;
this.columnprojectNaamOfAcronym.AllowDBNull = false;
}
@@ -2690,7 +2690,7 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitClass() {
- this.columnplanonTicketId = new global::System.Data.DataColumn("planonTicketId", typeof(string), null, global::System.Data.MappingType.Attribute);
+ this.columnplanonTicketId = new global::System.Data.DataColumn("planonTicketId", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnplanonTicketId);
this.columnsoort = new global::System.Data.DataColumn("soort", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnsoort);
@@ -2706,7 +2706,7 @@ namespace Biomaterial.xml {
base.Columns.Add(this.columnbiomaterial_Id);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnplanonIntakeData_Id}, true));
- this.columnplanonTicketId.Namespace = "";
+ this.columnplanonTicketId.AllowDBNull = false;
this.columnsoort.AllowDBNull = false;
this.columngebruik.AllowDBNull = false;
this.columnisHorizonOfTkiProject.AllowDBNull = false;
@@ -8348,11 +8348,11 @@ namespace Biomaterial.xml {
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
public partial class instantieDataTable : global::System.Data.TypedTableBase<instantieRow> {
- private global::System.Data.DataColumn columninstantie1;
+ private global::System.Data.DataColumn columnbedrijf;
- private global::System.Data.DataColumn columninstantie2;
+ private global::System.Data.DataColumn columninstituut;
- private global::System.Data.DataColumn columninstantie3;
+ private global::System.Data.DataColumn columnuniversiteit;
private global::System.Data.DataColumn columnleverancier_Id;
@@ -8393,25 +8393,25 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public global::System.Data.DataColumn instantie1Column {
+ public global::System.Data.DataColumn bedrijfColumn {
get {
- return this.columninstantie1;
+ return this.columnbedrijf;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public global::System.Data.DataColumn instantie2Column {
+ public global::System.Data.DataColumn instituutColumn {
get {
- return this.columninstantie2;
+ return this.columninstituut;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public global::System.Data.DataColumn instantie3Column {
+ public global::System.Data.DataColumn universiteitColumn {
get {
- return this.columninstantie3;
+ return this.columnuniversiteit;
}
}
@@ -8468,12 +8468,12 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public instantieRow AddinstantieRow(string instantie1, string instantie2, string instantie3, leverancierRow parentleverancierRowByleverancier_instantie, ontvangerRow parentontvangerRowByontvanger_instantie) {
+ public instantieRow AddinstantieRow(string bedrijf, string instituut, string universiteit, leverancierRow parentleverancierRowByleverancier_instantie, ontvangerRow parentontvangerRowByontvanger_instantie) {
instantieRow rowinstantieRow = ((instantieRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
- instantie1,
- instantie2,
- instantie3,
+ bedrijf,
+ instituut,
+ universiteit,
null,
null};
if ((parentleverancierRowByleverancier_instantie != null)) {
@@ -8504,9 +8504,9 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
internal void InitVars() {
- this.columninstantie1 = base.Columns["instantie1"];
- this.columninstantie2 = base.Columns["instantie2"];
- this.columninstantie3 = base.Columns["instantie3"];
+ this.columnbedrijf = base.Columns["bedrijf"];
+ this.columninstituut = base.Columns["instituut"];
+ this.columnuniversiteit = base.Columns["universiteit"];
this.columnleverancier_Id = base.Columns["leverancier_Id"];
this.columnontvanger_Id = base.Columns["ontvanger_Id"];
}
@@ -8514,19 +8514,19 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void InitClass() {
- this.columninstantie1 = new global::System.Data.DataColumn("instantie1", typeof(string), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columninstantie1);
- this.columninstantie2 = new global::System.Data.DataColumn("instantie2", typeof(string), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columninstantie2);
- this.columninstantie3 = new global::System.Data.DataColumn("instantie3", typeof(string), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columninstantie3);
+ this.columnbedrijf = new global::System.Data.DataColumn("bedrijf", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnbedrijf);
+ this.columninstituut = new global::System.Data.DataColumn("instituut", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columninstituut);
+ this.columnuniversiteit = new global::System.Data.DataColumn("universiteit", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnuniversiteit);
this.columnleverancier_Id = new global::System.Data.DataColumn("leverancier_Id", typeof(int), null, global::System.Data.MappingType.Hidden);
base.Columns.Add(this.columnleverancier_Id);
this.columnontvanger_Id = new global::System.Data.DataColumn("ontvanger_Id", typeof(int), null, global::System.Data.MappingType.Hidden);
base.Columns.Add(this.columnontvanger_Id);
- this.columninstantie1.AllowDBNull = false;
- this.columninstantie2.AllowDBNull = false;
- this.columninstantie3.AllowDBNull = false;
+ this.columnbedrijf.AllowDBNull = false;
+ this.columninstituut.AllowDBNull = false;
+ this.columnuniversiteit.AllowDBNull = false;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -17805,12 +17805,7 @@ namespace Biomaterial.xml {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string biomaterialId {
get {
- try {
- return ((string)(this[this.tablebiomaterial.biomaterialIdColumn]));
- }
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("The value for column \'biomaterialId\' in table \'biomaterial\' is DBNull.", e);
- }
+ return ((string)(this[this.tablebiomaterial.biomaterialIdColumn]));
}
set {
this[this.tablebiomaterial.biomaterialIdColumn] = value;
@@ -17828,18 +17823,6 @@ namespace Biomaterial.xml {
}
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public bool IsbiomaterialIdNull() {
- return this.IsNull(this.tablebiomaterial.biomaterialIdColumn);
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public void SetbiomaterialIdNull() {
- this[this.tablebiomaterial.biomaterialIdColumn] = global::System.Convert.DBNull;
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public eLabJournalDataRow[] GeteLabJournalDataRows() {
@@ -17925,12 +17908,7 @@ namespace Biomaterial.xml {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string sampleId {
get {
- try {
- return ((string)(this[this.tableeLabJournalData.sampleIdColumn]));
- }
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("The value for column \'sampleId\' in table \'eLabJournalData\' is DBNull.", e);
- }
+ return ((string)(this[this.tableeLabJournalData.sampleIdColumn]));
}
set {
this[this.tableeLabJournalData.sampleIdColumn] = value;
@@ -17986,18 +17964,6 @@ namespace Biomaterial.xml {
}
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public bool IssampleIdNull() {
- return this.IsNull(this.tableeLabJournalData.sampleIdColumn);
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public void SetsampleIdNull() {
- this[this.tableeLabJournalData.sampleIdColumn] = global::System.Convert.DBNull;
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isbiomaterial_IdNull() {
@@ -18029,12 +17995,7 @@ namespace Biomaterial.xml {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string projectId {
get {
- try {
- return ((string)(this[this.tablemyProjectsData.projectIdColumn]));
- }
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("The value for column \'projectId\' in table \'myProjectsData\' is DBNull.", e);
- }
+ return ((string)(this[this.tablemyProjectsData.projectIdColumn]));
}
set {
this[this.tablemyProjectsData.projectIdColumn] = value;
@@ -18079,18 +18040,6 @@ namespace Biomaterial.xml {
}
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public bool IsprojectIdNull() {
- return this.IsNull(this.tablemyProjectsData.projectIdColumn);
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public void SetprojectIdNull() {
- this[this.tablemyProjectsData.projectIdColumn] = global::System.Convert.DBNull;
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isbiomaterial_IdNull() {
@@ -18122,12 +18071,7 @@ namespace Biomaterial.xml {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string planonTicketId {
get {
- try {
- return ((string)(this[this.tableplanonIntakeData.planonTicketIdColumn]));
- }
- catch (global::System.InvalidCastException e) {
- throw new global::System.Data.StrongTypingException("The value for column \'planonTicketId\' in table \'planonIntakeData\' is DBNull.", e);
- }
+ return ((string)(this[this.tableplanonIntakeData.planonTicketIdColumn]));
}
set {
this[this.tableplanonIntakeData.planonTicketIdColumn] = value;
@@ -18216,18 +18160,6 @@ namespace Biomaterial.xml {
}
}
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public bool IsplanonTicketIdNull() {
- return this.IsNull(this.tableplanonIntakeData.planonTicketIdColumn);
- }
-
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public void SetplanonTicketIdNull() {
- this[this.tableplanonIntakeData.planonTicketIdColumn] = global::System.Convert.DBNull;
- }
-
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool Isbiomaterial_IdNull() {
@@ -21578,34 +21510,34 @@ namespace Biomaterial.xml {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public string instantie1 {
+ public string bedrijf {
get {
- return ((string)(this[this.tableinstantie.instantie1Column]));
+ return ((string)(this[this.tableinstantie.bedrijfColumn]));
}
set {
- this[this.tableinstantie.instantie1Column] = value;
+ this[this.tableinstantie.bedrijfColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public string instantie2 {
+ public string instituut {
get {
- return ((string)(this[this.tableinstantie.instantie2Column]));
+ return ((string)(this[this.tableinstantie.instituutColumn]));
}
set {
- this[this.tableinstantie.instantie2Column] = value;
+ this[this.tableinstantie.instituutColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
- public string instantie3 {
+ public string universiteit {
get {
- return ((string)(this[this.tableinstantie.instantie3Column]));
+ return ((string)(this[this.tableinstantie.universiteitColumn]));
}
set {
- this[this.tableinstantie.instantie3Column] = value;
+ this[this.tableinstantie.universiteitColumn] = value;
}
}
diff --git a/sources/Biomaterial/xml/Biomaterial.xsd b/sources/Biomaterial/xml/Biomaterial.xsd
index 6c22c14650cbb838e3fb15c14bc85e8ff256aa1b..ed34816572281b36ca6aca4374c84f6658f4b614 100644
--- a/sources/Biomaterial/xml/Biomaterial.xsd
+++ b/sources/Biomaterial/xml/Biomaterial.xsd
@@ -1,14 +1,15 @@
<?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>