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

Objektname wird hinzugefügt

Browse Source
This commit is contained in:
Husky
2018-06-30 22:26:56 +02:00
parent f8a85bdc68
commit 94067efce2
9 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Database/Datenbank.cs
View File

@@ -29,7 +29,7 @@ namespace Database
private string projektpfad = string.Empty;
public bool LoadProjekt(string filepath)
{
UnPackProject("18-850","willyteufelchen");
//UnPackProject("18-850","willyteufelchen");
//PackSystem("./projekte/18-850.zip", "./projekte/18-850","willyteufelchen");
projektpfad = filepath;
if (File.Exists(filepath))

2
KlassenBIB/InlinerSanierung.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
public sealed class InlinerSanierung : Sanierung
public sealed class InlinerSanierung : Sanieren
{
double kalibrierUnterdruck = -0.5;
double kalibierWalzenAbstand = 0.9;

1
KlassenBIB/KlassenBIB.csproj
View File

@@ -48,6 +48,7 @@
<Compile Include="InspektionskuerzelnCollection.cs" />
<Compile Include="Inspektionsobjekt.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Sanieren.cs" />
<Compile Include="Sanierung.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

19
KlassenBIB/Sanieren.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
{
public abstract class Sanieren : Sanierung
{
Guid guid;
DateTime datum;
bool fertig = false;
public Guid Guid { get => guid; set => guid = value; }
public DateTime Datum { get => datum; set => datum = value; }
public bool Fertig { get => fertig; set => fertig = value; }
}
}

14
KlassenBIB/Sanierung.cs
View File

@@ -2,15 +2,18 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
{
//
// Zusammenfassung:
// Bietet die grundlegene Struktur für eine Sanierung
public abstract class Sanierung : INotifyPropertyChanged
{
Guid guid;
//Guid guid;
double tempAusen;
double tempKanal;
string wetter;
@@ -21,7 +24,8 @@ namespace KlassenBIB
DateTime hDReinigungDatum;
DateTime sanierungsDatum;
public Guid Guid { get => guid; set => guid = value; }
//public Guid Guid { get => guid; set => guid = value; }
public double TempAusen
{
get => tempAusen;
@@ -30,7 +34,7 @@ namespace KlassenBIB
if(tempAusen != value)
{
tempAusen = value;
NotifyPropertyChanged("");
NotifyPropertyChanged();
}
}
@@ -45,7 +49,7 @@ namespace KlassenBIB
public DateTime SanierungsDatum { get => sanierungsDatum; set => sanierungsDatum = value; }
public event PropertyChangedEventHandler PropertyChanged;
private void NotifyPropertyChanged(string propertyName)
private void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
{
if (PropertyChanged != null)
PropertyChanged(this, new PropertyChangedEventArgs(propertyName));

4
SanSystem/frmMain.cs
View File

@@ -17,8 +17,8 @@ namespace SanSystem
public frmMain()
{
InitializeComponent();
Datenbank.Instance.LoadProjekt("projekt1.xaml");
Datenbank.Instance.CreateProjekt("");
Datenbank.Instance.LoadProjekt("./temp/18-850.xaml");
//Datenbank.Instance.CreateProjekt("");
this.Width = Screen.PrimaryScreen.WorkingArea.Width;
this.Height = Screen.PrimaryScreen.WorkingArea.Height;
this.WindowState = FormWindowState.Maximized;

100
SanSystem/frmObjektEdit.Designer.cs generated
View File

@@ -88,6 +88,8 @@
this.label10 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.btn_close = new System.Windows.Forms.Button();
this.lbl_objektname = new System.Windows.Forms.Label();
this.txt_objekt_name = new System.Windows.Forms.TextBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout();
@@ -112,6 +114,8 @@
//
// tabPage1
//
this.tabPage1.Controls.Add(this.txt_objekt_name);
this.tabPage1.Controls.Add(this.lbl_objektname);
this.tabPage1.Controls.Add(this.cb_material);
this.tabPage1.Controls.Add(this.cbb_wetter);
this.tabPage1.Controls.Add(this.label24);
@@ -180,10 +184,10 @@
"unbefestigt, anstehender Boden",
"unterschiedliche Werkstoffe",
"Ziegelwerk"});
this.cb_material.Location = new System.Drawing.Point(192, 225);
this.cb_material.Location = new System.Drawing.Point(192, 252);
this.cb_material.Name = "cb_material";
this.cb_material.Size = new System.Drawing.Size(323, 28);
this.cb_material.TabIndex = 24;
this.cb_material.TabIndex = 6;
//
// cbb_wetter
//
@@ -196,7 +200,7 @@
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;
this.cbb_wetter.TabIndex = 9;
//
// label24
//
@@ -228,7 +232,7 @@
this.txt_haltungslaenge.Location = new System.Drawing.Point(188, 21);
this.txt_haltungslaenge.Name = "txt_haltungslaenge";
this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 26);
this.txt_haltungslaenge.TabIndex = 24;
this.txt_haltungslaenge.TabIndex = 11;
//
// txt_laenge_schacht
//
@@ -236,7 +240,7 @@
this.txt_laenge_schacht.Location = new System.Drawing.Point(188, 112);
this.txt_laenge_schacht.Name = "txt_laenge_schacht";
this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 26);
this.txt_laenge_schacht.TabIndex = 23;
this.txt_laenge_schacht.TabIndex = 13;
//
// label21
//
@@ -255,7 +259,7 @@
this.checkBox1.Location = new System.Drawing.Point(9, 75);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(172, 24);
this.checkBox1.TabIndex = 20;
this.checkBox1.TabIndex = 12;
this.checkBox1.Text = "Geschlossene Ende";
this.checkBox1.UseVisualStyleBackColor = true;
//
@@ -275,18 +279,18 @@
this.dt_haltunggemessen_datum.CustomFormat = "dddd, dd. MMMM yyyy hh:mm";
this.dt_haltunggemessen_datum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dt_haltunggemessen_datum.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.dt_haltunggemessen_datum.Location = new System.Drawing.Point(236, 276);
this.dt_haltunggemessen_datum.Location = new System.Drawing.Point(298, 295);
this.dt_haltunggemessen_datum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dt_haltunggemessen_datum.Name = "dt_haltunggemessen_datum";
this.dt_haltunggemessen_datum.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(354, 26);
this.dt_haltunggemessen_datum.TabIndex = 17;
this.dt_haltunggemessen_datum.TabIndex = 10;
//
// label20
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label20.Location = new System.Drawing.Point(12, 281);
this.label20.Location = new System.Drawing.Point(8, 300);
this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(216, 20);
@@ -300,7 +304,7 @@
this.txt_hausnummer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_hausnummer.Name = "txt_hausnummer";
this.txt_hausnummer.Size = new System.Drawing.Size(148, 26);
this.txt_hausnummer.TabIndex = 15;
this.txt_hausnummer.TabIndex = 8;
//
// txt_strasse
//
@@ -309,7 +313,7 @@
this.txt_strasse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_strasse.Name = "txt_strasse";
this.txt_strasse.Size = new System.Drawing.Size(320, 26);
this.txt_strasse.TabIndex = 14;
this.txt_strasse.TabIndex = 7;
//
// label19
//
@@ -336,29 +340,29 @@
// 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.Location = new System.Drawing.Point(192, 174);
this.txt_dn.Location = new System.Drawing.Point(192, 201);
this.txt_dn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_dn.Name = "txt_dn";
this.txt_dn.Size = new System.Drawing.Size(330, 26);
this.txt_dn.TabIndex = 9;
this.txt_dn.TabIndex = 5;
//
// txt_punkt_bis
//
this.txt_punkt_bis.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_punkt_bis.Location = new System.Drawing.Point(192, 126);
this.txt_punkt_bis.Location = new System.Drawing.Point(192, 153);
this.txt_punkt_bis.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_punkt_bis.Name = "txt_punkt_bis";
this.txt_punkt_bis.Size = new System.Drawing.Size(330, 26);
this.txt_punkt_bis.TabIndex = 8;
this.txt_punkt_bis.TabIndex = 4;
//
// txt_punkt_von
//
this.txt_punkt_von.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_punkt_von.Location = new System.Drawing.Point(192, 80);
this.txt_punkt_von.Location = new System.Drawing.Point(192, 107);
this.txt_punkt_von.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_punkt_von.Name = "txt_punkt_von";
this.txt_punkt_von.Size = new System.Drawing.Size(330, 26);
this.txt_punkt_von.TabIndex = 7;
this.txt_punkt_von.TabIndex = 3;
//
// txt_pro_nr
//
@@ -367,13 +371,13 @@
this.txt_pro_nr.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_pro_nr.Name = "txt_pro_nr";
this.txt_pro_nr.Size = new System.Drawing.Size(330, 26);
this.txt_pro_nr.TabIndex = 6;
this.txt_pro_nr.TabIndex = 1;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label5.Location = new System.Drawing.Point(9, 228);
this.label5.Location = new System.Drawing.Point(9, 255);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(65, 20);
@@ -384,7 +388,7 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(9, 177);
this.label4.Location = new System.Drawing.Point(9, 204);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(104, 20);
@@ -395,7 +399,7 @@
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(9, 129);
this.label3.Location = new System.Drawing.Point(9, 156);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(76, 20);
@@ -406,7 +410,7 @@
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(9, 83);
this.label2.Location = new System.Drawing.Point(9, 110);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(83, 20);
@@ -471,14 +475,14 @@
this.txt_temp_kanal.Location = new System.Drawing.Point(114, 77);
this.txt_temp_kanal.Name = "txt_temp_kanal";
this.txt_temp_kanal.Size = new System.Drawing.Size(100, 26);
this.txt_temp_kanal.TabIndex = 3;
this.txt_temp_kanal.TabIndex = 18;
//
// txt_temp_aussen
//
this.txt_temp_aussen.Location = new System.Drawing.Point(114, 34);
this.txt_temp_aussen.Name = "txt_temp_aussen";
this.txt_temp_aussen.Size = new System.Drawing.Size(100, 26);
this.txt_temp_aussen.TabIndex = 2;
this.txt_temp_aussen.TabIndex = 17;
//
// label23
//
@@ -532,7 +536,7 @@
this.cb_lb_vorbereitung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cb_lb_vorbereitung.Name = "cb_lb_vorbereitung";
this.cb_lb_vorbereitung.Size = new System.Drawing.Size(211, 88);
this.cb_lb_vorbereitung.TabIndex = 4;
this.cb_lb_vorbereitung.TabIndex = 19;
//
// cb_stvo
//
@@ -542,7 +546,7 @@
this.cb_stvo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cb_stvo.Name = "cb_stvo";
this.cb_stvo.Size = new System.Drawing.Size(263, 24);
this.cb_stvo.TabIndex = 2;
this.cb_stvo.TabIndex = 16;
this.cb_stvo.Text = "Es wurde nach StVO abgesichert";
this.cb_stvo.UseVisualStyleBackColor = true;
//
@@ -554,7 +558,7 @@
this.cb_wasserhaltung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cb_wasserhaltung.Name = "cb_wasserhaltung";
this.cb_wasserhaltung.Size = new System.Drawing.Size(269, 24);
this.cb_wasserhaltung.TabIndex = 1;
this.cb_wasserhaltung.TabIndex = 15;
this.cb_wasserhaltung.Text = "Wasserhaltung wurde eingerichtet";
this.cb_wasserhaltung.UseVisualStyleBackColor = true;
//
@@ -566,7 +570,7 @@
this.cb_genehmigung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.cb_genehmigung.Name = "cb_genehmigung";
this.cb_genehmigung.Size = new System.Drawing.Size(245, 24);
this.cb_genehmigung.TabIndex = 0;
this.cb_genehmigung.TabIndex = 14;
this.cb_genehmigung.Text = "Genehmigung wurde eingeholt";
this.cb_genehmigung.UseVisualStyleBackColor = true;
//
@@ -599,7 +603,7 @@
this.txt_liner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_liner.Name = "txt_liner";
this.txt_liner.Size = new System.Drawing.Size(148, 26);
this.txt_liner.TabIndex = 14;
this.txt_liner.TabIndex = 23;
//
// txt_harzbedarf
//
@@ -608,7 +612,7 @@
this.txt_harzbedarf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_harzbedarf.Name = "txt_harzbedarf";
this.txt_harzbedarf.Size = new System.Drawing.Size(148, 26);
this.txt_harzbedarf.TabIndex = 13;
this.txt_harzbedarf.TabIndex = 22;
//
// txt_harz
//
@@ -617,7 +621,7 @@
this.txt_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_harz.Name = "txt_harz";
this.txt_harz.Size = new System.Drawing.Size(148, 26);
this.txt_harz.TabIndex = 12;
this.txt_harz.TabIndex = 20;
//
// txt_charge_liner
//
@@ -626,7 +630,7 @@
this.txt_charge_liner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_charge_liner.Name = "txt_charge_liner";
this.txt_charge_liner.Size = new System.Drawing.Size(300, 26);
this.txt_charge_liner.TabIndex = 11;
this.txt_charge_liner.TabIndex = 24;
//
// txt_charge_harz
//
@@ -635,7 +639,7 @@
this.txt_charge_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_charge_harz.Name = "txt_charge_harz";
this.txt_charge_harz.Size = new System.Drawing.Size(300, 26);
this.txt_charge_harz.TabIndex = 10;
this.txt_charge_harz.TabIndex = 21;
//
// groupBox1
//
@@ -664,7 +668,7 @@
this.dt_kalibrierdatum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.dt_kalibrierdatum.Name = "dt_kalibrierdatum";
this.dt_kalibrierdatum.Size = new System.Drawing.Size(283, 26);
this.dt_kalibrierdatum.TabIndex = 12;
this.dt_kalibrierdatum.TabIndex = 25;
//
// txt_vakuum
//
@@ -673,7 +677,7 @@
this.txt_vakuum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_vakuum.Name = "txt_vakuum";
this.txt_vakuum.Size = new System.Drawing.Size(148, 26);
this.txt_vakuum.TabIndex = 11;
this.txt_vakuum.TabIndex = 27;
//
// txt_temp_harz
//
@@ -682,7 +686,7 @@
this.txt_temp_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_temp_harz.Name = "txt_temp_harz";
this.txt_temp_harz.Size = new System.Drawing.Size(148, 26);
this.txt_temp_harz.TabIndex = 10;
this.txt_temp_harz.TabIndex = 28;
//
// txt_walze_distance
//
@@ -691,7 +695,7 @@
this.txt_walze_distance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.txt_walze_distance.Name = "txt_walze_distance";
this.txt_walze_distance.Size = new System.Drawing.Size(148, 26);
this.txt_walze_distance.TabIndex = 9;
this.txt_walze_distance.TabIndex = 26;
//
// label17
//
@@ -797,11 +801,29 @@
this.btn_close.Location = new System.Drawing.Point(37, 641);
this.btn_close.Name = "btn_close";
this.btn_close.Size = new System.Drawing.Size(181, 50);
this.btn_close.TabIndex = 1;
this.btn_close.TabIndex = 29;
this.btn_close.Text = "Close";
this.btn_close.UseVisualStyleBackColor = true;
this.btn_close.Click += new System.EventHandler(this.btn_close_Click);
//
// lbl_objektname
//
this.lbl_objektname.AutoSize = true;
this.lbl_objektname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbl_objektname.Location = new System.Drawing.Point(9, 70);
this.lbl_objektname.Name = "lbl_objektname";
this.lbl_objektname.Size = new System.Drawing.Size(95, 20);
this.lbl_objektname.TabIndex = 25;
this.lbl_objektname.Text = "Objektname";
//
// txt_objekt_name
//
this.txt_objekt_name.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_objekt_name.Location = new System.Drawing.Point(192, 67);
this.txt_objekt_name.Name = "txt_objekt_name";
this.txt_objekt_name.Size = new System.Drawing.Size(330, 26);
this.txt_objekt_name.TabIndex = 2;
//
// frmObjektEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
@@ -895,5 +917,7 @@
private System.Windows.Forms.Label label24;
private System.Windows.Forms.ComboBox cb_material;
private System.Windows.Forms.Button btn_close;
private System.Windows.Forms.TextBox txt_objekt_name;
private System.Windows.Forms.Label lbl_objektname;
}
}

2
SanSystem/frmObjektEdit.cs
View File

@@ -33,7 +33,7 @@ namespace SanSystem
private void frmObjektEdit_Load(object sender, EventArgs e)
{
txt_objekt_name.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Objektbezeichnung"));
txt_punkt_von.DataBindings.Add(new Binding("Text", inspektionsobjekt, "VonPunkt"));
txt_punkt_bis.DataBindings.Add(new Binding("Text", inspektionsobjekt, "BisPunkt"));
txt_strasse.DataBindings.Add(new Binding("Text", inspektionsobjekt, "StrasseName"));

2
SanSystem/frmObjekteList.cs
View File

@@ -163,7 +163,7 @@ namespace SanSystem
private void FrmObjektEdit_FormClosed(object sender, FormClosedEventArgs e)
{
loadObjekte(txt_strasse.Text);
CheckEntries();
}
private void dGObjekte_DataBindingComplete(object sender, DataGridViewBindingCompleteEventArgs e)