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

Options fenster repariert

Browse Source
This commit is contained in:
Husky
2018-07-14 14:13:57 +02:00
parent d87c3d5971
commit 30ab917e48
7 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BerichtGen/Bericht.cs
View File

@@ -12,7 +12,7 @@ using System.Threading.Tasks;
namespace BerichtGen
{
public class Bericht
class Bericht
{
private List<Image> _listImages;
/// <summary>

12
BerichtGen/BerichtGen.csproj
View File

@@ -70,15 +70,17 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Bericht.cs" />
<Compile Include="Options.cs" />
<Compile Include="Options.Designer.cs">
<DependentUpon>Options.cs</DependentUpon>
<Compile Include="FrmOptions.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmOptions.Designer.cs">
<DependentUpon>FrmOptions.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Options.resx">
<DependentUpon>Options.cs</DependentUpon>
<EmbeddedResource Include="FrmOptions.resx">
<DependentUpon>FrmOptions.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>

6
BerichtGen/Options.Designer.cs → BerichtGen/FrmOptions.Designer.cs generated
View File

@@ -1,6 +1,6 @@
namespace BerichtGen
{
partial class Options
partial class FrmOptions
{
/// <summary>
/// Required designer variable.
@@ -103,7 +103,7 @@
this.label1.TabIndex = 5;
this.label1.Text = "Nach dem erzeugen öffnen";
//
// Options
// FrmOptions
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -114,7 +114,7 @@
this.Controls.Add(this.cb_pdf);
this.Controls.Add(this.cb_doc);
this.Controls.Add(this.btn_start);
this.Name = "Options";
this.Name = "FrmOptions";
this.Text = "Options";
this.ResumeLayout(false);
this.PerformLayout();

16
BerichtGen/Options.cs → BerichtGen/FrmOptions.cs
View File

@@ -4,7 +4,6 @@ using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
@@ -15,7 +14,7 @@ using System.Windows.Forms;
namespace BerichtGen
{
public partial class Options : Form
public partial class FrmOptions : Form
{
Thread generateProtokollThread;
Hashtable grundDaten;
@@ -24,25 +23,26 @@ namespace BerichtGen
string speicherpfad;
string source;
List<BilderObject> bilderObjects;
DataTable tableContent = null;
public Options(string firma, string vorlage, string speicherpfad, Hashtable grunddaten, List<BilderObject> bilderObjects, DataTable tableContent = null)
public FrmOptions(string firma, string vorlage, string speicherpfad, Hashtable grunddaten, List<BilderObject> bilderObjects, DataTable tableContent = null)
{
InitializeComponent();
this.firma = firma;
this.vorlage = vorlage;
this.speicherpfad = speicherpfad;
this.grundDaten = grunddaten;
this.bilderObjects = bilderObjects;
this.tableContent = tableContent;
this.source = Path.Combine("documents",firma, vorlage);
this.source = Path.Combine("documents", firma, vorlage);
}
void Gen()
{
Bericht bericht = new Bericht();
bericht.Erzeuge(source, speicherpfad, grundDaten,bilderObjects,tableContent);
bericht.Erzeuge(source, speicherpfad, grundDaten, bilderObjects, tableContent);
}
private void btn_start_Click(object sender, EventArgs e)
@@ -56,7 +56,7 @@ namespace BerichtGen
}
if(rb_yes.Checked)
if (rb_yes.Checked)
{
}

0
BerichtGen/Options.resx → BerichtGen/FrmOptions.resx
View File

4
SanSystem/UCInliner.cs
View File

@@ -212,7 +212,7 @@ namespace SanSystem
Kommentar = "TestBild",
Path = @"C:\Users\Damian\Desktop\SanVerwaltung\SanSystem\bin\Debug\projekte\18-850\SW01-SW02\Schachtanbindung\4d0a1627-bd51-48d6-a27e-a4c6691b02d2.jpg"
});
BerichtGen.Options options = new BerichtGen.Options("", "", "", grunddaten,bilderO);
BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("", "", "", grunddaten,bilderO);
options.ShowDialog();
}
@@ -314,7 +314,7 @@ namespace SanSystem
private void btn_create_protokol_Click(object sender, EventArgs e)
{
Hashtable hashtable = inliner.MakeProtokoll(destinationPath);
BerichtGen.Options options = new BerichtGen.Options("JUME", "liner_einbau.docx", "./", hashtable, new List<BilderObject>());
BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "liner_einbau.docx", "./", hashtable, new List<BilderObject>());
options.ShowDialog();
}
}

2
SanSystem/frmObjekteList.cs
View File

@@ -270,7 +270,7 @@ namespace SanSystem
dr["bemerkung"] = obj.Bemerkung;
linereintraege.Rows.Add(dr);
}
BerichtGen.Options options = new BerichtGen.Options("JUME", "KalibrierungAuflistung.docx", "", grundDaten, null, linereintraege);
BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "KalibrierungAuflistung.docx", "", grundDaten, null, linereintraege);
options.ShowDialog();
}