Database removing

werden in SQL Datenbank hinzugefügt

SanSystem/App.config

@@ -4,6 +4,8 @@
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="SanSystem.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
@@ -63,4 +65,16 @@
       </setting>
     </SanSystem.Properties.Settings>
   </userSettings>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+    </providers>
+  </entityFramework>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="System.Data.SQLite.EF6" />
+      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
+    <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
+  </system.data>
 </configuration>

SanSystem/BüroExporter.cs

@@ -58,7 +58,7 @@ namespace SanSystem
                     }
                     else if (san is KlassenBIB.SchachtAnbindung)
                     {
-                        string sourceDirectory = san.CheckVerzeichnisse(Global.Instance.Projektpfad);
+                        /*string sourceDirectory = san.CheckVerzeichnisse(Global.Instance.Projektpfad);
                         SchachtAnbindung fotoDokumentation = (san as SchachtAnbindung);
                         KlassenBIB.Collections.Bilder fotos = fotoDokumentation.SavedBilders;
                         foreach (SavedBilder foto in fotos)
@@ -70,6 +70,7 @@ namespace SanSystem
 
                             File.Copy(foto.Speicherpfad, Path.Combine(tempPath, destinationName));
                         }
+                        */
 
                     }
                 }

SanSystem/Database/Datenbank.cs

@@ -9,10 +9,16 @@ using System.IO.Compression;
 using System.Diagnostics;
 using KlassenBIB;
 using SanShared.Exceptions;
-using System.Windows.Forms;
+
 
 namespace Database
 {
+   /* public class SanVerwaltungContext: DbContext
+    {
+        public DbSet<Projekt> Projekte { get; set; }
+
+    }
+   */
     public class Datenbank
     {
         public string pfad;
@@ -37,8 +43,8 @@ namespace Database
                 Directory.CreateDirectory(Path.Combine(pfad, "projekte"));
                 return;
             }
-            if (File.Exists(filepath))
+            //if (File.Exists(filepath))
-                TeufelDB = XamlServices.Load(filepath) as KlassenBIB.DB;
+                //TeufelDB = XamlServices.Load(filepath) as KlassenBIB.DB;
         }
 
         public KlassenBIB.Projekt loadedProjekt = null;
@@ -56,19 +62,21 @@ namespace Database
             this.projekt = projekt;
             loadedProjekt = Datenbank.Instance.TeufelDB.Projekte.Find(x => x.Nummer != null && x.Nummer.Equals(projekt));
            
-            string filepath = Path.Combine(pfad, "projekte", "TeufelDB.xaml");
+            /*string filepath = Path.Combine(pfad, "projekte", "TeufelDB.xaml");
             if (!File.Exists(filepath))
             {
                 if (!Directory.Exists("./projekte")) return true;
-                UpdateDatabase.UpdateNewGuids();
+                //UpdateDatabase.UpdateNewGuids();
                 
-                UpdateDatabase.TransferAuftraggeber();
+                //UpdateDatabase.TransferAuftraggeber();
-                UpdateDatabase.MakeNewDatabaseSystem();
+                //UpdateDatabase.MakeNewDatabaseSystem();
             } else
             {
                 //UpdateDatabase.GenerateNewBeziehungen();
             }
 
+            //UpdateDatabase.CreateSQLiteDB();
+            */
             return true;
         }
 
@@ -83,14 +91,8 @@ namespace Database
         public void SaveProjekt()
         {
             string filepath = Path.Combine(pfad, "projekte", "TeufelDB.xaml");
-            try
+            Trace.WriteLine(filepath);
-            {
+            //XamlServices.Save(filepath, TeufelDB);
-                XamlServices.Save(filepath, TeufelDB);
-            }
-            catch(UnauthorizedAccessException ex)
-            {
-                MessageBox.Show("Fehler beim speichern " + ex.Message);
-            }
         }
     }
 }

SanSystem/Database/UpdateDatabase.cs

@@ -1,7 +1,10 @@
-using KlassenBIB;
+/*using FastMember;
+using KlassenBIB;
 using SanShared;
 using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Data.SQLite;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -32,6 +35,169 @@ namespace Database
             return;
         }
 
+        public static void CreateSQLiteDB()
+        {
+            var source = Datenbank.Instance.TeufelDB;
+
+
+            // Auftraggber Datatable
+            DataTable dtauftraggeber = new DataTable();
+
+            // Verbindung zur SQLite herstellen
+
+            SQLiteConnection Connection = new SQLiteConnection("Data Source=datenbank.db;Version=3;");
+
+
+            SQLiteCommand Command = new SQLiteCommand("SELECT * FROM Auftraggeber", Connection);
+            SQLiteDataAdapter auftraggeberDA = new SQLiteDataAdapter();
+            //auftraggeberDA.SelectCommand = Command;
+            SQLiteCommandBuilder cmd = new SQLiteCommandBuilder(auftraggeberDA);
+
+            auftraggeberDA.SelectCommand = Command;
+            auftraggeberDA.InsertCommand = cmd.GetInsertCommand();
+
+            Connection.Open();
+
+            auftraggeberDA.Fill(dtauftraggeber);
+
+            DataTable srcdtAuftraggeber = new DataTable();
+            using (var reader = ObjectReader.Create(source.Auftraggeber, "Name", "Strasse", "Ort", "Ansprechpartner"))
+            {
+                srcdtAuftraggeber.Load(reader);
+            }
+
+            foreach (DataRow s in srcdtAuftraggeber.Rows)
+            {
+                DataRow dr = dtauftraggeber.NewRow();
+                //dr.BeginEdit();
+                dr["Name"] = s["Name"];
+                dr["Strasse"] = s["Strasse"];
+                dr["Ort"] = s["Ort"];
+                dr["Ansprechpartner"] = s["Ansprechpartner"];
+                //dr.EndEdit();
+
+                dtauftraggeber.Rows.Add(dr);
+
+            }
+            
+            auftraggeberDA.Update(dtauftraggeber);
+
+            //Imprägnierberichte
+            DataTable dtImpraegnierSource = new DataTable();
+            using (var reader = ObjectReader.Create(source.Imprägnierungen))
+            {
+                dtImpraegnierSource.Load(reader);
+            
+            }
+
+            Command = new SQLiteCommand("SELECT * FROM Impraegnierungen", Connection);
+            SQLiteDataAdapter imprDA = new SQLiteDataAdapter();
+            cmd = new SQLiteCommandBuilder(imprDA);
+            imprDA.SelectCommand = Command;
+            imprDA.InsertCommand = cmd.GetInsertCommand();
+            DataTable dtImpr = new DataTable();
+            imprDA.Fill(dtImpr);
+
+            foreach(DataRow s in dtImpraegnierSource.Rows)
+            {
+                DataRow dr = dtImpr.NewRow();
+                dr["Schlauchnummer"] = s["Schlauchnummer"];
+                dr["DN"] = s["DN"];
+                dr["Wanddicke"] = s["Wanddicke"];
+                dr["Laenge"] = s["LinerLänge"];
+                dr["NochVorhanden"] = s["NochVorhanden"];
+                dr["Impraegniernummer"] = s["Imprägniernummer"];
+                dr["ImpraegnierDatum"] = (s["ImprägnierungBeginn"] as KlassenBIB.ImprägnierungStrukture).Zeitstempel.Date.ToShortDateString();
+                dtImpr.Rows.Add(dr);
+            }
+
+            imprDA.Update(dtImpr);
+            dtImpr.Clear();
+            imprDA.Fill(dtImpr);
+
+
+
+
+            // Projekt schleife
+
+            Command = new SQLiteCommand("SELECT * FROM Projekt",Connection);
+            SQLiteDataAdapter projektDA = new SQLiteDataAdapter();
+            cmd = new SQLiteCommandBuilder(projektDA);
+            projektDA.SelectCommand = Command;
+            projektDA.InsertCommand = cmd.GetInsertCommand();
+
+            Command = new SQLiteCommand("SELECT * FROM Inspektionsobjekt", Connection);
+            SQLiteDataAdapter objektDA = new SQLiteDataAdapter();
+            cmd = new SQLiteCommandBuilder(objektDA);
+            objektDA.SelectCommand = Command;
+            objektDA.InsertCommand = cmd.GetInsertCommand();
+
+            DataTable dtprojekte = new DataTable();
+            DataTable dtObjekte = new DataTable();
+            projektDA.Fill(dtprojekte);
+            objektDA.Fill(dtObjekte);
+
+
+            int projektID = 1;
+            // Alle Projekte durch gehen
+            foreach(Projekt projekt in source.Projekte)
+            {
+                DataRow projektRow = dtprojekte.NewRow();
+                projektRow["ID"] = projektID;
+                projektRow["Nummer"] = projekt.Nummer;
+                projektRow["Ort"] = projekt.Ort;
+                projektRow["SanierungsIDPrefix"] = projekt.SanierungsIDPrefix;
+                projektRow["SanierungsIDSuffix"] = projekt.SanierungsIDSuffix;
+
+                int objektID = 1;
+                // Alle einzelne Inspektionsobjekte
+                foreach(var inspektionsobjekt in projekt.Objekte)
+                {
+                    DataRow objektRow = dtObjekte.NewRow();
+                    objektRow["id"] = objektID;
+                    objektRow["ref_projekt_id"] = projektID;
+                    objektRow["StrasseName"] = inspektionsobjekt.StrasseName;
+                    objektRow["Ort"] = inspektionsobjekt.OrtName;
+                    objektRow["Hausnummer"] = inspektionsobjekt.Hausnummer;
+                    objektRow["Projektnummer"] = inspektionsobjekt.Projektnummer;
+                    objektRow["Objektbezeichnung"] = inspektionsobjekt.Objektbezeichnung;
+                    objektRow["VonPunkt"] = inspektionsobjekt.VonPunkt;
+                    objektRow["BisPunkt"] = inspektionsobjekt.BisPunkt;
+                    objektRow["RohrMaterial"] = inspektionsobjekt.RohrMaterial;
+                    objektRow["Kanalrohrweite"] = inspektionsobjekt.Kanalrohrweite;
+                    objektRow["Haltungslaenge"] = inspektionsobjekt.Haltungslaenge;
+                    objektRow["Schachtlaenge"] = inspektionsobjekt.Schachtlaenge;
+                    objektRow["HaltungGemessen"] = inspektionsobjekt.HaltungGemessen.ToString();
+                    objektRow["Bemerkung"] = inspektionsobjekt.Bemerkung;
+                    objektRow["Inspektionsrichtung"] = inspektionsobjekt.Inspektionsrichtung;
+                    objektRow["Sanierungsnummer"] = inspektionsobjekt.Sanierungsnummer;
+
+                    foreach(Sanierung sanierung in inspektionsobjekt.Sanierung)
+                    {
+                        if(sanierung is InlinerSanierung)
+                        {
+                            
+                            InlinerSanierung san = (InlinerSanierung)sanierung;
+                            string searchquery = string.Format("Impraegniernummer = '{0}'",(san.Imprägnierungsbericht as WerkseitigImprägniert).Imprägniernummer);
+                            int refimpID = (int)dtImpr.Select(searchquery).Last()["id"];
+
+                        }
+                        
+
+                    }
+
+                    dtObjekte.Rows.Add(objektRow);
+                    objektID++;
+                }
+
+                dtprojekte.Rows.Add(projektRow);
+                projektID++;
+            }
+            projektDA.Update(dtprojekte);
+            objektDA.Update(dtObjekte);
+
+            Connection.Close();
+        }
        
 
         public static void MakeNewDatabaseSystem()
@@ -118,7 +284,8 @@ namespace Database
                 Datenbank.Instance.MainDatenbank.AuftraggeberListe.Add(tempProjekt.Auftraggeber);
 
             }
+ 
+        }
+    }
+}
 */
-        }
-    }
-}

SanSystem/Einstellungen/Settings.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+//using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -30,8 +30,8 @@ namespace SanSystem.Einstellungen
             }
             else
             {
-                string input = File.ReadAllText(modPath);
+                //string input = File.ReadAllText(modPath);
-                configuration = (Dictionary<string, long>)JsonConvert.DeserializeObject(input, typeof(Dictionary<string, long>));
+                //configuration = (Dictionary<string, long>)JsonConvert.DeserializeObject(input, typeof(Dictionary<string, long>));
             }
         }
 
@@ -65,8 +65,8 @@ namespace SanSystem.Einstellungen
 
         public virtual void SaveSettings()
         {
-            string ser = JsonConvert.SerializeObject(configuration);
+            //string ser = JsonConvert.SerializeObject(configuration);
-            File.WriteAllText(modPath, ser);
+            //File.WriteAllText(modPath, ser);
         }
 
         public void Dispose()

SanSystem/FrmAktuelleBesatzung.Designer.cs

@@ -42,9 +42,9 @@ namespace SanSystem
             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(475, 25);
+            this.label1.Size = new System.Drawing.Size(415, 20);
             this.label1.TabIndex = 0;
-            this.label1.Text = "Wer möchte Heute die Weltherrschaft an sich reißen?";
+            this.label1.Text = "Wer möchte sich Heute die Weltherschaft an sich reißen?";
             // 
             // label2
             // 
@@ -52,7 +52,7 @@ namespace SanSystem
             this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label2.Location = new System.Drawing.Point(244, 35);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(18, 25);
+            this.label2.Size = new System.Drawing.Size(13, 20);
             this.label2.TabIndex = 1;
             this.label2.Text = "/";
             // 
@@ -61,7 +61,7 @@ namespace SanSystem
             this.txt_vorarbeiter.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_vorarbeiter.Location = new System.Drawing.Point(12, 32);
             this.txt_vorarbeiter.Name = "txt_vorarbeiter";
-            this.txt_vorarbeiter.Size = new System.Drawing.Size(226, 30);
+            this.txt_vorarbeiter.Size = new System.Drawing.Size(226, 26);
             this.txt_vorarbeiter.TabIndex = 2;
             // 
             // txt_nacharbeiter
@@ -69,7 +69,7 @@ namespace SanSystem
             this.txt_nacharbeiter.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_nacharbeiter.Location = new System.Drawing.Point(263, 32);
             this.txt_nacharbeiter.Name = "txt_nacharbeiter";
-            this.txt_nacharbeiter.Size = new System.Drawing.Size(226, 30);
+            this.txt_nacharbeiter.Size = new System.Drawing.Size(226, 26);
             this.txt_nacharbeiter.TabIndex = 3;
             // 
             // btn_ok

SanSystem/FrmAuftraggeberEdit.Designer.cs

@@ -44,8 +44,7 @@
             // 
             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(5, 50);
+            this.label1.Location = new System.Drawing.Point(7, 62);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(64, 25);
             this.label1.TabIndex = 0;
@@ -55,8 +54,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(5, 82);
+            this.label2.Location = new System.Drawing.Point(7, 101);
-            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(79, 25);
             this.label2.TabIndex = 1;
@@ -66,8 +64,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(5, 111);
+            this.label3.Location = new System.Drawing.Point(7, 137);
-            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(39, 25);
             this.label3.TabIndex = 2;
@@ -77,8 +74,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label4.Location = new System.Drawing.Point(5, 149);
+            this.label4.Location = new System.Drawing.Point(7, 183);
-            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(157, 25);
             this.label4.TabIndex = 3;
@@ -87,10 +83,9 @@
             // btn_save
             // 
             this.btn_save.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btn_save.Location = new System.Drawing.Point(9, 188);
+            this.btn_save.Location = new System.Drawing.Point(12, 232);
-            this.btn_save.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_save.Name = "btn_save";
-            this.btn_save.Size = new System.Drawing.Size(436, 85);
+            this.btn_save.Size = new System.Drawing.Size(581, 105);
             this.btn_save.TabIndex = 4;
             this.btn_save.Text = "Speichern";
             this.btn_save.UseVisualStyleBackColor = true;
@@ -99,55 +94,50 @@
             // txt_name
             // 
             this.txt_name.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txt_name.Location = new System.Drawing.Point(158, 48);
+            this.txt_name.Location = new System.Drawing.Point(210, 59);
-            this.txt_name.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.txt_name.Name = "txt_name";
-            this.txt_name.Size = new System.Drawing.Size(288, 30);
+            this.txt_name.Size = new System.Drawing.Size(383, 30);
             this.txt_name.TabIndex = 5;
             // 
             // txt_strasse
             // 
             this.txt_strasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txt_strasse.Location = new System.Drawing.Point(158, 80);
+            this.txt_strasse.Location = new System.Drawing.Point(210, 98);
-            this.txt_strasse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.txt_strasse.Name = "txt_strasse";
-            this.txt_strasse.Size = new System.Drawing.Size(288, 30);
+            this.txt_strasse.Size = new System.Drawing.Size(383, 30);
             this.txt_strasse.TabIndex = 6;
             // 
             // txt_ort
             // 
             this.txt_ort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txt_ort.Location = new System.Drawing.Point(158, 111);
+            this.txt_ort.Location = new System.Drawing.Point(210, 137);
-            this.txt_ort.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.txt_ort.Name = "txt_ort";
-            this.txt_ort.Size = new System.Drawing.Size(288, 30);
+            this.txt_ort.Size = new System.Drawing.Size(383, 30);
             this.txt_ort.TabIndex = 7;
             // 
             // txt_ansp
             // 
             this.txt_ansp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txt_ansp.Location = new System.Drawing.Point(158, 146);
+            this.txt_ansp.Location = new System.Drawing.Point(210, 180);
-            this.txt_ansp.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.txt_ansp.Name = "txt_ansp";
-            this.txt_ansp.Size = new System.Drawing.Size(288, 30);
+            this.txt_ansp.Size = new System.Drawing.Size(383, 30);
             this.txt_ansp.TabIndex = 8;
             // 
             // cb_auftraggeberlist
             // 
             this.cb_auftraggeberlist.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.cb_auftraggeberlist.FormattingEnabled = true;
-            this.cb_auftraggeberlist.Location = new System.Drawing.Point(9, 10);
+            this.cb_auftraggeberlist.Location = new System.Drawing.Point(12, 12);
-            this.cb_auftraggeberlist.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_auftraggeberlist.Name = "cb_auftraggeberlist";
-            this.cb_auftraggeberlist.Size = new System.Drawing.Size(362, 33);
+            this.cb_auftraggeberlist.Size = new System.Drawing.Size(482, 33);
             this.cb_auftraggeberlist.TabIndex = 9;
             this.cb_auftraggeberlist.SelectionChangeCommitted += new System.EventHandler(this.Cb_auftraggeberlist_SelectionChangeCommitted);
             // 
             // frmAuftraggeberEdit
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(473, 297);
+            this.ClientSize = new System.Drawing.Size(631, 365);
             this.Controls.Add(this.cb_auftraggeberlist);
             this.Controls.Add(this.txt_ansp);
             this.Controls.Add(this.txt_ort);
@@ -158,9 +148,8 @@
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "frmAuftraggeberEdit";
-            this.Text = "Auftraggeber Editieren";
+            this.Text = "FrmAuftraggeberEdit";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmAuftraggeberEdit_FormClosing);
             this.ResumeLayout(false);
             this.PerformLayout();

SanSystem/FrmNewProjekt.cs

@@ -25,14 +25,11 @@ namespace SanSystem
             InitializeComponent();
         }
 
-        private bool project_already_excist(string projektnummer)
-        {
-            return Datenbank.Instance.TeufelDB.Projekte.FindAll(x => x.Nummer.Equals(projektnummer)).Count > 0;
-        }
-
         private void btn_save_Click(object sender, EventArgs e)
         {
-            if(project_already_excist(txt_pro_nr.Text))
+            using (var context = new SanVerwalterContext())
+            {
+                if (project_already_exist(context, txt_pro_nr.Text))
                 {
                     MessageBox.Show(string.Format("Projekt mit den nummer {0} excistiert bereits. Projekt wird nicht angelegt", txt_pro_nr.Text));
                     return;
@@ -40,11 +37,18 @@ namespace SanSystem
                 Projekt projekt = new Projekt();
                 projekt.Nummer = txt_pro_nr.Text;
                 projekt.Ort = txt_ort.Text;
-            Global.Instance.SetProjekt(projekt);
+                context.Projekte.Add(projekt);
+                context.SaveChanges();
+            }
             this.Close();
             //Global.Instance.ChangeProjekt(txt_pro_nr.Text);
         }
 
+        private bool project_already_exist(SanVerwalterContext context, string text)
+        {
+            return context.Projekte.Count(x => x.Nummer.Equals(text)) > 0;
+        }
+
         private void txt_pro_nr_KeyPress(object sender, KeyPressEventArgs e)
         {
             if(e.KeyChar == '/' || e.KeyChar == '\\')

SanSystem/FrmSelectMassenDate.cs

@@ -33,8 +33,6 @@ namespace SanSystem
         {
             MassenStatistik massenStatistik = null;
             List<Inspektionsobjekt> objekte;
-
-            // TODO Objekte können noch null sein, unter
             if (inspektionsobjekts == null)
                 objekte = Datenbank.Instance.loadedProjekt.Objekte;
             else

SanSystem/Global.cs

@@ -95,23 +95,11 @@ namespace SanSystem
             }
         }
 
-        internal void SetProjekt(Projekt projekt)
-        {
-            Database.Datenbank.Instance.SaveProjekt();
-            this.ProjektNummer = projekt.Nummer;
-            Database.Datenbank.Instance.loadedProjekt = null;
-            Database.Datenbank.Instance.LoadProjekt(projekt.Nummer);
-
-            if (!Directory.Exists(Projektpfad)) Directory.CreateDirectory(Projektpfad);
-            Database.Datenbank.Instance.TeufelDB.Projekte.Add(projekt);
-            Database.Datenbank.Instance.InitProjekt(projekt, Projektpfad);
-        }
-
         public string Projektpfad
         {
             get
             {
-                return Path.Combine(Properties.Settings.Default.DATABASEMAIN,speicherpfad_to_projekts, projektpfad);
+                return "C:\\";// Path.Combine(Properties.Settings.Default.DATABASEMAIN,speicherpfad_to_projekts, projektpfad);
             }
         }
 

SanSystem/KlassenBIB/Auftraggeber.cs

@@ -10,7 +10,7 @@ namespace KlassenBIB
     /// <summary>
     /// 
     /// </summary>
-    public class Auftraggeber :IAuftraggeber
+    public class Auftraggeber : DBModel, IAuftraggeber
     {
         /// <summary>
         /// 

SanSystem/KlassenBIB/DBModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KlassenBIB
+{
+    public abstract class DBModel
+    {
+        public int Id { get; set; }
+    }
+}

SanSystem/KlassenBIB/Inspektionsobjekt.cs

@@ -1,6 +1,7 @@
 using SanShared;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,12 +12,11 @@ namespace KlassenBIB
     /// <summary>
     /// 
     /// </summary>
-    [ContentProperty("Sanierung")]
+    public class Inspektionsobjekt: DBModel
-    public class Inspektionsobjekt
     {
         private string strasseName = "none";
 
-        public IAuftraggeber OverrideAuftraggeber { get; set; }
+        public Auftraggeber OverrideAuftraggeber { get; set; }
         public bool GeschlossenesEnde { get; set; }
         
         public string StrasseName  { get => strasseName; set => strasseName = value; }
@@ -43,25 +43,26 @@ namespace KlassenBIB
       
         public DateTime HaltungGemessen { get; set; }
 
-        public Collections.Inspektionskuerzeln Schadenskuerzeln { get; set; }
+        //public Collections.Inspektionskuerzeln Schadenskuerzeln { get; set; }
         
         public string Bemerkung { get; set; }
 
+        [NotMapped]
         public Collections.Sanierung Sanierung { get;set; }
         
-        public Collections.AusgefuehrteTaetigkeiten AusgefuehrteTaetigkeiten { get; set; }
+        //public Collections.AusgefuehrteTaetigkeiten AusgefuehrteTaetigkeiten { get; set; }
         
         public string Inspektionsrichtung { get; set; }
         
         public string Sanierungsnummer { get; set; }
         
-        public Guid Guid { get; set; }
+       
        
         public Inspektionsobjekt()
         {
-            Schadenskuerzeln = new Collections.Inspektionskuerzeln();
+            //Schadenskuerzeln = new Collections.Inspektionskuerzeln();
             Sanierung = new Collections.Sanierung();
-            AusgefuehrteTaetigkeiten = new Collections.AusgefuehrteTaetigkeiten();
+            //AusgefuehrteTaetigkeiten = new Collections.AusgefuehrteTaetigkeiten();
             if (HaltungGemessen <= DateTime.MinValue || HaltungGemessen >= DateTime.MaxValue) HaltungGemessen = DateTime.Now;
         }
     }

SanSystem/KlassenBIB/Projekt.cs

@@ -6,16 +6,14 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Markup;
 
-[assembly: XmlnsDefinition("http://schemas.cosysda.de/sanVerwaltung/xaml","KlassenBIB")]
 namespace KlassenBIB
 {
-    [ContentProperty("Objekte")]
+    public class Projekt: DBModel //:IProjekt
-    public class Projekt :IProjekt
     {
         public string Nummer { get; set; }
         public string Ort { get; set; }
-        public IAuftraggeber Auftraggeber { get; set; }
+        public Auftraggeber Auftraggeber { get; set; }
-        public Collections.Leistungsverzeichnis Leistungsverzeichnis { get; set; }
+        //public Collections.Leistungsverzeichnis Leistungsverzeichnis { get; set; }
         public Collections.AbwasserTechnischeAnlage Objekte { get; set; }
         public string SanierungsIDPrefix { get; set; }
         public string SanierungsIDSuffix { get; set; }
@@ -25,7 +23,7 @@ namespace KlassenBIB
         public Projekt()
         {
             Objekte = new Collections.AbwasserTechnischeAnlage();
-            Leistungsverzeichnis = new Collections.Leistungsverzeichnis();
+            //Leistungsverzeichnis = new Collections.Leistungsverzeichnis();
             Auftraggeber = new Auftraggeber();
         }
     }

SanSystem/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs

@@ -40,6 +40,7 @@ namespace KlassenBIB
         string bediener;
         DateTime anfangKalibrierung;
         DateTime endeKalibirierung;
+        DateTime tvInspektion;
         AbstractImprägnier imprägnierungsbericht;
 
         Dictionary<int, TimeSpan> lagerungZeiten = new Dictionary<int, TimeSpan>();
@@ -50,7 +51,7 @@ namespace KlassenBIB
             return haltungslaenge * harzbedarf;
         }
        
-        public override string CheckVerzeichnisse(string projektpfad)
+        public string CheckVerzeichnisse(string projektpfad)
         {
             string path = Path.Combine(projektpfad, PfadZurSan);
             if (!Directory.Exists(path)) Directory.CreateDirectory(path);
@@ -202,7 +203,7 @@ namespace KlassenBIB
             grunddaten["KL_rob_true"] = this.VorbereitetRoboter ? "X": " ";
             grunddaten["KL_HD_date"] = this.Datum.ToShortDateString();
             grunddaten["KL_Besatzung"] = this.Besatzung;
-            grunddaten["liner_laenge"] = Inspektionsobjekt.Haltungslaenge; //LaengeGesamt;
+            grunddaten["liner_laenge"] = Inspektionsobjekt.Haltungslaenge;
             grunddaten["Charge_Liner"] = this.imprägnierungsbericht == null ? this.LinerChargenummer : this.imprägnierungsbericht.Schlauchnummer;
             grunddaten["Charge_Harz"] = this.imprägnierungsbericht == null ? this.HarzChargenummer : (this.imprägnierungsbericht as WerkseitigImprägniert).Imprägniernummer;
             grunddaten["harz_bedarf_m"] = this.imprägnierungsbericht == null ? harzbedarf : this.imprägnierungsbericht.Harzmenge;
@@ -224,7 +225,7 @@ namespace KlassenBIB
             grunddaten["liner_type"] = LinerTyp;
             try
             {
-                grunddaten["TV_Kontrolle"] = string.Format("Ja, am {0}", AnfangAushaertung.Subtract(TimeSpan.FromMinutes(20)));
+                grunddaten["TV_Kontrolle"] = string.Format("Ja, am {0}", TvInspektion);
             }
             catch(ArgumentOutOfRangeException)
             {
@@ -339,5 +340,6 @@ namespace KlassenBIB
         public int EinbauTemperatur { get => temperaturEinbau; set => temperaturEinbau = value; }
         public double InversionsDruck { get => inversionsDruck; set => inversionsDruck = value; }
         public AbstractImprägnier Imprägnierungsbericht { get => imprägnierungsbericht; set => imprägnierungsbericht = value; }
+        public DateTime TvInspektion { get => tvInspektion; set => tvInspektion = value; }
     }
 }

SanSystem/KlassenBIB/Sanierung/Reparatur.cs

@@ -32,7 +32,7 @@ namespace KlassenBIB
         /// </summary>
         /// <param name="projektpfad"></param>
         /// <returns></returns>
-        public override string CheckVerzeichnisse(string projektpfad)
+        public string CheckVerzeichnisse(string projektpfad)
         {
             throw new NotImplementedException();
         }

SanSystem/KlassenBIB/Sanierung/Sanierung.cs

@@ -10,7 +10,7 @@ namespace KlassenBIB
 {
     [EditorBrowsable(EditorBrowsableState.Never)]
     [Browsable(false)]
-    public abstract class Sanierung : INotifyPropertyChanged
+    public class Sanierung : INotifyPropertyChanged
     {
         Guid guid;
         double tempAusen;
@@ -37,7 +37,7 @@ namespace KlassenBIB
             
         }
         
-        public abstract string CheckVerzeichnisse(string projektpfad);
+        //public string CheckVerzeichnisse(string projektpfad);
        
         public Guid Guid { get => guid; set => guid = value; }
         

SanSystem/KlassenBIB/SchachtAnbindung.cs

@@ -37,7 +37,7 @@ namespace KlassenBIB
         /// <summary>
         /// 
         /// </summary>
-        public override string CheckVerzeichnisse(string projektpfad)
+        public  string CheckVerzeichnisse(string projektpfad)
         {
             string path = Path.Combine(projektpfad, PfadZurSan);
             if (!Directory.Exists(path)) Directory.CreateDirectory(path);

SanSystem/Migrations/20230114101006_InitialCreate.Designer.cs

@@ -0,0 +1,226 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SanSystem;
+
+#nullable disable
+
+namespace SanSystem.Migrations
+{
+    [DbContext(typeof(SanVerwalterContext))]
+    [Migration("20230114101006_InitialCreate")]
+    partial class InitialCreate
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.0");
+
+            modelBuilder.Entity("KlassenBIB.Auftraggeber", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Ansprechpartner")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Ort")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Strasse")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Auftraggebers");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Inspektionsobjekt", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Bemerkung")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BisPunkt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("GeschlossenesEnde")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("HaltungGemessen")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("Haltungslaenge")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("Hausnummer")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Inspektionsrichtung")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("Kanalrohrweite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Objektbezeichnung")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrtName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("OverrideAuftraggeberId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ProjektId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Projektnummer")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RohrMaterial")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Sanierungsnummer")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("Schachtlaenge")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("StrasseName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("VonPunkt")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OverrideAuftraggeberId");
+
+                    b.HasIndex("ProjektId");
+
+                    b.ToTable("InspektionObjekte");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Projekt", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("AuftraggeberId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Nummer")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Ort")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SanierungsIDPrefix")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SanierungsIDSuffix")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuftraggeberId");
+
+                    b.ToTable("Projekte");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Sanierung", b =>
+                {
+                    b.Property<bool>("GenehmigungVorhanden")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HDReinigung")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("HDReinigungDatum")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("InspektionsobjektId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("STVOAbsicherung")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("TempAusen")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("TempKanal")
+                        .HasColumnType("REAL");
+
+                    b.Property<bool>("VorbereitetMechanisch")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("VorbereitetRoboter")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("WasserhaltungEingerichtet")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Wetter")
+                        .HasColumnType("TEXT");
+
+                    b.HasIndex("InspektionsobjektId");
+
+                    b.ToTable("Sanierung");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Inspektionsobjekt", b =>
+                {
+                    b.HasOne("KlassenBIB.Auftraggeber", "OverrideAuftraggeber")
+                        .WithMany()
+                        .HasForeignKey("OverrideAuftraggeberId");
+
+                    b.HasOne("KlassenBIB.Projekt", null)
+                        .WithMany("Objekte")
+                        .HasForeignKey("ProjektId");
+
+                    b.Navigation("OverrideAuftraggeber");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Projekt", b =>
+                {
+                    b.HasOne("KlassenBIB.Auftraggeber", "Auftraggeber")
+                        .WithMany()
+                        .HasForeignKey("AuftraggeberId");
+
+                    b.Navigation("Auftraggeber");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Sanierung", b =>
+                {
+                    b.HasOne("KlassenBIB.Inspektionsobjekt", "Inspektionsobjekt")
+                        .WithMany()
+                        .HasForeignKey("InspektionsobjektId");
+
+                    b.Navigation("Inspektionsobjekt");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Projekt", b =>
+                {
+                    b.Navigation("Objekte");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SanSystem/Migrations/20230114101006_InitialCreate.cs

@@ -0,0 +1,153 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace SanSystem.Migrations
+{
+    public partial class InitialCreate : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Auftraggebers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Name = table.Column<string>(type: "TEXT", nullable: true),
+                    Strasse = table.Column<string>(type: "TEXT", nullable: true),
+                    Ort = table.Column<string>(type: "TEXT", nullable: true),
+                    Ansprechpartner = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Auftraggebers", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Projekte",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Nummer = table.Column<string>(type: "TEXT", nullable: true),
+                    Ort = table.Column<string>(type: "TEXT", nullable: true),
+                    AuftraggeberId = table.Column<int>(type: "INTEGER", nullable: true),
+                    SanierungsIDPrefix = table.Column<string>(type: "TEXT", nullable: true),
+                    SanierungsIDSuffix = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Projekte", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Projekte_Auftraggebers_AuftraggeberId",
+                        column: x => x.AuftraggeberId,
+                        principalTable: "Auftraggebers",
+                        principalColumn: "Id");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "InspektionObjekte",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    OverrideAuftraggeberId = table.Column<int>(type: "INTEGER", nullable: true),
+                    GeschlossenesEnde = table.Column<bool>(type: "INTEGER", nullable: false),
+                    StrasseName = table.Column<string>(type: "TEXT", nullable: true),
+                    OrtName = table.Column<string>(type: "TEXT", nullable: true),
+                    Hausnummer = table.Column<string>(type: "TEXT", nullable: true),
+                    Projektnummer = table.Column<string>(type: "TEXT", nullable: true),
+                    Objektbezeichnung = table.Column<string>(type: "TEXT", nullable: true),
+                    VonPunkt = table.Column<string>(type: "TEXT", nullable: true),
+                    BisPunkt = table.Column<string>(type: "TEXT", nullable: true),
+                    RohrMaterial = table.Column<string>(type: "TEXT", nullable: true),
+                    Kanalrohrweite = table.Column<uint>(type: "INTEGER", nullable: false),
+                    Haltungslaenge = table.Column<double>(type: "REAL", nullable: false),
+                    Schachtlaenge = table.Column<double>(type: "REAL", nullable: false),
+                    HaltungGemessen = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    Bemerkung = table.Column<string>(type: "TEXT", nullable: true),
+                    Inspektionsrichtung = table.Column<string>(type: "TEXT", nullable: true),
+                    Sanierungsnummer = table.Column<string>(type: "TEXT", nullable: true),
+                    Guid = table.Column<Guid>(type: "TEXT", nullable: false),
+                    ProjektId = table.Column<int>(type: "INTEGER", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InspektionObjekte", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_InspektionObjekte_Auftraggebers_OverrideAuftraggeberId",
+                        column: x => x.OverrideAuftraggeberId,
+                        principalTable: "Auftraggebers",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_InspektionObjekte_Projekte_ProjektId",
+                        column: x => x.ProjektId,
+                        principalTable: "Projekte",
+                        principalColumn: "Id");
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Sanierung",
+                columns: table => new
+                {
+                    Guid = table.Column<Guid>(type: "TEXT", nullable: false),
+                    TempAusen = table.Column<double>(type: "REAL", nullable: false),
+                    TempKanal = table.Column<double>(type: "REAL", nullable: false),
+                    Wetter = table.Column<string>(type: "TEXT", nullable: true),
+                    GenehmigungVorhanden = table.Column<bool>(type: "INTEGER", nullable: false),
+                    WasserhaltungEingerichtet = table.Column<bool>(type: "INTEGER", nullable: false),
+                    STVOAbsicherung = table.Column<bool>(type: "INTEGER", nullable: false),
+                    HDReinigung = table.Column<bool>(type: "INTEGER", nullable: false),
+                    HDReinigungDatum = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    InspektionsobjektId = table.Column<int>(type: "INTEGER", nullable: true),
+                    VorbereitetMechanisch = table.Column<bool>(type: "INTEGER", nullable: false),
+                    VorbereitetRoboter = table.Column<bool>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.ForeignKey(
+                        name: "FK_Sanierung_InspektionObjekte_InspektionsobjektId",
+                        column: x => x.InspektionsobjektId,
+                        principalTable: "InspektionObjekte",
+                        principalColumn: "Id");
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InspektionObjekte_OverrideAuftraggeberId",
+                table: "InspektionObjekte",
+                column: "OverrideAuftraggeberId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InspektionObjekte_ProjektId",
+                table: "InspektionObjekte",
+                column: "ProjektId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Projekte_AuftraggeberId",
+                table: "Projekte",
+                column: "AuftraggeberId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Sanierung_InspektionsobjektId",
+                table: "Sanierung",
+                column: "InspektionsobjektId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Sanierung");
+
+            migrationBuilder.DropTable(
+                name: "InspektionObjekte");
+
+            migrationBuilder.DropTable(
+                name: "Projekte");
+
+            migrationBuilder.DropTable(
+                name: "Auftraggebers");
+        }
+    }
+}

SanSystem/Migrations/SanVerwalterContextModelSnapshot.cs

@@ -0,0 +1,224 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using SanSystem;
+
+#nullable disable
+
+namespace SanSystem.Migrations
+{
+    [DbContext(typeof(SanVerwalterContext))]
+    partial class SanVerwalterContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.0");
+
+            modelBuilder.Entity("KlassenBIB.Auftraggeber", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Ansprechpartner")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Ort")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Strasse")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Auftraggebers");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Inspektionsobjekt", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Bemerkung")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("BisPunkt")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("GeschlossenesEnde")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("HaltungGemessen")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("Haltungslaenge")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("Hausnummer")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Inspektionsrichtung")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("Kanalrohrweite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Objektbezeichnung")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OrtName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("OverrideAuftraggeberId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("ProjektId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Projektnummer")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("RohrMaterial")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Sanierungsnummer")
+                        .HasColumnType("TEXT");
+
+                    b.Property<double>("Schachtlaenge")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("StrasseName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("VonPunkt")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OverrideAuftraggeberId");
+
+                    b.HasIndex("ProjektId");
+
+                    b.ToTable("InspektionObjekte");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Projekt", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("AuftraggeberId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Nummer")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Ort")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SanierungsIDPrefix")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SanierungsIDSuffix")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuftraggeberId");
+
+                    b.ToTable("Projekte");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Sanierung", b =>
+                {
+                    b.Property<bool>("GenehmigungVorhanden")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("HDReinigung")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("HDReinigungDatum")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("InspektionsobjektId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("STVOAbsicherung")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("TempAusen")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("TempKanal")
+                        .HasColumnType("REAL");
+
+                    b.Property<bool>("VorbereitetMechanisch")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("VorbereitetRoboter")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("WasserhaltungEingerichtet")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Wetter")
+                        .HasColumnType("TEXT");
+
+                    b.HasIndex("InspektionsobjektId");
+
+                    b.ToTable("Sanierung");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Inspektionsobjekt", b =>
+                {
+                    b.HasOne("KlassenBIB.Auftraggeber", "OverrideAuftraggeber")
+                        .WithMany()
+                        .HasForeignKey("OverrideAuftraggeberId");
+
+                    b.HasOne("KlassenBIB.Projekt", null)
+                        .WithMany("Objekte")
+                        .HasForeignKey("ProjektId");
+
+                    b.Navigation("OverrideAuftraggeber");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Projekt", b =>
+                {
+                    b.HasOne("KlassenBIB.Auftraggeber", "Auftraggeber")
+                        .WithMany()
+                        .HasForeignKey("AuftraggeberId");
+
+                    b.Navigation("Auftraggeber");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Sanierung", b =>
+                {
+                    b.HasOne("KlassenBIB.Inspektionsobjekt", "Inspektionsobjekt")
+                        .WithMany()
+                        .HasForeignKey("InspektionsobjektId");
+
+                    b.Navigation("Inspektionsobjekt");
+                });
+
+            modelBuilder.Entity("KlassenBIB.Projekt", b =>
+                {
+                    b.Navigation("Objekte");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

SanSystem/NuGet.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <packageSources>
+ <add key="wibu-packages" value="%ProgramData%\CodeMeter\DevKit\dotnet\NuGet" />
+ </packageSources>
+</configuration>

SanSystem/Program.cs

@@ -18,13 +18,14 @@ namespace SanSystem
         [STAThread]
         static void Main()
         {
+
             new Mutex(initiallyOwned: true, "SanVerwaltung", out bool result);
             if(!result)
             {
                 MessageBox.Show("Bitte nur 1 Instanz starten der Software!", "", MessageBoxButtons.OK, MessageBoxIcon.Hand);
                 Environment.Exit(1);
             }
-//#if !DEBUG
+#if !DEBUG
             try
             {
                 using (Dongle dongle = new Dongle(60))
@@ -48,11 +49,11 @@ namespace SanSystem
                 MessageBox.Show("Sorry es wurde kein Dongle gefunden!\n" + ex.Message);
                 Application.Exit();
             }
-/*#else
+#else
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new frmMain());
-#endif*/
+#endif
         }
         
     }

SanSystem/ProgrammModule.cs

@@ -14,8 +14,6 @@ namespace SanSystem
         HUTPROFIL = 8,
         QUICKLOCK = 16,
         DICHTHEITSPRÜFUNG = 32,
-        STAMMDATEN = 64,
-        BUEROEXPORTER = 128,
     }
 
     class ProgrammModules

SanSystem/Properties/Settings.Designer.cs

@@ -1,38 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.42000
-//
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace SanSystem.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("C:\\")]
-        public string DATABASEMAIN {
-            get {
-                return ((string)(this["DATABASEMAIN"]));
-            }
-            set {
-                this["DATABASEMAIN"] = value;
-            }
-        }
-    }
-}

SanSystem/Properties/Settings.settings

@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="SanSystem.Properties" GeneratedClassName="Settings">
-  <Profiles />
-  <Settings>
-    <Setting Name="DATABASEMAIN" Type="System.String" Scope="User">
-      <Value Profile="(Default)">C:\</Value>
-    </Setting>
-  </Settings>
-</SettingsFile>

SanSystem/SanShared/Dongle.cs

@@ -24,15 +24,15 @@ namespace SanShared
 
         public Dongle(uint ProductCode)
         {
-//if !DEBUG
+#if !DEBUG
             this.FirmCode = 103086;
             this.ProductCode = ProductCode;
-/*#else
+#else
             return;
             this.FirmCode = 10;
             this.ProductCode = 1;
 #endif
-*/
+
 
             cmApi = new Api();
             cmCred = new CmCredential();
@@ -102,15 +102,22 @@ namespace SanShared
 
         public void CleanDongle()
         {
+#if DEBUG
+            return;
+#endif
             cmApi.CmRelease(hcmse);
         }
 
         public bool CheckDongleVorhanden()
         {
+#if LAPTOP
+            return true;
+#else
             if (hcmse == null)
                 return false;
             else
                 return true;
+#endif
         }
 
         public string GetDongleSerial()
@@ -139,6 +146,9 @@ namespace SanShared
 
         public bool IsLicensed(byte neededMask)
         {
+#if DEBUG
+            return true;
+#else
             uint DongleFeature = GetFeatureMap();
 
             //Trace.WriteLine("DongleFeature: " + DongleFeature);
@@ -148,6 +158,7 @@ namespace SanShared
             if ((DongleFeatureB & neededMask) == neededMask)
                 return true;
             return false;
+#endif
         }
 
         public void Dispose()

SanSystem/SanSystem.csproj

@@ -1,618 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
 	<PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C6546A88-8830-4EF2-B99C-B9183171F6EF}</ProjectGuid>
 		<OutputType>WinExe</OutputType>
-    <RootNamespace>SanSystem</RootNamespace>
+		<TargetFramework>net6.0-windows</TargetFramework>
-    <AssemblyName>SanSystem</AssemblyName>
+		<UseWindowsForms>true</UseWindowsForms>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LAPTOP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
 	</PropertyGroup>
+
 	<ItemGroup>
-    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+	  <None Remove="version.txt" />
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="FluentFTP, Version=37.0.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentFTP.37.0.2\lib\net45\FluentFTP.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Chart.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Chart.Base.19.4.0.56\lib\net46\Syncfusion.Chart.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Chart.Windows, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Chart.Windows.19.4.0.56\lib\net46\Syncfusion.Chart.Windows.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Compression.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Compression.Base.19.4.0.56\lib\net46\Syncfusion.Compression.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Core.WinForms, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Core.WinForms.19.4.0.56\lib\net46\Syncfusion.Core.WinForms.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.DocIO.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.DocIO.WinForms.19.4.0.56\lib\net46\Syncfusion.DocIO.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.DocToPdfConverter.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.DocToPDFConverter.WinForms.19.4.0.56\lib\net46\Syncfusion.DocToPdfConverter.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Grid.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Grid.Base.19.4.0.56\lib\net46\Syncfusion.Grid.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Grid.Windows, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Grid.Windows.19.4.0.56\lib\net46\Syncfusion.Grid.Windows.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Grouping.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Grouping.Base.19.4.0.56\lib\net46\Syncfusion.Grouping.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Licensing, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Licensing.19.4.0.56\lib\net46\Syncfusion.Licensing.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.OfficeChart.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.OfficeChart.Base.19.4.0.56\lib\net46\Syncfusion.OfficeChart.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Pdf.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Pdf.WinForms.19.4.0.56\lib\net46\Syncfusion.Pdf.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.PdfViewer.Windows, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.PdfViewer.Windows.19.4.0.56\lib\net46\Syncfusion.PdfViewer.Windows.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.SfInput.WinForms, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.SfInput.WinForms.19.4.0.56\lib\net46\Syncfusion.SfInput.WinForms.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.SfSpellChecker.WPF, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.SfSpellChecker.WPF.19.4.0.56\lib\net46\Syncfusion.SfSpellChecker.WPF.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Shared.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Shared.Base.19.4.0.56\lib\net46\Syncfusion.Shared.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Shared.Windows, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Shared.Windows.19.4.0.56\lib\net46\Syncfusion.Shared.Windows.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Shared.WPF, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Shared.WPF.19.4.0.56\lib\net46\Syncfusion.Shared.WPF.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.SpellChecker.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.SpellChecker.Base.19.4.0.56\lib\net46\Syncfusion.SpellChecker.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Tools.Base, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Tools.Base.19.4.0.56\lib\net46\Syncfusion.Tools.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="Syncfusion.Tools.Windows, Version=19.4460.0.56, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
-      <HintPath>..\packages\Syncfusion.Tools.Windows.19.4.0.56\lib\net46\Syncfusion.Tools.Windows.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Tinkerforge">
-      <HintPath>..\dlls\Tinkerforge.dll</HintPath>
-    </Reference>
-    <Reference Include="WibuCmNET">
-      <HintPath>..\3rdPackage\WibuCmNET.dll</HintPath>
-    </Reference>
-    <Reference Include="wupi.net">
-      <HintPath>..\3rdPackage\wupi.net.dll</HintPath>
-    </Reference>
-    <Reference Include="WupiEngineNet">
-      <HintPath>..\3rdPackage\WupiEngineNet.dll</HintPath>
-    </Reference>
 	</ItemGroup>
+
 	<ItemGroup>
-    <Compile Include="BerichtGen\Bericht.cs" />
-    <Compile Include="BerichtGen\BerichtWorker.cs" />
-    <Compile Include="BerichtGen\FrmOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="BerichtGen\FrmOptions.Designer.cs">
-      <DependentUpon>FrmOptions.cs</DependentUpon>
-    </Compile>
-    <Compile Include="BerichtGen\makeGraphic.cs" />
-    <Compile Include="BüroExporter.cs" />
-    <Compile Include="CSVParser\AcceptedCSVFormats.cs" />
-    <Compile Include="CSVParser\BlueLight.cs" />
-    <Compile Include="CSVParser\CSVParser.cs" />
-    <Compile Include="CSVParser\CsvParserFactory.cs" />
-    <Compile Include="CSVParser\UVRelining.cs" />
-    <Compile Include="Database\Datenbank.cs" />
-    <Compile Include="Database\UpdateDatabase.cs" />
-    <Compile Include="Einstellungen\ObjecteListSetting.cs" />
-    <Compile Include="Einstellungen\Settings.cs" />
-    <Compile Include="Einstellungen\SoftwareConfiguration.cs" />
-    <Compile Include="Einstellungen\StreetListSettings.cs" />
-    <Compile Include="FrmAktuelleBesatzung.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmAktuelleBesatzung.Designer.cs">
-      <DependentUpon>FrmAktuelleBesatzung.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmAuftraggeberEdit.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmAuftraggeberEdit.Designer.cs">
-      <DependentUpon>frmAuftraggeberEdit.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmExceptionWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmExceptionWindow.Designer.cs">
-      <DependentUpon>frmExceptionWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FrmGetDataFromBluelight.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmGetDataFromBluelight.Designer.cs">
-      <DependentUpon>FrmGetDataFromBluelight.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmImprägnierBerichtEdit.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmImprägnierBerichtEdit.Designer.cs">
-      <DependentUpon>frmImprägnierBerichtEdit.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmImprägnierBerichtList.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmImprägnierBerichtList.Designer.cs">
-      <DependentUpon>frmImprägnierBerichtList.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmKalibrierungFestlegung.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmKalibrierungFestlegung.Designer.cs">
-      <DependentUpon>frmKalibrierungFestlegung.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FrmLinerReste.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmLinerReste.Designer.cs">
-      <DependentUpon>FrmLinerReste.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmNewProjekt.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmNewProjekt.Designer.cs">
-      <DependentUpon>frmNewProjekt.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmObjektEdit.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmObjektEdit.Designer.cs">
-      <DependentUpon>frmObjektEdit.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmObjekteList.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmObjekteList.Designer.cs">
-      <DependentUpon>frmObjekteList.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmOffsetSet.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmOffsetSet.Designer.cs">
-      <DependentUpon>frmOffsetSet.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FrmPrefixSuffix.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FrmPrefixSuffix.Designer.cs">
-      <DependentUpon>FrmPrefixSuffix.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmProjektList.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmProjektList.Designer.cs">
-      <DependentUpon>frmProjektList.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmReparaturKonzept.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmReparaturKonzept.Designer.cs">
-      <DependentUpon>frmReparaturKonzept.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmSanKonzeptList.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmSanKonzeptList.Designer.cs">
-      <DependentUpon>frmSanKonzeptList.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>
-    <Compile Include="frmSelectNewSan.Designer.cs">
-      <DependentUpon>frmSelectNewSan.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmSettings.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmSettings.Designer.cs">
-      <DependentUpon>frmSettings.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmStrassenList.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmStrassenList.Designer.cs">
-      <DependentUpon>frmStrassenList.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmMain.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmMain.Designer.cs">
-      <DependentUpon>frmMain.cs</DependentUpon>
-    </Compile>
-    <Compile Include="frmInfo.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="frmInfo.Designer.cs">
-      <DependentUpon>frmInfo.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Global.cs" />
-    <Compile Include="KlassenBIB\Auftraggeber.cs" />
-    <Compile Include="KlassenBIB\AusgefuehrteTaetigkeiten.cs" />
-    <Compile Include="KlassenBIB\Collections\AbwasserTechnischeAnlage.cs" />
-    <Compile Include="KlassenBIB\Collections\AuftraggeberList.cs" />
-    <Compile Include="KlassenBIB\Collections\AusgefuehrteTaetigkeiten.cs" />
-    <Compile Include="KlassenBIB\Collections\Bilder.cs" />
-    <Compile Include="KlassenBIB\Collections\ChargeNummer.cs" />
-    <Compile Include="KlassenBIB\Collections\ImprägnierBericht.cs" />
-    <Compile Include="KlassenBIB\Collections\Inspektionskuerzeln.cs" />
-    <Compile Include="KlassenBIB\Collections\Leistungsverzeichnis.cs" />
-    <Compile Include="KlassenBIB\Collections\Projekte.cs" />
-    <Compile Include="KlassenBIB\Collections\Sanierung.cs" />
-    <Compile Include="KlassenBIB\Collections\Sanierungskonzept.cs" />
-    <Compile Include="KlassenBIB\DB.cs" />
-    <Compile Include="KlassenBIB\IImportedObjekte.cs" />
-    <Compile Include="KlassenBIB\Inspektionskuerzeln.cs" />
-    <Compile Include="KlassenBIB\Inspektionsobjekt.cs" />
-    <Compile Include="KlassenBIB\LeistungsVerzeichnis.cs" />
-    <Compile Include="KlassenBIB\Lieferschein.cs" />
-    <Compile Include="KlassenBIB\LinerChargen.cs" />
-    <Compile Include="KlassenBIB\Projekt.cs" />
-    <Compile Include="KlassenBIB\Sanierungskonzept.cs" />
-    <Compile Include="KlassenBIB\Sanierung\AbstractSanieren.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Renovation\AbstractImprägnier.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Renovation\ImprägnierungStrukture.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Renovation\InlinerSanierung.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Renovation\UVAnlagenTyp.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Renovation\VorOrtImprägnier.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Renovation\WerkseitigImprägniert.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Reparatur.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Reparatur\Hutprofil.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Reparatur\Kurzliner.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Reparatur\Quicklock.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Reparatur\SanMitHarz.cs" />
-    <Compile Include="KlassenBIB\Sanierung\Sanierung.cs" />
-    <Compile Include="KlassenBIB\Sanierung\StructChargeNummern.cs" />
-    <Compile Include="KlassenBIB\SavedBilder.cs" />
-    <Compile Include="KlassenBIB\SchachtAnbindung.cs" />
-    <Compile Include="MassenStatistik.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="ProgrammModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SanShared\BerichtWorker.cs" />
-    <Compile Include="SanShared\BilderObject.cs" />
-    <Compile Include="SanShared\Dongle.cs" />
-    <Compile Include="SanShared\Exceptions\CSVImportException.cs" />
-    <Compile Include="SanShared\Exceptions\DataBaseVersionMismatchException.cs" />
-    <Compile Include="SanShared\Exceptions\LangNotFoundException.cs" />
-    <Compile Include="SanShared\IAuftraggeber.cs" />
-    <Compile Include="SanShared\IImportedObjekte.cs" />
-    <Compile Include="SanShared\IMakeProtokol.cs" />
-    <Compile Include="SanShared\IProjekt.cs" />
-    <Compile Include="SanShared\IReadCSVData.cs" />
-    <Compile Include="SanShared\ITemperature.cs" />
-    <Compile Include="SanShared\UVcsvStrukture.cs" />
-    <Compile Include="SchnittstelleImporter\I2006XML.cs" />
-    <Compile Include="SchnittstelleImporter\ImportBuilder.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\Anschlussdaten.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\Enums.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\InspizierteAbwassertechnischeAnlage.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\Lage.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\OptischeInspektion.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\RGrunddaten.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\Rohrleitung.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\RZustand.cs" />
-    <Compile Include="SchnittstelleImporter\XML2006\XMLParser.cs" />
-    <Compile Include="TempCAN\TemperaturBuilder.cs" />
-    <Compile Include="TempCAN\TinkerForgeTemperatur.cs" />
-    <Compile Include="UCInliner.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UCInliner.Designer.cs">
-      <DependentUpon>UCInliner.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UCLinerGrundlagenBrawo.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UCLinerGrundlagenBrawo.Designer.cs">
-      <DependentUpon>UCLinerGrundlagenBrawo.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UCWeitereFotos.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UCWeitereFotos.Designer.cs">
-      <DependentUpon>UCWeitereFotos.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UCWerkseitigImprägniert.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UCWerkseitigImprägniert.Designer.cs">
-      <DependentUpon>UCWerkseitigImprägniert.cs</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="BerichtGen\FrmOptions.resx">
-      <DependentUpon>FrmOptions.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FrmAktuelleBesatzung.resx">
-      <DependentUpon>FrmAktuelleBesatzung.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmAuftraggeberEdit.resx">
-      <DependentUpon>frmAuftraggeberEdit.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmExceptionWindow.resx">
-      <DependentUpon>frmExceptionWindow.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FrmGetDataFromBluelight.resx">
-      <DependentUpon>FrmGetDataFromBluelight.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmImprägnierBerichtEdit.resx">
-      <DependentUpon>frmImprägnierBerichtEdit.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmImprägnierBerichtList.resx">
-      <DependentUpon>frmImprägnierBerichtList.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmKalibrierungFestlegung.resx">
-      <DependentUpon>frmKalibrierungFestlegung.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FrmLinerReste.resx">
-      <DependentUpon>FrmLinerReste.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmNewProjekt.resx">
-      <DependentUpon>frmNewProjekt.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmObjektEdit.resx">
-      <DependentUpon>frmObjektEdit.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmObjekteList.resx">
-      <DependentUpon>frmObjekteList.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmOffsetSet.resx">
-      <DependentUpon>frmOffsetSet.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FrmPrefixSuffix.resx">
-      <DependentUpon>FrmPrefixSuffix.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmProjektList.resx">
-      <DependentUpon>frmProjektList.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmReparaturKonzept.resx">
-      <DependentUpon>frmReparaturKonzept.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmSanKonzeptList.resx">
-      <DependentUpon>frmSanKonzeptList.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmSelectMassenDate.resx">
-      <DependentUpon>frmSelectMassenDate.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmSelectNewSan.resx">
-      <DependentUpon>frmSelectNewSan.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmSettings.resx">
-      <DependentUpon>frmSettings.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmStrassenList.resx">
-      <DependentUpon>frmStrassenList.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmMain.resx">
-      <DependentUpon>frmMain.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmInfo.resx">
-      <DependentUpon>frmInfo.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <EmbeddedResource Include="UCInliner.resx">
-      <DependentUpon>UCInliner.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UCLinerGrundlagenBrawo.resx">
-      <DependentUpon>UCLinerGrundlagenBrawo.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UCWeitereFotos.resx">
-      <DependentUpon>UCWeitereFotos.cs</DependentUpon>
-    </EmbeddedResource>
-    <None Include="documents\JUME\KalibrierungAuflistung.docx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="documents\JUME\liner_einbauBlueLight.docx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="documents\JUME\liner_einbauUV_Relining.docx">
-      <CopyToOutputDirectory>Always</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">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <None Include="SchnittstelleImporter\XML2006\SchemaDateien\0610-betriebsdaten.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="SchnittstelleImporter\XML2006\SchemaDateien\0610-hydraulikdaten.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="SchnittstelleImporter\XML2006\SchemaDateien\0610-metadaten.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="SchnittstelleImporter\XML2006\SchemaDateien\0610-referenzlisten.xsd">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="SchnittstelleImporter\XML2006\SchemaDateien\0610-stammdaten.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="SchnittstelleImporter\XML2006\SchemaDateien\0610-zustandsdaten.xsd">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Dichtheitspruefung\Dichtheitsprüfung\Dichtheitsprüfung.csproj">
-      <Project>{324277c6-2eb3-47b7-9dd5-7fa520e7d349}</Project>
-      <Name>Dichtheitsprüfung</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\UpdateLib\UpdateLib.csproj">
-      <Project>{cf95db30-247b-4382-948e-3bd5eb73c938}</Project>
-      <Name>UpdateLib</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="UCWerkseitigImprägniert.resx">
-      <DependentUpon>UCWerkseitigImprägniert.cs</DependentUpon>
-    </EmbeddedResource>
 	  <EmbeddedResource Include="version.txt">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </EmbeddedResource>
 	</ItemGroup>
+
 	<ItemGroup>
-    <None Include="Resources\Icon1.ico" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
+	    <PrivateAssets>all</PrivateAssets>
+	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+	  <PackageReference Include="Syncfusion.Chart.Windows" Version="20.4.0.43" />
+	  <PackageReference Include="Syncfusion.DocIO.WinForms" Version="20.4.0.43" />
+	  <PackageReference Include="Syncfusion.DocToPDFConverter.WinForms" Version="20.4.0.43" />
+	  <PackageReference Include="Wibu.CodeMeter.WibuCmNET" Version="7.50.5271.500" />
 	</ItemGroup>
+
 	<ItemGroup>
-    <None Include="Resources\add.ico" />
+	  <None Update="SanVerwaltung.db">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
+	  <None Update="SanVerwaltung.db-shm">
+	    <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+	  </None>
+	  <None Update="SanVerwaltung.db-wal">
+	    <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+	  </None>
 	</ItemGroup>
-  <ItemGroup>
+
-    <None Include="Resources\apply.ico" />
+	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-  </ItemGroup>
+	  <Exec Command="git rev-parse HEAD &gt; &quot;$(ProjectDir)\version.txt&quot;" />
-  <ItemGroup>
+	</Target>
-    <None Include="Resources\application.ico" />
+
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\close.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\delete.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Image1.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Add.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Apply.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Close.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Create.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Danger.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Database.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Delete.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Erase.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Error.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Find.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\List.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Modify.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\New document.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\OK.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Save.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Turn off.bmp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\Yes.bmp" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>git rev-parse HEAD &gt; "$(ProjectDir)\version.txt"</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
 </Project>

SanSystem/SanVerwalterContext.cs

@@ -0,0 +1,32 @@
+using KlassenBIB;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SanSystem
+{
+    public class SanVerwalterContext : DbContext
+    {
+        public DbSet<Projekt> Projekte { get; set; }
+        public DbSet<Inspektionsobjekt> InspektionObjekte { get; set; }
+        public DbSet<Sanierung> Sanierung { get; set; }
+        public DbSet<Auftraggeber> Auftraggebers { get; set; }
+
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            optionsBuilder.UseSqlite("Data Source=SanVerwaltung.db");
+            base.OnConfiguring(optionsBuilder);
+            
+        }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<Sanierung>().HasNoKey();
+            base.OnModelCreating(modelBuilder);
+            
+        }
+    }
+}

SanSystem/SchnittstelleImporter/I2006XML.cs

@@ -188,7 +188,7 @@ namespace SchnittstelleImporter
                     inspektionskuerzelns.Add(inspektionskuerzeln);
                 }
 
-                inspektionsobjekt.Schadenskuerzeln = inspektionskuerzelns;
+                //inspektionsobjekt.Schadenskuerzeln = inspektionskuerzelns;
                 result.Add(inspektionsobjekt);
             }
             

SanSystem/TempCAN/TemperaturBuilder.cs

@@ -29,8 +29,8 @@ namespace TempCAN
         {
             switch(temperaturSchnittstellen)
             {
-                case TemperaturSchnittstellen.TINKERFORGE:
+                //case TemperaturSchnittstellen.TINKERFORGE:
-                    return new TinkerForgeTemperatur();
+                    //return new TinkerForgeTemperatur();
                     
 
                 default:

SanSystem/TempCAN/TinkerForgeTemperatur.cs

@@ -1,4 +1,4 @@
-using System;
+/*using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -66,3 +66,5 @@ namespace TempCAN
         }
     }
 }
+*/
+

SanSystem/UCInliner.Designer.cs

@@ -63,6 +63,8 @@
             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.label7 = new System.Windows.Forms.Label();
+            this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
             this.tabControl1.SuspendLayout();
             this.tabPage2.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -83,6 +85,8 @@
             // 
             // tabPage2
             // 
+            this.tabPage2.Controls.Add(this.label7);
+            this.tabPage2.Controls.Add(this.dateTimePicker1);
             this.tabPage2.Controls.Add(this.btn_gen_dp);
             this.tabPage2.Controls.Add(this.label6);
             this.tabPage2.Controls.Add(this.txt_einbaudruck);
@@ -104,18 +108,18 @@
             this.tabPage2.Controls.Add(this.cb_stvo);
             this.tabPage2.Controls.Add(this.cb_wasserhaltung);
             this.tabPage2.Controls.Add(this.cb_genehmigung);
-            this.tabPage2.Location = new System.Drawing.Point(4, 29);
+            this.tabPage2.Location = new System.Drawing.Point(4, 34);
             this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tabPage2.Size = new System.Drawing.Size(1336, 669);
+            this.tabPage2.Size = new System.Drawing.Size(1336, 664);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "Vorraussetzungen";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
             // btn_gen_dp
             // 
-            this.btn_gen_dp.Location = new System.Drawing.Point(840, 323);
+            this.btn_gen_dp.Location = new System.Drawing.Point(946, 323);
             this.btn_gen_dp.Name = "btn_gen_dp";
             this.btn_gen_dp.Size = new System.Drawing.Size(167, 103);
             this.btn_gen_dp.TabIndex = 43;
@@ -126,25 +130,25 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(713, 337);
+            this.label6.Location = new System.Drawing.Point(713, 393);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(34, 20);
+            this.label6.Size = new System.Drawing.Size(42, 25);
             this.label6.TabIndex = 42;
             this.label6.Text = "Bar";
             // 
             // txt_einbaudruck
             // 
-            this.txt_einbaudruck.Location = new System.Drawing.Point(564, 334);
+            this.txt_einbaudruck.Location = new System.Drawing.Point(564, 390);
             this.txt_einbaudruck.Name = "txt_einbaudruck";
-            this.txt_einbaudruck.Size = new System.Drawing.Size(138, 26);
+            this.txt_einbaudruck.Size = new System.Drawing.Size(138, 30);
             this.txt_einbaudruck.TabIndex = 41;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(398, 337);
+            this.label5.Location = new System.Drawing.Point(398, 393);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(98, 20);
+            this.label5.Size = new System.Drawing.Size(121, 25);
             this.label5.TabIndex = 40;
             this.label5.Text = "Einbaudruck";
             // 
@@ -167,25 +171,25 @@
             this.cb_preliner.Location = new System.Drawing.Point(8, 130);
             this.cb_preliner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cb_preliner.Name = "cb_preliner";
-            this.cb_preliner.Size = new System.Drawing.Size(205, 24);
+            this.cb_preliner.Size = new System.Drawing.Size(253, 29);
             this.cb_preliner.TabIndex = 38;
             this.cb_preliner.Text = "Preliner wurde verwendet";
             this.cb_preliner.UseVisualStyleBackColor = true;
             // 
             // txt_besatzung
             // 
-            this.txt_besatzung.Location = new System.Drawing.Point(564, 264);
+            this.txt_besatzung.Location = new System.Drawing.Point(564, 320);
             this.txt_besatzung.Name = "txt_besatzung";
-            this.txt_besatzung.Size = new System.Drawing.Size(296, 26);
+            this.txt_besatzung.Size = new System.Drawing.Size(296, 30);
             this.txt_besatzung.TabIndex = 37;
             this.txt_besatzung.Enter += new System.EventHandler(this.txt_besatzung_Enter);
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(398, 267);
+            this.label2.Location = new System.Drawing.Point(398, 323);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(86, 20);
+            this.label2.Size = new System.Drawing.Size(105, 25);
             this.label2.TabIndex = 36;
             this.label2.Text = "Besatzung";
             // 
@@ -206,7 +210,7 @@
             this.cb_mech.AutoSize = true;
             this.cb_mech.Location = new System.Drawing.Point(6, 90);
             this.cb_mech.Name = "cb_mech";
-            this.cb_mech.Size = new System.Drawing.Size(113, 24);
+            this.cb_mech.Size = new System.Drawing.Size(140, 29);
             this.cb_mech.TabIndex = 2;
             this.cb_mech.Text = "Mechanisch";
             this.cb_mech.UseVisualStyleBackColor = true;
@@ -216,7 +220,7 @@
             this.cb_roboter.AutoSize = true;
             this.cb_roboter.Location = new System.Drawing.Point(6, 60);
             this.cb_roboter.Name = "cb_roboter";
-            this.cb_roboter.Size = new System.Drawing.Size(86, 24);
+            this.cb_roboter.Size = new System.Drawing.Size(102, 29);
             this.cb_roboter.TabIndex = 1;
             this.cb_roboter.Text = "Roboter";
             this.cb_roboter.UseVisualStyleBackColor = true;
@@ -228,7 +232,7 @@
             this.cb_hd.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cb_hd.Location = new System.Drawing.Point(6, 29);
             this.cb_hd.Name = "cb_hd";
-            this.cb_hd.Size = new System.Drawing.Size(56, 24);
+            this.cb_hd.Size = new System.Drawing.Size(67, 29);
             this.cb_hd.TabIndex = 0;
             this.cb_hd.Text = "HD ";
             this.cb_hd.UseVisualStyleBackColor = true;
@@ -245,7 +249,7 @@
             // 
             // ftpProgress
             // 
-            this.ftpProgress.Location = new System.Drawing.Point(140, 454);
+            this.ftpProgress.Location = new System.Drawing.Point(84, 454);
             this.ftpProgress.Name = "ftpProgress";
             this.ftpProgress.Size = new System.Drawing.Size(280, 37);
             this.ftpProgress.TabIndex = 29;
@@ -266,7 +270,7 @@
             this.label1.AutoSize = true;
             this.label1.Location = new System.Drawing.Point(398, 237);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(108, 20);
+            this.label1.Size = new System.Drawing.Size(132, 25);
             this.label1.TabIndex = 27;
             this.label1.Text = "Eingebaut am";
             // 
@@ -274,7 +278,7 @@
             // 
             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, 26);
+            this.dt_eingebaut.Size = new System.Drawing.Size(325, 30);
             this.dt_eingebaut.TabIndex = 26;
             // 
             // cb_fertig
@@ -284,7 +288,7 @@
             this.cb_fertig.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.cb_fertig.Location = new System.Drawing.Point(13, 323);
             this.cb_fertig.Name = "cb_fertig";
-            this.cb_fertig.Size = new System.Drawing.Size(100, 35);
+            this.cb_fertig.Size = new System.Drawing.Size(122, 43);
             this.cb_fertig.TabIndex = 25;
             this.cb_fertig.Text = "Fertig";
             this.cb_fertig.UseVisualStyleBackColor = true;
@@ -298,18 +302,18 @@
             "Trocken",
             "Niederschlag",
             "Schnee - Eisschmelze"});
-            this.cbb_wetter.Location = new System.Drawing.Point(564, 296);
+            this.cbb_wetter.Location = new System.Drawing.Point(564, 352);
             this.cbb_wetter.Name = "cbb_wetter";
-            this.cbb_wetter.Size = new System.Drawing.Size(191, 28);
+            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(398, 300);
+            this.label24.Location = new System.Drawing.Point(398, 356);
             this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(57, 20);
+            this.label24.Size = new System.Drawing.Size(70, 25);
             this.label24.TabIndex = 24;
             this.label24.Text = "Wetter";
             // 
@@ -335,14 +339,14 @@
             // 
             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, 26);
+            this.txt_einbau_temp.Size = new System.Drawing.Size(100, 30);
             this.txt_einbau_temp.TabIndex = 22;
             // 
             // 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, 26);
+            this.txt_lagerung_temp.Size = new System.Drawing.Size(100, 30);
             this.txt_lagerung_temp.TabIndex = 21;
             // 
             // label4
@@ -350,7 +354,7 @@
             this.label4.AutoSize = true;
             this.label4.Location = new System.Drawing.Point(15, 171);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(136, 20);
+            this.label4.Size = new System.Drawing.Size(168, 25);
             this.label4.TabIndex = 20;
             this.label4.Text = "Liner beim Einbau";
             // 
@@ -359,7 +363,7 @@
             this.label3.AutoSize = true;
             this.label3.Location = new System.Drawing.Point(15, 123);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(106, 20);
+            this.label3.Size = new System.Drawing.Size(131, 25);
             this.label3.TabIndex = 19;
             this.label3.Text = "Linerlagerung";
             // 
@@ -377,14 +381,14 @@
             // 
             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, 26);
+            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(229, 32);
             this.txt_temp_aussen.Name = "txt_temp_aussen";
-            this.txt_temp_aussen.Size = new System.Drawing.Size(100, 26);
+            this.txt_temp_aussen.Size = new System.Drawing.Size(100, 30);
             this.txt_temp_aussen.TabIndex = 17;
             // 
             // label23
@@ -392,7 +396,7 @@
             this.label23.AutoSize = true;
             this.label23.Location = new System.Drawing.Point(15, 80);
             this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(49, 20);
+            this.label23.Size = new System.Drawing.Size(63, 25);
             this.label23.TabIndex = 1;
             this.label23.Text = "Kanal";
             // 
@@ -401,7 +405,7 @@
             this.label22.AutoSize = true;
             this.label22.Location = new System.Drawing.Point(15, 34);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(63, 20);
+            this.label22.Size = new System.Drawing.Size(79, 25);
             this.label22.TabIndex = 0;
             this.label22.Text = "Aussen";
             // 
@@ -414,7 +418,7 @@
             this.cb_stvo.Location = new System.Drawing.Point(8, 91);
             this.cb_stvo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cb_stvo.Name = "cb_stvo";
-            this.cb_stvo.Size = new System.Drawing.Size(263, 24);
+            this.cb_stvo.Size = new System.Drawing.Size(323, 29);
             this.cb_stvo.TabIndex = 16;
             this.cb_stvo.Text = "Es wurde nach StVO abgesichert";
             this.cb_stvo.UseVisualStyleBackColor = true;
@@ -428,7 +432,7 @@
             this.cb_wasserhaltung.Location = new System.Drawing.Point(8, 57);
             this.cb_wasserhaltung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cb_wasserhaltung.Name = "cb_wasserhaltung";
-            this.cb_wasserhaltung.Size = new System.Drawing.Size(269, 24);
+            this.cb_wasserhaltung.Size = new System.Drawing.Size(329, 29);
             this.cb_wasserhaltung.TabIndex = 15;
             this.cb_wasserhaltung.Text = "Wasserhaltung wurde eingerichtet";
             this.cb_wasserhaltung.UseVisualStyleBackColor = true;
@@ -442,14 +446,32 @@
             this.cb_genehmigung.Location = new System.Drawing.Point(8, 23);
             this.cb_genehmigung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cb_genehmigung.Name = "cb_genehmigung";
-            this.cb_genehmigung.Size = new System.Drawing.Size(245, 24);
+            this.cb_genehmigung.Size = new System.Drawing.Size(299, 29);
             this.cb_genehmigung.TabIndex = 14;
             this.cb_genehmigung.Text = "Genehmigung wurde eingeholt";
             this.cb_genehmigung.UseVisualStyleBackColor = true;
             // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(398, 278);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(153, 25);
+            this.label7.TabIndex = 45;
+            this.label7.Text = "TV Kontrolle am";
+            this.label7.Click += new System.EventHandler(this.label7_Click);
+            // 
+            // dateTimePicker1
+            // 
+            this.dateTimePicker1.Location = new System.Drawing.Point(562, 273);
+            this.dateTimePicker1.Name = "dateTimePicker1";
+            this.dateTimePicker1.Size = new System.Drawing.Size(510, 30);
+            this.dateTimePicker1.TabIndex = 44;
+            this.dateTimePicker1.ValueChanged += new System.EventHandler(this.dateTimePicker1_ValueChanged);
+            // 
             // UCInliner
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.tabControl1);
             this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -505,5 +527,7 @@
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Button btn_gen_dp;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.DateTimePicker dateTimePicker1;
     }
 }

SanSystem/UCInliner.cs

@@ -11,12 +11,12 @@ using KlassenBIB;
 using System.Diagnostics;
 using System.IO;
 using SanShared;
-using FluentFTP;
+
 using System.Collections;
 using CSVParser;
 using BerichtGen;
 using SanShared.Exceptions;
-using Dichtheitsprüfung;
+//using Dichtheitsprüfung;
 using System.Threading;
 
 namespace SanSystem
@@ -71,7 +71,7 @@ namespace SanSystem
         {
             using(Dongle dongle = new Dongle(60))
             {
-                btn_gen_dp.Enabled = dongle.IsLicensed((byte)AktivierteModule.DICHTHEITSPRÜFUNG) ? true : false;
+                btn_gen_dp.Enabled = dongle.IsLicensed((byte)AktivierteModule.SCHLAUCHLINER) ? true : false;
                 dongle.CleanDongle();
             }
             CheckDirectories();
@@ -144,6 +144,7 @@ namespace SanSystem
             txt_temp_aussen.Update();
         }
 
+        /*
         private  void DownloadFromUV()
         {
             Progress<double> progress = new Progress<double>(x =>
@@ -199,6 +200,7 @@ namespace SanSystem
             }
 
         }
+        */
 
         private void btn_transfer_ftp_Click(object sender, EventArgs e)
         {
@@ -221,12 +223,12 @@ namespace SanSystem
                 filenames.Clear();
                 if (MessageBox.Show("Bitte stellen Sie sicher, dass der Server antwortet und dass nur die Dateien vorhanden sind!, Bitte beachten Sie, dass das fenster einfrieren kann", "WARNUNG", MessageBoxButtons.OKCancel, MessageBoxIcon.Stop) == DialogResult.OK)
                 {
-                    DownloadFromUV();
+                    //DownloadFromUV();
                 }
             }
         }
 
-        private void ListFiles(FtpClient client, string directory)
+        /*private void ListFiles(FtpClient client, string directory)
         {
             client.ListingParser = FtpParser.Unix;
             foreach (FtpListItem item in client.GetListing(directory, FtpListOption.ForceNameList))
@@ -241,6 +243,7 @@ namespace SanSystem
                 }
             }
         }
+        */
 
         private bool AccessCSV()
         {
@@ -316,7 +319,7 @@ namespace SanSystem
             {
                 MessageBox.Show("Warnung, es wurden keine Daten von der Anlage geladen, Grafik konnte nicht erstellt werden");
             }
-            Hashtable hashtable = inliner.MakeProtokoll(destinationPath, Database.Datenbank.Instance.loadedProjekt,inliner.Offset);
+            Hashtable hashtable = new Hashtable(); //inliner.MakeProtokoll(destinationPath, Database.Datenbank.Instance.loadedProjekt,inliner.Offset);
             DirectoryInfo directory = Directory.GetParent(destinationPath);
             string speicherpfad = directory.FullName;
             speicherpfad = Path.Combine(speicherpfad, "Einbauprotokolle");
@@ -347,6 +350,7 @@ namespace SanSystem
             options.ShowDialog();
         }
 
+        /*
         private void GeneriereDP()
         {
 #if DEBUG
@@ -382,6 +386,7 @@ namespace SanSystem
             }
 #endif
         }
+        */
 
         private void Btn_gen_dp_Click(object sender, EventArgs e)
         {
@@ -399,9 +404,9 @@ namespace SanSystem
 
             }
 
-            Thread generateDichtheitsprüfung = new Thread(GeneriereDP);
+            //Thread generateDichtheitsprüfung = new Thread(GeneriereDP);
-            generateDichtheitsprüfung.IsBackground = true;
+            //generateDichtheitsprüfung.IsBackground = true;
-            generateDichtheitsprüfung.Start();
+            //generateDichtheitsprüfung.Start();
             
         }
 
@@ -412,5 +417,15 @@ namespace SanSystem
                 txt_besatzung.Text = Global.Instance.AktuelleBesatzung;
             }
         }
+
+        private void label7_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }

SanSystem/frmMain.Designer.cs

@@ -39,20 +39,20 @@
             this.auftraggeberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.prefixSuffixToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.exportFürBüroErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.speichernToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.einstellungenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.berichteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.massenberichteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.verbrauchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.imprägnierberichteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.massenstatistikToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolstrip_gesamtLiner = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolstrip_messages = new System.Windows.Forms.ToolStripStatusLabel();
-            this.update = new UpdateLib.Updater();
+//            this.update = new UpdateLib.Updater();
+            this.speichernToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.imprägnierberichteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.massenstatistikToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.einstellungenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.infoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mainmenu.SuspendLayout();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -129,26 +129,11 @@
             this.exportFürBüroErstellenToolStripMenuItem.Text = "Export für Büro erstellen";
             this.exportFürBüroErstellenToolStripMenuItem.Click += new System.EventHandler(this.exportFürBüroErstellenToolStripMenuItem_Click);
             // 
-            // speichernToolStripMenuItem1
-            // 
-            this.speichernToolStripMenuItem1.Name = "speichernToolStripMenuItem1";
-            this.speichernToolStripMenuItem1.Size = new System.Drawing.Size(254, 26);
-            this.speichernToolStripMenuItem1.Text = "Speichern";
-            this.speichernToolStripMenuItem1.Click += new System.EventHandler(this.speichernToolStripMenuItem1_Click);
-            // 
-            // einstellungenToolStripMenuItem
-            // 
-            this.einstellungenToolStripMenuItem.Name = "einstellungenToolStripMenuItem";
-            this.einstellungenToolStripMenuItem.Size = new System.Drawing.Size(254, 26);
-            this.einstellungenToolStripMenuItem.Text = "Einstellungen";
-            this.einstellungenToolStripMenuItem.Click += new System.EventHandler(this.einstellungenToolStripMenuItem_Click);
-            // 
             // projektordnerÖffnenToolStripMenuItem
             // 
             this.projektordnerÖffnenToolStripMenuItem.Name = "projektordnerÖffnenToolStripMenuItem";
             this.projektordnerÖffnenToolStripMenuItem.Size = new System.Drawing.Size(170, 25);
             this.projektordnerÖffnenToolStripMenuItem.Text = "Projektordner Öffnen";
-            this.projektordnerÖffnenToolStripMenuItem.ToolTipText = "Öffnet die interne Ordner Struktur wo alle Daten vorhanden sind";
             this.projektordnerÖffnenToolStripMenuItem.Click += new System.EventHandler(this.ProjektordnerÖffnenToolStripMenuItem_Click);
             // 
             // berichteToolStripMenuItem
@@ -176,27 +161,6 @@
             this.verbrauchToolStripMenuItem.Text = "Verbrauch";
             this.verbrauchToolStripMenuItem.Click += new System.EventHandler(this.VerbrauchToolStripMenuItem_Click);
             // 
-            // imprägnierberichteToolStripMenuItem1
-            // 
-            this.imprägnierberichteToolStripMenuItem1.Name = "imprägnierberichteToolStripMenuItem1";
-            this.imprägnierberichteToolStripMenuItem1.Size = new System.Drawing.Size(213, 26);
-            this.imprägnierberichteToolStripMenuItem1.Text = "Imprägnierberichte";
-            this.imprägnierberichteToolStripMenuItem1.Click += new System.EventHandler(this.imprägnierberichteToolStripMenuItem1_Click);
-            // 
-            // massenstatistikToolStripMenuItem1
-            // 
-            this.massenstatistikToolStripMenuItem1.Name = "massenstatistikToolStripMenuItem1";
-            this.massenstatistikToolStripMenuItem1.Size = new System.Drawing.Size(213, 26);
-            this.massenstatistikToolStripMenuItem1.Text = "Massenstatistik";
-            this.massenstatistikToolStripMenuItem1.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem1_Click);
-            // 
-            // infoToolStripMenuItem
-            // 
-            this.infoToolStripMenuItem.Name = "infoToolStripMenuItem";
-            this.infoToolStripMenuItem.Size = new System.Drawing.Size(49, 25);
-            this.infoToolStripMenuItem.Text = "Info";
-            this.infoToolStripMenuItem.Click += new System.EventHandler(this.infoToolStripMenuItem_Click);
-            // 
             // statusStrip1
             // 
             this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
@@ -231,7 +195,42 @@
             // 
             // update
             // 
-            this.update.UpdateUrl = "http://home.cosysda.de/sanverwaltung/UpdateInfo.dat";
+            //this.update.UpdateUrl = "http://home.cosysda.de/sanverwaltung/UpdateInfo.dat";
+            // 
+            // speichernToolStripMenuItem1
+            // 
+            this.speichernToolStripMenuItem1.Name = "speichernToolStripMenuItem1";
+            this.speichernToolStripMenuItem1.Size = new System.Drawing.Size(254, 26);
+            this.speichernToolStripMenuItem1.Text = "Speichern";
+            this.speichernToolStripMenuItem1.Click += new System.EventHandler(this.speichernToolStripMenuItem1_Click);
+            // 
+            // imprägnierberichteToolStripMenuItem1
+            // 
+            this.imprägnierberichteToolStripMenuItem1.Name = "imprägnierberichteToolStripMenuItem1";
+            this.imprägnierberichteToolStripMenuItem1.Size = new System.Drawing.Size(213, 26);
+            this.imprägnierberichteToolStripMenuItem1.Text = "Imprägnierberichte";
+            this.imprägnierberichteToolStripMenuItem1.Click += new System.EventHandler(this.imprägnierberichteToolStripMenuItem1_Click);
+            // 
+            // massenstatistikToolStripMenuItem1
+            // 
+            this.massenstatistikToolStripMenuItem1.Name = "massenstatistikToolStripMenuItem1";
+            this.massenstatistikToolStripMenuItem1.Size = new System.Drawing.Size(213, 26);
+            this.massenstatistikToolStripMenuItem1.Text = "Massenstatistik";
+            this.massenstatistikToolStripMenuItem1.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem1_Click);
+            // 
+            // einstellungenToolStripMenuItem
+            // 
+            this.einstellungenToolStripMenuItem.Name = "einstellungenToolStripMenuItem";
+            this.einstellungenToolStripMenuItem.Size = new System.Drawing.Size(254, 26);
+            this.einstellungenToolStripMenuItem.Text = "Einstellungen";
+            this.einstellungenToolStripMenuItem.Click += new System.EventHandler(this.einstellungenToolStripMenuItem_Click);
+            // 
+            // infoToolStripMenuItem
+            // 
+            this.infoToolStripMenuItem.Name = "infoToolStripMenuItem";
+            this.infoToolStripMenuItem.Size = new System.Drawing.Size(49, 25);
+            this.infoToolStripMenuItem.Text = "Info";
+            this.infoToolStripMenuItem.Click += new System.EventHandler(this.infoToolStripMenuItem_Click);
             // 
             // frmMain
             // 
@@ -272,7 +271,7 @@
         private System.Windows.Forms.ToolStripMenuItem verbrauchToolStripMenuItem;
         private System.Windows.Forms.ToolStripStatusLabel toolstrip_gesamtLiner;
         private System.Windows.Forms.ToolStripMenuItem prefixSuffixToolStripMenuItem;
-        private UpdateLib.Updater update;
+       // private UpdateLib.Updater update;
         private System.Windows.Forms.ToolStripStatusLabel toolstrip_messages;
         private System.Windows.Forms.ToolStripMenuItem exportFürBüroErstellenToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem speichernToolStripMenuItem1;

SanSystem/frmMain.cs

@@ -32,7 +32,7 @@ namespace SanSystem
 #if !DEBUG
             update.CheckForUpdates();
 #endif
-            string sx = Properties.Settings.Default.DATABASEMAIN;
+            string sx = "";
             
             
             Datenbank.Instance.pfad = sx;
@@ -40,7 +40,7 @@ namespace SanSystem
             if (!Directory.Exists(Global.Instance.Projektpfad)) Directory.CreateDirectory(Global.Instance.Projektpfad);
             try
             {
-                Datenbank.Instance.LoadProjekt(Global.Instance.ProjektNummer);//     Path.Combine(Global.Instance.Projektpfad,"18-850.xaml"));
+                Datenbank.Instance.LoadProjekt(Global.Instance.ProjektNummer);
             }
             catch(DataBaseVersionMismatchException ex)
             {
@@ -77,12 +77,12 @@ namespace SanSystem
 
             frmLinerReste.Show();
 
-            /*frmInfo frmInfo = new frmInfo();
+            frmInfo frmInfo = new frmInfo();
             frmInfo.MdiParent = this; 
             frmInfo.Location = new Point(this.Width - frmInfo.Width - 05, this.Height - frmInfo.Height-80);
 
             frmInfo.Show();
-            */
+
             FrmAktuelleBesatzung frmAktuelleBesatzung = new FrmAktuelleBesatzung();
             frmAktuelleBesatzung.ShowDialog();
 
@@ -105,14 +105,6 @@ namespace SanSystem
 
             Global.Instance.OnStatusMessageChanged += Instance_OnStatusMessageChanged;
 
-            using (Dongle dongle = new Dongle(60))
-            {
-                stammdatenImportierenToolStripMenuItem.Enabled = dongle.IsLicensed((byte)AktivierteModule.STAMMDATEN) ? true : false;
-                exportFürBüroErstellenToolStripMenuItem.Enabled = dongle.IsLicensed((byte)AktivierteModule.BUEROEXPORTER) ? true : false;
-                dongle.CleanDongle();
-            }
-            
-
 
         }
 
@@ -162,9 +154,9 @@ namespace SanSystem
 
         private void FrmProjektList_FormClosed(object sender, FormClosedEventArgs e)
         {
-            if (Datenbank.Instance.loadedProjekt == null) return;
+            /*if(Datenbank.Instance.loadedProjekt.Auftraggeber.Name == null)
-            if(Datenbank.Instance.loadedProjekt.Auftraggeber.Name == null)
                 showauftraggeberform();
+            */
 
             toolStripStatus_projekt_Label.Text = Global.Instance.ProjektNummer;
             Form[] openedWindows = this.MdiChildren;
@@ -189,13 +181,11 @@ namespace SanSystem
             //frmLinerReste.IsMdiChild = true;
             frmLinerReste.Show();
 
-            /*frmInfo frmInfo = new frmInfo();
+            frmInfo frmInfo = new frmInfo();
             frmInfo.MdiParent = this;
             frmInfo.Location = new Point(this.Width - frmInfo.Width - 05, this.Height - frmInfo.Height - 80);
 
             frmInfo.Show();
-            */
-            
         }
 
        
@@ -208,10 +198,7 @@ namespace SanSystem
 
         private void stammdatenImportierenToolStripMenuItem_Click(object sender, EventArgs e)
         {
-#if !DEBUG
+            
-            MessageBox.Show("Funktion steht nicht zur Verfügung");
-            return;
-#else
             OpenFileDialog openFileDialog = new OpenFileDialog();
             openFileDialog.Filter = "XML Daten | *.xml";
             if(Datenbank.Instance.loadedProjekt == null)
@@ -242,7 +229,7 @@ namespace SanSystem
                 strassenList.StartPosition = FormStartPosition.Manual;
                 strassenList.Show();
             }
-#endif
+            
         }
 
         private void auftraggeberToolStripMenuItem_Click(object sender, EventArgs e)
@@ -345,10 +332,10 @@ namespace SanSystem
                     }
                 }
                 string destinationPath = san.CheckVerzeichnisse(Global.Instance.Projektpfad);
-                Hashtable hashtable = san.MakeProtokoll(destinationPath, Database.Datenbank.Instance.loadedProjekt, DateTime.MinValue);
+                //Hashtable hashtable = san.MakeProtokoll(destinationPath, Database.Datenbank.Instance.loadedProjekt, DateTime.MinValue);
                 DirectoryInfo directory = Directory.GetParent(destinationPath);
                 string speicherpfad = Path.Combine(directory.FullName,"Einbauprotokolle");
-                BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "liner_einbauBlueLight.docx", speicherpfad, san.Inspektionsobjekt.Objektbezeichnung, hashtable, bilder,null,true);
+                //BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "liner_einbauBlueLight.docx", speicherpfad, san.Inspektionsobjekt.Objektbezeichnung, hashtable, bilder,null,true);
 
             }
             //options.ShowDialog();

SanSystem/frmObjektEdit.Designer.cs

@@ -108,10 +108,10 @@
             // tabPage2
             // 
             this.tabPage2.Controls.Add(this.dgv_sanierungen);
-            this.tabPage2.Location = new System.Drawing.Point(4, 34);
+            this.tabPage2.Location = new System.Drawing.Point(4, 29);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(1282, 651);
+            this.tabPage2.Size = new System.Drawing.Size(1282, 656);
             this.tabPage2.TabIndex = 2;
             this.tabPage2.Text = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -130,10 +130,10 @@
             // Kanalinformationen
             // 
             this.Kanalinformationen.Controls.Add(this.dgv_schadenkuerzel);
-            this.Kanalinformationen.Location = new System.Drawing.Point(4, 34);
+            this.Kanalinformationen.Location = new System.Drawing.Point(4, 29);
             this.Kanalinformationen.Name = "Kanalinformationen";
             this.Kanalinformationen.Padding = new System.Windows.Forms.Padding(3);
-            this.Kanalinformationen.Size = new System.Drawing.Size(1282, 651);
+            this.Kanalinformationen.Size = new System.Drawing.Size(1282, 656);
             this.Kanalinformationen.TabIndex = 1;
             this.Kanalinformationen.Text = "Kanalinformationen";
             this.Kanalinformationen.UseVisualStyleBackColor = true;
@@ -182,11 +182,11 @@
             this.tabPage1.Controls.Add(this.label2);
             this.tabPage1.Controls.Add(this.label1);
             this.tabPage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.tabPage1.Location = new System.Drawing.Point(4, 34);
+            this.tabPage1.Location = new System.Drawing.Point(4, 29);
             this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.tabPage1.Size = new System.Drawing.Size(1282, 651);
+            this.tabPage1.Size = new System.Drawing.Size(1282, 656);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "Grunddaten";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -208,9 +208,9 @@
             this.cb_overrideAuftraggeber.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.cb_overrideAuftraggeber.Location = new System.Drawing.Point(590, 191);
             this.cb_overrideAuftraggeber.Name = "cb_overrideAuftraggeber";
-            this.cb_overrideAuftraggeber.Size = new System.Drawing.Size(279, 29);
+            this.cb_overrideAuftraggeber.Size = new System.Drawing.Size(190, 24);
             this.cb_overrideAuftraggeber.TabIndex = 33;
-            this.cb_overrideAuftraggeber.Text = "Auftraggeber Überschreiben";
+            this.cb_overrideAuftraggeber.Text = "Spezielle Auftraggeber";
             this.cb_overrideAuftraggeber.UseVisualStyleBackColor = true;
             this.cb_overrideAuftraggeber.CheckedChanged += new System.EventHandler(this.Cb_overrideAuftraggeber_CheckedChanged);
             // 
@@ -219,7 +219,7 @@
             this.txt_san_nr.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_san_nr.Location = new System.Drawing.Point(745, 29);
             this.txt_san_nr.Name = "txt_san_nr";
-            this.txt_san_nr.Size = new System.Drawing.Size(191, 30);
+            this.txt_san_nr.Size = new System.Drawing.Size(191, 26);
             this.txt_san_nr.TabIndex = 7;
             // 
             // txt_ort
@@ -227,7 +227,7 @@
             this.txt_ort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_ort.Location = new System.Drawing.Point(745, 145);
             this.txt_ort.Name = "txt_ort";
-            this.txt_ort.Size = new System.Drawing.Size(191, 30);
+            this.txt_ort.Size = new System.Drawing.Size(191, 26);
             this.txt_ort.TabIndex = 9;
             // 
             // txt_bemerkung
@@ -243,7 +243,7 @@
             this.txt_objekt_name.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_objekt_name.Location = new System.Drawing.Point(192, 67);
             this.txt_objekt_name.Name = "txt_objekt_name";
-            this.txt_objekt_name.Size = new System.Drawing.Size(330, 30);
+            this.txt_objekt_name.Size = new System.Drawing.Size(330, 26);
             this.txt_objekt_name.TabIndex = 2;
             // 
             // txt_hausnummer
@@ -252,7 +252,7 @@
             this.txt_hausnummer.Location = new System.Drawing.Point(745, 107);
             this.txt_hausnummer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_hausnummer.Name = "txt_hausnummer";
-            this.txt_hausnummer.Size = new System.Drawing.Size(148, 30);
+            this.txt_hausnummer.Size = new System.Drawing.Size(148, 26);
             this.txt_hausnummer.TabIndex = 8;
             // 
             // txt_strasse
@@ -261,7 +261,7 @@
             this.txt_strasse.Location = new System.Drawing.Point(745, 67);
             this.txt_strasse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_strasse.Name = "txt_strasse";
-            this.txt_strasse.Size = new System.Drawing.Size(320, 30);
+            this.txt_strasse.Size = new System.Drawing.Size(320, 26);
             this.txt_strasse.TabIndex = 7;
             // 
             // txt_dn
@@ -270,7 +270,7 @@
             this.txt_dn.Location = new System.Drawing.Point(192, 201);
             this.txt_dn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_dn.Name = "txt_dn";
-            this.txt_dn.Size = new System.Drawing.Size(330, 30);
+            this.txt_dn.Size = new System.Drawing.Size(330, 26);
             this.txt_dn.TabIndex = 5;
             // 
             // txt_punkt_bis
@@ -279,7 +279,7 @@
             this.txt_punkt_bis.Location = new System.Drawing.Point(192, 153);
             this.txt_punkt_bis.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_punkt_bis.Name = "txt_punkt_bis";
-            this.txt_punkt_bis.Size = new System.Drawing.Size(330, 30);
+            this.txt_punkt_bis.Size = new System.Drawing.Size(330, 26);
             this.txt_punkt_bis.TabIndex = 4;
             this.txt_punkt_bis.Leave += new System.EventHandler(this.Txt_punkt_bis_Leave);
             // 
@@ -289,7 +289,7 @@
             this.txt_punkt_von.Location = new System.Drawing.Point(192, 107);
             this.txt_punkt_von.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_punkt_von.Name = "txt_punkt_von";
-            this.txt_punkt_von.Size = new System.Drawing.Size(330, 30);
+            this.txt_punkt_von.Size = new System.Drawing.Size(330, 26);
             this.txt_punkt_von.TabIndex = 3;
             this.txt_punkt_von.TextChanged += new System.EventHandler(this.txt_punkt_von_TextChanged);
             // 
@@ -299,7 +299,7 @@
             this.txt_pro_nr.Location = new System.Drawing.Point(192, 31);
             this.txt_pro_nr.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt_pro_nr.Name = "txt_pro_nr";
-            this.txt_pro_nr.Size = new System.Drawing.Size(330, 30);
+            this.txt_pro_nr.Size = new System.Drawing.Size(330, 26);
             this.txt_pro_nr.TabIndex = 1;
             // 
             // label9
@@ -308,7 +308,7 @@
             this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label9.Location = new System.Drawing.Point(585, 32);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(84, 25);
+            this.label9.Size = new System.Drawing.Size(66, 20);
             this.label9.TabIndex = 32;
             this.label9.Text = "SAN. Nr";
             // 
@@ -331,7 +331,7 @@
             this.cb_objekname_man.AutoSize = true;
             this.cb_objekname_man.Location = new System.Drawing.Point(108, 70);
             this.cb_objekname_man.Name = "cb_objekname_man";
-            this.cb_objekname_man.Size = new System.Drawing.Size(72, 24);
+            this.cb_objekname_man.Size = new System.Drawing.Size(59, 20);
             this.cb_objekname_man.TabIndex = 29;
             this.cb_objekname_man.Text = "man?";
             this.cb_objekname_man.UseVisualStyleBackColor = true;
@@ -343,7 +343,7 @@
             this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label8.Location = new System.Drawing.Point(601, 340);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(112, 25);
+            this.label8.Size = new System.Drawing.Size(91, 20);
             this.label8.TabIndex = 28;
             this.label8.Text = "Bemerkung";
             // 
@@ -353,7 +353,7 @@
             this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label7.Location = new System.Drawing.Point(584, 148);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(39, 25);
+            this.label7.Size = new System.Drawing.Size(31, 20);
             this.label7.TabIndex = 27;
             this.label7.Text = "Ort";
             // 
@@ -363,7 +363,7 @@
             this.lbl_objektname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbl_objektname.Location = new System.Drawing.Point(9, 70);
             this.lbl_objektname.Name = "lbl_objektname";
-            this.lbl_objektname.Size = new System.Drawing.Size(118, 25);
+            this.lbl_objektname.Size = new System.Drawing.Size(95, 20);
             this.lbl_objektname.TabIndex = 25;
             this.lbl_objektname.Text = "Objektname";
             // 
@@ -410,7 +410,7 @@
             "Ziegelwerk"});
             this.cb_material.Location = new System.Drawing.Point(192, 252);
             this.cb_material.Name = "cb_material";
-            this.cb_material.Size = new System.Drawing.Size(323, 33);
+            this.cb_material.Size = new System.Drawing.Size(323, 28);
             this.cb_material.TabIndex = 6;
             // 
             // groupBox2
@@ -432,7 +432,7 @@
             this.txt_haltungslaenge.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_haltungslaenge.Location = new System.Drawing.Point(188, 21);
             this.txt_haltungslaenge.Name = "txt_haltungslaenge";
-            this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 30);
+            this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 26);
             this.txt_haltungslaenge.TabIndex = 11;
             // 
             // txt_laenge_schacht
@@ -440,7 +440,7 @@
             this.txt_laenge_schacht.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_laenge_schacht.Location = new System.Drawing.Point(188, 112);
             this.txt_laenge_schacht.Name = "txt_laenge_schacht";
-            this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 30);
+            this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 26);
             this.txt_laenge_schacht.TabIndex = 13;
             // 
             // label21
@@ -449,7 +449,7 @@
             this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label21.Location = new System.Drawing.Point(6, 114);
             this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(132, 25);
+            this.label21.Size = new System.Drawing.Size(107, 20);
             this.label21.TabIndex = 21;
             this.label21.Text = "Schachtlänge";
             // 
@@ -459,7 +459,7 @@
             this.cb_geschlossenesEnde.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.cb_geschlossenesEnde.Location = new System.Drawing.Point(9, 75);
             this.cb_geschlossenesEnde.Name = "cb_geschlossenesEnde";
-            this.cb_geschlossenesEnde.Size = new System.Drawing.Size(210, 29);
+            this.cb_geschlossenesEnde.Size = new System.Drawing.Size(172, 24);
             this.cb_geschlossenesEnde.TabIndex = 12;
             this.cb_geschlossenesEnde.Text = "Geschlossene Ende";
             this.cb_geschlossenesEnde.UseVisualStyleBackColor = true;
@@ -471,7 +471,7 @@
             this.label6.Location = new System.Drawing.Point(5, 26);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(137, 25);
+            this.label6.Size = new System.Drawing.Size(112, 20);
             this.label6.TabIndex = 5;
             this.label6.Text = "Haltungslänge";
             // 
@@ -484,7 +484,7 @@
             this.dt_haltunggemessen_datum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.dt_haltunggemessen_datum.Name = "dt_haltunggemessen_datum";
             this.dt_haltunggemessen_datum.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(354, 30);
+            this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(354, 26);
             this.dt_haltunggemessen_datum.TabIndex = 10;
             // 
             // label20
@@ -494,7 +494,7 @@
             this.label20.Location = new System.Drawing.Point(8, 300);
             this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(265, 25);
+            this.label20.Size = new System.Drawing.Size(216, 20);
             this.label20.TabIndex = 16;
             this.label20.Text = "Haltungslänge gemessen am";
             // 
@@ -505,7 +505,7 @@
             this.label19.Location = new System.Drawing.Point(584, 111);
             this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(129, 25);
+            this.label19.Size = new System.Drawing.Size(105, 20);
             this.label19.TabIndex = 13;
             this.label19.Text = "Hausnummer";
             // 
@@ -516,7 +516,7 @@
             this.label18.Location = new System.Drawing.Point(584, 72);
             this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(79, 25);
+            this.label18.Size = new System.Drawing.Size(64, 20);
             this.label18.TabIndex = 12;
             this.label18.Text = "Strasse";
             // 
@@ -527,7 +527,7 @@
             this.label5.Location = new System.Drawing.Point(9, 255);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(81, 25);
+            this.label5.Size = new System.Drawing.Size(65, 20);
             this.label5.TabIndex = 4;
             this.label5.Text = "Material";
             // 
@@ -538,7 +538,7 @@
             this.label4.Location = new System.Drawing.Point(9, 204);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(128, 25);
+            this.label4.Size = new System.Drawing.Size(104, 20);
             this.label4.TabIndex = 3;
             this.label4.Text = "Durchmesser";
             // 
@@ -549,7 +549,7 @@
             this.label3.Location = new System.Drawing.Point(9, 156);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(94, 25);
+            this.label3.Size = new System.Drawing.Size(76, 20);
             this.label3.TabIndex = 2;
             this.label3.Text = "Bis Punkt";
             // 
@@ -560,7 +560,7 @@
             this.label2.Location = new System.Drawing.Point(9, 110);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(103, 25);
+            this.label2.Size = new System.Drawing.Size(83, 20);
             this.label2.TabIndex = 1;
             this.label2.Text = "Von Punkt";
             // 
@@ -571,7 +571,7 @@
             this.label1.Location = new System.Drawing.Point(9, 35);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(143, 25);
+            this.label1.Size = new System.Drawing.Size(116, 20);
             this.label1.TabIndex = 0;
             this.label1.Text = "Projektnummer";
             // 
@@ -591,7 +591,7 @@
             // 
             // frmObjektEdit
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
             this.ClientSize = new System.Drawing.Size(1290, 689);

SanSystem/frmObjektEdit.cs

@@ -40,8 +40,8 @@ namespace SanSystem
             tabControl1.TabPages.RemoveAt(2);
             tabControl1.TabPages.RemoveAt(1);
 #endif
-            dgv_schadenkuerzel.DataSource = inspektion.Schadenskuerzeln;
+            //dgv_schadenkuerzel.DataSource = inspektion.Schadenskuerzeln;
-            dgv_sanierungen.DataSource = inspektion.AusgefuehrteTaetigkeiten;
+            //dgv_sanierungen.DataSource = inspektion.AusgefuehrteTaetigkeiten;
 
             foreach(Sanierung san in inspektion.Sanierung)
             {
@@ -283,7 +283,7 @@ namespace SanSystem
 
         private void FrmAuftraggeberEdit_FormClosed(object sender, FormClosedEventArgs e)
         {
-            inspektionsobjekt.OverrideAuftraggeber = (sender as frmAuftraggeberEdit).Auftraggeber;
+            //inspektionsobjekt.OverrideAuftraggeber = (sender as frmAuftraggeberEdit).Auftraggeber;
             
         }
     }

SanSystem/frmObjekteList.Designer.cs

@@ -65,7 +65,6 @@
             this.dGObjekte.Margin = new System.Windows.Forms.Padding(2);
             this.dGObjekte.MultiSelect = false;
             this.dGObjekte.Name = "dGObjekte";
-            this.dGObjekte.RowHeadersWidth = 51;
             this.dGObjekte.RowTemplate.Height = 24;
             this.dGObjekte.Size = new System.Drawing.Size(499, 238);
             this.dGObjekte.TabIndex = 0;
@@ -91,7 +90,7 @@
             this.lbl_street.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbl_street.Location = new System.Drawing.Point(6, 9);
             this.lbl_street.Name = "lbl_street";
-            this.lbl_street.Size = new System.Drawing.Size(128, 25);
+            this.lbl_street.Size = new System.Drawing.Size(104, 20);
             this.lbl_street.TabIndex = 2;
             this.lbl_street.Text = "Strassename";
             // 
@@ -101,7 +100,7 @@
             this.lbl_projekt.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbl_projekt.Location = new System.Drawing.Point(6, 49);
             this.lbl_projekt.Name = "lbl_projekt";
-            this.lbl_projekt.Size = new System.Drawing.Size(143, 25);
+            this.lbl_projekt.Size = new System.Drawing.Size(116, 20);
             this.lbl_projekt.TabIndex = 3;
             this.lbl_projekt.Text = "Projektnummer";
             // 
@@ -110,7 +109,7 @@
             this.txt_strasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_strasse.Location = new System.Drawing.Point(157, 6);
             this.txt_strasse.Name = "txt_strasse";
-            this.txt_strasse.Size = new System.Drawing.Size(352, 30);
+            this.txt_strasse.Size = new System.Drawing.Size(352, 26);
             this.txt_strasse.TabIndex = 4;
             // 
             // txt_pro_nr_1
@@ -118,7 +117,7 @@
             this.txt_pro_nr_1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_pro_nr_1.Location = new System.Drawing.Point(157, 46);
             this.txt_pro_nr_1.Name = "txt_pro_nr_1";
-            this.txt_pro_nr_1.Size = new System.Drawing.Size(100, 30);
+            this.txt_pro_nr_1.Size = new System.Drawing.Size(100, 26);
             this.txt_pro_nr_1.TabIndex = 5;
             // 
             // label3
@@ -127,7 +126,7 @@
             this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label3.Location = new System.Drawing.Point(263, 49);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(19, 25);
+            this.label3.Size = new System.Drawing.Size(14, 20);
             this.label3.TabIndex = 6;
             this.label3.Text = "-";
             // 
@@ -137,7 +136,7 @@
             this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label4.Location = new System.Drawing.Point(389, 49);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(19, 25);
+            this.label4.Size = new System.Drawing.Size(14, 20);
             this.label4.TabIndex = 7;
             this.label4.Text = "-";
             // 
@@ -146,7 +145,7 @@
             this.txt_pro_nr_2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_pro_nr_2.Location = new System.Drawing.Point(283, 46);
             this.txt_pro_nr_2.Name = "txt_pro_nr_2";
-            this.txt_pro_nr_2.Size = new System.Drawing.Size(100, 30);
+            this.txt_pro_nr_2.Size = new System.Drawing.Size(100, 26);
             this.txt_pro_nr_2.TabIndex = 8;
             // 
             // txt_pro_nr_3
@@ -154,7 +153,7 @@
             this.txt_pro_nr_3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_pro_nr_3.Location = new System.Drawing.Point(409, 46);
             this.txt_pro_nr_3.Name = "txt_pro_nr_3";
-            this.txt_pro_nr_3.Size = new System.Drawing.Size(100, 30);
+            this.txt_pro_nr_3.Size = new System.Drawing.Size(100, 26);
             this.txt_pro_nr_3.TabIndex = 9;
             // 
             // lbl_ort
@@ -163,7 +162,7 @@
             this.lbl_ort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbl_ort.Location = new System.Drawing.Point(549, 9);
             this.lbl_ort.Name = "lbl_ort";
-            this.lbl_ort.Size = new System.Drawing.Size(39, 25);
+            this.lbl_ort.Size = new System.Drawing.Size(31, 20);
             this.lbl_ort.TabIndex = 10;
             this.lbl_ort.Text = "Ort";
             // 
@@ -172,7 +171,7 @@
             this.txt_ort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_ort.Location = new System.Drawing.Point(604, 6);
             this.txt_ort.Name = "txt_ort";
-            this.txt_ort.Size = new System.Drawing.Size(235, 30);
+            this.txt_ort.Size = new System.Drawing.Size(235, 26);
             this.txt_ort.TabIndex = 11;
             // 
             // label1
@@ -181,7 +180,7 @@
             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(15, 25);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(32, 25);
+            this.label1.Size = new System.Drawing.Size(25, 20);
             this.label1.TabIndex = 12;
             this.label1.Text = "    ";
             // 
@@ -191,7 +190,7 @@
             this.lbl_projwrong.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbl_projwrong.Location = new System.Drawing.Point(46, 25);
             this.lbl_projwrong.Name = "lbl_projwrong";
-            this.lbl_projwrong.Size = new System.Drawing.Size(276, 25);
+            this.lbl_projwrong.Size = new System.Drawing.Size(224, 20);
             this.lbl_projwrong.TabIndex = 13;
             this.lbl_projwrong.Text = "Projektnummer nicht vergeben";
             // 
@@ -201,7 +200,7 @@
             this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label5.Location = new System.Drawing.Point(15, 51);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(32, 25);
+            this.label5.Size = new System.Drawing.Size(25, 20);
             this.label5.TabIndex = 14;
             this.label5.Text = "    ";
             // 
@@ -211,7 +210,7 @@
             this.lbl_grounddata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lbl_grounddata.Location = new System.Drawing.Point(46, 51);
             this.lbl_grounddata.Name = "lbl_grounddata";
-            this.lbl_grounddata.Size = new System.Drawing.Size(345, 25);
+            this.lbl_grounddata.Size = new System.Drawing.Size(282, 20);
             this.lbl_grounddata.TabIndex = 15;
             this.lbl_grounddata.Text = "Grunddaten sind nicht richtig vergeben";
             // 
@@ -255,7 +254,7 @@
             this.btn_set_kali.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.btn_set_kali.Location = new System.Drawing.Point(510, 262);
             this.btn_set_kali.Name = "btn_set_kali";
-            this.btn_set_kali.Size = new System.Drawing.Size(423, 53);
+            this.btn_set_kali.Size = new System.Drawing.Size(317, 53);
             this.btn_set_kali.TabIndex = 19;
             this.btn_set_kali.Text = "Ausgewählte mit Linergrundlagen versehen";
             this.btn_set_kali.UseVisualStyleBackColor = true;

SanSystem/frmObjekteList.cs

@@ -189,7 +189,7 @@ namespace SanSystem
         private void btn_add_Click(object sender, EventArgs e)
         {
             Inspektionsobjekt inspektionsobjekt = new Inspektionsobjekt();
-            inspektionsobjekt.Guid = Guid.NewGuid();
+            //inspektionsobjekt.Guid = Guid.NewGuid();
             inspektionsobjekt.Projektnummer = inspektionsobjekte.First().Projektnummer;
             inspektionsobjekt.OrtName = inspektionsobjekte.First().OrtName;
             inspektionsobjekt.StrasseName = inspektionsobjekte.First().StrasseName;
@@ -255,7 +255,6 @@ namespace SanSystem
 
         private void btn_make_ausdruck_Click(object sender, EventArgs e)
         {
-            return;
             List<Inspektionsobjekt> ausdruck = new List<Inspektionsobjekt>();
 
             DataGridViewCheckBoxCell checkBoxCell = null;

SanSystem/frmProjektList.cs

@@ -29,24 +29,15 @@ namespace SanSystem
 
         private void frmProjektList_Load(object sender, EventArgs e)
         {
-            
+            using(var context = new SanVerwalterContext())
-            foreach(Projekt projekt in Datenbank.Instance.TeufelDB.Projekte)
             {
-                if (projekt.Nummer == null)
+                List<Projekt> list = context.Projekte.ToList();
+                foreach(Projekt projekt in list)
                 {
-                    Datenbank.Instance.TeufelDB.Projekte.Remove(projekt);
-                    if(Debugger.IsAttached)
-                    {
-                        Debugger.Break();
-                    }
-                    else
-                    {
-                        continue;
-                    }
-                }
                     lb_projekte.Items.Add(projekt.Nummer);
                 }
             }
+        }
 
         private void btn_ok_Click(object sender, EventArgs e)
         {

SanSystem/frmSettings.cs

@@ -17,9 +17,6 @@ namespace SanSystem
         public frmSettings()
         {
             InitializeComponent();
-#if !DEBUG
-            MessageBox.Show("Funktion noch nicht vollständig implementiert. Nutzung auf eigene Gefahr");
-#endif
             softwareConfiguration = new SoftwareConfiguration();
 
             txt_anlageIP.Text = softwareConfiguration.GetAnlageIP();

SanSystem/frmStrassenList.cs

@@ -47,6 +47,7 @@ namespace SanSystem
 
         private void buildSortedSteetList()
         {
+            
             List<string> ortteile = Datenbank.Instance.loadedProjekt.Objekte.Select(x => x.OrtName).Distinct().ToList();
             int aktuellOpened = -1;
             bool aktuelleStrasse = false;
@@ -110,6 +111,7 @@ namespace SanSystem
 
         private void buildUnsortedStreetList()
         {
+           
             List<string> strassen = Datenbank.Instance.loadedProjekt.Objekte.Select(x => x.StrasseName).Distinct().ToList();
             List<string> streets = new List<string>();
             
@@ -129,6 +131,9 @@ namespace SanSystem
 
         private void frmStrassenList_Load(object sender, EventArgs e)
         {
+
+            
+            
             this.Height = this.MdiParent.Height - 120;
             if(streetListSetting.SortedSelected())
             {
@@ -147,16 +152,6 @@ namespace SanSystem
 
         private void btn_add_Click(object sender, EventArgs e)
         {
-            if(Datenbank.Instance.loadedProjekt == null)
-            {
-                MessageBox.Show("Es wurde kein Projekt geladen");
-                return;
-            }
-            if(Datenbank.Instance.TeufelDB.Imprägnierungen.Count < 1)
-            {
-                MessageBox.Show("Bitte zunächst die Imprägnierung hinzufügen");
-                return;
-            }
             KlassenBIB.Inspektionsobjekt inspektionsobjekt = new KlassenBIB.Inspektionsobjekt();
             inspektionsobjekt.Projektnummer = Global.Instance.ProjektNummer;
             Datenbank.Instance.loadedProjekt.Objekte.Add(inspektionsobjekt);

SanSystem/packages.config

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EntityFramework" version="6.4.4" targetFramework="net472" />
+  <package id="FastMember" version="1.5.0" targetFramework="net472" />
   <package id="FluentFTP" version="37.0.2" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.115.5" targetFramework="net472" />
   <package id="Syncfusion.Chart.Base" version="19.4.0.56" targetFramework="net472" />
   <package id="Syncfusion.Chart.Windows" version="19.4.0.56" targetFramework="net472" />
   <package id="Syncfusion.Compression.Base" version="19.4.0.56" targetFramework="net472" />
@@ -23,4 +26,8 @@
   <package id="Syncfusion.SpellChecker.Base" version="19.4.0.56" targetFramework="net472" />
   <package id="Syncfusion.Tools.Base" version="19.4.0.56" targetFramework="net472" />
   <package id="Syncfusion.Tools.Windows" version="19.4.0.56" targetFramework="net472" />
+  <package id="System.Data.SQLite" version="1.0.115.5" targetFramework="net472" />
+  <package id="System.Data.SQLite.Core" version="1.0.115.5" targetFramework="net472" />
+  <package id="System.Data.SQLite.EF6" version="1.0.115.5" targetFramework="net472" />
+  <package id="System.Data.SQLite.Linq" version="1.0.115.5" targetFramework="net472" />
 </packages>