Husky/Kanalsanierungsverwaltung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vergessene commit

Browse Source
This commit is contained in:
Husky
2018-07-21 12:24:23 +02:00
parent 20388f5603
commit 53fa3789f2
28 changed files with 307 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BerichtGen/Bericht.cs
View File

@@ -24,6 +24,7 @@ namespace BerichtGen
/// <param name="source">Die zuverwendete Vorlagenname</param>
/// <param name="savepath">Pfad zum Speichern</param>
/// <param name="filename"></param>
/// <param name="daten"></param>
/// <param name="bilderObjects">Zur zeit ohne Implementierung</param>
/// <param name="tableContents">Für Tabellen anzeige</param>
/// <param name="erzeugeDOC">Ein doc datei soll erzeugt werden</param>
@@ -135,7 +136,7 @@ namespace BerichtGen
graphics.Dispose();
}
catch(Exception ex)
catch(Exception)
{
}

58
KlassenBIB/InlinerSanierung.cs
View File

@@ -37,7 +37,11 @@ namespace KlassenBIB
{
return haltungslaenge * harzbedarf;
}
/// <summary>
///
/// </summary>
/// <param name="projektpfad"></param>
/// <returns></returns>
public override string CheckVerzeichnisse(string projektpfad)
{
string path = Path.Combine(projektpfad, PfadZurSan);
@@ -48,6 +52,11 @@ namespace KlassenBIB
return mypath;
}
/// <summary>
///
/// </summary>
/// <param name="destinationPath"></param>
/// <returns></returns>
public Hashtable MakeProtokoll(string destinationPath)
{
@@ -139,17 +148,30 @@ namespace KlassenBIB
return grunddaten;
}
/// <summary>
///
/// </summary>
public InlinerSanierung()
{
//datumKalibrierung = new DateTime();
Verzeichnispfad = "UVAnlage";
if (datumKalibrierung <= DateTime.MinValue || datumKalibrierung >= DateTime.MaxValue) datumKalibrierung = DateTime.Now;
}
/// <summary>
///
/// </summary>
public double KalibrierUnterdruck { get => kalibrierUnterdruck; set => kalibrierUnterdruck = value; }
/// <summary>
///
/// </summary>
public double KalibierWalzenAbstand { get => kalibierWalzenAbstand; set => kalibierWalzenAbstand = value; }
/// <summary>
///
/// </summary>
public double HarzKalibrierTemperatur { get => harzKalibrierTemperatur; set => harzKalibrierTemperatur = value; }
/// <summary>
///
/// </summary>
public DateTime DatumKalibrierung
{
get
@@ -163,15 +185,45 @@ namespace KlassenBIB
datumKalibrierung = value;
}
}
/// <summary>
///
/// </summary>
public string HarzChargenummer { get => harzChargenummer; set => harzChargenummer = value; }
/// <summary>
///
/// </summary>
public string LinerChargenummer { get => linerChargenummer; set => linerChargenummer = value; }
/// <summary>
///
/// </summary>
public double Harzbedarf { get => harzbedarf; set => harzbedarf = value; }
/// <summary>
///
/// </summary>
public uint Rueckholgeschwindigkeit { get => rueckholgeschwindigkeit; set => rueckholgeschwindigkeit = value; }
/// <summary>
///
/// </summary>
public bool GeschlosseneEnde { get => geschlosseneEnde; set => geschlosseneEnde = value; }
/// <summary>
///
/// </summary>
public double HarzBedarf { get => harzbedarf; set => harzbedarf = value; }
/// <summary>
///
/// </summary>
public string HarzTyp { get => harzTyp; set => harzTyp = value; }
/// <summary>
///
/// </summary>
public string LinerTyp { get => linerTyp; set => linerTyp = value; }
/// <summary>
///
/// </summary>
public DateTime AnfangAushaertung { get => anfangAushaertung; set => anfangAushaertung = value; }
/// <summary>
///
/// </summary>
public DateTime EndeAushaertung { get => endeAushaertung; set => endeAushaertung = value; }
}
}

16
KlassenBIB/Sanieren.cs
View File

@@ -6,16 +6,30 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public abstract class Sanieren : Sanierung
{
Guid guid;
DateTime datum = new DateTime();
bool fertig = false;
string verzeichnispfad;
/// <summary>
///
/// </summary>
public Guid Guid { get => guid; set => guid = value; }
/// <summary>
///
/// </summary>
public DateTime Datum { get => datum; set => datum = value; }
/// <summary>
///
/// </summary>
public bool Fertig { get => fertig; set => fertig = value; }
/// <summary>
///
/// </summary>
public string Verzeichnispfad { get => verzeichnispfad; protected set => verzeichnispfad = value; }
}
}

6
KlassenBIB/Sanierung.cs
View File

@@ -11,6 +11,9 @@ namespace KlassenBIB
//
// Zusammenfassung:
// Bietet die grundlegene Struktur für eine Sanierung
/// <summary>
///
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
[Browsable(false)]
public abstract class Sanierung : INotifyPropertyChanged
@@ -26,6 +29,9 @@ namespace KlassenBIB
DateTime hDReinigungDatum;
//DateTime sanierungsDatum;
Inspektionsobjekt inspektionsobjekt;
/// <summary>
///
/// </summary>
protected string pfadZurSan;
/// <summary>

3
KlassenBIB/SanierungCollection.cs
View File

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class SanierungCollection : List<Sanierung>
{
}

6
SanSystem/FrmKalibrierungFestlegung.cs
View File

@@ -11,8 +11,14 @@ using System.Windows.Forms;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class FrmKalibrierungFestlegung : Form
{
/// <summary>
///
/// </summary>
public FrmKalibrierungFestlegung(List<Inspektionsobjekt> inspektionsobjekts)
{
InitializeComponent();

6
SanSystem/FrmNewProjekt.cs
View File

@@ -11,8 +11,14 @@ using System.Windows.Forms;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class FrmNewProjekt : Form
{
/// <summary>
///
/// </summary>
public FrmNewProjekt()
{
InitializeComponent();

3
SanSystem/FrmSelectMassenDate.cs
View File

@@ -12,6 +12,9 @@ using System.Windows.Forms;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class FrmSelectMassenDate : Form
{

18
SanSystem/FrmSelectNewSan.cs
View File

@@ -10,21 +10,39 @@ using System.Windows.Forms;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class FrmSelectNewSan : Form
{
/// <summary>
///
/// </summary>
public event EventHandler AddInlinerClicked;
/// <summary>
///
/// </summary>
public event EventHandler AddSchachtAnbindungClicked;
/// <summary>
///
/// </summary>
protected virtual void OnAddSchachtAnbindungClicked(EventArgs e)
{
EventHandler handler = AddSchachtAnbindungClicked;
if (handler != null) handler(this, e);
}
/// <summary>
///
/// </summary>
protected virtual void OnAddInlinerClicked(EventArgs e)
{
EventHandler handler = AddInlinerClicked;
if (handler != null) handler(this, e);
}
/// <summary>
///
/// </summary>
public FrmSelectNewSan()
{
InitializeComponent();

12
SanSystem/UCInliner.cs
View File

@@ -17,7 +17,9 @@ using Syncfusion.Windows.Forms.Chart;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class UCInliner : UserControl
{
enum TabPages
@@ -29,6 +31,10 @@ namespace SanSystem
string destinationPath = string.Empty;
UCLinerGrundlagen UCLinerGrundlagen = null;
List<string> filenames = new List<string>();
/// <summary>
///
/// </summary>
/// <param name="san"></param>
public UCInliner(InlinerSanierung san)
{
InitializeComponent();
@@ -143,7 +149,7 @@ namespace SanSystem
FtpClient newClient = null;
client.Dispose();
FtpClient newclient = null;
//FtpClient newclient = null;
foreach (string file in filenames)
{
newClient = new FtpClient("192.168.250.2");
@@ -166,7 +172,7 @@ namespace SanSystem
}
catch (TimeoutException ex)
{
MessageBox.Show("Die anlage reagiert nicht!");
MessageBox.Show("Die anlage reagiert nicht!\n"+ex.Message);
}
}

14
SanSystem/UCLinerGrundlagen.cs
View File

@@ -11,16 +11,28 @@ using KlassenBIB;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class UCLinerGrundlagen : UserControl
{
InlinerSanierung inliner = null;
/// <summary>
///
/// </summary>
public List<Inspektionsobjekt> inspektionsobjekts = null;
/// <summary>
///
/// </summary>
/// <param name="inliner"></param>
public UCLinerGrundlagen(InlinerSanierung inliner)
{
InitializeComponent();
this.inliner = inliner;
}
/// <summary>
///
/// </summary>
public UCLinerGrundlagen()
{
InitializeComponent();

3
SanSystem/UCSchachtanbindung.cs
View File

@@ -13,6 +13,9 @@ using System.IO;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class UCSchachtanbindung : UserControl
{
SchachtAnbindung schacht = null;

3
SanSystem/frmMain.Designer.cs generated
View File

@@ -1,5 +1,8 @@
namespace SanSystem
{
/// <summary>
///
/// </summary>
partial class frmMain
{
/// <summary>

7
SanSystem/frmMain.cs
View File

@@ -16,9 +16,14 @@ using System.Windows.Forms;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class frmMain : Form
{
/// <summary>
///
/// </summary>
public frmMain()
{
InitializeComponent();

8
SanSystem/frmObjektEdit.cs
View File

@@ -14,11 +14,17 @@ using Database;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class frmObjektEdit : Form
{
Inspektionsobjekt inspektionsobjekt = null;
/// <summary>
///
/// </summary>
/// <param name="inspektion"></param>
public frmObjektEdit(Inspektionsobjekt inspektion)
{
InitializeComponent();

13
SanSystem/frmObjekteList.cs
View File

@@ -15,12 +15,18 @@ using System.Windows.Forms;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class frmObjekteList : Form
{
private List<Inspektionsobjekt> inspektionsobjekte;
ObjecteListSetting objecteListSetting = new ObjecteListSetting();
/// <summary>
///
/// </summary>
/// <param name="streetname"></param>
private void loadObjekte(string streetname)
{
@@ -63,7 +69,10 @@ namespace SanSystem
}
return true;
}
/// <summary>
///
/// </summary>
/// <param name="streetname"></param>
public frmObjekteList(string streetname)
{
InitializeComponent();

6
SanSystem/frmProjektList.cs
View File

@@ -11,8 +11,14 @@ using System.Windows.Forms;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class frmProjektList : Form
{
/// <summary>
///
/// </summary>
public frmProjektList()
{
InitializeComponent();

7
SanSystem/frmStrassenList.cs
View File

@@ -12,10 +12,15 @@ using System.Windows.Forms;
namespace SanSystem
{
/// <summary>
///
/// </summary>
public partial class frmStrassenList : Form
{
BindingSource bs = new BindingSource();
/// <summary>
///
/// </summary>
public frmStrassenList()
{
InitializeComponent();

3
SchnittstelleImporter/XML2006/Anschlussdaten.cs
View File

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace SchnittstelleImporter.XML2006
{
/// <summary>
///
/// </summary>
public class Anschlussdaten
{
string objektbezeichnung;

39
SchnittstelleImporter/XML2006/Enums.cs
View File

@@ -11,9 +11,21 @@ namespace SchnittstelleImporter.XML2006
/// </summary>
public enum EAnlagetyp
{
/// <summary>
///
/// </summary>
Haltung = 1,
/// <summary>
///
/// </summary>
Anschlussleitung = 2,
/// <summary>
///
/// </summary>
Schacht = 3,
/// <summary>
///
/// </summary>
Bauwerk = 4
}
/// <summary>
@@ -40,7 +52,13 @@ namespace SchnittstelleImporter.XML2006
/// </summary>
public enum ERohrleitungstyp
{
/// <summary>
///
/// </summary>
HALTUNG,
/// <summary>
///
/// </summary>
LEITUNG
}
/// <summary>
@@ -56,8 +74,17 @@ namespace SchnittstelleImporter.XML2006
/// </summary>
public enum EKnotenTyp
{
/// <summary>
///
/// </summary>
SCHACHT = 0,
/// <summary>
///
/// </summary>
ANSCHLUSSPUNKT = 1,
/// <summary>
///
/// </summary>
BAUWERK = 2
}
/// <summary>
@@ -65,9 +92,21 @@ namespace SchnittstelleImporter.XML2006
/// </summary>
public enum EKantenTyp
{
/// <summary>
///
/// </summary>
HALTUNG,
/// <summary>
///
/// </summary>
LEITUNG,
/// <summary>
///
/// </summary>
RINNE,
/// <summary>
///
/// </summary>
GERINNE
}
}

3
SchnittstelleImporter/XML2006/InspizierteAbwassertechnischeAnlage.cs
View File

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace SchnittstelleImporter.XML2006
{
/// <summary>
///
/// </summary>
public sealed class InspizierteAbwassertechnischeAnlage
{
string objektbezeichnung;

3
SchnittstelleImporter/XML2006/Lage.cs
View File

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace SchnittstelleImporter.XML2006
{
/// <summary>
///
/// </summary>
public class Lage
{
string strassename;

3
SchnittstelleImporter/XML2006/OptischeInspektion.cs
View File

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace SchnittstelleImporter.XML2006
{
/// <summary>
///
/// </summary>
public class OptischeInspektion
{
DateTime inspektionstime;

3
SchnittstelleImporter/XML2006/RGrunddaten.cs
View File

@@ -6,6 +6,9 @@ using System.Threading.Tasks;
namespace SchnittstelleImporter.XML2006
{
/// <summary>
///
/// </summary>
public class RGrunddaten
{
string knotenZulauf;

51
SchnittstelleImporter/XML2006/RZustand.cs
View File

@@ -6,11 +6,23 @@ using System.Threading.Tasks;
namespace SchnittstelleImporter.XML2006
{
/// <summary>
///
/// </summary>
public struct Quantifizierung
{
/// <summary>
///
/// </summary>
public decimal Numerisch;
/// <summary>
///
/// </summary>
public string Text;
/// <summary>
///
/// </summary>
public override string ToString()
{
if (Text != null)
@@ -20,6 +32,9 @@ namespace SchnittstelleImporter.XML2006
return Numerisch.ToString();
}
}
/// <summary>
///
/// </summary>
public class RZustand
{
decimal station;
@@ -35,17 +50,53 @@ namespace SchnittstelleImporter.XML2006
int positionBis;
string kommentar;
/// <summary>
///
/// </summary>
public decimal Station { get => station; set => station = value; }
/// <summary>
///
/// </summary>
public string Inspektionskode { get => inspektionskode; set => inspektionskode = value; }
/// <summary>
///
/// </summary>
public string Charakterisierung1 { get => charakterisierung1; set => charakterisierung1 = value; }
/// <summary>
///
/// </summary>
public string Charakterisierung2 { get => charakterisierung2; set => charakterisierung2 = value; }
/// <summary>
///
/// </summary>
public bool Verbindung { get => verbindung; set => verbindung = value; }
/// <summary>
///
/// </summary>
public Quantifizierung Quantifizierung1 { get => quantifizierung1; set => quantifizierung1 = value; }
/// <summary>
///
/// </summary>
public Quantifizierung Quantifizierung2 { get => quantifizierung2; set => quantifizierung2 = value; }
/// <summary>
///
/// </summary>
public string Streckenschaden { get => streckenschaden; set => streckenschaden = value; }
/// <summary>
///
/// </summary>
public int Streckenschadennr { get => streckenschadennr; set => streckenschadennr = value; }
/// <summary>
///
/// </summary>
public int PositionVon { get => positionVon; set => positionVon = value; }
/// <summary>
///
/// </summary>
public int PositionBis { get => positionBis; set => positionBis = value; }
/// <summary>
///
/// </summary>
public string Kommentar { get => kommentar; set => kommentar = value; }
}
}

3
SchnittstelleImporter/XML2006/XMLParser.cs
View File

@@ -13,6 +13,9 @@ namespace SchnittstelleImporter.XML2006
/// </summary>
public static class XMLParser
{
/// <summary>
///
/// </summary>
public static Dictionary<InspizierteAbwassertechnischeAnlage, string> anlageInFile = new Dictionary<InspizierteAbwassertechnischeAnlage, string>();
/// <summary>
/// Gibt eine Liste an anlagen zurück von einer XML Datei.

12
TempCAN/TemperaturBuilder.cs
View File

@@ -7,12 +7,24 @@ using SanShared;
namespace TempCAN
{
/// <summary>
///
/// </summary>
public enum TemperaturSchnittstellen
{
/// <summary>
///
/// </summary>
TINKERFORGE
}
/// <summary>
///
/// </summary>
public static class TemperaturBuilder
{
/// <summary>
///
/// </summary>
public static ITemperature Temperatur(TemperaturSchnittstellen temperaturSchnittstellen)
{
switch(temperaturSchnittstellen)

9
TempCAN/TinkerForgeTemperatur.cs
View File

@@ -8,6 +8,9 @@ using Tinkerforge;
namespace TempCAN
{
/// <summary>
///
/// </summary>
public class TinkerForgeTemperatur : ITemperature
{
private static string HOST = "localhost";
@@ -16,6 +19,9 @@ namespace TempCAN
double temperatur;
bool erfolg = true;
/// <summary>
///
/// </summary>
public TinkerForgeTemperatur()
{
IPConnection ipcon = new IPConnection();
@@ -39,6 +45,9 @@ namespace TempCAN
ipcon = null;
}
/// <summary>
///
/// </summary>
public double GetTemperatur(out string message)
{
message = "";