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

Güteschutzanpassungen durchgeführt

Browse Source
This commit is contained in:
HuskyTeufel
2020-05-06 15:41:16 +02:00
parent df08dfc415
commit 457875537e
6 changed files with 105 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BerichtGen/Bericht.cs
View File

@@ -96,7 +96,7 @@ namespace BerichtGen
if(bilderObjects.Count > 0)
{
//section.ChildEntities.Clear();
iWParagraph.Text = "Weitere Bilder";
iWParagraph.Text = "Bilddokumentation der Sanierung";
iWParagraph.AppendBreak(BreakType.LineBreak);
IWTable wTable = section.Body.AddTable();
wTable.ResetCells(1, 2);

6
KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs
View File

@@ -31,9 +31,9 @@ namespace KlassenBIB
uint rueckholgeschwindigkeit;
bool geschlosseneEnde = false; // Todo Rausschmeißen
bool preliner = false;
int lagerungTemperatur = 6;
int temperaturEinbau = 19;
double inversionsDruck = 0.6;
int lagerungTemperatur;
int temperaturEinbau;
double inversionsDruck;
DateTime anfangAushaertung;
DateTime endeAushaertung;
string ort;

108
SanSystem/UCInliner.Designer.cs generated
View File

@@ -55,6 +55,13 @@
this.cb_stvo = new System.Windows.Forms.CheckBox();
this.cb_wasserhaltung = new System.Windows.Forms.CheckBox();
this.cb_genehmigung = new System.Windows.Forms.CheckBox();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.txt_lagerung_temp = new System.Windows.Forms.TextBox();
this.txt_einbau_temp = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.txt_einbaudruck = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -75,6 +82,9 @@
//
// tabPage2
//
this.tabPage2.Controls.Add(this.label6);
this.tabPage2.Controls.Add(this.txt_einbaudruck);
this.tabPage2.Controls.Add(this.label5);
this.tabPage2.Controls.Add(this.btn_open_file);
this.tabPage2.Controls.Add(this.cb_preliner);
this.tabPage2.Controls.Add(this.txt_besatzung);
@@ -103,7 +113,7 @@
//
// btn_open_file
//
this.btn_open_file.Location = new System.Drawing.Point(535, 311);
this.btn_open_file.Location = new System.Drawing.Point(946, 109);
this.btn_open_file.Name = "btn_open_file";
this.btn_open_file.Size = new System.Drawing.Size(172, 71);
this.btn_open_file.TabIndex = 39;
@@ -127,7 +137,7 @@
//
// txt_besatzung
//
this.txt_besatzung.Location = new System.Drawing.Point(551, 192);
this.txt_besatzung.Location = new System.Drawing.Point(564, 264);
this.txt_besatzung.Name = "txt_besatzung";
this.txt_besatzung.Size = new System.Drawing.Size(296, 30);
this.txt_besatzung.TabIndex = 37;
@@ -135,7 +145,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(392, 195);
this.label2.Location = new System.Drawing.Point(398, 267);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(105, 25);
this.label2.TabIndex = 36;
@@ -187,9 +197,9 @@
//
// btn_create_protokol
//
this.btn_create_protokol.Location = new System.Drawing.Point(393, 311);
this.btn_create_protokol.Location = new System.Drawing.Point(946, 34);
this.btn_create_protokol.Name = "btn_create_protokol";
this.btn_create_protokol.Size = new System.Drawing.Size(107, 69);
this.btn_create_protokol.Size = new System.Drawing.Size(172, 69);
this.btn_create_protokol.TabIndex = 33;
this.btn_create_protokol.Text = "Protokoll erzeugen";
this.btn_create_protokol.UseVisualStyleBackColor = true;
@@ -201,6 +211,7 @@
this.ftpProgress.Name = "ftpProgress";
this.ftpProgress.Size = new System.Drawing.Size(280, 37);
this.ftpProgress.TabIndex = 29;
this.ftpProgress.Visible = false;
//
// btn_transfer_ftp
//
@@ -210,12 +221,13 @@
this.btn_transfer_ftp.TabIndex = 28;
this.btn_transfer_ftp.Text = "Daten von der Anlage downloaden";
this.btn_transfer_ftp.UseVisualStyleBackColor = true;
this.btn_transfer_ftp.Visible = false;
this.btn_transfer_ftp.Click += new System.EventHandler(this.btn_transfer_ftp_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(392, 165);
this.label1.Location = new System.Drawing.Point(398, 237);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(132, 25);
this.label1.TabIndex = 27;
@@ -223,7 +235,7 @@
//
// dt_eingebaut
//
this.dt_eingebaut.Location = new System.Drawing.Point(556, 160);
this.dt_eingebaut.Location = new System.Drawing.Point(562, 232);
this.dt_eingebaut.Name = "dt_eingebaut";
this.dt_eingebaut.Size = new System.Drawing.Size(325, 30);
this.dt_eingebaut.TabIndex = 26;
@@ -249,16 +261,16 @@
"Trocken",
"Niederschlag",
"Schnee - Eisschmelze"});
this.cbb_wetter.Location = new System.Drawing.Point(551, 224);
this.cbb_wetter.Location = new System.Drawing.Point(564, 296);
this.cbb_wetter.Name = "cbb_wetter";
this.cbb_wetter.Size = new System.Drawing.Size(282, 33);
this.cbb_wetter.Size = new System.Drawing.Size(191, 33);
this.cbb_wetter.TabIndex = 23;
//
// 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(392, 228);
this.label24.Location = new System.Drawing.Point(398, 300);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(70, 25);
this.label24.TabIndex = 24;
@@ -266,6 +278,10 @@
//
// groupBox3
//
this.groupBox3.Controls.Add(this.txt_einbau_temp);
this.groupBox3.Controls.Add(this.txt_lagerung_temp);
this.groupBox3.Controls.Add(this.label4);
this.groupBox3.Controls.Add(this.label3);
this.groupBox3.Controls.Add(this.btn_get_temp);
this.groupBox3.Controls.Add(this.txt_temp_kanal);
this.groupBox3.Controls.Add(this.txt_temp_aussen);
@@ -273,14 +289,14 @@
this.groupBox3.Controls.Add(this.label22);
this.groupBox3.Location = new System.Drawing.Point(396, 23);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(485, 131);
this.groupBox3.Size = new System.Drawing.Size(538, 200);
this.groupBox3.TabIndex = 7;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Temperatur";
//
// btn_get_temp
//
this.btn_get_temp.Location = new System.Drawing.Point(236, 29);
this.btn_get_temp.Location = new System.Drawing.Point(351, 27);
this.btn_get_temp.Name = "btn_get_temp";
this.btn_get_temp.Size = new System.Drawing.Size(174, 36);
this.btn_get_temp.TabIndex = 4;
@@ -290,14 +306,14 @@
//
// txt_temp_kanal
//
this.txt_temp_kanal.Location = new System.Drawing.Point(114, 77);
this.txt_temp_kanal.Location = new System.Drawing.Point(229, 75);
this.txt_temp_kanal.Name = "txt_temp_kanal";
this.txt_temp_kanal.Size = new System.Drawing.Size(100, 30);
this.txt_temp_kanal.TabIndex = 18;
//
// txt_temp_aussen
//
this.txt_temp_aussen.Location = new System.Drawing.Point(114, 34);
this.txt_temp_aussen.Location = new System.Drawing.Point(229, 32);
this.txt_temp_aussen.Name = "txt_temp_aussen";
this.txt_temp_aussen.Size = new System.Drawing.Size(100, 30);
this.txt_temp_aussen.TabIndex = 17;
@@ -362,6 +378,63 @@
this.cb_genehmigung.Text = "Genehmigung wurde eingeholt";
this.cb_genehmigung.UseVisualStyleBackColor = true;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(15, 123);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(131, 25);
this.label3.TabIndex = 19;
this.label3.Text = "Linerlagerung";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(15, 171);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(168, 25);
this.label4.TabIndex = 20;
this.label4.Text = "Liner beim Einbau";
//
// txt_lagerung_temp
//
this.txt_lagerung_temp.Location = new System.Drawing.Point(229, 123);
this.txt_lagerung_temp.Name = "txt_lagerung_temp";
this.txt_lagerung_temp.Size = new System.Drawing.Size(100, 30);
this.txt_lagerung_temp.TabIndex = 21;
//
// txt_einbau_temp
//
this.txt_einbau_temp.Location = new System.Drawing.Point(229, 166);
this.txt_einbau_temp.Name = "txt_einbau_temp";
this.txt_einbau_temp.Size = new System.Drawing.Size(100, 30);
this.txt_einbau_temp.TabIndex = 22;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(398, 337);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(121, 25);
this.label5.TabIndex = 40;
this.label5.Text = "Einbaudruck";
//
// txt_einbaudruck
//
this.txt_einbaudruck.Location = new System.Drawing.Point(564, 334);
this.txt_einbaudruck.Name = "txt_einbaudruck";
this.txt_einbaudruck.Size = new System.Drawing.Size(138, 30);
this.txt_einbaudruck.TabIndex = 41;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(713, 337);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(42, 25);
this.label6.TabIndex = 42;
this.label6.Text = "Bar";
//
// UCInliner
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
@@ -412,5 +485,12 @@
private System.Windows.Forms.TextBox txt_besatzung;
private System.Windows.Forms.CheckBox cb_preliner;
private System.Windows.Forms.Button btn_open_file;
private System.Windows.Forms.TextBox txt_einbau_temp;
private System.Windows.Forms.TextBox txt_lagerung_temp;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txt_einbaudruck;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
}
}

6
SanSystem/UCInliner.cs
View File

@@ -78,10 +78,16 @@ namespace SanSystem
cbb_wetter.DataBindings.Clear();
txt_besatzung.DataBindings.Clear();
cb_preliner.DataBindings.Clear();
txt_einbau_temp.DataBindings.Clear();
txt_lagerung_temp.DataBindings.Clear();
txt_einbaudruck.DataBindings.Clear();
txt_besatzung.DataBindings.Add(new Binding("Text", inliner, "Besatzung"));
cb_fertig.DataBindings.Add(new Binding("Checked", inliner, "fertig"));
cb_preliner.DataBindings.Add(new Binding("Checked", inliner, "Preliner"));
cbb_wetter.DataBindings.Add(new Binding("Text", inliner, "Wetter"));
txt_lagerung_temp.DataBindings.Add(new Binding("Text", inliner, "LagerungTemperatur"));
txt_einbau_temp.DataBindings.Add(new Binding("Text", inliner, "EinbauTemperatur"));
txt_einbaudruck.DataBindings.Add(new Binding("Text", inliner, "InversionsDruck"));
if (inliner.Datum != null)
{
if (inliner.Datum <= DateTime.MinValue || inliner.Datum >= DateTime.MaxValue)

BIN
SanSystem/documents/JUME/liner_einbauBlueLight.docx
View File

Binary file not shown.

1
SanSystem/frmMain.cs
View File

@@ -202,6 +202,7 @@ namespace SanSystem
List<BilderObject> bilder = new List<BilderObject>();
foreach(Inspektionsobjekt objekte in Database.Datenbank.Instance.loadedProjekt.Objekte)
{
if (bilder.Count > 0) bilder.Clear();
foreach(AbstractSanieren san in objekte.Sanierung)
{
if(san is InlinerSanierung)