From 9ee15d86cb23f26b321f1462754bf600bb758089 Mon Sep 17 00:00:00 2001 From: Husky Date: Sat, 14 Jul 2018 22:50:32 +0200 Subject: [PATCH] Massenstatistik wird erstellt --- KlassenBIB/InlinerSanierung.cs | 2 +- KlassenBIB/Sanieren.cs | 4 +- SanSystem/FrmSelectMassenDate.Designer.cs | 85 ++++++++ SanSystem/FrmSelectMassenDate.cs | 27 +++ SanSystem/FrmSelectMassenDate.resx | 120 +++++++++++ SanSystem/MassenStatistik.cs | 196 ++++++++++++++++++ SanSystem/SanSystem.csproj | 13 ++ SanSystem/UCInliner.cs | 2 +- SanSystem/documents/JUME/Massenstatistik.docx | Bin 0 -> 14496 bytes SanSystem/frmMain.Designer.cs | 46 ++-- SanSystem/frmMain.cs | 6 + SanSystem/frmObjektEdit.cs | 1 + 12 files changed, 479 insertions(+), 23 deletions(-) create mode 100644 SanSystem/FrmSelectMassenDate.Designer.cs create mode 100644 SanSystem/FrmSelectMassenDate.cs create mode 100644 SanSystem/FrmSelectMassenDate.resx create mode 100644 SanSystem/MassenStatistik.cs create mode 100644 SanSystem/documents/JUME/Massenstatistik.docx diff --git a/KlassenBIB/InlinerSanierung.cs b/KlassenBIB/InlinerSanierung.cs index b87f453..7c92c0e 100644 --- a/KlassenBIB/InlinerSanierung.cs +++ b/KlassenBIB/InlinerSanierung.cs @@ -118,7 +118,7 @@ namespace KlassenBIB grunddaten["KL_HD_true"] = ""; grunddaten["KL_mech_true"] = ""; grunddaten["KL_rob_true"] = ""; - grunddaten["KL_HD_date"] = this.Datum.HasValue ? this.Datum.Value.ToShortDateString() : ""; + grunddaten["KL_HD_date"] = this.Datum.ToShortDateString(); grunddaten["KL_Besatzung"] = ""; grunddaten["liner_laenge"] = LaengeGesamt; grunddaten["Charge_Liner"] = this.LinerChargenummer; diff --git a/KlassenBIB/Sanieren.cs b/KlassenBIB/Sanieren.cs index 784a57e..2b9050f 100644 --- a/KlassenBIB/Sanieren.cs +++ b/KlassenBIB/Sanieren.cs @@ -9,12 +9,12 @@ namespace KlassenBIB public abstract class Sanieren : Sanierung { Guid guid; - DateTime? datum; + DateTime datum; bool fertig = false; string verzeichnispfad; public Guid Guid { get => guid; set => guid = value; } - public DateTime? Datum { get => datum; set => datum = value; } + public DateTime Datum { get => datum; set => datum = value; } public bool Fertig { get => fertig; set => fertig = value; } public string Verzeichnispfad { get => verzeichnispfad; protected set => verzeichnispfad = value; } } diff --git a/SanSystem/FrmSelectMassenDate.Designer.cs b/SanSystem/FrmSelectMassenDate.Designer.cs new file mode 100644 index 0000000..25f55f8 --- /dev/null +++ b/SanSystem/FrmSelectMassenDate.Designer.cs @@ -0,0 +1,85 @@ +namespace SanSystem +{ + partial class FrmSelectMassenDate + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.dt_targetDatum = new System.Windows.Forms.DateTimePicker(); + this.btn_gen = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(57, 20); + this.label1.TabIndex = 0; + this.label1.Text = "Datum"; + // + // dt_targetDatum + // + this.dt_targetDatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dt_targetDatum.Location = new System.Drawing.Point(75, 4); + this.dt_targetDatum.Name = "dt_targetDatum"; + this.dt_targetDatum.Size = new System.Drawing.Size(341, 26); + this.dt_targetDatum.TabIndex = 1; + // + // btn_gen + // + this.btn_gen.Location = new System.Drawing.Point(16, 36); + this.btn_gen.Name = "btn_gen"; + this.btn_gen.Size = new System.Drawing.Size(400, 66); + this.btn_gen.TabIndex = 2; + this.btn_gen.Text = "Erzeugen"; + this.btn_gen.UseVisualStyleBackColor = true; + this.btn_gen.Click += new System.EventHandler(this.btn_gen_Click); + // + // FrmSelectMassenDate + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(429, 114); + this.Controls.Add(this.btn_gen); + this.Controls.Add(this.dt_targetDatum); + this.Controls.Add(this.label1); + this.Name = "FrmSelectMassenDate"; + this.Text = "FrmSelectMassenDate"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.DateTimePicker dt_targetDatum; + private System.Windows.Forms.Button btn_gen; + } +} \ No newline at end of file diff --git a/SanSystem/FrmSelectMassenDate.cs b/SanSystem/FrmSelectMassenDate.cs new file mode 100644 index 0000000..9b29208 --- /dev/null +++ b/SanSystem/FrmSelectMassenDate.cs @@ -0,0 +1,27 @@ +using Database; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SanSystem +{ + public partial class FrmSelectMassenDate : Form + { + public FrmSelectMassenDate() + { + InitializeComponent(); + } + + private void btn_gen_Click(object sender, EventArgs e) + { + MassenStatistik massenStatistik = new MassenStatistik(Datenbank.Instance.loadedProjekt.Objekte, dt_targetDatum.Value); + + } + } +} diff --git a/SanSystem/FrmSelectMassenDate.resx b/SanSystem/FrmSelectMassenDate.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/FrmSelectMassenDate.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SanSystem/MassenStatistik.cs b/SanSystem/MassenStatistik.cs new file mode 100644 index 0000000..0884b83 --- /dev/null +++ b/SanSystem/MassenStatistik.cs @@ -0,0 +1,196 @@ +using Database; +using KlassenBIB; +using SanShared; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SanSystem +{ + class MassenStatistik : IMakeProtokol + { + List inspektionsobjekts = null; + + DateTime targetDatum; + public MassenStatistik(List inspektionsobjekts, DateTime datum) + { + this.inspektionsobjekts = inspektionsobjekts; + targetDatum = datum; + + + BuildBericht(SearchForWaranties()); + } + + void BuildBericht(List list) + { + Hashtable grundDaten = MakeProtokoll(""); + + DataTable inliner = getMassenTableInliner(); + + double gesamtLiner = 0; + double gesamtHarz = 0; + foreach (Inspektionsobjekt objekt in list) + { + DataRow dr = inliner.NewRow(); + dr["hausnummer"] = objekt.Hausnummer; + Trace.WriteLine(objekt.Hausnummer); + if (objekt.Hausnummer.Equals("17a")) + Debugger.Break(); + if(objekt.HaltungGemessen.Day == targetDatum.Day && + objekt.HaltungGemessen.Month == targetDatum.Month && + objekt.HaltungGemessen.Year == targetDatum.Year) + { + dr["vorbereitet"] = "ja"; + + } + else + { + dr["vorbereitet"] = "nein wurde am " + objekt.HaltungGemessen.ToShortDateString(); + } + int schachtanbindungen = 0; + foreach (Sanieren mainsan in objekt.Sanierung) + { + if ( + mainsan.Datum.Day == targetDatum.Day && + mainsan.Datum.Month == targetDatum.Month && + mainsan.Datum.Year == targetDatum.Year) + { + + if (mainsan is InlinerSanierung) + { + double linerLang = objekt.Haltungslaenge + objekt.Schachtlaenge + 0.5; + gesamtLiner += linerLang; + dr["liner_laenge"] = linerLang; + dr["kalibrierschlauch"] = objekt.Haltungslaenge + (objekt.Schachtlaenge * 2) + 0.3; + dr["preliner"] = linerLang - 0.5; + dr["harzmenge"] = linerLang * (mainsan as InlinerSanierung).HarzBedarf; + gesamtHarz += linerLang * (mainsan as InlinerSanierung).Harzbedarf; + } + if (mainsan is SchachtAnbindung) + { + schachtanbindungen++; + } + dr["schachtanbindung"] = schachtanbindungen; + } + } + inliner.Rows.Add(dr); + } + + grundDaten["gesamtHarz"] = gesamtHarz; + grundDaten["gesamtliner"] = gesamtLiner; + grundDaten["Ausdruck_datum"] = targetDatum.ToLongDateString(); + grundDaten["Ort"] = inspektionsobjekts.Last().OrtName; + grundDaten["Strasse"] = inspektionsobjekts.Last().StrasseName; + grundDaten["Projektnummer"] = Datenbank.Instance.loadedProjekt.Nummer; + BerichtGen.FrmOptions frmOptions = new BerichtGen.FrmOptions("JUME", "Massenstatistik.docx", ".", "Massenstatistik", grundDaten, null, inliner); + frmOptions.ShowDialog(); + } + + public Hashtable MakeProtokoll(string destinationPath) + { + Hashtable grundDaten = new Hashtable() + { + {"Ausdruck_datum","" }, + {"Strasse","" }, + {"Ort","" }, + {"Projektnummer","" }, + {"gesamtliner","" }, + {"gesamtHarz","" } + }; + return grundDaten; + } + + + + DataTable getMassenTableInliner() + { + DataTable dt = new DataTable("Liner"); + DataColumn column = new DataColumn("hausnummer") + { + MaxLength = 50 + }; + dt.Columns.Add(column); + + column = new DataColumn("liner_laenge") + { + MaxLength = 50 + }; + dt.Columns.Add(column); + + column = new DataColumn("kalibrierschlauch") + { + MaxLength = 50 + }; + dt.Columns.Add(column); + + column = new DataColumn("preliner") + { + MaxLength = 50 + }; + dt.Columns.Add(column); + + column = new DataColumn("harzmenge") + { + MaxLength = 50 + }; + dt.Columns.Add(column); + + column = new DataColumn("vorbereitet") + { + MaxLength = 50 + }; + dt.Columns.Add(column); + + + column = new DataColumn("schachtanbindung") + { + MaxLength = 50 + }; + dt.Columns.Add(column); + + return dt; + } + + List SearchForWaranties() + { + if (inspektionsobjekts == null) return null ; + + List result = new List(); + foreach(Inspektionsobjekt objekt in inspektionsobjekts) + { + bool add = false; + if ( + objekt.HaltungGemessen.Year == targetDatum.Year && + objekt.HaltungGemessen.Month == targetDatum.Month && + objekt.HaltungGemessen.Day == targetDatum.Day + ) + { + add = true; + } + + foreach(Sanieren san in objekt.Sanierung) + { + if (san.Fertig && + + san.Datum.Day == targetDatum.Day && + san.Datum.Month == targetDatum.Month && + san.Datum.Year == targetDatum.Year + ) + add = true; + } + + if (add) + result.Add(objekt); + + + } + return result; + + } + } +} diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 7e2107d..93020a6 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -100,6 +100,12 @@ frmProjektList.cs + + Form + + + FrmSelectMassenDate.cs + Form @@ -120,6 +126,7 @@ + @@ -155,6 +162,9 @@ frmProjektList.cs + + FrmSelectMassenDate.cs + FrmSelectNewSan.cs @@ -188,6 +198,9 @@ PreserveNewest + + PreserveNewest + diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs index 22e7d0e..f493a0a 100644 --- a/SanSystem/UCInliner.cs +++ b/SanSystem/UCInliner.cs @@ -86,7 +86,7 @@ namespace SanSystem { if(inliner.Datum == null) { - inliner.Datum = DateTime.Now; + //inliner.Datum = DateTime.Now; dt_eingebaut.DataBindings.Clear(); dt_eingebaut.DataBindings.Add(new Binding("Value", inliner, "Datum")); dt_eingebaut.Enabled = true; diff --git a/SanSystem/documents/JUME/Massenstatistik.docx b/SanSystem/documents/JUME/Massenstatistik.docx new file mode 100644 index 0000000000000000000000000000000000000000..030aab0acd0af90ea48da36c659ae45cdecb2866 GIT binary patch literal 14496 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 literal 0 HcmV?d00001 diff --git a/SanSystem/frmMain.Designer.cs b/SanSystem/frmMain.Designer.cs index ef01819..39eedb7 100644 --- a/SanSystem/frmMain.Designer.cs +++ b/SanSystem/frmMain.Designer.cs @@ -32,9 +32,10 @@ this.projektToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.neuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.öffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.speichernToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel(); - this.speichernToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -44,11 +45,11 @@ this.mainmenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.mainmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.projektToolStripMenuItem, - this.speichernToolStripMenuItem}); + this.speichernToolStripMenuItem, + this.massenstatistikToolStripMenuItem}); this.mainmenu.Location = new System.Drawing.Point(0, 0); this.mainmenu.Name = "mainmenu"; - this.mainmenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); - this.mainmenu.Size = new System.Drawing.Size(795, 28); + this.mainmenu.Size = new System.Drawing.Size(596, 24); this.mainmenu.TabIndex = 1; this.mainmenu.Text = "menuStrip1"; // @@ -58,58 +59,64 @@ this.neuToolStripMenuItem, this.öffnenToolStripMenuItem}); this.projektToolStripMenuItem.Name = "projektToolStripMenuItem"; - this.projektToolStripMenuItem.Size = new System.Drawing.Size(67, 24); + this.projektToolStripMenuItem.Size = new System.Drawing.Size(56, 20); this.projektToolStripMenuItem.Text = "Projekt"; // // neuToolStripMenuItem // this.neuToolStripMenuItem.Name = "neuToolStripMenuItem"; - this.neuToolStripMenuItem.Size = new System.Drawing.Size(181, 26); + this.neuToolStripMenuItem.Size = new System.Drawing.Size(111, 22); this.neuToolStripMenuItem.Text = "Neu"; this.neuToolStripMenuItem.Click += new System.EventHandler(this.neuToolStripMenuItem_Click); // // öffnenToolStripMenuItem // this.öffnenToolStripMenuItem.Name = "öffnenToolStripMenuItem"; - this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(181, 26); + this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(111, 22); this.öffnenToolStripMenuItem.Text = "Öffnen"; this.öffnenToolStripMenuItem.Click += new System.EventHandler(this.öffnenToolStripMenuItem_Click); // + // speichernToolStripMenuItem + // + this.speichernToolStripMenuItem.Name = "speichernToolStripMenuItem"; + this.speichernToolStripMenuItem.Size = new System.Drawing.Size(71, 20); + this.speichernToolStripMenuItem.Text = "Speichern"; + this.speichernToolStripMenuItem.Click += new System.EventHandler(this.speichernToolStripMenuItem_Click); + // // statusStrip1 // this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatus_projekt_Label}); - this.statusStrip1.Location = new System.Drawing.Point(0, 434); + this.statusStrip1.Location = new System.Drawing.Point(0, 351); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); - this.statusStrip1.Size = new System.Drawing.Size(795, 25); + this.statusStrip1.Size = new System.Drawing.Size(596, 22); this.statusStrip1.TabIndex = 3; this.statusStrip1.Text = "statusStrip1"; // // toolStripStatus_projekt_Label // this.toolStripStatus_projekt_Label.Name = "toolStripStatus_projekt_Label"; - this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(55, 20); + this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(44, 17); this.toolStripStatus_projekt_Label.Text = "Projekt"; // - // speichernToolStripMenuItem + // massenstatistikToolStripMenuItem // - this.speichernToolStripMenuItem.Name = "speichernToolStripMenuItem"; - this.speichernToolStripMenuItem.Size = new System.Drawing.Size(86, 24); - this.speichernToolStripMenuItem.Text = "Speichern"; - this.speichernToolStripMenuItem.Click += new System.EventHandler(this.speichernToolStripMenuItem_Click); + this.massenstatistikToolStripMenuItem.Name = "massenstatistikToolStripMenuItem"; + this.massenstatistikToolStripMenuItem.Size = new System.Drawing.Size(99, 20); + this.massenstatistikToolStripMenuItem.Text = "Massenstatistik"; + this.massenstatistikToolStripMenuItem.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem_Click); // // frmMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(795, 459); + this.ClientSize = new System.Drawing.Size(596, 373); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.mainmenu); this.IsMdiContainer = true; this.MainMenuStrip = this.mainmenu; - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "frmMain"; this.Text = "Kanalsanierungsverwaltung"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frm_main_FormClosing); @@ -132,6 +139,7 @@ private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripStatusLabel toolStripStatus_projekt_Label; private System.Windows.Forms.ToolStripMenuItem speichernToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem massenstatistikToolStripMenuItem; } } diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index cdd28fd..001b347 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -102,5 +102,11 @@ namespace SanSystem { Datenbank.Instance.SaveProjekt(); } + + private void massenstatistikToolStripMenuItem_Click(object sender, EventArgs e) + { + FrmSelectMassenDate frmSelectMassenDate = new FrmSelectMassenDate(); + frmSelectMassenDate.ShowDialog(); + } } } diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index 0a99d7a..b51dc0b 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -156,6 +156,7 @@ namespace SanSystem } InlinerSanierung san = new InlinerSanierung(); san.Inspektionsobjekt = inspektionsobjekt; + san.Datum = new DateTime(2018, 01, 01, 12, 00, 00); inspektionsobjekt.Sanierung.Add(san); TabPage tab = new TabPage(); tab.Text = "InlinerSanierung";