Merge branch '4-massenstatistik' into 'master'

Resolve "Massenstatistik"

Closes #4

See merge request cosysda/SanVerwaltung!1

BerichtGen/BerichtGen.csproj

@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\BerichtGen.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

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";

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;

KlassenBIB/KlassenBIB.csproj

@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\KlassenBIB.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

KlassenBIB/Sanieren.cs

@@ -9,12 +9,12 @@ namespace KlassenBIB
     public abstract class Sanieren : Sanierung
     {
         Guid guid;
-        DateTime? datum;
+        DateTime datum = new DateTime();
         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; }
     }

SanShared/SanShared.csproj

@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\SanShared.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

SanSystem/FrmSelectMassenDate.Designer.cs

@@ -0,0 +1,85 @@
+namespace SanSystem
+{
+    partial class FrmSelectMassenDate
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        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;
+    }
+}

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);
+
+        }
+    }
+}

SanSystem/FrmSelectMassenDate.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

SanSystem/MassenStatistik.cs

@@ -0,0 +1,193 @@
+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<Inspektionsobjekt> inspektionsobjekts = null;
+        
+        DateTime targetDatum;
+        public MassenStatistik(List<Inspektionsobjekt> inspektionsobjekts, DateTime datum)
+        {
+            this.inspektionsobjekts = inspektionsobjekts;
+            targetDatum = datum;
+
+            
+            BuildBericht(SearchForWaranties());
+        }
+
+        void BuildBericht(List<Inspektionsobjekt> 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;
+                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<Inspektionsobjekt> SearchForWaranties()
+        {
+            if (inspektionsobjekts == null) return null ;
+
+            List<Inspektionsobjekt> result = new List<Inspektionsobjekt>();
+            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;
+
+        }
+    }
+}

SanSystem/SanSystem.csproj

@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\SanSystem.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="FluentFTP, Version=19.2.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentFTP.19.2.2\lib\net45\FluentFTP.dll</HintPath>
     </Reference>
@@ -49,10 +53,18 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\3rdPackage\Syncfusion.Chart.Windows.dll</HintPath>
     </Reference>
+    <Reference Include="Syncfusion.Core.WinForms, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
+    <Reference Include="Syncfusion.Grid.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
+    <Reference Include="Syncfusion.Grid.Windows, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
+    <Reference Include="Syncfusion.SfInput.WinForms, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
     <Reference Include="Syncfusion.Shared.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\3rdPackage\Syncfusion.Shared.Base.dll</HintPath>
     </Reference>
+    <Reference Include="Syncfusion.Shared.Windows, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
+    <Reference Include="Syncfusion.SpellChecker.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
+    <Reference Include="Syncfusion.Tools.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
+    <Reference Include="Syncfusion.Tools.Windows, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Design" />
@@ -100,6 +112,12 @@
     <Compile Include="frmProjektList.Designer.cs">
       <DependentUpon>frmProjektList.cs</DependentUpon>
     </Compile>
+    <Compile Include="FrmSelectMassenDate.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FrmSelectMassenDate.Designer.cs">
+      <DependentUpon>FrmSelectMassenDate.cs</DependentUpon>
+    </Compile>
     <Compile Include="FrmSelectNewSan.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -120,6 +138,7 @@
     </Compile>
     <Compile Include="Global.cs" />
     <Compile Include="HelpFunktion.cs" />
+    <Compile Include="MassenStatistik.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UCInliner.cs">
@@ -155,6 +174,9 @@
     <EmbeddedResource Include="frmProjektList.resx">
       <DependentUpon>frmProjektList.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FrmSelectMassenDate.resx">
+      <DependentUpon>FrmSelectMassenDate.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FrmSelectNewSan.resx">
       <DependentUpon>FrmSelectNewSan.cs</DependentUpon>
     </EmbeddedResource>
@@ -188,6 +210,9 @@
     <None Include="documents\JUME\liner_einbau.docx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="documents\JUME\Massenstatistik.docx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\DataSources\KlassenBIB.Strasse.datasource" />
     <None Include="Properties\Settings.settings">

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;

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;
     }
 }

SanSystem/UCSchachtanbindung.cs

@@ -17,16 +17,29 @@ namespace SanSystem
     {
         SchachtAnbindung schacht = null;
         string mydestination = string.Empty;
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="schacht"></param>
         public UCSchachtanbindung(SchachtAnbindung schacht)
         {
             InitializeComponent();
             this.schacht = schacht;
         }
 
+        /// <summary>
+        /// Sollte nicht verwendet werden
+        /// </summary>
+        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;
 
             

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(596, 24);
-            this.mainmenu.Size = new System.Drawing.Size(795, 28);
             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(596, 22);
-            this.statusStrip1.Size = new System.Drawing.Size(795, 25);
             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.massenstatistikToolStripMenuItem.Name = "massenstatistikToolStripMenuItem";
-            this.speichernToolStripMenuItem.Size = new System.Drawing.Size(86, 24);
+            this.massenstatistikToolStripMenuItem.Size = new System.Drawing.Size(99, 20);
-            this.speichernToolStripMenuItem.Text = "Speichern";
+            this.massenstatistikToolStripMenuItem.Text = "Massenstatistik";
-            this.speichernToolStripMenuItem.Click += new System.EventHandler(this.speichernToolStripMenuItem_Click);
+            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;
     }
 }
 

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();
+        }
     }
 }

SanSystem/frmObjektEdit.cs

@@ -82,18 +82,6 @@ namespace SanSystem
             
         }
 
-        private void btn_get_temp_Click(object sender, EventArgs e)
-        {
-            /*
-            ITemperature temperature = TempCAN.TemperaturBuilder.Temperatur(TempCAN.TemperaturSchnittstellen.TINKERFORGE);
-
-            double temperatur = temperature.GetTemperatur();
-            inliner.TempAusen = temperatur;
-            //var x = txt_temp_aussen.DataBindings;
-            
-            txt_temp_aussen.Update();
-            */
-        }
 
         private void btn_close_Click(object sender, EventArgs e)
         {
@@ -131,6 +119,7 @@ namespace SanSystem
         private void FrmSelectNewSan_AddSchachtAnbindungClicked(object sender, EventArgs e)
         {
             SchachtAnbindung schachtAnbindung = new SchachtAnbindung();
+            schachtAnbindung.Datum = DateTime.Now;
             schachtAnbindung.Inspektionsobjekt = inspektionsobjekt;
             inspektionsobjekt.Sanierung.Add(schachtAnbindung);
             TabPage tab = new TabPage();
@@ -156,6 +145,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";

SchnittstelleImporter/SchnittstelleImporter.csproj

@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\SchnittstelleImporter.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

TempCAN/TempCAN.csproj

@@ -20,6 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\TempCAN.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>