Imprägnierungsprotokolle werden erstellt
This commit is contained in:
@@ -27,6 +27,7 @@ namespace BerichtGen
|
|||||||
string speicherpfad;
|
string speicherpfad;
|
||||||
string source;
|
string source;
|
||||||
string filename;
|
string filename;
|
||||||
|
bool hidden = false;
|
||||||
List<BilderObject> bilderObjects;
|
List<BilderObject> bilderObjects;
|
||||||
|
|
||||||
DataTable tableContent = null;
|
DataTable tableContent = null;
|
||||||
@@ -40,7 +41,7 @@ namespace BerichtGen
|
|||||||
/// <param name="grunddaten"></param>
|
/// <param name="grunddaten"></param>
|
||||||
/// <param name="bilderObjects"></param>
|
/// <param name="bilderObjects"></param>
|
||||||
/// <param name="tableContent"></param>
|
/// <param name="tableContent"></param>
|
||||||
public FrmOptions(string firma, string vorlage, string speicherpfad,string filename, Hashtable grunddaten, List<BilderObject> bilderObjects, DataTable tableContent = null)
|
public FrmOptions(string firma, string vorlage, string speicherpfad, string filename, Hashtable grunddaten, List<BilderObject> bilderObjects, DataTable tableContent = null, bool hidden = false)
|
||||||
{
|
{
|
||||||
|
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@@ -55,6 +56,11 @@ namespace BerichtGen
|
|||||||
this.tableContent = tableContent;
|
this.tableContent = tableContent;
|
||||||
this.source = Path.Combine("documents", firma, vorlage);
|
this.source = Path.Combine("documents", firma, vorlage);
|
||||||
this.filename = filename;
|
this.filename = filename;
|
||||||
|
this.hidden = hidden;
|
||||||
|
if(hidden)
|
||||||
|
{
|
||||||
|
GenerateBericht();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,7 +71,7 @@ namespace BerichtGen
|
|||||||
bericht.Erzeuge(source, speicherpfad,filename, grundDaten, bilderObjects, tableContent,cb_doc.Checked,cb_pdf.Checked);
|
bericht.Erzeuge(source, speicherpfad,filename, grundDaten, bilderObjects, tableContent,cb_doc.Checked,cb_pdf.Checked);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btn_start_Click(object sender, EventArgs e)
|
private void GenerateBericht()
|
||||||
{
|
{
|
||||||
generateProtokollThread = new Thread(Gen);
|
generateProtokollThread = new Thread(Gen);
|
||||||
generateProtokollThread.IsBackground = true;
|
generateProtokollThread.IsBackground = true;
|
||||||
@@ -76,12 +82,17 @@ namespace BerichtGen
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rb_yes.Checked && cb_pdf.Checked)
|
if (rb_yes.Checked && cb_pdf.Checked && !hidden)
|
||||||
{
|
{
|
||||||
string pfad = Path.Combine(speicherpfad, string.Format("{0}.pdf", filename));
|
string pfad = Path.Combine(speicherpfad, string.Format("{0}.pdf", filename));
|
||||||
FrmPDFViewer frmPDFViewer = new FrmPDFViewer(pfad);
|
FrmPDFViewer frmPDFViewer = new FrmPDFViewer(pfad);
|
||||||
frmPDFViewer.ShowDialog();
|
frmPDFViewer.ShowDialog();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btn_start_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
GenerateBericht();
|
||||||
|
|
||||||
this.Close();
|
this.Close();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,8 @@ namespace Database
|
|||||||
tempProjekt = XamlServices.Load(filepath) as KlassenBIB.Projekt;
|
tempProjekt = XamlServices.Load(filepath) as KlassenBIB.Projekt;
|
||||||
|
|
||||||
//auftraggebers.Add(tempProjekt.Auftraggeber);
|
//auftraggebers.Add(tempProjekt.Auftraggeber);
|
||||||
if (Datenbank.Instance.MainDatenbank.AuftraggeberListe.Contains(tempProjekt.Auftraggeber))
|
IAuftraggeber test = Datenbank.Instance.MainDatenbank.AuftraggeberListe.Find(x =>x.Name.Equals(tempProjekt.Auftraggeber.Name));
|
||||||
|
if (test != null)
|
||||||
{
|
{
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -83,6 +83,10 @@
|
|||||||
<Compile Include="Sanierung\Renovation\WerkseitigImprägniert.cs" />
|
<Compile Include="Sanierung\Renovation\WerkseitigImprägniert.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\BerichtGen\BerichtGen.csproj">
|
||||||
|
<Project>{3022DA07-FD06-4AEA-9FC8-00D318E95A82}</Project>
|
||||||
|
<Name>BerichtGen</Name>
|
||||||
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\CSVParser\CSVParser.csproj">
|
<ProjectReference Include="..\CSVParser\CSVParser.csproj">
|
||||||
<Project>{3F79BD28-9BF6-4902-8977-41E9E71F8488}</Project>
|
<Project>{3F79BD28-9BF6-4902-8977-41E9E71F8488}</Project>
|
||||||
<Name>CSVParser</Name>
|
<Name>CSVParser</Name>
|
||||||
|
|||||||
@@ -27,5 +27,6 @@ namespace KlassenBIB
|
|||||||
public double HarzTemperatur { get; set; }
|
public double HarzTemperatur { get; set; }
|
||||||
public double Vakuum { get; set; }
|
public double Vakuum { get; set; }
|
||||||
public string HarzTyp { get; set; }
|
public string HarzTyp { get; set; }
|
||||||
|
public double Walzenabstand { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
using SanShared;
|
using BerichtGen;
|
||||||
|
using CSVParser;
|
||||||
|
using SanShared;
|
||||||
|
using SanShared.Exceptions;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@@ -34,9 +37,10 @@ namespace KlassenBIB
|
|||||||
string bediener;
|
string bediener;
|
||||||
DateTime anfangKalibrierung;
|
DateTime anfangKalibrierung;
|
||||||
DateTime endeKalibirierung;
|
DateTime endeKalibirierung;
|
||||||
|
AbstractImprägnier imprägnierungsbericht;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public double GetGesamtHarzbedarf(double haltungslaenge)
|
public double GetGesamtHarzbedarf(double haltungslaenge)
|
||||||
{
|
{
|
||||||
return haltungslaenge * harzbedarf;
|
return haltungslaenge * harzbedarf;
|
||||||
@@ -55,6 +59,43 @@ namespace KlassenBIB
|
|||||||
|
|
||||||
public Hashtable MakeProtokoll(string destinationPath, IProjekt projekt)
|
public Hashtable MakeProtokoll(string destinationPath, IProjekt projekt)
|
||||||
{
|
{
|
||||||
|
IEnumerable<string> files = Directory.EnumerateFiles(destinationPath, "*.csv", SearchOption.AllDirectories);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
IReadCSVData csvFile = null;
|
||||||
|
List<UVcsvStrukture> struktures = null;
|
||||||
|
if (files.Count() > 0)
|
||||||
|
{
|
||||||
|
csvFile = CsvParserFactory.ReadCSVFile(AcceptedCSVFormats.BLUELIGHT, files.Last());
|
||||||
|
try
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
struktures = csvFile.ReadCSVStrukture();
|
||||||
|
}
|
||||||
|
catch (CSVImportException)
|
||||||
|
{
|
||||||
|
//MessageBox.Show("Es scheint den Falschen Anlagentyp angegeben worden sein.", "CSV Datei konnte nicht gelesen werden", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
//return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.AnfangAushaertung = struktures.Select(x => x.Zeitstempel).Min();
|
||||||
|
this.EndeAushaertung = struktures.Select(x => x.Zeitstempel).Max();
|
||||||
|
this.Rueckholgeschwindigkeit = 0;
|
||||||
|
}
|
||||||
|
catch (FileNotFoundException ex)
|
||||||
|
{
|
||||||
|
Trace.WriteLine(ex.Message);
|
||||||
|
//MessageBox.Show(string.Format("Datei {0} wurde nicht gefunden", ex.FileName));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (struktures != null)
|
||||||
|
{
|
||||||
|
makeGraphic.GetGraphics(struktures, destinationPath);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
Hashtable grunddaten = new Hashtable()
|
Hashtable grunddaten = new Hashtable()
|
||||||
{
|
{
|
||||||
{"AG_Vorname","" },
|
{"AG_Vorname","" },
|
||||||
@@ -106,7 +147,7 @@ namespace KlassenBIB
|
|||||||
grunddaten["hausnummer"] = Inspektionsobjekt.Hausnummer;
|
grunddaten["hausnummer"] = Inspektionsobjekt.Hausnummer;
|
||||||
grunddaten["AG_Vorname"] = projekt.Auftraggeber.Name;
|
grunddaten["AG_Vorname"] = projekt.Auftraggeber.Name;
|
||||||
grunddaten["KLP_Nummer"] = Inspektionsobjekt.Sanierungsnummer;
|
grunddaten["KLP_Nummer"] = Inspektionsobjekt.Sanierungsnummer;
|
||||||
grunddaten["KLP_Datum"] = DateTime.Now.ToShortDateString();
|
grunddaten["KLP_Datum"] = this.Datum.ToShortDateString();//DateTime.Now.ToShortDateString();
|
||||||
grunddaten["AG_Ort"] = projekt.Auftraggeber.Ort;
|
grunddaten["AG_Ort"] = projekt.Auftraggeber.Ort;
|
||||||
grunddaten["AG_Strasse"] = projekt.Auftraggeber.Strasse;
|
grunddaten["AG_Strasse"] = projekt.Auftraggeber.Strasse;
|
||||||
grunddaten["AG_Ansprechpartner"] = projekt.Auftraggeber.Ansprechpartner;
|
grunddaten["AG_Ansprechpartner"] = projekt.Auftraggeber.Ansprechpartner;
|
||||||
@@ -202,5 +243,6 @@ namespace KlassenBIB
|
|||||||
public DateTime EndeKalibirierung { get => endeKalibirierung; set => endeKalibirierung = value; }
|
public DateTime EndeKalibirierung { get => endeKalibirierung; set => endeKalibirierung = value; }
|
||||||
|
|
||||||
public bool Preliner { get => preliner; set => preliner = value; }
|
public bool Preliner { get => preliner; set => preliner = value; }
|
||||||
|
public AbstractImprägnier Imprägnierungsbericht { get => imprägnierungsbericht; set => imprägnierungsbericht = value; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,5 +12,10 @@ namespace KlassenBIB
|
|||||||
public string Imprägniernummer { get; set; }
|
public string Imprägniernummer { get; set; }
|
||||||
public bool LagerungKorrekt { get; set; }
|
public bool LagerungKorrekt { get; set; }
|
||||||
public string LängeCode { get; set; }
|
public string LängeCode { get; set; }
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return Imprägniernummer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -232,6 +232,12 @@
|
|||||||
<Compile Include="UCSchachtanbindung.Designer.cs">
|
<Compile Include="UCSchachtanbindung.Designer.cs">
|
||||||
<DependentUpon>UCSchachtanbindung.cs</DependentUpon>
|
<DependentUpon>UCSchachtanbindung.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="UCWerkseitigImprägniert.cs">
|
||||||
|
<SubType>UserControl</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="UCWerkseitigImprägniert.Designer.cs">
|
||||||
|
<DependentUpon>UCWerkseitigImprägniert.cs</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<EmbeddedResource Include="frmAuftraggeberEdit.resx">
|
<EmbeddedResource Include="frmAuftraggeberEdit.resx">
|
||||||
<DependentUpon>frmAuftraggeberEdit.cs</DependentUpon>
|
<DependentUpon>frmAuftraggeberEdit.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
@@ -358,6 +364,9 @@
|
|||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<EmbeddedResource Include="UCWerkseitigImprägniert.resx">
|
||||||
|
<DependentUpon>UCWerkseitigImprägniert.cs</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="version.txt">
|
<EmbeddedResource Include="version.txt">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
|||||||
2
SanSystem/UCInliner.Designer.cs
generated
2
SanSystem/UCInliner.Designer.cs
generated
@@ -225,7 +225,7 @@
|
|||||||
//
|
//
|
||||||
this.dt_eingebaut.Location = new System.Drawing.Point(556, 160);
|
this.dt_eingebaut.Location = new System.Drawing.Point(556, 160);
|
||||||
this.dt_eingebaut.Name = "dt_eingebaut";
|
this.dt_eingebaut.Name = "dt_eingebaut";
|
||||||
this.dt_eingebaut.Size = new System.Drawing.Size(291, 30);
|
this.dt_eingebaut.Size = new System.Drawing.Size(325, 30);
|
||||||
this.dt_eingebaut.TabIndex = 26;
|
this.dt_eingebaut.TabIndex = 26;
|
||||||
//
|
//
|
||||||
// cb_fertig
|
// cb_fertig
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ namespace SanSystem
|
|||||||
}
|
}
|
||||||
InlinerSanierung inliner = null;
|
InlinerSanierung inliner = null;
|
||||||
string destinationPath = string.Empty;
|
string destinationPath = string.Empty;
|
||||||
|
UCWerkseitigImprägniert werkseitigImprägniert = null;
|
||||||
UCLinerGrundlagenBrawo UCLinerGrundlagen = null;
|
UCLinerGrundlagenBrawo UCLinerGrundlagen = null;
|
||||||
List<string> filenames = new List<string>();
|
List<string> filenames = new List<string>();
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -41,11 +42,13 @@ namespace SanSystem
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
inliner = san;
|
inliner = san;
|
||||||
|
werkseitigImprägniert = new UCWerkseitigImprägniert(san);
|
||||||
UCLinerGrundlagen = new UCLinerGrundlagenBrawo(san);
|
UCLinerGrundlagen = new UCLinerGrundlagenBrawo(san);
|
||||||
|
|
||||||
TabPage tab = new TabPage("Linergrundlagen");
|
TabPage tab = new TabPage("Linergrundlagen");
|
||||||
UCLinerGrundlagen.Dock = DockStyle.Fill;
|
UCLinerGrundlagen.Dock = DockStyle.Fill;
|
||||||
tab.Controls.Add(UCLinerGrundlagen);
|
tab.Controls.Add(werkseitigImprägniert);
|
||||||
|
//tab.Controls.Add(UCLinerGrundlagen);
|
||||||
tabControl1.TabPages.Add(tab);
|
tabControl1.TabPages.Add(tab);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -274,9 +277,7 @@ namespace SanSystem
|
|||||||
prozess.StartInfo.FileName = "explorer";
|
prozess.StartInfo.FileName = "explorer";
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
DirectoryInfo directory = Directory.GetParent(destinationPath);
|
prozess.StartInfo.Arguments = destinationPath;
|
||||||
|
|
||||||
prozess.StartInfo.Arguments = Directory.GetParent(destinationPath).FullName;
|
|
||||||
prozess.Start();
|
prozess.Start();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
73
SanSystem/UCWerkseitigImprägniert.Designer.cs
generated
Normal file
73
SanSystem/UCWerkseitigImprägniert.Designer.cs
generated
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
namespace SanSystem
|
||||||
|
{
|
||||||
|
partial class UCWerkseitigImprägniert
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Erforderliche Designervariable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Verwendete Ressourcen bereinigen.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Vom Komponenten-Designer generierter Code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Erforderliche Methode für die Designerunterstützung.
|
||||||
|
/// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
this.btn_save = new System.Windows.Forms.Button();
|
||||||
|
this.lst_imprägnierberichte = new System.Windows.Forms.ComboBox();
|
||||||
|
this.SuspendLayout();
|
||||||
|
//
|
||||||
|
// 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(3, 98);
|
||||||
|
this.btn_save.Name = "btn_save";
|
||||||
|
this.btn_save.Size = new System.Drawing.Size(149, 144);
|
||||||
|
this.btn_save.TabIndex = 0;
|
||||||
|
this.btn_save.Text = "Speichern";
|
||||||
|
this.btn_save.UseVisualStyleBackColor = true;
|
||||||
|
this.btn_save.Click += new System.EventHandler(this.Btn_save_Click);
|
||||||
|
//
|
||||||
|
// lst_imprägnierberichte
|
||||||
|
//
|
||||||
|
this.lst_imprägnierberichte.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
this.lst_imprägnierberichte.FormattingEnabled = true;
|
||||||
|
this.lst_imprägnierberichte.Location = new System.Drawing.Point(3, 44);
|
||||||
|
this.lst_imprägnierberichte.Name = "lst_imprägnierberichte";
|
||||||
|
this.lst_imprägnierberichte.Size = new System.Drawing.Size(334, 33);
|
||||||
|
this.lst_imprägnierberichte.TabIndex = 1;
|
||||||
|
//
|
||||||
|
// UCWerkseitigImprägniert
|
||||||
|
//
|
||||||
|
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
||||||
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
this.Controls.Add(this.lst_imprägnierberichte);
|
||||||
|
this.Controls.Add(this.btn_save);
|
||||||
|
this.Name = "UCWerkseitigImprägniert";
|
||||||
|
this.Size = new System.Drawing.Size(949, 343);
|
||||||
|
this.Load += new System.EventHandler(this.UCWerkseitigImprägniert_Load);
|
||||||
|
this.ResumeLayout(false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private System.Windows.Forms.Button btn_save;
|
||||||
|
private System.Windows.Forms.ComboBox lst_imprägnierberichte;
|
||||||
|
}
|
||||||
|
}
|
||||||
35
SanSystem/UCWerkseitigImprägniert.cs
Normal file
35
SanSystem/UCWerkseitigImprägniert.cs
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.Data;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using KlassenBIB;
|
||||||
|
|
||||||
|
namespace SanSystem
|
||||||
|
{
|
||||||
|
public partial class UCWerkseitigImprägniert : UserControl
|
||||||
|
{
|
||||||
|
InlinerSanierung inliner;
|
||||||
|
|
||||||
|
public UCWerkseitigImprägniert(InlinerSanierung inliner)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
this.inliner = inliner;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UCWerkseitigImprägniert_Load(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
lst_imprägnierberichte.DataSource = Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Btn_save_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
inliner.Imprägnierungsbericht = (WerkseitigImprägniert)lst_imprägnierberichte.SelectedItem;
|
||||||
|
//MessageBox.Show(lst_imprägnierberichte.SelectedItem.GetType().ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
120
SanSystem/UCWerkseitigImprägniert.resx
Normal file
120
SanSystem/UCWerkseitigImprägniert.resx
Normal file
@@ -0,0 +1,120 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
</root>
|
||||||
@@ -27,6 +27,8 @@ namespace SanSystem
|
|||||||
txt_harzTemperatur.DataBindings.Add("Text", werkseitigImprägniert, "HarzTemperatur");
|
txt_harzTemperatur.DataBindings.Add("Text", werkseitigImprägniert, "HarzTemperatur");
|
||||||
txt_bediener.DataBindings.Add("Text", werkseitigImprägniert, "Bediener");
|
txt_bediener.DataBindings.Add("Text", werkseitigImprägniert, "Bediener");
|
||||||
txt_mischungtyp.DataBindings.Add("Text", werkseitigImprägniert, "HarzTyp");
|
txt_mischungtyp.DataBindings.Add("Text", werkseitigImprägniert, "HarzTyp");
|
||||||
|
txt_vakuum.DataBindings.Add("Text", werkseitigImprägniert, "Vakuum");
|
||||||
|
txt_walzenabstand.DataBindings.Add("Text", werkseitigImprägniert, "Walzenabstand");
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ namespace SanSystem
|
|||||||
{
|
{
|
||||||
WerkseitigImprägniert werkseitigImprägnierts = new WerkseitigImprägniert();
|
WerkseitigImprägniert werkseitigImprägnierts = new WerkseitigImprägniert();
|
||||||
Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Add(werkseitigImprägnierts);
|
Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Add(werkseitigImprägnierts);
|
||||||
|
frmImprägnierBerichtEdit frmImprägnierBerichtEdit = new frmImprägnierBerichtEdit(werkseitigImprägnierts);
|
||||||
|
frmImprägnierBerichtEdit.ShowDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Lst_imprägnierBerichtNr_DoubleClick(object sender, EventArgs e)
|
private void Lst_imprägnierBerichtNr_DoubleClick(object sender, EventArgs e)
|
||||||
@@ -37,6 +39,7 @@ namespace SanSystem
|
|||||||
if (imprägnierung == null) return;
|
if (imprägnierung == null) return;
|
||||||
|
|
||||||
frmImprägnierBerichtEdit frmImprägnierBerichtEdit = new frmImprägnierBerichtEdit(imprägnierung);
|
frmImprägnierBerichtEdit frmImprägnierBerichtEdit = new frmImprägnierBerichtEdit(imprägnierung);
|
||||||
|
frmImprägnierBerichtEdit.FormClosed += FrmImprägnierBerichtEdit_FormClosed;
|
||||||
frmImprägnierBerichtEdit.ShowDialog();
|
frmImprägnierBerichtEdit.ShowDialog();
|
||||||
/*frmObjekteList frmObjekteList = new frmObjekteList(selectedStreetName);
|
/*frmObjekteList frmObjekteList = new frmObjekteList(selectedStreetName);
|
||||||
frmObjekteList.MdiParent = this.MdiParent;
|
frmObjekteList.MdiParent = this.MdiParent;
|
||||||
@@ -44,5 +47,12 @@ namespace SanSystem
|
|||||||
frmObjekteList.Show();
|
frmObjekteList.Show();
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void FrmImprägnierBerichtEdit_FormClosed(object sender, FormClosedEventArgs e)
|
||||||
|
{
|
||||||
|
lst_imprägnierBerichtNr.DataSource = null;
|
||||||
|
List<string> imprägnierberichte = Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Select(x => x.Imprägniernummer).ToList();
|
||||||
|
lst_imprägnierBerichtNr.DataSource = imprägnierberichte;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
40
SanSystem/frmMain.Designer.cs
generated
40
SanSystem/frmMain.Designer.cs
generated
@@ -41,9 +41,11 @@
|
|||||||
this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.imprägnierberichteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
|
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
|
||||||
this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel();
|
this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel();
|
||||||
this.imprägnierberichteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.berichteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
this.massenberichteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.mainmenu.SuspendLayout();
|
this.mainmenu.SuspendLayout();
|
||||||
this.statusStrip1.SuspendLayout();
|
this.statusStrip1.SuspendLayout();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
@@ -58,11 +60,12 @@
|
|||||||
this.massenstatistikToolStripMenuItem,
|
this.massenstatistikToolStripMenuItem,
|
||||||
this.projektordnerÖffnenToolStripMenuItem,
|
this.projektordnerÖffnenToolStripMenuItem,
|
||||||
this.toolStripMenuItem1,
|
this.toolStripMenuItem1,
|
||||||
this.imprägnierberichteToolStripMenuItem});
|
this.imprägnierberichteToolStripMenuItem,
|
||||||
|
this.berichteToolStripMenuItem});
|
||||||
this.mainmenu.Location = new System.Drawing.Point(0, 0);
|
this.mainmenu.Location = new System.Drawing.Point(0, 0);
|
||||||
this.mainmenu.Name = "mainmenu";
|
this.mainmenu.Name = "mainmenu";
|
||||||
this.mainmenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
|
this.mainmenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
|
||||||
this.mainmenu.Size = new System.Drawing.Size(795, 36);
|
this.mainmenu.Size = new System.Drawing.Size(938, 36);
|
||||||
this.mainmenu.TabIndex = 1;
|
this.mainmenu.TabIndex = 1;
|
||||||
this.mainmenu.Text = "menuStrip1";
|
this.mainmenu.Text = "menuStrip1";
|
||||||
//
|
//
|
||||||
@@ -131,6 +134,13 @@
|
|||||||
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
|
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
|
||||||
this.toolStripMenuItem1.Size = new System.Drawing.Size(14, 32);
|
this.toolStripMenuItem1.Size = new System.Drawing.Size(14, 32);
|
||||||
//
|
//
|
||||||
|
// imprägnierberichteToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.imprägnierberichteToolStripMenuItem.Name = "imprägnierberichteToolStripMenuItem";
|
||||||
|
this.imprägnierberichteToolStripMenuItem.Size = new System.Drawing.Size(193, 32);
|
||||||
|
this.imprägnierberichteToolStripMenuItem.Text = "Imprägnierberichte";
|
||||||
|
this.imprägnierberichteToolStripMenuItem.Click += new System.EventHandler(this.ImprägnierberichteToolStripMenuItem_Click);
|
||||||
|
//
|
||||||
// statusStrip1
|
// statusStrip1
|
||||||
//
|
//
|
||||||
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
|
this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
|
||||||
@@ -139,7 +149,7 @@
|
|||||||
this.statusStrip1.Location = new System.Drawing.Point(0, 433);
|
this.statusStrip1.Location = new System.Drawing.Point(0, 433);
|
||||||
this.statusStrip1.Name = "statusStrip1";
|
this.statusStrip1.Name = "statusStrip1";
|
||||||
this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
|
this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
|
||||||
this.statusStrip1.Size = new System.Drawing.Size(795, 26);
|
this.statusStrip1.Size = new System.Drawing.Size(938, 26);
|
||||||
this.statusStrip1.TabIndex = 3;
|
this.statusStrip1.TabIndex = 3;
|
||||||
this.statusStrip1.Text = "statusStrip1";
|
this.statusStrip1.Text = "statusStrip1";
|
||||||
//
|
//
|
||||||
@@ -149,18 +159,26 @@
|
|||||||
this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(55, 20);
|
this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(55, 20);
|
||||||
this.toolStripStatus_projekt_Label.Text = "Projekt";
|
this.toolStripStatus_projekt_Label.Text = "Projekt";
|
||||||
//
|
//
|
||||||
// imprägnierberichteToolStripMenuItem
|
// berichteToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.imprägnierberichteToolStripMenuItem.Name = "imprägnierberichteToolStripMenuItem";
|
this.berichteToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||||
this.imprägnierberichteToolStripMenuItem.Size = new System.Drawing.Size(193, 32);
|
this.massenberichteToolStripMenuItem});
|
||||||
this.imprägnierberichteToolStripMenuItem.Text = "Imprägnierberichte";
|
this.berichteToolStripMenuItem.Name = "berichteToolStripMenuItem";
|
||||||
this.imprägnierberichteToolStripMenuItem.Click += new System.EventHandler(this.ImprägnierberichteToolStripMenuItem_Click);
|
this.berichteToolStripMenuItem.Size = new System.Drawing.Size(101, 32);
|
||||||
|
this.berichteToolStripMenuItem.Text = "Berichte ";
|
||||||
|
//
|
||||||
|
// massenberichteToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.massenberichteToolStripMenuItem.Name = "massenberichteToolStripMenuItem";
|
||||||
|
this.massenberichteToolStripMenuItem.Size = new System.Drawing.Size(234, 32);
|
||||||
|
this.massenberichteToolStripMenuItem.Text = "Massenberichte";
|
||||||
|
this.massenberichteToolStripMenuItem.Click += new System.EventHandler(this.MassenberichteToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// frmMain
|
// frmMain
|
||||||
//
|
//
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.ClientSize = new System.Drawing.Size(795, 459);
|
this.ClientSize = new System.Drawing.Size(938, 459);
|
||||||
this.Controls.Add(this.statusStrip1);
|
this.Controls.Add(this.statusStrip1);
|
||||||
this.Controls.Add(this.mainmenu);
|
this.Controls.Add(this.mainmenu);
|
||||||
this.IsMdiContainer = true;
|
this.IsMdiContainer = true;
|
||||||
@@ -194,6 +212,8 @@
|
|||||||
private System.Windows.Forms.ToolStripMenuItem projektordnerÖffnenToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem projektordnerÖffnenToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
|
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
|
||||||
private System.Windows.Forms.ToolStripMenuItem imprägnierberichteToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem imprägnierberichteToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem berichteToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem massenberichteToolStripMenuItem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
using Database;
|
using Database;
|
||||||
using FluentFTP;
|
using FluentFTP;
|
||||||
using KlassenBIB;
|
using KlassenBIB;
|
||||||
|
using SanShared;
|
||||||
using SanShared.Exceptions;
|
using SanShared.Exceptions;
|
||||||
using SchnittstelleImporter;
|
using SchnittstelleImporter;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
@@ -193,5 +195,33 @@ namespace SanSystem
|
|||||||
frmImprägnierBerichtList frmImprägnierBerichtList = new frmImprägnierBerichtList();
|
frmImprägnierBerichtList frmImprägnierBerichtList = new frmImprägnierBerichtList();
|
||||||
frmImprägnierBerichtList.ShowDialog();
|
frmImprägnierBerichtList.ShowDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void MassenberichteToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
List<InlinerSanierung> ausdruck = new List<InlinerSanierung>();
|
||||||
|
foreach(Inspektionsobjekt objekte in Database.Datenbank.Instance.loadedProjekt.Objekte)
|
||||||
|
{
|
||||||
|
foreach(AbstractSanieren san in objekte.Sanierung)
|
||||||
|
{
|
||||||
|
if(san is InlinerSanierung)
|
||||||
|
{
|
||||||
|
ausdruck.Add((InlinerSanierung)san);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach(InlinerSanierung san in ausdruck)
|
||||||
|
{
|
||||||
|
|
||||||
|
string destinationPath = san.CheckVerzeichnisse(Global.Instance.Projektpfad);
|
||||||
|
Hashtable hashtable = san.MakeProtokoll(destinationPath, Database.Datenbank.Instance.loadedProjekt);
|
||||||
|
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, new List<BilderObject>(),null,true);
|
||||||
|
|
||||||
|
}
|
||||||
|
//options.ShowDialog();
|
||||||
|
MessageBox.Show("Fertig");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user