From 9ee15d86cb23f26b321f1462754bf600bb758089 Mon Sep 17 00:00:00 2001 From: Husky Date: Sat, 14 Jul 2018 22:50:32 +0200 Subject: [PATCH 1/4] 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"; From a6e58a81ef4d0e183a3d33ab7c775a37249986d9 Mon Sep 17 00:00:00 2001 From: Husky Date: Sat, 14 Jul 2018 22:55:24 +0200 Subject: [PATCH 2/4] Design anpassungen --- BerichtGen/FrmOptions.Designer.cs | 2 ++ SanSystem/MassenStatistik.cs | 3 --- SanSystem/documents/JUME/Massenstatistik.docx | Bin 14496 -> 14531 bytes 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/BerichtGen/FrmOptions.Designer.cs b/BerichtGen/FrmOptions.Designer.cs index 6b41403..ef3f04c 100644 --- a/BerichtGen/FrmOptions.Designer.cs +++ b/BerichtGen/FrmOptions.Designer.cs @@ -61,6 +61,8 @@ // cb_pdf // this.cb_pdf.AutoSize = true; + this.cb_pdf.Checked = true; + this.cb_pdf.CheckState = System.Windows.Forms.CheckState.Checked; this.cb_pdf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cb_pdf.Location = new System.Drawing.Point(6, 35); this.cb_pdf.Name = "cb_pdf"; diff --git a/SanSystem/MassenStatistik.cs b/SanSystem/MassenStatistik.cs index 0884b83..d4eaf01 100644 --- a/SanSystem/MassenStatistik.cs +++ b/SanSystem/MassenStatistik.cs @@ -38,9 +38,6 @@ namespace SanSystem { 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) diff --git a/SanSystem/documents/JUME/Massenstatistik.docx b/SanSystem/documents/JUME/Massenstatistik.docx index 030aab0acd0af90ea48da36c659ae45cdecb2866..c8a07099a294c90546400cdb4eb130441681ac35 100644 GIT binary patch delta 4203 zcmZ9PWn7etw#Lb!yQIM(q(dZRGju9BfOJU;0}LSugD)kG#85H<4$>hdjVLjcbf+LC z3=Jv`*S*g@_nzNbU)GmreOv4QJnJ323tr7bLLwJqezzZlgYzCKLc#)AdM!xPzvQgG z<=TQPf%_Y0HFEBr(!)l%`dcWL3`S{1+%mMn@^^UvH%0qk?9D8twsr$TTbNg`URo?A zP>%Dn@7YldZO)9BXQvX%j`1>$+|Rvt^1)*d>{&PamZEK58y0IZNCP)eBH`F-l$~DQ zy*}&Oaa%?|r*-Ij5DIX?0hT%ZrM17XtQsD{vT8?qTMG$2e%%2cEG&Lf$1sn_0=@}R zZf}l79VUC=`ZCYq?yKiWz?jV2G&&70!W263462H<0XOzRJzf9 zR$w)cw`x^5vMP(57hxk_xD&gM;(h#UqzPXHHHlGrZjsjD0!qqky(kr;piV8tdLVs) z3>)HEi#e-krvLV~ z)+--S6Uns{aAW^2YdOjF4eMY`XrG8Q+JNo;Q`&G+7yKurLss6E6m(jkQ8T=)*_)`; zVR2)r4$kVgU9oVvtmh!Q<*2$sNaA8|=|6nT{BW=WWG<&|egDdYlTX%CdGjI3O)P_O3y%XjL zc7iXpcdNTO-04`Jbw&vhxXFx^PBiFcNBgYTtLk08{~{Nu8IiGUy{sYrjk>kEWIUGv z9YX61JWuqRmd(%Mw9VznYg2d$6u7;4lE>bSG?;jKD*(Ike$ftyTn~P4`0kYe?xyY~ z%;XGR4Ys`zJia+To#rE;`;jtH7E&S?qts*&q`s-u9-pzHi$cF+gAo3t9R@|32nV6`9AzC*rKe;6s!yNat zE#+5DcIO}?1yg-d+4S))Apcc?V&T>$r#LdtJ?x1k>v;aUs`CN0=yZ?OHj965<-*1;HPd1Rj*0eG8yVc zfOF$nf{#O+V@EfF$dBq4X+w#{vKrh}h*||FM$--D_wN2YQ~dfdtjd{VRYFfsY`Tjq z91sb0LWI^F)~<-*BqE>9r^JfF7m4&%qr9QZpZa_Xg-5ugmO}+!v5tu7K*+}*4LB25 zDKz4O)<{S}7Y|rETgmyVIXAOPjmbl}0JusLPSP34dvwg9Qlmx2WZgl~*Lu3aGf0iX z0O(;f$dKq&YlWzaD5F2#@+@8F1IX*}|W zF8CHy?B$T3G7jHF&CO?0gYz&~siek+-oTNH7A>>0FaO(a2nOuGMv*FsY13 zF24V5{GPxGJA9{;K|DMvtAKhdE;E@=UfQH(+LfZzs6L$ggv(3F?Ve?%P}7@pskvXE5mU2w&j)3 zZcE2{UO26?jb0gsdNGdoYAgeM(>(LjuV2_oVt-{Tm}Q-EBS>#c7-wCeU*ze}R5zb8 zF4%<9E|d>9LmZmy0;fcOOIVb^jgRXG_f;NSRfMp#`tx6=)N(t|{>b`VDmNvxpxV$& z!+gf(tR{V<+7OpU z6U}dE7FT~1_>IkQnNL6F@S!@CQ#wYQ>4yzMuUcr&A--3EZkLw&Il@PXe*O`$jC&!K zC8ZjYLCY;tI=SwXkJSL1n{3k=kw*gu>KgtTV~)S^tfAaP5{ML|oI(Q2xK5(i*;u!f z&48b|LbgXqvC!KCYPtSBu@`Vd|83@P(}1~vu7ii~i?ha_ebRZRiHKnT;@Xs{ZRyth zVxm)1{VSLLkNWnu`d|2zx?^ESWH8K-Lgx1ssnp^aERn{lmbTukv}L|*!P^P%X<|7@?lg&4vU|CclW;kfUsUIH!T7j91uAU4h;?tPJow>qnNLgpP!qji?3)P z%;Tf!@*nG?{@eOGMo-ut)fNm`=^up~{GMlkPbCgddk!9deIRe-;3#90 z;@9^`Whvlv=_pX~>ZS|){yjTm>S54+Ak&BYo&FtEYd|k?ok&pRmXC0!}3B9~2>@b9?q!5gAXL6t`3f^HJ zLElfpixoezmhlN@+)AnQdGSAg$i|PZA=QjTr0YB+pIR;H$TpIYBKFvQ?nzL zIJEH828*y>8cO3dW;g<;pC0YrsSgSs3F+`ZwMx@x6eH1Rl?rDv(+T9#fQ1%tun~>K zW-o6G?*=nvRf@4UH+FygQa(s3#y1_>~t}2hfROE^lceQO(=P6sj z%}V(~i;$`cEl-&TO!tbZDc1uC1X$i|{j_C2;*}a=8lH2_lQIM74dh1QA9fx~;T&Mf z>s3f6>E`TobjcX$!FJ31tYLSglG5*>XrGi6VmUV4F{}pj+)dr`GW#og=(*MTw6o>W zHb$ze>aKVZ+7bh^3RdILM#8G}l}T*+Rlo;>9B~H*X05W<_U68kiCHKwf-ykZd^JJew*;eLfXT8_ij3~BDvE5dq`7Xd^cnbN4055Lx#UP24F|5HK zM7~11$*%i?0~q@k2X#ld(elS$ugH4 zeeZ;CAMnGDx%KPZE}PHZs|l{1`%6DEd4q&*xOcT>wqyJm$+~@%M_mg~H`UzNSGjrX zF}~!!OaLc%N4jw(a1l3^Tj%~gCbFzzXKiiAy6$wj2?knJSmO+}OQE=-A_Trol8EsN zZ`6(6Cw$hjStn>i{WGJ$G$7Kv+2f?XzRVuVrVO)wIZuKt=2o~=QQ89P3tY8Ha-R1bNG#jEjDAC9yoCyT4%~5U zPiNoOt@L=03^5Rvp1g$wXuQ@I*TI=*`D zD8D$;8?927o98{Fc`hg#8*W=kA;26oDKssUIOY!ZTd90FHkD=SsmH8SV4(PskH4p= z+x>H_y4PB`lH3O>Va|*#G3%8ytvi7fyOx+&n3oT-n0R=_JkiJ%$MrDIp;f8_anuLf_c~)D(y1Chtr;5W@9w`^wiXq5( z&cn=GyuYD?jF+aYi)1~+CDhpX?!1Z&W7h+ob%~Ql9YlPJ7+dlmch z9M)|Jf^h-8E^+F}1FbgI^I;h zyO~3?n2pS`RDEw7mQPAj;Cr}3iOE5AN=fBT4>e<{9+R0eQ;|4Pl-htO8B3_SA zvzHuBrFHqejFL+>ij;n9MPle4BoJSABZ<;)fT}nZUE@93!bEhMnHf>@VW%SZ`E-*a zW+b4IYN@KosL>p*GPe@H2mi&nk z{qa(cT6>WHU}8~7e_{tUMVn5i@8o6FKm(@h{ zlO}Q5^_-#(E)q^a_{jU+{(Rk;gd{GIFs((At^EC69~wq(radfNUmIh@qwJZ`WV>8w zT<(K{`eieVX4X-~qB6fRYR2>jHrh|+I}*z7v93|F{x$%bTb$KZHdvfKMNr5qJIEYg z%h$w1l+^G`-_eW0%%bm1zvW+2t{M-2&7SiS@|!fa2mci2F0~kRy%?d|F8mc>h-M;~ zQSxOdiu4$4f~;C1rEOe*?HUN-0KYm#NHwYQ%MqEq{G(YiNNN7>5)W8VGH*W}jl6#- zk5GpuS1!UM2CyQ9sMPEk8?%%~98bipGc)C>R%-|qd>io6(9A=`W3KI*`c4V+qKO3^ zs4nDK{&M2<6>MkG1bran#0BKyvD7A8saDRxbacU$!XBlFIYE@t;pgxs{B+G$DBq?0 z>IE@Nh;Zt;dY5(WYP3!=s=;29A+8+MGr7DX?`ottf%0 zBE^=*$QZ{%9@T#raxQP4>*#XzcXrv|z3NdkZ)~R;Fa*vcOF9%Mv{Xy3VK#}13T^Z* zP(X5aFJkRBZ?950C8A04pq^!(c*8e+Zynkh;|Cb*j{beAyDC9>O lCEQlzFBwJLYUBf1{(o&B(q5JUk3&g{NV4Q{{gz|-)#T@ delta 4133 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 Date: Sun, 15 Jul 2018 11:53:53 +0200 Subject: [PATCH 3/4] Es wird jetzt ein massenstatistik erzeugt --- BerichtGen/BerichtGen.csproj | 1 + KlassenBIB/KlassenBIB.csproj | 1 + KlassenBIB/Sanieren.cs | 2 +- SanShared/SanShared.csproj | 1 + SanSystem/SanSystem.csproj | 12 ++++++++++++ SanSystem/UCSchachtanbindung.Designer.cs | 18 +++++++++++++++--- SanSystem/UCSchachtanbindung.cs | 13 +++++++++++++ SanSystem/documents/JUME/liner_einbau.docx | Bin 51868 -> 51889 bytes SanSystem/frmObjektEdit.cs | 13 +------------ SanSystem_exe.WibuAxProject | Bin 0 -> 6955 bytes SanVerwaltung.sln | 6 ++++++ .../SchnittstelleImporter.csproj | 1 + TempCAN/TempCAN.csproj | 1 + 13 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 SanSystem_exe.WibuAxProject diff --git a/BerichtGen/BerichtGen.csproj b/BerichtGen/BerichtGen.csproj index 536739a..30aaba9 100644 --- a/BerichtGen/BerichtGen.csproj +++ b/BerichtGen/BerichtGen.csproj @@ -20,6 +20,7 @@ DEBUG;TRACE prompt 4 + bin\Debug\BerichtGen.xml pdbonly diff --git a/KlassenBIB/KlassenBIB.csproj b/KlassenBIB/KlassenBIB.csproj index 261db06..4e33752 100644 --- a/KlassenBIB/KlassenBIB.csproj +++ b/KlassenBIB/KlassenBIB.csproj @@ -20,6 +20,7 @@ DEBUG;TRACE prompt 4 + bin\Debug\KlassenBIB.xml pdbonly diff --git a/KlassenBIB/Sanieren.cs b/KlassenBIB/Sanieren.cs index 2b9050f..c8dbca6 100644 --- a/KlassenBIB/Sanieren.cs +++ b/KlassenBIB/Sanieren.cs @@ -9,7 +9,7 @@ namespace KlassenBIB public abstract class Sanieren : Sanierung { Guid guid; - DateTime datum; + DateTime datum = new DateTime(); bool fertig = false; string verzeichnispfad; diff --git a/SanShared/SanShared.csproj b/SanShared/SanShared.csproj index cbece24..f394d1b 100644 --- a/SanShared/SanShared.csproj +++ b/SanShared/SanShared.csproj @@ -20,6 +20,7 @@ DEBUG;TRACE prompt 4 + bin\Debug\SanShared.xml pdbonly diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 93020a6..c90facd 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + bin\Debug\SanSystem.xml AnyCPU @@ -32,6 +33,9 @@ 4 + + True + ..\packages\FluentFTP.19.2.2\lib\net45\FluentFTP.dll @@ -49,10 +53,18 @@ False ..\3rdPackage\Syncfusion.Chart.Windows.dll + + + + False ..\3rdPackage\Syncfusion.Shared.Base.dll + + + + diff --git a/SanSystem/UCSchachtanbindung.Designer.cs b/SanSystem/UCSchachtanbindung.Designer.cs index d127d5a..c168eb0 100644 --- a/SanSystem/UCSchachtanbindung.Designer.cs +++ b/SanSystem/UCSchachtanbindung.Designer.cs @@ -38,6 +38,7 @@ this.bearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cb_erledigt = new System.Windows.Forms.CheckBox(); + this.dt_datum = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.pt_box)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -55,9 +56,9 @@ // txt_schachtnummer // this.txt_schachtnummer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_schachtnummer.Location = new System.Drawing.Point(252, 15); + this.txt_schachtnummer.Location = new System.Drawing.Point(141, 15); this.txt_schachtnummer.Name = "txt_schachtnummer"; - this.txt_schachtnummer.Size = new System.Drawing.Size(232, 26); + this.txt_schachtnummer.Size = new System.Drawing.Size(157, 26); this.txt_schachtnummer.TabIndex = 1; // // pt_box @@ -113,17 +114,27 @@ // this.cb_erledigt.AutoSize = true; this.cb_erledigt.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_erledigt.Location = new System.Drawing.Point(512, 10); + this.cb_erledigt.Location = new System.Drawing.Point(304, 14); this.cb_erledigt.Name = "cb_erledigt"; this.cb_erledigt.Size = new System.Drawing.Size(93, 28); this.cb_erledigt.TabIndex = 6; this.cb_erledigt.Text = "Erledigt"; this.cb_erledigt.UseVisualStyleBackColor = true; // + // dt_datum + // + this.dt_datum.CalendarFont = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dt_datum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dt_datum.Location = new System.Drawing.Point(403, 15); + this.dt_datum.Name = "dt_datum"; + this.dt_datum.Size = new System.Drawing.Size(298, 26); + this.dt_datum.TabIndex = 7; + // // UCSchachtanbindung // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.dt_datum); this.Controls.Add(this.cb_erledigt); this.Controls.Add(this.lb_pictures); this.Controls.Add(this.btn_add_bild); @@ -151,5 +162,6 @@ private System.Windows.Forms.ToolStripMenuItem bearbeitenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem löschenToolStripMenuItem; private System.Windows.Forms.CheckBox cb_erledigt; + private System.Windows.Forms.DateTimePicker dt_datum; } } diff --git a/SanSystem/UCSchachtanbindung.cs b/SanSystem/UCSchachtanbindung.cs index 8f0ea72..5d48c17 100644 --- a/SanSystem/UCSchachtanbindung.cs +++ b/SanSystem/UCSchachtanbindung.cs @@ -17,16 +17,29 @@ namespace SanSystem { SchachtAnbindung schacht = null; string mydestination = string.Empty; + /// + /// + /// + /// public UCSchachtanbindung(SchachtAnbindung schacht) { InitializeComponent(); this.schacht = schacht; } + /// + /// Sollte nicht verwendet werden + /// + public UCSchachtanbindung() + { + + } + private void UCSchachtanbindung_Load(object sender, EventArgs e) { txt_schachtnummer.DataBindings.Add(new Binding("Text", schacht, "Schachtnummer")); cb_erledigt.DataBindings.Add(new Binding("Checked", schacht, "Fertig")); + dt_datum.DataBindings.Add(new Binding("Value", schacht, "Datum")); lb_pictures.DataSource = schacht.SavedBilders; diff --git a/SanSystem/documents/JUME/liner_einbau.docx b/SanSystem/documents/JUME/liner_einbau.docx index 6ec8dc7e54f46d4519a19e25ce872deff69c59ca..ffeb8f75a3732ffc478b6cc0974a7555a89aaec7 100644 GIT binary patch delta 9583 zcmZ8{b95a{_wI>p+eTxvv28SNaGErBPHdmpPTJVE?M97lHpZ{-`@8FY_kR1YS+i#C zJ$UAsXJ&R*GE{9cR82eri0PuEI}8T^KyZctU;qFBcLyhnPZkd5uHP)}U06N70ndyS zoHONdH&hm1;pE4EINtd!N(e0mpEy^3uLCdq+(yYV z{rsUZz5Jmee;eaNoXj6CZXP=mayxuH+7pg(Qa8oUdj5DWQCBAisn?biUV9#&zO{pu za56202#*<=r`cx58s!`NMD?J{XPRt4zWzA@MoyzYHr)$LFxU!X2zsUUvH?3i zmq>(*Ba#{W^G;tu$*L@{6pW^oZSp@!(>2Q{TJ$Lv!llBU8bALah*J;$Ug?o!Tb{If zO~0ta;JTxx??~so*jo#O(aGO80F5e4vs;HSGQS{@AI!3KB(Xk|jVE6}cQXPY5gyzM zZ_3bMJJq*9JggdpI&mOHV=`D`dt1jO9pMt2Vu2)>>KMm1;hxqDzlu+<(D%R?+^ioC- zbPTdGL%-bdvH!qh6^Jb+%ylXkgbbI-Yx?OK(T0p{GteS$SdagGNRf!}voH z(iYIi((|rSP7j<(Wht zc57VP8>sjcOm>ll7v$!8j~snF7q4u(fG{hg+^A{Q4EoUQG+=~5l^xKcTupSx=jVBY ztkKF|ErCOkXl?x}tlTz&YOMC7t4$Ivl-%^=3V!KiBUz+yzg^qSn{m1o=VR{N*KO#~ z>T45>rY&WZ7*XO^-L{qxT=JfDOj}JjQPb6Q*oZkO4XoGqh@OGq$i5N2K>V+(4sFKe zuB+#cb|7Lg+Td>VXc_iBA_D!~A#2O`I&o-e2)W(pWT@VFg@H{_p`a%3yGQP=5z|U$MH+h@fzJi5U&?rX zR!(k~Y1zfFY#uGxWp=AM@Gxd}&z5mFeP6Y1=0`c8tXhZ|EXse}Y<^PP+`$Tqlka^; z!z}dTGXKs4n?LVYzHU!u>wiuIX;P^n7QiM5mq0OJ>qK^6C^?Qs)-B|hkwKe1Pb{iW zYXYh_+AVfx0IUD=Rh2Q5a#HG!yy<d`%`M$9LdybhqL2hi+klGVl=B z`@$6PLD0Q2JhUL$^%8&t|K$NNckmT$VeECZGeqU{Sw%{WkPSIBeXj(s!l$s`t2Tr+cmYBo

1*1gy*IPDBd?~rHg2{S2 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 E13FYby8r+H delta 9491 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 prompt 4 + bin\Debug\SchnittstelleImporter.xml pdbonly diff --git a/TempCAN/TempCAN.csproj b/TempCAN/TempCAN.csproj index cd599ac..764db76 100644 --- a/TempCAN/TempCAN.csproj +++ b/TempCAN/TempCAN.csproj @@ -20,6 +20,7 @@ DEBUG;TRACE prompt 4 + bin\Debug\TempCAN.xml pdbonly From a2b760ab2c363eb4728e384a25b8f8aa496e5dc8 Mon Sep 17 00:00:00 2001 From: Husky Date: Sun, 15 Jul 2018 11:54:44 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Viewer=20aus=20projektmappe=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SanVerwaltung.sln | 6 ------ 1 file changed, 6 deletions(-) diff --git a/SanVerwaltung.sln b/SanVerwaltung.sln index b418471..045699c 100644 --- a/SanVerwaltung.sln +++ b/SanVerwaltung.sln @@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Language", "Language\Langua EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BerichtGen", "BerichtGen\BerichtGen.csproj", "{3022DA07-FD06-4AEA-9FC8-00D318E95A82}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Viewer", "Viewer\Viewer.csproj", "{0DF6A372-2881-4C35-B695-69CA6ED2F0D6}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,10 +71,6 @@ Global {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Debug|Any CPU.Build.0 = Debug|Any CPU {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Release|Any CPU.ActiveCfg = Release|Any CPU {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Release|Any CPU.Build.0 = Release|Any CPU - {0DF6A372-2881-4C35-B695-69CA6ED2F0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0DF6A372-2881-4C35-B695-69CA6ED2F0D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0DF6A372-2881-4C35-B695-69CA6ED2F0D6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0DF6A372-2881-4C35-B695-69CA6ED2F0D6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE