Husky/Kanalsanierungsverwaltung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Angefangen umzuschreiben auf andere DB struktur

Browse Source
This commit is contained in:
Husky
2018-06-24 22:14:25 +02:00
parent e0d7cf03d1
commit 2aa414665d
16 changed files with 221 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
KlassenBIB/AdresseCollection.cs
View File

@@ -1,12 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
{
public class AdresseCollection : List<Strasse>
{
}
}

28
KlassenBIB/InlinerSanierung.cs
View File

@@ -8,19 +8,20 @@ namespace KlassenBIB
{ {
public sealed class InlinerSanierung : Sanierung public sealed class InlinerSanierung : Sanierung
{ {
decimal kalibrierUnterdruck = -0.5m; double kalibrierUnterdruck = -0.5;
decimal kalibierWalzenAbstand = 0.9m; double kalibierWalzenAbstand = 0.9;
decimal harzKalibrierTemperatur; double harzKalibrierTemperatur;
DateTime datumKalibrierung; DateTime datumKalibrierung;
string harzChargenummer; string harzChargenummer;
string linerChargenummer; string linerChargenummer;
decimal harzbedarf = 1.8m; double harzbedarf = 1.8;
uint rueckholgeschwindigkeit = 24; uint rueckholgeschwindigkeit = 24;
bool geschlosseneEnde = false;
/// <summary> /// <summary>
/// Gibt den kompletten Harzbedarf auf die Haltungslänge bezogen zurück /// Gibt den kompletten Harzbedarf auf die Haltungslänge bezogen zurück
/// </summary> /// </summary>
public decimal GesamtHarzBedarf public double GesamtHarzBedarf
{ {
get get
{ {
@@ -28,5 +29,22 @@ namespace KlassenBIB
} }
} }
public InlinerSanierung()
{
//datumKalibrierung = new DateTime();
}
public double KalibrierUnterdruck { get => kalibrierUnterdruck; set => kalibrierUnterdruck = value; }
public double KalibierWalzenAbstand { get => kalibierWalzenAbstand; set => kalibierWalzenAbstand = value; }
public double HarzKalibrierTemperatur { get => harzKalibrierTemperatur; set => harzKalibrierTemperatur = value; }
public DateTime DatumKalibrierung {
get => datumKalibrierung;
set => datumKalibrierung = value; }
public string HarzChargenummer { get => harzChargenummer; set => harzChargenummer = value; }
public string LinerChargenummer { get => linerChargenummer; set => linerChargenummer = value; }
public double Harzbedarf { get => harzbedarf; set => harzbedarf = value; }
public uint Rueckholgeschwindigkeit { get => rueckholgeschwindigkeit; set => rueckholgeschwindigkeit = value; }
public bool GeschlosseneEnde { get => geschlosseneEnde; set => geschlosseneEnde = value; }
} }
} }

5
KlassenBIB/Inspektionsobjekt.cs
View File

@@ -10,12 +10,15 @@ namespace KlassenBIB
[ContentProperty("Schadenskuerzeln")] [ContentProperty("Schadenskuerzeln")]
public class Inspektionsobjekt public class Inspektionsobjekt
{ {
public string StrasseName { get; set; }
public string OrtName { get; set; }
public string Projektnummer { get; set; }
public string Objektbezeichnung { get; set; } public string Objektbezeichnung { get; set; }
public string VonPunkt { get; set; } public string VonPunkt { get; set; }
public string BisPunkt { get; set; } public string BisPunkt { get; set; }
public string RohrMaterial { get; set; } public string RohrMaterial { get; set; }
public uint Kanalrohrweite { get; set; } public uint Kanalrohrweite { get; set; }
public decimal Haltungslaenge { get; set; } public double Haltungslaenge { get; set; }
public InspektionskuerzelnCollection Schadenskuerzeln { get; private set; } public InspektionskuerzelnCollection Schadenskuerzeln { get; private set; }
public Sanierung Sanierung { get;set; } public Sanierung Sanierung { get;set; }

2
KlassenBIB/KlassenBIB.csproj
View File

@@ -42,7 +42,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AbwasserTechnischeAnlageCollection.cs" /> <Compile Include="AbwasserTechnischeAnlageCollection.cs" />
<Compile Include="AdresseCollection.cs" />
<Compile Include="InlinerSanierung.cs" /> <Compile Include="InlinerSanierung.cs" />
<Compile Include="Projekt.cs" /> <Compile Include="Projekt.cs" />
<Compile Include="Inspektionskuerzeln.cs" /> <Compile Include="Inspektionskuerzeln.cs" />
@@ -50,7 +49,6 @@
<Compile Include="Inspektionsobjekt.cs" /> <Compile Include="Inspektionsobjekt.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Sanierung.cs" /> <Compile Include="Sanierung.cs" />
<Compile Include="Strasse.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

4
KlassenBIB/Projekt.cs
View File

@@ -13,11 +13,11 @@ namespace KlassenBIB
{ {
public string Nummer { get; set; } public string Nummer { get; set; }
public string Ort { get; set; } public string Ort { get; set; }
public AdresseCollection Adressen { get; private set; } public AbwasserTechnischeAnlageCollection Objekte { get; set; }
public Projekt() public Projekt()
{ {
Adressen = new AdresseCollection(); Objekte = new AbwasserTechnischeAnlageCollection();
} }
} }
} }

3
KlassenBIB/Sanierung.cs
View File

@@ -9,7 +9,7 @@ namespace KlassenBIB
public abstract class Sanierung public abstract class Sanierung
{ {
Guid guid; Guid guid;
string projektnummer;
double tempAusen; double tempAusen;
double tempKanal; double tempKanal;
string wetter; string wetter;
@@ -22,7 +22,6 @@ namespace KlassenBIB
Inspektionsobjekt inspektionsObjekt; Inspektionsobjekt inspektionsObjekt;
public Guid Guid { get => guid; set => guid = value; } public Guid Guid { get => guid; set => guid = value; }
public string ProjektNummer { get => projektnummer; set => projektnummer = value; }
public double TempAusen { get => tempAusen; set => tempAusen = value; } public double TempAusen { get => tempAusen; set => tempAusen = value; }
public double TempKanal { get => tempKanal; set => tempKanal = value; } public double TempKanal { get => tempKanal; set => tempKanal = value; }
public string Wetter { get => wetter; set => wetter = value; } public string Wetter { get => wetter; set => wetter = value; }

29
KlassenBIB/Strasse.cs
View File

@@ -1,29 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Markup;
namespace KlassenBIB
{
[ContentProperty("Objekte")]
public class Strasse
{
public string Nummer { get; set; }
public string Strassename { get; set; }
public string Ort { get; set; }
public AbwasserTechnischeAnlageCollection Objekte { get; set; }
public Strasse()
{
Objekte = new AbwasserTechnischeAnlageCollection();
}
public override string ToString()
{
return Strassename;
}
}
}

29
KlassenBIBTests/InspektionsobjektTests.cs
View File

@@ -31,6 +31,9 @@ namespace KlassenBIB.Tests
Inspektionsobjekt inspektionsobjekt = new Inspektionsobjekt(); Inspektionsobjekt inspektionsobjekt = new Inspektionsobjekt();
inspektionsobjekt.Objektbezeichnung = "122345"; inspektionsobjekt.Objektbezeichnung = "122345";
inspektionsobjekt.StrasseName = "Dieselstraße";
inspektionsobjekt.OrtName = "Meppen";
inspektionsobjekt.Projektnummer = "18-850-034";
inspektionsobjekt.Schadenskuerzeln.Add(new Inspektionskuerzeln() inspektionsobjekt.Schadenskuerzeln.Add(new Inspektionskuerzeln()
{ {
Hauptkode = "BCD", Hauptkode = "BCD",
@@ -49,23 +52,22 @@ namespace KlassenBIB.Tests
inliner.Guid = Guid.NewGuid(); inliner.Guid = Guid.NewGuid();
inliner.TempAusen = 1; inliner.TempAusen = 1;
inliner.STVOAbsicherung = true; inliner.STVOAbsicherung = true;
inliner.DatumKalibrierung = DateTime.Now;
inliner.HDReinigungDatum = DateTime.Now;
inliner.SanierungsDatum = DateTime.Now;
inspektionsobjekt.Sanierung = inliner; inspektionsobjekt.Sanierung = inliner;
inliner.InspektionsObjekt = inspektionsobjekt; inliner.InspektionsObjekt = inspektionsobjekt;
abwasserTechnischeAnlageCollection.Add(inspektionsobjekt); abwasserTechnischeAnlageCollection.Add(inspektionsobjekt);
projekt.Objekte.Add(inspektionsobjekt);
Strasse strasse = new Strasse()
{
Ort = "Oldenburg",
Strassename = "Dieselstraße",
Objekte = abwasserTechnischeAnlageCollection
};
projekt.Adressen.Add(strasse);
XamlServices.Save("db.xaml", projekt); XamlServices.Save("projekt1.xaml", projekt);
} }
[TestMethod()] [TestMethod()]
public void InspektionsobjektTest() public void InspektionsobjektTest()
@@ -73,17 +75,13 @@ namespace KlassenBIB.Tests
Projekt projekt = new Projekt(); Projekt projekt = new Projekt();
projekt.Ort = "Oldenburg"; projekt.Ort = "Oldenburg";
Strasse strasse = new Strasse()
{
Strassename = "Schlachthofstrase",
Ort = "Oldenburg"
};
Inspektionsobjekt inspektionsobjekt = new Inspektionsobjekt(); Inspektionsobjekt inspektionsobjekt = new Inspektionsobjekt();
inspektionsobjekt.Objektbezeichnung = "SW01"; inspektionsobjekt.Objektbezeichnung = "SW01";
inspektionsobjekt.VonPunkt = "SW01"; inspektionsobjekt.VonPunkt = "SW01";
inspektionsobjekt.BisPunkt = "SW02"; inspektionsobjekt.BisPunkt = "SW02";
inspektionsobjekt.Haltungslaenge = 10m; inspektionsobjekt.Haltungslaenge = 10;
inspektionsobjekt.RohrMaterial = "Steinzeug"; inspektionsobjekt.RohrMaterial = "Steinzeug";
inspektionsobjekt.Kanalrohrweite = 150; inspektionsobjekt.Kanalrohrweite = 150;
@@ -91,7 +89,10 @@ namespace KlassenBIB.Tests
sanierung.InspektionsObjekt = inspektionsobjekt; sanierung.InspektionsObjekt = inspektionsobjekt;
sanierung.Guid = Guid.NewGuid(); sanierung.Guid = Guid.NewGuid();
sanierung.WasserhaltungEingerichtet = true; sanierung.WasserhaltungEingerichtet = true;
sanierung.DatumKalibrierung = DateTime.Now;
inspektionsobjekt.Sanierung = sanierung;
Assert.AreEqual(sanierung.GesamtHarzBedarf, 18m); Assert.AreEqual(sanierung.GesamtHarzBedarf, 18m);

5
SanSystem/frmMain.cs
View File

@@ -30,12 +30,13 @@ namespace SanSystem
Projekt projekt = Datenbank.Instance.loadedProjekt; Projekt projekt = Datenbank.Instance.loadedProjekt;
AdresseCollection adressen = projekt.Adressen; //dresseCollection adressen = projekt.Adressen;
/*
adressen[0].Objekte.Add(new Inspektionsobjekt() adressen[0].Objekte.Add(new Inspektionsobjekt()
{ {
Objektbezeichnung = "SW01" Objektbezeichnung = "SW01"
}); });
*/
Datenbank.Instance.SaveProjekt(); Datenbank.Instance.SaveProjekt();
} }

176
SanSystem/frmObjektEdit.Designer.cs generated
View File

@@ -36,7 +36,6 @@
this.txt_strasse = new System.Windows.Forms.TextBox(); this.txt_strasse = new System.Windows.Forms.TextBox();
this.label19 = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label();
this.txt_material = new System.Windows.Forms.TextBox();
this.txt_dn = new System.Windows.Forms.TextBox(); this.txt_dn = new System.Windows.Forms.TextBox();
this.txt_punkt_bis = new System.Windows.Forms.TextBox(); this.txt_punkt_bis = new System.Windows.Forms.TextBox();
this.txt_punkt_von = new System.Windows.Forms.TextBox(); this.txt_punkt_von = new System.Windows.Forms.TextBox();
@@ -65,10 +64,10 @@
this.label11 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox(); this.txt_walze_distance = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox(); this.txt_temp_harz = new System.Windows.Forms.TextBox();
this.textBox3 = new System.Windows.Forms.TextBox(); this.txt_vakuum = new System.Windows.Forms.TextBox();
this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker(); this.dt_kalibrierdatum = new System.Windows.Forms.DateTimePicker();
this.txt_charge_harz = new System.Windows.Forms.TextBox(); this.txt_charge_harz = new System.Windows.Forms.TextBox();
this.txt_charge_liner = new System.Windows.Forms.TextBox(); this.txt_charge_liner = new System.Windows.Forms.TextBox();
this.txt_harz = new System.Windows.Forms.TextBox(); this.txt_harz = new System.Windows.Forms.TextBox();
@@ -85,6 +84,9 @@
this.txt_temp_aussen = new System.Windows.Forms.TextBox(); this.txt_temp_aussen = new System.Windows.Forms.TextBox();
this.txt_temp_kanal = new System.Windows.Forms.TextBox(); this.txt_temp_kanal = new System.Windows.Forms.TextBox();
this.btn_get_temp = new System.Windows.Forms.Button(); this.btn_get_temp = new System.Windows.Forms.Button();
this.label24 = new System.Windows.Forms.Label();
this.cbb_wetter = new System.Windows.Forms.ComboBox();
this.cb_material = new System.Windows.Forms.ComboBox();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
@@ -108,6 +110,9 @@
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.cb_material);
this.tabPage1.Controls.Add(this.cbb_wetter);
this.tabPage1.Controls.Add(this.label24);
this.tabPage1.Controls.Add(this.groupBox2); this.tabPage1.Controls.Add(this.groupBox2);
this.tabPage1.Controls.Add(this.dateTimePicker1); this.tabPage1.Controls.Add(this.dateTimePicker1);
this.tabPage1.Controls.Add(this.label20); this.tabPage1.Controls.Add(this.label20);
@@ -115,7 +120,6 @@
this.tabPage1.Controls.Add(this.txt_strasse); this.tabPage1.Controls.Add(this.txt_strasse);
this.tabPage1.Controls.Add(this.label19); this.tabPage1.Controls.Add(this.label19);
this.tabPage1.Controls.Add(this.label18); this.tabPage1.Controls.Add(this.label18);
this.tabPage1.Controls.Add(this.txt_material);
this.tabPage1.Controls.Add(this.txt_dn); this.tabPage1.Controls.Add(this.txt_dn);
this.tabPage1.Controls.Add(this.txt_punkt_bis); this.tabPage1.Controls.Add(this.txt_punkt_bis);
this.tabPage1.Controls.Add(this.txt_punkt_von); this.tabPage1.Controls.Add(this.txt_punkt_von);
@@ -195,15 +199,6 @@
this.label18.TabIndex = 12; this.label18.TabIndex = 12;
this.label18.Text = "Strasse"; this.label18.Text = "Strasse";
// //
// txt_material
//
this.txt_material.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_material.Location = new System.Drawing.Point(192, 223);
this.txt_material.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_material.Name = "txt_material";
this.txt_material.Size = new System.Drawing.Size(330, 26);
this.txt_material.TabIndex = 10;
//
// txt_dn // txt_dn
// //
this.txt_dn.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_dn.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -420,10 +415,10 @@
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.dateTimePicker2); this.groupBox1.Controls.Add(this.dt_kalibrierdatum);
this.groupBox1.Controls.Add(this.textBox3); this.groupBox1.Controls.Add(this.txt_vakuum);
this.groupBox1.Controls.Add(this.textBox2); this.groupBox1.Controls.Add(this.txt_temp_harz);
this.groupBox1.Controls.Add(this.textBox1); this.groupBox1.Controls.Add(this.txt_walze_distance);
this.groupBox1.Controls.Add(this.label17); this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.label14); this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.label16); this.groupBox1.Controls.Add(this.label16);
@@ -433,7 +428,7 @@
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox1.Size = new System.Drawing.Size(753, 328); this.groupBox1.Size = new System.Drawing.Size(688, 278);
this.groupBox1.TabIndex = 9; this.groupBox1.TabIndex = 9;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "Kalibrierung"; this.groupBox1.Text = "Kalibrierung";
@@ -537,41 +532,41 @@
this.label9.TabIndex = 0; this.label9.TabIndex = 0;
this.label9.Text = "Harz"; this.label9.Text = "Harz";
// //
// textBox1 // txt_walze_distance
// //
this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_walze_distance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBox1.Location = new System.Drawing.Point(212, 118); this.txt_walze_distance.Location = new System.Drawing.Point(212, 118);
this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_walze_distance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox1.Name = "textBox1"; this.txt_walze_distance.Name = "txt_walze_distance";
this.textBox1.Size = new System.Drawing.Size(148, 26); this.txt_walze_distance.Size = new System.Drawing.Size(148, 26);
this.textBox1.TabIndex = 9; this.txt_walze_distance.TabIndex = 9;
// //
// textBox2 // txt_temp_harz
// //
this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_temp_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBox2.Location = new System.Drawing.Point(212, 231); this.txt_temp_harz.Location = new System.Drawing.Point(212, 232);
this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_temp_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox2.Name = "textBox2"; this.txt_temp_harz.Name = "txt_temp_harz";
this.textBox2.Size = new System.Drawing.Size(148, 26); this.txt_temp_harz.Size = new System.Drawing.Size(148, 26);
this.textBox2.TabIndex = 10; this.txt_temp_harz.TabIndex = 10;
// //
// textBox3 // txt_vakuum
// //
this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_vakuum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBox3.Location = new System.Drawing.Point(518, 118); this.txt_vakuum.Location = new System.Drawing.Point(518, 118);
this.textBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_vakuum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox3.Name = "textBox3"; this.txt_vakuum.Name = "txt_vakuum";
this.textBox3.Size = new System.Drawing.Size(148, 26); this.txt_vakuum.Size = new System.Drawing.Size(148, 26);
this.textBox3.TabIndex = 11; this.txt_vakuum.TabIndex = 11;
// //
// dateTimePicker2 // dt_kalibrierdatum
// //
this.dateTimePicker2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dt_kalibrierdatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dateTimePicker2.Location = new System.Drawing.Point(212, 48); this.dt_kalibrierdatum.Location = new System.Drawing.Point(212, 48);
this.dateTimePicker2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dt_kalibrierdatum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dateTimePicker2.Name = "dateTimePicker2"; this.dt_kalibrierdatum.Name = "dt_kalibrierdatum";
this.dateTimePicker2.Size = new System.Drawing.Size(439, 26); this.dt_kalibrierdatum.Size = new System.Drawing.Size(283, 26);
this.dateTimePicker2.TabIndex = 12; this.dt_kalibrierdatum.TabIndex = 12;
// //
// txt_charge_harz // txt_charge_harz
// //
@@ -624,9 +619,9 @@
this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.checkBox1.Location = new System.Drawing.Point(9, 75); this.checkBox1.Location = new System.Drawing.Point(9, 75);
this.checkBox1.Name = "checkBox1"; this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(121, 24); this.checkBox1.Size = new System.Drawing.Size(172, 24);
this.checkBox1.TabIndex = 20; this.checkBox1.TabIndex = 20;
this.checkBox1.Text = "Geschlossen"; this.checkBox1.Text = "Geschlossene Ende";
this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.UseVisualStyleBackColor = true;
// //
// groupBox2 // groupBox2
@@ -649,9 +644,9 @@
this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label21.Location = new System.Drawing.Point(6, 114); this.label21.Location = new System.Drawing.Point(6, 114);
this.label21.Name = "label21"; this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(68, 20); this.label21.Size = new System.Drawing.Size(107, 20);
this.label21.TabIndex = 21; this.label21.TabIndex = 21;
this.label21.Text = "Schacht"; this.label21.Text = "Schachtlänge";
// //
// txt_laenge_schacht // txt_laenge_schacht
// //
@@ -724,11 +719,74 @@
this.btn_get_temp.Text = "Von Anlage holen"; this.btn_get_temp.Text = "Von Anlage holen";
this.btn_get_temp.UseVisualStyleBackColor = true; this.btn_get_temp.UseVisualStyleBackColor = true;
// //
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label24.Location = new System.Drawing.Point(561, 157);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(57, 20);
this.label24.TabIndex = 22;
this.label24.Text = "Wetter";
//
// cbb_wetter
//
this.cbb_wetter.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cbb_wetter.FormattingEnabled = true;
this.cbb_wetter.Location = new System.Drawing.Point(758, 154);
this.cbb_wetter.Name = "cbb_wetter";
this.cbb_wetter.Size = new System.Drawing.Size(282, 28);
this.cbb_wetter.TabIndex = 23;
//
// cb_material
//
this.cb_material.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cb_material.FormattingEnabled = true;
this.cb_material.Items.AddRange(new object[] {
"Asbestzement",
"Beton",
"Betonsegment",
"Duktiles Gusseisen",
"Edelstahl",
"Faserzement",
"Glasfaserverstärkter Kunststoff",
"Grauguss",
"Mauerwerk",
"Nichtidenfizierter Kunststoff",
"Nichtidentifizierter Werkstoff",
"Nichtidentifiziertes Eisen und Stahl",
"Ortbeton",
"Pflaster",
"Polyesterharz",
"Polyesterharzbeton",
"Polyethylen",
"Polyethylen hoher Dichte",
"Polymerbeton",
"Polymermodifizierter Zementbeton",
"Polypropylen",
"Polyvinylchlorid ",
"Polyvinylchlorid hart",
"Porosit",
"Rasen",
"Spannbeton",
"Spritzbeton",
"Stahl",
"Stahlbeton",
"Stahlfaserbeton",
"Steinzeug",
"unbefestigt, anstehender Boden",
"unterschiedliche Werkstoffe",
"Ziegelwerk"});
this.cb_material.Location = new System.Drawing.Point(192, 225);
this.cb_material.Name = "cb_material";
this.cb_material.Size = new System.Drawing.Size(323, 28);
this.cb_material.TabIndex = 24;
//
// frmObjektEdit // frmObjektEdit
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1131, 701); this.ClientSize = new System.Drawing.Size(1131, 643);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
@@ -763,7 +821,6 @@
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txt_material;
private System.Windows.Forms.TextBox txt_dn; private System.Windows.Forms.TextBox txt_dn;
private System.Windows.Forms.TextBox txt_punkt_bis; private System.Windows.Forms.TextBox txt_punkt_bis;
private System.Windows.Forms.TextBox txt_punkt_von; private System.Windows.Forms.TextBox txt_punkt_von;
@@ -796,10 +853,10 @@
private System.Windows.Forms.TextBox txt_harz; private System.Windows.Forms.TextBox txt_harz;
private System.Windows.Forms.TextBox txt_charge_liner; private System.Windows.Forms.TextBox txt_charge_liner;
private System.Windows.Forms.TextBox txt_charge_harz; private System.Windows.Forms.TextBox txt_charge_harz;
private System.Windows.Forms.DateTimePicker dateTimePicker2; private System.Windows.Forms.DateTimePicker dt_kalibrierdatum;
private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.TextBox txt_vakuum;
private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox txt_temp_harz;
private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox txt_walze_distance;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.MaskedTextBox txt_haltungslaenge; private System.Windows.Forms.MaskedTextBox txt_haltungslaenge;
private System.Windows.Forms.MaskedTextBox txt_laenge_schacht; private System.Windows.Forms.MaskedTextBox txt_laenge_schacht;
@@ -811,5 +868,8 @@
private System.Windows.Forms.TextBox txt_temp_aussen; private System.Windows.Forms.TextBox txt_temp_aussen;
private System.Windows.Forms.Label label23; private System.Windows.Forms.Label label23;
private System.Windows.Forms.Label label22; private System.Windows.Forms.Label label22;
private System.Windows.Forms.ComboBox cbb_wetter;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.ComboBox cb_material;
} }
} }

16
SanSystem/frmObjektEdit.cs
View File

@@ -14,17 +14,19 @@ namespace SanSystem
public partial class frmObjektEdit : Form public partial class frmObjektEdit : Form
{ {
Inspektionsobjekt inspektionsobjekt = null; Inspektionsobjekt inspektionsobjekt = null;
InlinerSanierung inliner = null;
public frmObjektEdit(Inspektionsobjekt inspektion) public frmObjektEdit(Inspektionsobjekt inspektion)
{ {
InitializeComponent(); InitializeComponent();
this.inspektionsobjekt = inspektion; this.inspektionsobjekt = inspektion;
this.inliner = (InlinerSanierung)inspektion.Sanierung;
} }
private void frmObjektEdit_Load(object sender, EventArgs e) private void frmObjektEdit_Load(object sender, EventArgs e)
{ {
txt_punkt_von.DataBindings.Add(new Binding("Text", inspektionsobjekt, "VonPunkt")); txt_punkt_von.DataBindings.Add(new Binding("Text", inspektionsobjekt, "VonPunkt"));
txt_punkt_bis.DataBindings.Add(new Binding("Text", inspektionsobjekt, "BisPunkt")); txt_punkt_bis.DataBindings.Add(new Binding("Text", inspektionsobjekt, "BisPunkt"));
txt_material.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Rohrmaterial")); cb_material.DataBindings.Add(new Binding("Text", inspektionsobjekt, "RohrMaterial"));
txt_haltungslaenge.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Haltungslaenge")); txt_haltungslaenge.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Haltungslaenge"));
txt_dn.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Kanalrohrweite")); txt_dn.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Kanalrohrweite"));
txt_temp_aussen.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "TempAusen")); txt_temp_aussen.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "TempAusen"));
@@ -33,6 +35,18 @@ namespace SanSystem
cb_genehmigung.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "genehmigungVorhanden")); cb_genehmigung.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "genehmigungVorhanden"));
cb_stvo.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "sTVOAbsicherung")); cb_stvo.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "sTVOAbsicherung"));
cb_wasserhaltung.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "wasserhaltungEingerichtet")); cb_wasserhaltung.DataBindings.Add(new Binding("Checked", inspektionsobjekt.Sanierung, "wasserhaltungEingerichtet"));
//
txt_walze_distance.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "KalibierWalzenAbstand"));
txt_vakuum.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "KalibrierUnterdruck"));
txt_temp_harz.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "HarzKalibrierTemperatur"));
txt_charge_harz.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "HarzChargenummer"));
txt_charge_liner.DataBindings.Add(new Binding("Text", inspektionsobjekt.Sanierung, "LinerChargenummer"));
dt_kalibrierdatum.DataBindings.Add(new Binding("Value", inliner, "DatumKalibrierung"));
//dt_kalibrierdatum.Value = inspektionsobjekt.Sanierung.
} }
} }
} }

2
SanSystem/frmObjekteList.Designer.cs generated
View File

@@ -122,7 +122,7 @@
// //
// strasseBindingSource // strasseBindingSource
// //
this.strasseBindingSource.DataSource = typeof(KlassenBIB.Strasse); //this.strasseBindingSource.DataSource = typeof(KlassenBIB.Strasse);
// //
// button1 // button1
// //

21
SanSystem/frmObjekteList.cs
View File

@@ -14,25 +14,24 @@ namespace SanSystem
{ {
public partial class frmObjekteList : Form public partial class frmObjekteList : Form
{ {
AdresseCollection street = new AdresseCollection();
BindingSource bs = new BindingSource();
Strasse strasse = null;
public frmObjekteList(Strasse strasse) public frmObjekteList(string streetname)
{ {
InitializeComponent(); InitializeComponent();
bs.DataSource = street;
this.strasse = strasse;
//dGObjekte.BindingContext = strasse.Objekte; //dGObjekte.BindingContext = strasse.Objekte;
//dGObjekte.DataSource = strasse.Objekte;// bs; //strasse.Objekte; //dGObjekte.DataSource = strasse.Objekte;// bs; //strasse.Objekte;
//dGObjekte.AutoGenerateColumns = false; //dGObjekte.AutoGenerateColumns = false;
/*
txt_strasse.DataBindings.Add(new Binding("Text", strasse, "Strassename")); txt_strasse.DataBindings.Add(new Binding("Text", strasse, "Strassename"));
txt_ort.DataBindings.Add(new Binding("Text", strasse, "Ort")); txt_ort.DataBindings.Add(new Binding("Text", strasse, "Ort"));
txt_pro_nr_3.DataBindings.Add(new Binding("Text", strasse, "Nummer")); txt_pro_nr_3.DataBindings.Add(new Binding("Text", strasse, "Nummer"));
*/
} }
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
@@ -42,19 +41,19 @@ namespace SanSystem
Strassename = "XSSD" Strassename = "XSSD"
}); });
*/ */
/*
strasse.Objekte.Add(new Inspektionsobjekt() strasse.Objekte.Add(new Inspektionsobjekt()
{ {
Objektbezeichnung = "134" Objektbezeichnung = "134"
}); });
dGObjekte.DataSource = null; dGObjekte.DataSource = null;
dGObjekte.DataSource = strasse.Objekte; dGObjekte.DataSource = strasse.Objekte;
*/
} }
private void frmObjekteList_Load(object sender, EventArgs e) private void frmObjekteList_Load(object sender, EventArgs e)
{ {
dGObjekte.DataSource = strasse.Objekte; //dGObjekte.DataSource = strasse.Objekte;
} }
private void dGObjekte_RowHeaderMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) private void dGObjekte_RowHeaderMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e)

19
SanSystem/frmStrassenList.cs
View File

@@ -24,10 +24,10 @@ namespace SanSystem
private void frmStrassenList_Load(object sender, EventArgs e) private void frmStrassenList_Load(object sender, EventArgs e)
{ {
bs.DataSource = Datenbank.Instance.loadedProjekt.Adressen; List<string> strassen = Database.Datenbank.Instance.loadedProjekt.Objekte.Select(x => x.StrasseName).Distinct().ToList();
bs.DataSource = strassen;
lst_strassen.DataSource = bs; lst_strassen.DataSource = bs;
this.Height = this.MdiParent.Height - 120; this.Height = this.MdiParent.Height - 120;
} }
@@ -36,11 +36,7 @@ namespace SanSystem
private void lst_strassen_SelectedIndexChanged(object sender, EventArgs e) private void lst_strassen_SelectedIndexChanged(object sender, EventArgs e)
{ {
return; return;
KlassenBIB.Strasse strasse = ((sender as ListBox).SelectedItem as KlassenBIB.Strasse);
if (strasse == null) return;
frmObjekteList objekteList = new frmObjekteList(strasse);
objekteList.MdiParent = this.MdiParent;
objekteList.Show();
} }
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
@@ -52,12 +48,13 @@ namespace SanSystem
private void lst_strassen_DoubleClick(object sender, EventArgs e) private void lst_strassen_DoubleClick(object sender, EventArgs e)
{ {
KlassenBIB.Strasse str = (KlassenBIB.Strasse)(sender as ListBox).SelectedItem; string selectedStreetName = (sender as ListBox).SelectedItem.ToString();
if (selectedStreetName == null) return;
if (str == null) return; frmObjekteList frmObjekteList = new frmObjekteList(selectedStreetName);
frmObjekteList frmObjekteList = new frmObjekteList(str);
frmObjekteList.MdiParent = this.MdiParent; frmObjekteList.MdiParent = this.MdiParent;
frmObjekteList.Show(); frmObjekteList.Show();
} }
} }
} }

6
SanVerwaltung.sln
View File

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KlassenBIBTests", "KlassenB
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchnittstelleImporter", "SchnittstelleImporter\SchnittstelleImporter.csproj", "{E1564A4D-39FD-489B-8029-AEEF33033EF2}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchnittstelleImporter", "SchnittstelleImporter\SchnittstelleImporter.csproj", "{E1564A4D-39FD-489B-8029-AEEF33033EF2}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TempCAN", "TempCAN\TempCAN.csproj", "{E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
{E1564A4D-39FD-489B-8029-AEEF33033EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {E1564A4D-39FD-489B-8029-AEEF33033EF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1564A4D-39FD-489B-8029-AEEF33033EF2}.Release|Any CPU.ActiveCfg = Release|Any CPU {E1564A4D-39FD-489B-8029-AEEF33033EF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E1564A4D-39FD-489B-8029-AEEF33033EF2}.Release|Any CPU.Build.0 = Release|Any CPU {E1564A4D-39FD-489B-8029-AEEF33033EF2}.Release|Any CPU.Build.0 = Release|Any CPU
{E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

33
TempCAN/TempCAN.csproj
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>e4979419-5eae-4b6d-a6a0-9632c1de87a0</ProjectGuid> <ProjectGuid>{E4979419-5EAE-4B6D-A6A0-9632C1DE87A0}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TempCAN</RootNamespace> <RootNamespace>TempCAN</RootNamespace>
@@ -30,24 +30,21 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System"/> <Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Core"/> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml.Linq"/> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.DataSetExtensions"/> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="Microsoft.CSharp"/> <Reference Include="System.Xml" />
<Reference Include="Tinkerforge">
<Reference Include="System.Data"/> <HintPath>..\dlls\Tinkerforge.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http"/>
<Reference Include="System.Xml"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Class1.cs" /> <Compile Include="Temperatur.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>