Es wird jetzt ein massenstatistik erzeugt

This commit is contained in:
Husky
2018-07-15 11:53:53 +02:00
parent a6e58a81ef
commit 1362483c8c
13 changed files with 53 additions and 16 deletions

View File

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

View File

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

View File

@@ -9,7 +9,7 @@ namespace KlassenBIB
public abstract class Sanieren : Sanierung public abstract class Sanieren : Sanierung
{ {
Guid guid; Guid guid;
DateTime datum; DateTime datum = new DateTime();
bool fertig = false; bool fertig = false;
string verzeichnispfad; string verzeichnispfad;

View File

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

View File

@@ -21,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\SanSystem.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +33,9 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="FluentFTP, Version=19.2.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL"> <Reference Include="FluentFTP, Version=19.2.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
<HintPath>..\packages\FluentFTP.19.2.2\lib\net45\FluentFTP.dll</HintPath> <HintPath>..\packages\FluentFTP.19.2.2\lib\net45\FluentFTP.dll</HintPath>
</Reference> </Reference>
@@ -49,10 +53,18 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPackage\Syncfusion.Chart.Windows.dll</HintPath> <HintPath>..\3rdPackage\Syncfusion.Chart.Windows.dll</HintPath>
</Reference> </Reference>
<Reference Include="Syncfusion.Core.WinForms, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
<Reference Include="Syncfusion.Grid.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
<Reference Include="Syncfusion.Grid.Windows, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
<Reference Include="Syncfusion.SfInput.WinForms, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
<Reference Include="Syncfusion.Shared.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL"> <Reference Include="Syncfusion.Shared.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPackage\Syncfusion.Shared.Base.dll</HintPath> <HintPath>..\3rdPackage\Syncfusion.Shared.Base.dll</HintPath>
</Reference> </Reference>
<Reference Include="Syncfusion.Shared.Windows, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
<Reference Include="Syncfusion.SpellChecker.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
<Reference Include="Syncfusion.Tools.Base, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89" />
<Reference Include="Syncfusion.Tools.Windows, Version=16.1460.0.37, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Design" /> <Reference Include="System.Design" />

View File

@@ -38,6 +38,7 @@
this.bearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.bearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.cb_erledigt = new System.Windows.Forms.CheckBox(); this.cb_erledigt = new System.Windows.Forms.CheckBox();
this.dt_datum = new System.Windows.Forms.DateTimePicker();
((System.ComponentModel.ISupportInitialize)(this.pt_box)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pt_box)).BeginInit();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@@ -55,9 +56,9 @@
// txt_schachtnummer // txt_schachtnummer
// //
this.txt_schachtnummer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_schachtnummer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_schachtnummer.Location = new System.Drawing.Point(252, 15); this.txt_schachtnummer.Location = new System.Drawing.Point(141, 15);
this.txt_schachtnummer.Name = "txt_schachtnummer"; this.txt_schachtnummer.Name = "txt_schachtnummer";
this.txt_schachtnummer.Size = new System.Drawing.Size(232, 26); this.txt_schachtnummer.Size = new System.Drawing.Size(157, 26);
this.txt_schachtnummer.TabIndex = 1; this.txt_schachtnummer.TabIndex = 1;
// //
// pt_box // pt_box
@@ -113,17 +114,27 @@
// //
this.cb_erledigt.AutoSize = true; this.cb_erledigt.AutoSize = true;
this.cb_erledigt.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cb_erledigt.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cb_erledigt.Location = new System.Drawing.Point(512, 10); this.cb_erledigt.Location = new System.Drawing.Point(304, 14);
this.cb_erledigt.Name = "cb_erledigt"; this.cb_erledigt.Name = "cb_erledigt";
this.cb_erledigt.Size = new System.Drawing.Size(93, 28); this.cb_erledigt.Size = new System.Drawing.Size(93, 28);
this.cb_erledigt.TabIndex = 6; this.cb_erledigt.TabIndex = 6;
this.cb_erledigt.Text = "Erledigt"; this.cb_erledigt.Text = "Erledigt";
this.cb_erledigt.UseVisualStyleBackColor = true; this.cb_erledigt.UseVisualStyleBackColor = true;
// //
// dt_datum
//
this.dt_datum.CalendarFont = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dt_datum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dt_datum.Location = new System.Drawing.Point(403, 15);
this.dt_datum.Name = "dt_datum";
this.dt_datum.Size = new System.Drawing.Size(298, 26);
this.dt_datum.TabIndex = 7;
//
// UCSchachtanbindung // UCSchachtanbindung
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.dt_datum);
this.Controls.Add(this.cb_erledigt); this.Controls.Add(this.cb_erledigt);
this.Controls.Add(this.lb_pictures); this.Controls.Add(this.lb_pictures);
this.Controls.Add(this.btn_add_bild); this.Controls.Add(this.btn_add_bild);
@@ -151,5 +162,6 @@
private System.Windows.Forms.ToolStripMenuItem bearbeitenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem bearbeitenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem löschenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem löschenToolStripMenuItem;
private System.Windows.Forms.CheckBox cb_erledigt; private System.Windows.Forms.CheckBox cb_erledigt;
private System.Windows.Forms.DateTimePicker dt_datum;
} }
} }

View File

@@ -17,16 +17,29 @@ namespace SanSystem
{ {
SchachtAnbindung schacht = null; SchachtAnbindung schacht = null;
string mydestination = string.Empty; string mydestination = string.Empty;
/// <summary>
///
/// </summary>
/// <param name="schacht"></param>
public UCSchachtanbindung(SchachtAnbindung schacht) public UCSchachtanbindung(SchachtAnbindung schacht)
{ {
InitializeComponent(); InitializeComponent();
this.schacht = schacht; this.schacht = schacht;
} }
/// <summary>
/// Sollte nicht verwendet werden
/// </summary>
public UCSchachtanbindung()
{
}
private void UCSchachtanbindung_Load(object sender, EventArgs e) private void UCSchachtanbindung_Load(object sender, EventArgs e)
{ {
txt_schachtnummer.DataBindings.Add(new Binding("Text", schacht, "Schachtnummer")); txt_schachtnummer.DataBindings.Add(new Binding("Text", schacht, "Schachtnummer"));
cb_erledigt.DataBindings.Add(new Binding("Checked", schacht, "Fertig")); cb_erledigt.DataBindings.Add(new Binding("Checked", schacht, "Fertig"));
dt_datum.DataBindings.Add(new Binding("Value", schacht, "Datum"));
lb_pictures.DataSource = schacht.SavedBilders; lb_pictures.DataSource = schacht.SavedBilders;

View File

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

BIN
SanSystem_exe.WibuAxProject Normal file

Binary file not shown.

View File

@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Language", "Language\Langua
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BerichtGen", "BerichtGen\BerichtGen.csproj", "{3022DA07-FD06-4AEA-9FC8-00D318E95A82}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BerichtGen", "BerichtGen\BerichtGen.csproj", "{3022DA07-FD06-4AEA-9FC8-00D318E95A82}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Viewer", "Viewer\Viewer.csproj", "{0DF6A372-2881-4C35-B695-69CA6ED2F0D6}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -71,6 +73,10 @@ Global
{3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Debug|Any CPU.Build.0 = Debug|Any CPU {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Release|Any CPU.ActiveCfg = Release|Any CPU {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Release|Any CPU.Build.0 = Release|Any CPU {3022DA07-FD06-4AEA-9FC8-00D318E95A82}.Release|Any CPU.Build.0 = Release|Any CPU
{0DF6A372-2881-4C35-B695-69CA6ED2F0D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0DF6A372-2881-4C35-B695-69CA6ED2F0D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0DF6A372-2881-4C35-B695-69CA6ED2F0D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0DF6A372-2881-4C35-B695-69CA6ED2F0D6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

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

View File

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