From 12fa97bc28ff9052d601faa68aa020e473e7aa6f Mon Sep 17 00:00:00 2001 From: Damian Wessels Date: Sat, 14 Jan 2023 09:39:16 +0100 Subject: [PATCH] Tranfer to net core --- SanSystem/Database/Datenbank.cs | 21 +- SanSystem/Database/UpdateDatabase.cs | 5 +- SanSystem/Einstellungen/Settings.cs | 10 +- SanSystem/Global.cs | 2 +- SanSystem/KlassenBIB/Inspektionsobjekt.cs | 1 - SanSystem/KlassenBIB/Projekt.cs | 2 - .../Sanierung/Renovation/InlinerSanierung.cs | 6 +- SanSystem/NuGet.config | 6 + SanSystem/Properties/Settings.Designer.cs | 38 - SanSystem/Properties/Settings.settings | 9 - SanSystem/SanSystem.csproj | 683 +----------------- SanSystem/TempCAN/TemperaturBuilder.cs | 4 +- SanSystem/TempCAN/TinkerForgeTemperatur.cs | 4 +- SanSystem/UCInliner.Designer.cs | 98 ++- SanSystem/UCInliner.cs | 31 +- SanSystem/frmMain.Designer.cs | 6 +- SanSystem/frmMain.cs | 4 +- 17 files changed, 159 insertions(+), 771 deletions(-) create mode 100644 SanSystem/NuGet.config delete mode 100644 SanSystem/Properties/Settings.Designer.cs delete mode 100644 SanSystem/Properties/Settings.settings diff --git a/SanSystem/Database/Datenbank.cs b/SanSystem/Database/Datenbank.cs index e4d0f50..858fd1a 100644 --- a/SanSystem/Database/Datenbank.cs +++ b/SanSystem/Database/Datenbank.cs @@ -10,8 +10,15 @@ using System.Diagnostics; using KlassenBIB; using SanShared.Exceptions; + namespace Database { + /* public class SanVerwaltungContext: DbContext + { + public DbSet Projekte { get; set; } + + } + */ public class Datenbank { public string pfad; @@ -36,8 +43,8 @@ namespace Database Directory.CreateDirectory(Path.Combine(pfad, "projekte")); return; } - if (File.Exists(filepath)) - TeufelDB = XamlServices.Load(filepath) as KlassenBIB.DB; + //if (File.Exists(filepath)) + //TeufelDB = XamlServices.Load(filepath) as KlassenBIB.DB; } public KlassenBIB.Projekt loadedProjekt = null; @@ -59,16 +66,16 @@ namespace Database if (!File.Exists(filepath)) { if (!Directory.Exists("./projekte")) return true; - UpdateDatabase.UpdateNewGuids(); + //UpdateDatabase.UpdateNewGuids(); - UpdateDatabase.TransferAuftraggeber(); - UpdateDatabase.MakeNewDatabaseSystem(); + //UpdateDatabase.TransferAuftraggeber(); + //UpdateDatabase.MakeNewDatabaseSystem(); } else { //UpdateDatabase.GenerateNewBeziehungen(); } - UpdateDatabase.CreateSQLiteDB(); + //UpdateDatabase.CreateSQLiteDB(); return true; } @@ -85,7 +92,7 @@ namespace Database { string filepath = Path.Combine(pfad, "projekte", "TeufelDB.xaml"); Trace.WriteLine(filepath); - XamlServices.Save(filepath, TeufelDB); + //XamlServices.Save(filepath, TeufelDB); } } } diff --git a/SanSystem/Database/UpdateDatabase.cs b/SanSystem/Database/UpdateDatabase.cs index ff1bdf6..d4fc68b 100644 --- a/SanSystem/Database/UpdateDatabase.cs +++ b/SanSystem/Database/UpdateDatabase.cs @@ -1,4 +1,4 @@ -using FastMember; +/*using FastMember; using KlassenBIB; using SanShared; using System; @@ -284,7 +284,8 @@ namespace Database Datenbank.Instance.MainDatenbank.AuftraggeberListe.Add(tempProjekt.Auftraggeber); } - */ + } } } +*/ diff --git a/SanSystem/Einstellungen/Settings.cs b/SanSystem/Einstellungen/Settings.cs index 185e0a9..eefe5e2 100644 --- a/SanSystem/Einstellungen/Settings.cs +++ b/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); - configuration = (Dictionary)JsonConvert.DeserializeObject(input, typeof(Dictionary)); + //string input = File.ReadAllText(modPath); + //configuration = (Dictionary)JsonConvert.DeserializeObject(input, typeof(Dictionary)); } } @@ -65,8 +65,8 @@ namespace SanSystem.Einstellungen public virtual void SaveSettings() { - string ser = JsonConvert.SerializeObject(configuration); - File.WriteAllText(modPath, ser); + //string ser = JsonConvert.SerializeObject(configuration); + //File.WriteAllText(modPath, ser); } public void Dispose() diff --git a/SanSystem/Global.cs b/SanSystem/Global.cs index d932861..934e76c 100644 --- a/SanSystem/Global.cs +++ b/SanSystem/Global.cs @@ -111,7 +111,7 @@ namespace SanSystem { get { - return Path.Combine(Properties.Settings.Default.DATABASEMAIN,speicherpfad_to_projekts, projektpfad); + return "C:\\";// Path.Combine(Properties.Settings.Default.DATABASEMAIN,speicherpfad_to_projekts, projektpfad); } } diff --git a/SanSystem/KlassenBIB/Inspektionsobjekt.cs b/SanSystem/KlassenBIB/Inspektionsobjekt.cs index fe04287..5a9fa74 100644 --- a/SanSystem/KlassenBIB/Inspektionsobjekt.cs +++ b/SanSystem/KlassenBIB/Inspektionsobjekt.cs @@ -11,7 +11,6 @@ namespace KlassenBIB /// /// /// - [ContentProperty("Sanierung")] public class Inspektionsobjekt { private string strasseName = "none"; diff --git a/SanSystem/KlassenBIB/Projekt.cs b/SanSystem/KlassenBIB/Projekt.cs index 686a928..711c86d 100644 --- a/SanSystem/KlassenBIB/Projekt.cs +++ b/SanSystem/KlassenBIB/Projekt.cs @@ -6,10 +6,8 @@ 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 :IProjekt { public string Nummer { get; set; } diff --git a/SanSystem/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs b/SanSystem/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs index 230bdb1..0bc0343 100644 --- a/SanSystem/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs +++ b/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 lagerungZeiten = new Dictionary(); @@ -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; } } } diff --git a/SanSystem/NuGet.config b/SanSystem/NuGet.config new file mode 100644 index 0000000..e333c16 --- /dev/null +++ b/SanSystem/NuGet.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SanSystem/Properties/Settings.Designer.cs b/SanSystem/Properties/Settings.Designer.cs deleted file mode 100644 index 1c3f239..0000000 --- a/SanSystem/Properties/Settings.Designer.cs +++ /dev/null @@ -1,38 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -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; - } - } - } -} diff --git a/SanSystem/Properties/Settings.settings b/SanSystem/Properties/Settings.settings deleted file mode 100644 index fb30c22..0000000 --- a/SanSystem/Properties/Settings.settings +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - C:\ - - - \ No newline at end of file diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 1ff48d3..b690094 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -1,651 +1,32 @@ - - - - - - Debug - AnyCPU - {C6546A88-8830-4EF2-B99C-B9183171F6EF} - WinExe - SanSystem - SanSystem - v4.7.2 - 512 - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - TRACE;DEBUG;LAPTOP - prompt - 4 - - - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - - - True - - - ..\packages\FastMember.1.5.0\lib\net461\FastMember.dll - - - ..\packages\FluentFTP.37.0.2\lib\net45\FluentFTP.dll - - - ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\packages\Syncfusion.Chart.Base.19.4.0.56\lib\net46\Syncfusion.Chart.Base.dll - - - ..\packages\Syncfusion.Chart.Windows.19.4.0.56\lib\net46\Syncfusion.Chart.Windows.dll - - - ..\packages\Syncfusion.Compression.Base.19.4.0.56\lib\net46\Syncfusion.Compression.Base.dll - - - ..\packages\Syncfusion.Core.WinForms.19.4.0.56\lib\net46\Syncfusion.Core.WinForms.dll - - - ..\packages\Syncfusion.DocIO.WinForms.19.4.0.56\lib\net46\Syncfusion.DocIO.Base.dll - - - ..\packages\Syncfusion.DocToPDFConverter.WinForms.19.4.0.56\lib\net46\Syncfusion.DocToPdfConverter.Base.dll - - - ..\packages\Syncfusion.Grid.Base.19.4.0.56\lib\net46\Syncfusion.Grid.Base.dll - - - ..\packages\Syncfusion.Grid.Windows.19.4.0.56\lib\net46\Syncfusion.Grid.Windows.dll - - - ..\packages\Syncfusion.Grouping.Base.19.4.0.56\lib\net46\Syncfusion.Grouping.Base.dll - - - ..\packages\Syncfusion.Licensing.19.4.0.56\lib\net46\Syncfusion.Licensing.dll - - - ..\packages\Syncfusion.OfficeChart.Base.19.4.0.56\lib\net46\Syncfusion.OfficeChart.Base.dll - - - ..\packages\Syncfusion.Pdf.WinForms.19.4.0.56\lib\net46\Syncfusion.Pdf.Base.dll - - - ..\packages\Syncfusion.PdfViewer.Windows.19.4.0.56\lib\net46\Syncfusion.PdfViewer.Windows.dll - - - ..\packages\Syncfusion.SfInput.WinForms.19.4.0.56\lib\net46\Syncfusion.SfInput.WinForms.dll - - - ..\packages\Syncfusion.SfSpellChecker.WPF.19.4.0.56\lib\net46\Syncfusion.SfSpellChecker.WPF.dll - - - ..\packages\Syncfusion.Shared.Base.19.4.0.56\lib\net46\Syncfusion.Shared.Base.dll - - - ..\packages\Syncfusion.Shared.Windows.19.4.0.56\lib\net46\Syncfusion.Shared.Windows.dll - - - ..\packages\Syncfusion.Shared.WPF.19.4.0.56\lib\net46\Syncfusion.Shared.WPF.dll - - - ..\packages\Syncfusion.SpellChecker.Base.19.4.0.56\lib\net46\Syncfusion.SpellChecker.Base.dll - - - ..\packages\Syncfusion.Tools.Base.19.4.0.56\lib\net46\Syncfusion.Tools.Base.dll - - - ..\packages\Syncfusion.Tools.Windows.19.4.0.56\lib\net46\Syncfusion.Tools.Windows.dll - - - - - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.5\lib\net46\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.115.5\lib\net46\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.115.5\lib\net46\System.Data.SQLite.Linq.dll - - - - - - - - - - - - - - - ..\dlls\Tinkerforge.dll - - - ..\3rdPackage\WibuCmNET.dll - - - ..\3rdPackage\wupi.net.dll - - - ..\3rdPackage\WupiEngineNet.dll - - - - - - - Form - - - FrmOptions.cs - - - - - - - - - - - - - - - - Form - - - FrmAktuelleBesatzung.cs - - - Form - - - frmAuftraggeberEdit.cs - - - Form - - - frmExceptionWindow.cs - - - Form - - - FrmGetDataFromBluelight.cs - - - Form - - - frmImprägnierBerichtEdit.cs - - - Form - - - frmImprägnierBerichtList.cs - - - Form - - - frmKalibrierungFestlegung.cs - - - Form - - - FrmLinerReste.cs - - - Form - - - frmNewProjekt.cs - - - Form - - - frmObjektEdit.cs - - - Form - - - frmObjekteList.cs - - - Form - - - frmOffsetSet.cs - - - Form - - - FrmPrefixSuffix.cs - - - Form - - - frmProjektList.cs - - - Form - - - frmReparaturKonzept.cs - - - Form - - - frmSanKonzeptList.cs - - - Form - - - frmSelectMassenDate.cs - - - Form - - - frmSelectNewSan.cs - - - Form - - - frmSettings.cs - - - Form - - - frmStrassenList.cs - - - Form - - - frmMain.cs - - - Form - - - frmInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - UCInliner.cs - - - UserControl - - - UCLinerGrundlagenBrawo.cs - - - UserControl - - - UCWeitereFotos.cs - - - UserControl - - - UCWerkseitigImprägniert.cs - - - FrmOptions.cs - - - FrmAktuelleBesatzung.cs - - - frmAuftraggeberEdit.cs - - - frmExceptionWindow.cs - - - FrmGetDataFromBluelight.cs - - - frmImprägnierBerichtEdit.cs - - - frmImprägnierBerichtList.cs - - - frmKalibrierungFestlegung.cs - - - FrmLinerReste.cs - - - frmNewProjekt.cs - - - frmObjektEdit.cs - - - frmObjekteList.cs - - - frmOffsetSet.cs - - - FrmPrefixSuffix.cs - - - frmProjektList.cs - - - frmReparaturKonzept.cs - - - frmSanKonzeptList.cs - - - frmSelectMassenDate.cs - - - frmSelectNewSan.cs - - - frmSettings.cs - - - frmStrassenList.cs - - - frmMain.cs - - - frmInfo.cs - - - PublicResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - UCInliner.cs - - - UCLinerGrundlagenBrawo.cs - - - UCWeitereFotos.cs - - - PreserveNewest - - - PreserveNewest - - - Always - - - Always - - - PreserveNewest - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - Designer - - - Designer - - - Designer - - - Designer - PreserveNewest - - - Designer - - - Designer - - - - - - - - {324277c6-2eb3-47b7-9dd5-7fa520e7d349} - Dichtheitsprüfung - - - {cf95db30-247b-4382-948e-3bd5eb73c938} - UpdateLib - - - - - UCWerkseitigImprägniert.cs - - - Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - git rev-parse HEAD > "$(ProjectDir)\version.txt" - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - \ No newline at end of file + + + + WinExe + net6.0-windows + true + false + + + + + + + + + Always + + + + + + + + + + + + + + + + diff --git a/SanSystem/TempCAN/TemperaturBuilder.cs b/SanSystem/TempCAN/TemperaturBuilder.cs index d0fb342..554314f 100644 --- a/SanSystem/TempCAN/TemperaturBuilder.cs +++ b/SanSystem/TempCAN/TemperaturBuilder.cs @@ -29,8 +29,8 @@ namespace TempCAN { switch(temperaturSchnittstellen) { - case TemperaturSchnittstellen.TINKERFORGE: - return new TinkerForgeTemperatur(); + //case TemperaturSchnittstellen.TINKERFORGE: + //return new TinkerForgeTemperatur(); default: diff --git a/SanSystem/TempCAN/TinkerForgeTemperatur.cs b/SanSystem/TempCAN/TinkerForgeTemperatur.cs index 2cff252..b4a5e75 100644 --- a/SanSystem/TempCAN/TinkerForgeTemperatur.cs +++ b/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 } } } +*/ + diff --git a/SanSystem/UCInliner.Designer.cs b/SanSystem/UCInliner.Designer.cs index 06dfc69..5b3672a 100644 --- a/SanSystem/UCInliner.Designer.cs +++ b/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; } } diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs index 22c66ef..a0e0598 100644 --- a/SanSystem/UCInliner.cs +++ b/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 @@ -144,6 +144,7 @@ namespace SanSystem txt_temp_aussen.Update(); } + /* private void DownloadFromUV() { Progress progress = new Progress(x => @@ -159,7 +160,7 @@ namespace SanSystem }); try { - + FtpClient client = new FtpClient("192.168.250.2"); client.Port = 21; client.DataConnectionType = FtpDataConnectionType.AutoActive; @@ -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() { @@ -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); - generateDichtheitsprüfung.IsBackground = true; - generateDichtheitsprüfung.Start(); + //Thread generateDichtheitsprüfung = new Thread(GeneriereDP); + //generateDichtheitsprüfung.IsBackground = true; + //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) + { + + } } } diff --git a/SanSystem/frmMain.Designer.cs b/SanSystem/frmMain.Designer.cs index 63ebe6b..0486b08 100644 --- a/SanSystem/frmMain.Designer.cs +++ b/SanSystem/frmMain.Designer.cs @@ -47,7 +47,7 @@ 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(); @@ -195,7 +195,7 @@ // // update // - this.update.UpdateUrl = "http://home.cosysda.de/sanverwaltung/UpdateInfo.dat"; + //this.update.UpdateUrl = "http://home.cosysda.de/sanverwaltung/UpdateInfo.dat"; // // speichernToolStripMenuItem1 // @@ -271,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; diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index 513f2df..6382f12 100644 --- a/SanSystem/frmMain.cs +++ b/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) {