shu
/
OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20241008

Browse Source
master
Stefan Hutter 1 year ago
parent 4fbeb345ee
commit b8a392b514
110 changed files with 2049 additions and 203 deletions
Show Stats Download Patch File Download Diff File

BIN
API_NetFramework/bin/Database.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/Database.pdb
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDoc_NetFramework.pdb
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
View File

Binary file not shown.

4
API_NetFramework/obj/Debug/API_NetFramework.csproj.FileListAbsolute.txt
Unescape View File

@ -126,6 +126,8 @@ E:\Software-Projekte\OnDoc\OnDoc\EDOKAAPI_NetFramework\obj\Debug\API_NetFramewor
E:\Software-Projekte\OnDoc\OnDoc\EDOKAAPI_NetFramework\obj\Debug\API_NetF.7D617477.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\EDOKAAPI_NetFramework\obj\Debug\EDOKAAPI_NetFramework.dll
E:\Software-Projekte\OnDoc\OnDoc\EDOKAAPI_NetFramework\obj\Debug\EDOKAAPI_NetFramework.pdb
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\API_NetFramework.csproj.AssemblyReference.cache
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\API_NetFramework.csproj.CoreCompileInputs.cache
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\libSkiaSharp.dylib
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\x86\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\x64\libSkiaSharp.dll
@ -287,8 +289,6 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\de\System.Web.WebPages.res
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\de\System.Web.WebPages.Deployment.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\de\System.Web.WebPages.Razor.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\de\System.Web.Optimization.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\API_NetFramework.csproj.AssemblyReference.cache
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\API_NetFramework.csproj.CoreCompileInputs.cache
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\API_NetF.7D617477.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\OnDoc_NetFramework.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\obj\Debug\OnDoc_NetFramework.pdb

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb
View File

Binary file not shown.

BIN
BarcodeLib/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
BarcodeLib/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache
View File

Binary file not shown.

22
BarcodeLib/obj/Debug/BarcodeLib.csproj.FileListAbsolute.txt
Unescape View File

@ -6,14 +6,13 @@ E:\Software-Projekte\OnDoc\OnDoc\EDOKA_BarcodeLib\obj\Debug\BarcodeLib.csproj.Co
E:\Software-Projekte\OnDoc\OnDoc\EDOKA_BarcodeLib\obj\Debug\BarcodeLib.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\EDOKA_BarcodeLib\obj\Debug\BarcodeLib.dll
E:\Software-Projekte\OnDoc\OnDoc\EDOKA_BarcodeLib\obj\Debug\BarcodeLib.pdb
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\BarcodeLib.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\BarcodeLib.pdb
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\QRCoder.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.csproj.AssemblyReference.cache
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.UI.Barcodekleber.resources
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.csproj.GenerateResource.cache
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.csproj.CoreCompileInputs.cache
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.pdb
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\BarcodeLib.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\BarcodeLib.pdb
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Database.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.Bars.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.Compat.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.DataVisualization.dll
@ -21,19 +20,20 @@ E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.Editor.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.VSDesign.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.Web.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.xml
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.Web.xml
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.UI.Barcodekleber.resources
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.csproj.GenerateResource.cache
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Database.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Helper.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\QRCoder.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Model.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Logging.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\NLog.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\NLog.Database.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Database.pdb
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.xml
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\FastReport.Web.xml
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Helper.pdb
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Model.pdb
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\Logging.pdb
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\NLog.xml
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\bin\Debug\NLog.Database.xml
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.dll
E:\Software-Projekte\OnDoc\OnDoc\BarcodeLib\obj\Debug\BarcodeLib.pdb

21
Client/Client.csproj
Unescape View File

@ -97,7 +97,6 @@
<Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@ -742,6 +741,26 @@
<None Include="Resources\Copy_24x24-32.png" />
<None Include="Resources\Copy_32x32-32.png" />
<None Include="Resources\Copy_48x48-32.png" />
<None Include="Resources\Word_ToApprove_16x16-32.png" />
<None Include="Resources\Word_ToApprove_24x24-32.png" />
<None Include="Resources\Word_ToApprove_32x32-32.png" />
<None Include="Resources\Word_ToApprove_48x48-32.png" />
<None Include="Resources\Word_ToApprove_256x256-32.png" />
<None Include="Resources\Word_approved_16x16-32.png" />
<None Include="Resources\Word_approved_24x24-32.png" />
<None Include="Resources\Word_approved_32x32-32.png" />
<None Include="Resources\Word_approved_48x48-32.png" />
<None Include="Resources\Word_approved_256x256-32.png" />
<None Include="Resources\Excel_ToApprove_16x16-32.png" />
<None Include="Resources\Excel_ToApprove_24x24-32.png" />
<None Include="Resources\Excel_ToApprove_32x32-32.png" />
<None Include="Resources\Excel_ToApprove_48x48-32.png" />
<None Include="Resources\Excel_ToApprove_256x256-32.png" />
<None Include="Resources\Excel_approved_16x16-32.png" />
<None Include="Resources\Excel_approved_24x24-32.png" />
<None Include="Resources\Excel_approved_32x32-32.png" />
<None Include="Resources\Excel_approved_48x48-32.png" />
<None Include="Resources\Excel_approved_256x256-32.png" />
<Content Include="SmartDocGen.ico" />
</ItemGroup>
<ItemGroup>

3
Client/Client.csproj.user
Unescape View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<StartArguments>
</StartArguments>
<StartArguments>funktion=ucheck</StartArguments>
</PropertyGroup>
<PropertyGroup>
<PublishUrlHistory>publish\</PublishUrlHistory>

1
Client/Diverses/valueselector.cs
Unescape View File

@ -31,6 +31,7 @@ namespace OnDoc.Diverses
public void load_data()
{
if (datenherkunft == "" || datenherkunft == "&Freitext&") { return; }
Database.DB dB = new Database.DB(AppParams.connectionstring);
dB.clear_parameter();
dB.add_parameter("@nrpar00",partnernr);

1
Client/DocMgmt/DokTypSelect.Designer.cs generated
Unescape View File

@ -116,6 +116,7 @@ namespace OnDoc.DocMgmt
this.ribbonPanel1.Items.Add(this.ribbonButton1);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Schliessen";
this.ribbonPanel1.Visible = false;
//
// ribbonButton1
//

2
Client/DocMgmt/DokTypSelect.resx
Unescape View File

@ -284,7 +284,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
CAAAAk1TRnQBSQFMAgEBAgEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAWABAAFgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

32
Client/DocMgmt/Dokumenterstellung.cs
Unescape View File

@ -15,10 +15,13 @@ using Syncfusion.WinForms.DataGrid;
using Syncfusion.WinForms.DataGrid.Interactivity;
using Database;
using OnDoc.UIControls;
using BroadcastListener.Classes;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
namespace OnDoc.DocMgmt
{
public partial class Dokumenterstellung : SfForm
public partial class Dokumenterstellung : SfForm, IMessageListener1
{
public int partnernr { get; set; } = 0;
public int profilnr { get; set; } = 0;
@ -34,6 +37,7 @@ namespace OnDoc.DocMgmt
public Dokumenterstellung()
{
InitializeComponent();
Broadcaster().AddListener(this);
}
public Dokumenterstellung(int Partnernr, int Dokumenttpynr, int Profilnr)
@ -42,6 +46,8 @@ namespace OnDoc.DocMgmt
partnernr = Partnernr;
dokumenttypnr = Dokumenttpynr;
profilnr = Profilnr;
Broadcaster().AddListener(this);
Closing += Form_Closing;
}
public Dokumenterstellung(int Partnernr, int Dokumenttypnr, int Profilnr, string Interaktion, string Showdoc)
@ -52,7 +58,24 @@ namespace OnDoc.DocMgmt
profilnr = Profilnr;
interaktion= Interaktion;
showdoc = Showdoc;
Broadcaster().AddListener(this);
Closing += Form_Closing;
}
private void Form_Closing(object sender, CancelEventArgs e)
{
Broadcaster().RemoveListener(this);
}
public void OnListen(string message, SenderInfo sender)
{
if (message == "BtnErstellung")
{
if (ucAllgemeineDokumentParam1.uniqid == sender.Details)
{
if (sender.Function == "Disable") { btnDokumenterstellen.Enabled = false; } else { btnDokumenterstellen.Enabled = true; }
}
}
}
private void Dokumenterstellung_Load(object sender, EventArgs e)
{
@ -62,6 +85,10 @@ namespace OnDoc.DocMgmt
ucAllgemeineDokumentParam1.partnernr = partnernr;
ucAllgemeineDokumentParam1.profilnr = profilnr;
ucAllgemeineDokumentParam1.Refresh_Details();
//if (ucAllgemeineDokumentParam1.check_bp_person() == false)
//{
// btnDokumenterstellen.Enabled = false;
//}
}
@ -72,7 +99,7 @@ namespace OnDoc.DocMgmt
public void Dokument_Erstellen()
{
if (ucAllgemeineDokumentParam1.check_fields()==false) {
MessageBox.Show(ucAllgemeineDokumentParam1.check_error);
MessageBox.Show(ucAllgemeineDokumentParam1.check_error,"Feldwerte",MessageBoxButtons.OK,MessageBoxIcon.Error);
return; };
ucAllgemeineDokumentParam1.Update_DocGenData();
clsDocData dokdata = new clsDocData();
@ -103,6 +130,7 @@ namespace OnDoc.DocMgmt
//if (dok.extension.Substring(0,1).ToUpper() == "D") { System.Diagnostics.Process.Start("winword.exe", filename); }
//if (dok.extension.Substring(0, 1).ToUpper() == "X") { System.Diagnostics.Process.Start("excel.exe", filename); }
//clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
this.Close();
return;
}

43
Client/DocMgmt/Dokumentpaket.Designer.cs generated
Unescape View File

@ -40,6 +40,8 @@
this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonExit = new System.Windows.Forms.RibbonButton();
this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonNew = new System.Windows.Forms.RibbonButton();
this.ribbonPanel3 = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonGenerieren = new System.Windows.Forms.RibbonButton();
this.RibbonButtonGenerate = new System.Windows.Forms.RibbonButton();
@ -55,8 +57,6 @@
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.dokList1 = new OnDoc.UICintrols.DokList();
this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonNew = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).BeginInit();
this.TabControlDokuments.SuspendLayout();
this.pnlfooter.SuspendLayout();
@ -89,6 +89,7 @@
//
this.txtpersonnummer.Location = new System.Drawing.Point(72, 65);
this.txtpersonnummer.Name = "txtpersonnummer";
this.txtpersonnummer.ReadOnly = true;
this.txtpersonnummer.Size = new System.Drawing.Size(100, 20);
this.txtpersonnummer.TabIndex = 3;
//
@ -96,6 +97,7 @@
//
this.txtbpnummer.Location = new System.Drawing.Point(72, 18);
this.txtbpnummer.Name = "txtbpnummer";
this.txtbpnummer.ReadOnly = true;
this.txtbpnummer.Size = new System.Drawing.Size(100, 20);
this.txtbpnummer.TabIndex = 2;
this.txtbpnummer.Leave += new System.EventHandler(this.textBox1_Leave);
@ -165,6 +167,7 @@
this.ribbonPanel1.Items.Add(this.RibbonButtonExit);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = null;
this.ribbonPanel1.Visible = false;
//
// RibbonButtonExit
//
@ -175,6 +178,22 @@
this.RibbonButtonExit.Text = "Schliessen";
this.RibbonButtonExit.Click += new System.EventHandler(this.RibbonButtonExit_Click);
//
// ribbonPanel5
//
this.ribbonPanel5.ButtonMoreVisible = false;
this.ribbonPanel5.Items.Add(this.ribbonButtonNew);
this.ribbonPanel5.Name = "ribbonPanel5";
this.ribbonPanel5.Text = "";
//
// ribbonButtonNew
//
this.ribbonButtonNew.Image = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32;
this.ribbonButtonNew.LargeImage = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32;
this.ribbonButtonNew.Name = "ribbonButtonNew";
this.ribbonButtonNew.SmallImage = global::OnDoc.Properties.Resources.NewDokPaket_24x24_32;
this.ribbonButtonNew.Text = "Neu";
this.ribbonButtonNew.Click += new System.EventHandler(this.ribbonButtonNew_Click);
//
// ribbonPanel3
//
this.ribbonPanel3.ButtonMoreVisible = false;
@ -208,6 +227,7 @@
this.sfListView1.Size = new System.Drawing.Size(249, 530);
this.sfListView1.TabIndex = 18;
this.sfListView1.Text = "sfListView1";
this.sfListView1.SelectionChanged += new System.EventHandler<Syncfusion.WinForms.ListView.Events.ItemSelectionChangedEventArgs>(this.sfListView1_SelectionChanged);
this.sfListView1.ItemChecked += new System.EventHandler<Syncfusion.WinForms.ListView.Events.ItemCheckedEventArgs>(this.sfListView1_ItemChecked);
//
// TabControlDokuments
@ -309,6 +329,7 @@
this.btnSearchPerson.Size = new System.Drawing.Size(33, 23);
this.btnSearchPerson.TabIndex = 7;
this.btnSearchPerson.UseVisualStyleBackColor = true;
this.btnSearchPerson.Click += new System.EventHandler(this.btnSearchPerson_Click);
//
// groupBox2
//
@ -338,32 +359,18 @@
this.dokList1.docartnr = 0;
this.dokList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dokList1.forMaNr = 0;
this.dokList1.interop = false;
this.dokList1.Location = new System.Drawing.Point(3, 16);
this.dokList1.mitarbeiternr = 0;
this.dokList1.Name = "dokList1";
this.dokList1.partnernr = 0;
this.dokList1.profilnr = 0;
this.dokList1.runmacros = false;
this.dokList1.selected_cellvalue = null;
this.dokList1.selected_dokumentid = null;
this.dokList1.Size = new System.Drawing.Size(477, 660);
this.dokList1.TabIndex = 0;
//
// ribbonPanel5
//
this.ribbonPanel5.ButtonMoreVisible = false;
this.ribbonPanel5.Items.Add(this.ribbonButtonNew);
this.ribbonPanel5.Name = "ribbonPanel5";
this.ribbonPanel5.Text = "";
//
// ribbonButtonNew
//
this.ribbonButtonNew.Image = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32;
this.ribbonButtonNew.LargeImage = global::OnDoc.Properties.Resources.NewDokPaket_32x32_32;
this.ribbonButtonNew.Name = "ribbonButtonNew";
this.ribbonButtonNew.SmallImage = global::OnDoc.Properties.Resources.NewDokPaket_24x24_32;
this.ribbonButtonNew.Text = "Neu";
this.ribbonButtonNew.Click += new System.EventHandler(this.ribbonButtonNew_Click);
//
// Dokumentpaket
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

168
Client/DocMgmt/Dokumentpaket.cs
Unescape View File

@ -19,6 +19,10 @@ using Syncfusion.WinForms.DataGrid;
using Syncfusion.WinForms.DataGrid.Interactivity;
using Syncfusion.WinForms.ListView.Enums;
using Syncfusion.WinForms.ListView.Events;
using Syncfusion.WinForms.ListView;
using OnDoc.UIControls.Administrator;
using System.Diagnostics;
using NLog.LayoutRenderers.Wrappers;
namespace OnDoc.DocMgmt
{
@ -47,21 +51,25 @@ namespace OnDoc.DocMgmt
}
private void NeuesDokumentpaket()
private bool NeuesDokumentpaket()
{
DokTypSelect dt = new DokTypSelect();
dt.vorlagentype = 2;
dt.ShowDialog();
if (dt.DialogResult == DialogResult.OK) { dokumentpaketnr = Convert.ToInt32(dt.dokumenttypnr); }
if (dt.DialogResult == DialogResult.OK) { dokumentpaketnr = Convert.ToInt32(dt.dokumenttypnr); return true; } else { return false; }
}
private void Dokumentpaket_Load(object sender, EventArgs e)
{
this.BeginUpdate();
if (dokumentpaketnr == 0)
{
NeuesDokumentpaket();
if (!NeuesDokumentpaket()){ this.Close(); return; };
}
Update_PaketDetails();
if (this.txtbpnummer.Text == "") { btnSearchBP_Click(sender, e); }
this.EndUpdate();
}
private void Update_PaketDetails() {
Cursor = Cursors.WaitCursor;
@ -124,9 +132,39 @@ namespace OnDoc.DocMgmt
private void btnSearchBP_Click(object sender, EventArgs e)
{
UCAllgemeineDokumentParam newdoc = new UCAllgemeineDokumentParam();
doclist.Add(newdoc);
Refresh_DocTab();
Partnersuche ps = new Partnersuche();
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
this.txtbpnummer.Text = ps.partnernr.ToString(); ;
this.lblKurznameBP.Text = ps.partnerkurzname.ToString();
if (this.txtbpnummer.Text.Length > 9)
{
MessageBox.Show("Beim gewählten Partner handelt es ich nicht um einBP.", "Partnerselektion", MessageBoxButtons.OK, MessageBoxIcon.Error);
this.txtbpnummer.Text = "";
this.lblKurznameBP.Text = "";
return;
}
set_bp_person(ps.partnernr,0);
}
}
private void btnSearchPerson_Click(object sender, EventArgs e)
{
Partnersuche ps = new Partnersuche();
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
this.txtpersonnummer.Text = ps.partnernr.ToString();
this.lblKurznamePerson.Text = ps.partnerkurzname.ToString();
if (this.txtpersonnummer.Text.Length < 9) {
MessageBox.Show("Beim gewählten Partner handelt es ich nicht um eine Person.", "Partnerselektion", MessageBoxButtons.OK, MessageBoxIcon.Error);
this.txtpersonnummer.Text = "";
this.lblKurznamePerson.Text = "";
return;
}
set_bp_person(0,ps.partnernr);
}
}
private void add_uc(System.Data.DataRow r)
{
@ -135,8 +173,15 @@ namespace OnDoc.DocMgmt
newdoc.Dock= DockStyle.Fill;
newdoc.checkpartner = false;
newdoc.dokumenttypnr = Convert.ToInt32(r[2]);
if (newdoc.set_personendokument() == true)
{
if (txtpersonnummer.Text != "") { newdoc.partnernr = Convert.ToInt32(txtpersonnummer.Text); }
}
else
{
if (txtbpnummer.Text != "") { newdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); }
}
if (txtbpnummer.Text !="") { newdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); }
newdoc.Refresh_Details();
TabPageAdv tabPage = new TabPageAdv(r[3].ToString());
tabPage.Controls.Add(newdoc);
@ -201,17 +246,58 @@ namespace OnDoc.DocMgmt
}
}
private void textBox1_Leave(object sender, EventArgs e)
private void set_bp_person(int bpnummer, int personnummer)
{
Database.DB db = new Database.DB(AppParams.connectionstring);
db.clear_parameter();
if (bpnummer !=0) db.add_parameter("@partnernr", bpnummer.ToString());
if (personnummer !=0) db.add_parameter("@partnernr", personnummer.ToString());
db.Get_Tabledata("sp_ondoc_bp_person", true, false);
if (bpnummer!=0 && db.dsdaten.Tables[0].Rows.Count ==1)
{
txtbpnummer.Text = db.dsdaten.Tables[0].Rows[0]["bp_nr"].ToString();
lblKurznameBP.Text = db.dsdaten.Tables[0].Rows[0]["bp_kurzname"].ToString();
txtpersonnummer.Text = "";
if (txtpersonnummer.Text=="")
{
txtpersonnummer.Text = db.dsdaten.Tables[0].Rows[0]["pers_nr"].ToString();
lblKurznamePerson.Text = db.dsdaten.Tables[0].Rows[0]["person_kurzname"].ToString();
}
update_dokumente_bp_person(bpnummer, true);
if (txtpersonnummer.Text!="") { update_dokumente_bp_person(Convert.ToInt32(txtpersonnummer.Text), false); }
}
}
private void update_dokumente_bp_person(int partnernr, bool bp)
{
try
{
foreach (TabPageAdv tab in TabControlDokuments.TabPages)
{
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
uc.partnernr = Convert.ToInt32(txtbpnummer.Text);
uc.update_partner();
uc.ausDokumentpaket = true;
if (bp && !uc.personendokument)
{
uc.partnernr = partnernr;
uc.update_partner();
}
if (!bp && uc.personendokument)
{
uc.partnernr = partnernr;
uc.update_partner();
}
uc.ausDokumentpaket = false;
}
}catch { }
}
catch { }
}
private void textBox1_Leave(object sender, EventArgs e)
{
//set_bp_person();
}
@ -230,9 +316,49 @@ namespace OnDoc.DocMgmt
this.Close();
}
private bool check_all_doks()
{
string errormessage = "";
string dokumenterror = "";
foreach (TabPageAdv tab in TabControlDokuments.TabPages)
{
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
uc.ausDokumentpaket = true;
dokumenterror = "";
if (uc.partnernr == 0) { dokumenterror = dokumenterror + "- Kein Partner gewählt" + Environment.NewLine; }
else
{
uc.check_bp_person();
if (uc.bpperson_error_type == 1) { dokumenterror = dokumenterror + "- Dokument muss für eine Person erstellt werden" + Environment.NewLine; }
if (uc.bpperson_error_type == 2) { dokumenterror = dokumenterror + "- Dokument muss für einen BP erstellt werden" + Environment.NewLine; }
}
if (!uc.check_fields())
{
dokumenterror = dokumenterror + uc.check_error + Environment.NewLine;
}
uc.ausDokumentpaket = false;
if (dokumenterror!="") { errormessage = errormessage + Environment.NewLine+ tab.Text +":"+ Environment.NewLine + dokumenterror; }
}
if (errormessage != "")
{
MessageBox.Show(errormessage, "Folgende Fehler korrigieren:", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
return true;
}
private void RibbonButtonGenerieren_Click(object sender, EventArgs e)
{
if (check_all_doks()==false)
{
return;
}
string filter = "dokumentid in ('";
progressBarAdv1.Minimum = 0;
progressBarAdv1.Maximum = TabControlDokuments.TabPages.Count;
@ -244,7 +370,7 @@ namespace OnDoc.DocMgmt
Application.DoEvents();
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
uc.partnernr = Convert.ToInt32(txtbpnummer.Text);
// uc.partnernr = Convert.ToInt32(txtbpnummer.Text);
uc.Set_Edit_later();
uc.Update_DocGenData();
clsDocData dokdata = new clsDocData();
@ -305,8 +431,24 @@ namespace OnDoc.DocMgmt
public void ribbonButtonNew_Click(object sender, EventArgs e)
{
NeuesDokumentpaket();
if (!NeuesDokumentpaket()) { return; }
Update_PaketDetails();
}
private void sfListView1_SelectionChanged(object sender, ItemSelectionChangedEventArgs e)
{
var dr = e.AddedItems[0] as DataRowView;
foreach (TabPageAdv p in TabControlDokuments.TabPages)
{
if (p.Text == dr[3].ToString())
{
TabControlDokuments.SelectedTab=p; return;
}
}
return;
}
}
}

2
Client/DocMgmt/Dokumentpaket.resx
Unescape View File

@ -166,7 +166,7 @@
<data name="RibbonButtonGenerieren.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="btnSearchBP.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

2
Client/DocMgmt/frmBewilligung.Designer.cs generated
Unescape View File

@ -50,7 +50,7 @@
this.Name = "frmBewilligung";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "Bewilligung";
this.Text = "Unterschriftenprüfung";
this.Load += new System.EventHandler(this.frmBewilligung_Load);
this.ResumeLayout(false);

104
Client/DocMgmt/frmToApproval.Designer.cs generated
Unescape View File

@ -31,24 +31,25 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmToApproval));
this.cbboxunterschriftrechts = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxunterschriftlinks = new Syncfusion.WinForms.ListView.SfComboBox();
this.cbboxbewilligungsinstanz = new Syncfusion.WinForms.ListView.SfComboBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.txtnachricht = new System.Windows.Forms.TextBox();
this.btntoapproval = new System.Windows.Forms.Button();
this.btncancel = new System.Windows.Forms.Button();
this.pxapproval1 = new System.Windows.Forms.PictureBox();
this.pxapproval2 = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftrechts)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftlinks)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxbewilligungsinstanz)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pxapproval1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pxapproval2)).BeginInit();
this.SuspendLayout();
//
// cbboxunterschriftrechts
//
this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftrechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftrechts.Location = new System.Drawing.Point(216, 103);
this.cbboxunterschriftrechts.Location = new System.Drawing.Point(216, 62);
this.cbboxunterschriftrechts.Name = "cbboxunterschriftrechts";
this.cbboxunterschriftrechts.Size = new System.Drawing.Size(287, 19);
this.cbboxunterschriftrechts.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
@ -60,7 +61,7 @@
//
this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxunterschriftlinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftlinks.Location = new System.Drawing.Point(216, 68);
this.cbboxunterschriftlinks.Location = new System.Drawing.Point(216, 27);
this.cbboxunterschriftlinks.Name = "cbboxunterschriftlinks";
this.cbboxunterschriftlinks.Size = new System.Drawing.Size(287, 19);
this.cbboxunterschriftlinks.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
@ -68,61 +69,40 @@
this.cbboxunterschriftlinks.TabIndex = 11;
this.cbboxunterschriftlinks.TabStop = false;
//
// cbboxbewilligungsinstanz
//
this.cbboxbewilligungsinstanz.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbboxbewilligungsinstanz.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxbewilligungsinstanz.Location = new System.Drawing.Point(216, 36);
this.cbboxbewilligungsinstanz.Name = "cbboxbewilligungsinstanz";
this.cbboxbewilligungsinstanz.Size = new System.Drawing.Size(287, 19);
this.cbboxbewilligungsinstanz.Style.DropDownStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
this.cbboxbewilligungsinstanz.Style.TokenStyle.CloseButtonBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.cbboxbewilligungsinstanz.TabIndex = 10;
this.cbboxbewilligungsinstanz.TabStop = false;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(29, 36);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(90, 13);
this.label1.TabIndex = 13;
this.label1.Text = "Bewilligung durch";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(29, 72);
this.label2.Location = new System.Drawing.Point(29, 31);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(173, 13);
this.label2.Size = new System.Drawing.Size(151, 13);
this.label2.TabIndex = 14;
this.label2.Text = "Unterschfrift links bewilligung durch";
this.label2.Text = "Unterschfrift links prüfen durch";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(29, 103);
this.label3.Location = new System.Drawing.Point(29, 62);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(181, 13);
this.label3.Size = new System.Drawing.Size(159, 13);
this.label3.TabIndex = 15;
this.label3.Text = "Unterschfrift rechts bewilligung durch";
this.label3.Text = "Unterschfrift rechts prüfen durch";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(29, 145);
this.label4.Location = new System.Drawing.Point(29, 104);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 13);
this.label4.TabIndex = 16;
this.label4.Text = "Nachricht";
//
// textBox1
// txtnachricht
//
this.textBox1.Location = new System.Drawing.Point(216, 142);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(287, 146);
this.textBox1.TabIndex = 17;
this.txtnachricht.Location = new System.Drawing.Point(216, 101);
this.txtnachricht.Multiline = true;
this.txtnachricht.Name = "txtnachricht";
this.txtnachricht.Size = new System.Drawing.Size(287, 146);
this.txtnachricht.TabIndex = 17;
//
// btntoapproval
//
@ -130,7 +110,7 @@
this.btntoapproval.Name = "btntoapproval";
this.btntoapproval.Size = new System.Drawing.Size(171, 23);
this.btntoapproval.TabIndex = 18;
this.btntoapproval.Text = "zur Bewilligung senden";
this.btntoapproval.Text = "zur Prüfung";
this.btntoapproval.UseVisualStyleBackColor = true;
this.btntoapproval.Click += new System.EventHandler(this.btntoapproval_Click);
//
@ -142,31 +122,55 @@
this.btncancel.TabIndex = 19;
this.btncancel.Text = "Abbruch";
this.btncancel.UseVisualStyleBackColor = true;
this.btncancel.Click += new System.EventHandler(this.btncancel_Click);
//
// pxapproval1
//
this.pxapproval1.Image = ((System.Drawing.Image)(resources.GetObject("pxapproval1.Image")));
this.pxapproval1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pxapproval1.InitialImage")));
this.pxapproval1.Location = new System.Drawing.Point(509, 19);
this.pxapproval1.Name = "pxapproval1";
this.pxapproval1.Size = new System.Drawing.Size(33, 32);
this.pxapproval1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pxapproval1.TabIndex = 20;
this.pxapproval1.TabStop = false;
//
// pxapproval2
//
this.pxapproval2.Image = ((System.Drawing.Image)(resources.GetObject("pxapproval2.Image")));
this.pxapproval2.InitialImage = ((System.Drawing.Image)(resources.GetObject("pxapproval2.InitialImage")));
this.pxapproval2.Location = new System.Drawing.Point(509, 57);
this.pxapproval2.Name = "pxapproval2";
this.pxapproval2.Size = new System.Drawing.Size(33, 32);
this.pxapproval2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pxapproval2.TabIndex = 21;
this.pxapproval2.TabStop = false;
//
// frmToApproval
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(529, 347);
this.ClientSize = new System.Drawing.Size(557, 347);
this.Controls.Add(this.pxapproval2);
this.Controls.Add(this.pxapproval1);
this.Controls.Add(this.btncancel);
this.Controls.Add(this.btntoapproval);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.txtnachricht);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.cbboxunterschriftrechts);
this.Controls.Add(this.cbboxunterschriftlinks);
this.Controls.Add(this.cbboxbewilligungsinstanz);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmToApproval";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "Dokument bewilligen lassen";
this.Text = "Prüfung der Unterschriften";
this.Load += new System.EventHandler(this.frmToApproval_Load);
((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftrechts)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxunterschriftlinks)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxbewilligungsinstanz)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pxapproval1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pxapproval2)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -176,13 +180,13 @@
private Syncfusion.WinForms.ListView.SfComboBox cbboxunterschriftrechts;
private Syncfusion.WinForms.ListView.SfComboBox cbboxunterschriftlinks;
private Syncfusion.WinForms.ListView.SfComboBox cbboxbewilligungsinstanz;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox txtnachricht;
private System.Windows.Forms.Button btntoapproval;
private System.Windows.Forms.Button btncancel;
private System.Windows.Forms.PictureBox pxapproval1;
private System.Windows.Forms.PictureBox pxapproval2;
}
}

91
Client/DocMgmt/frmToApproval.cs
Unescape View File

@ -30,33 +30,96 @@ namespace OnDoc.DocMgmt
db.clear_parameter();
db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false);
cbboxbewilligungsinstanz.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftlinks.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftrechts.DataSource = db.dsdaten.Tables[0];
cbboxbewilligungsinstanz.DisplayMember = "name";
cbboxbewilligungsinstanz.ValueMember = "mitarbeiternr";
cbboxunterschriftlinks.DisplayMember = "name";
cbboxunterschriftlinks.ValueMember = "mitarbeiternr";
cbboxunterschriftrechts.DisplayMember = "name";
cbboxunterschriftrechts.ValueMember = "mitarbeiternr";
db.Get_Tabledata("Select * from dokument where dokumentid='"+dokumentid+"'",false,true);
cbboxunterschriftlinks.SelectedValue = db.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString();
cbboxunterschriftrechts.SelectedValue = db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString();
pxapproval1.Visible = false;
pxapproval2.Visible = false;
cbboxunterschriftlinks.Enabled = true;
cbboxunterschriftrechts.Enabled = true;
if (db.dsdaten.Tables[0].Rows[0]["ersteller"].ToString()== db.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString())
{
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
}
if (db.dsdaten.Tables[0].Rows[0]["ersteller"].ToString() == db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
{
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
}
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approved"])){
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
btntoapproval.Enabled = false;
}
}
private void btntoapproval_Click(object sender, EventArgs e)
{
DB dB = new DB(AppParams.connectionstring);
dB.Get_Tabledata_for_Update("select top 1 * from dokument_bewilligung where id=-2", false, true);
DataRow dr = dB.daten.Tables[0].NewRow();
dr["dokumentid"]=this.dokumentid;
dr["mitarbeiter_bewilligung"] = this.cbboxbewilligungsinstanz.SelectedValue;
dr["bewilligt"] = false;
dr["bewilligungstyp"] = 1;
dr["erstellt_am"]=DateTime.Now;
dr["mutiert_am"] = DateTime.Now;
dr["mutierer"] = AppParams.CurrentMitarbieter;
dr["aktiv"] = true;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
if (pxapproval1.Visible == false)
{
DataRow dr = dB.daten.Tables[0].NewRow();
dr["dokumentid"] = this.dokumentid;
dr["mitarbeiter_bewilligung"] = cbboxunterschriftlinks.SelectedValue.ToString();
dr["bewilligt"] = false;
dr["abgelehnt"] = false;
dr["bewilligungstyp"] = 1;
dr["erstellt_am"] = DateTime.Now;
dr["mutiert_am"] = DateTime.Now;
dr["mutierer"] = AppParams.CurrentMitarbieter;
dr["aktiv"] = true;
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
}
if (pxapproval2.Visible == false)
{
DataRow dr = dB.daten.Tables[0].NewRow();
dr["dokumentid"] = this.dokumentid;
dr["mitarbeiter_bewilligung"] = cbboxunterschriftrechts.SelectedValue.ToString();
dr["bewilligt"] = false;
dr["abgelehnt"] = false;
dr["bewilligungstyp"] = 2;
dr["erstellt_am"] = DateTime.Now;
dr["mutiert_am"] = DateTime.Now;
dr["mutierer"] = AppParams.CurrentMitarbieter;
dr["aktiv"] = true;
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
}
if (pxapproval1.Visible && pxapproval2.Visible)
{
MessageBox.Show("Die Unterschriftenprüfung für dieses Dokument ist bereits erfolgt", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information);
this.Close();
}
if (txtnachricht.Text.Trim() != "")
{
dB.insert_note(AppParams.CurrentMitarbieter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid);
}
}
private void btncancel_Click(object sender, EventArgs e)
{
this.Close();
}
}
}

1120
Client/DocMgmt/frmToApproval.resx
View File

File diff suppressed because it is too large Load Diff

2
Client/Klassen/clsAppParams.cs
Unescape View File

@ -96,7 +96,7 @@ namespace OnDoc.Klassen
break;
case "funktion":
function = value;
if (value.ToLower() != "createdoc" && value.ToLower() != "createpac")
if (value.ToLower() != "createdoc" && value.ToLower() != "createpac" && value.ToLower() != "ucheck")
{
MessageBox.Show("Funktion ist ungültig: " + value, "Parameterfehler", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;

3
Client/Klassen/clsProcessWatch.cs
Unescape View File

@ -95,7 +95,10 @@ namespace OnDoc.Klassen
private static void Save_File(string dokumentid, string filename)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select * from dokument where dokumentid='" + dokumentid + "'", false, true);
db.Save_To_DB(dokumentid, filename);
db.set_approvalstate(dokumentid, false);
Logging.DocLog.Info("Dokument gespeichert", "Processwatch", dokumentid, "", filename);
}

3
Client/Program.cs
Unescape View File

@ -48,7 +48,7 @@ namespace OnDoc
}
else
{
if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0)
if (args[0].ToString().ToUpper().IndexOf("PARTNERNR") > 0 || args[0].ToString().ToUpper().IndexOf("UCHECK") > 0)
{
AppParams.init();
//MessageBox.Show(AppParams.tempdir);
@ -61,6 +61,7 @@ namespace OnDoc
}
else
{
MessageBox.Show("Die Übergabeparemeter '" + args[0].ToString()+"' sind ungültig","Aufruffehler",MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}

200
Client/Properties/Resources.Designer.cs generated
Unescape View File

@ -710,6 +710,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_approved_16x16_32 {
get {
object obj = ResourceManager.GetObject("Excel_approved_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_approved_24x24_32 {
get {
object obj = ResourceManager.GetObject("Excel_approved_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_approved_256x256_32 {
get {
object obj = ResourceManager.GetObject("Excel_approved_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_approved_32x32_32 {
get {
object obj = ResourceManager.GetObject("Excel_approved_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_approved_48x48_32 {
get {
object obj = ResourceManager.GetObject("Excel_approved_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
@ -760,6 +810,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_ToApprove_16x16_32 {
get {
object obj = ResourceManager.GetObject("Excel_ToApprove_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_ToApprove_24x24_32 {
get {
object obj = ResourceManager.GetObject("Excel_ToApprove_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_ToApprove_256x256_32 {
get {
object obj = ResourceManager.GetObject("Excel_ToApprove_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_ToApprove_32x32_32 {
get {
object obj = ResourceManager.GetObject("Excel_ToApprove_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Excel_ToApprove_48x48_32 {
get {
object obj = ResourceManager.GetObject("Excel_ToApprove_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
@ -1960,6 +2060,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_approved_16x16_32 {
get {
object obj = ResourceManager.GetObject("Word_approved_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_approved_24x24_32 {
get {
object obj = ResourceManager.GetObject("Word_approved_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_approved_256x256_32 {
get {
object obj = ResourceManager.GetObject("Word_approved_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_approved_32x32_32 {
get {
object obj = ResourceManager.GetObject("Word_approved_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_approved_48x48_32 {
get {
object obj = ResourceManager.GetObject("Word_approved_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
@ -2010,6 +2160,56 @@ namespace OnDoc.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_ToApprove_16x16_32 {
get {
object obj = ResourceManager.GetObject("Word_ToApprove_16x16_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_ToApprove_24x24_32 {
get {
object obj = ResourceManager.GetObject("Word_ToApprove_24x24_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_ToApprove_256x256_32 {
get {
object obj = ResourceManager.GetObject("Word_ToApprove_256x256_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_ToApprove_32x32_32 {
get {
object obj = ResourceManager.GetObject("Word_ToApprove_32x32_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Word_ToApprove_48x48_32 {
get {
object obj = ResourceManager.GetObject("Word_ToApprove_48x48_32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>

60
Client/Properties/Resources.resx
Unescape View File

@ -313,6 +313,21 @@
<data name="Excel_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_approved_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_approved_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_approved_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_approved_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_approved_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_approved_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_approved_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_approved_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_approved_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_approved_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_Edit_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_Edit_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -328,6 +343,21 @@
<data name="Excel_Edit_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_Edit_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_ToApprove_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_ToApprove_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_ToApprove_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_ToApprove_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_ToApprove_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_ToApprove_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_ToApprove_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_ToApprove_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Excel_ToApprove_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Excel_ToApprove_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Execute_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Execute_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -688,6 +718,21 @@
<data name="Word_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_approved_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_approved_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_approved_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_approved_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_approved_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_approved_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_approved_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_approved_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_approved_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_approved_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_Edit_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_Edit_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -703,6 +748,21 @@
<data name="Word_Edit_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_Edit_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_ToApprove_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_ToApprove_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_ToApprove_24x24_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_ToApprove_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_ToApprove_256x256_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_ToApprove_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_ToApprove_32x32_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_ToApprove_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Word_ToApprove_48x48_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Word_ToApprove_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Zuweisen_16x16_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zuweisen_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

BIN
Client/Resources/Excel_ToApprove_16x16-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 717 B

BIN
Client/Resources/Excel_ToApprove_24x24-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Client/Resources/Excel_ToApprove_256x256-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
Client/Resources/Excel_ToApprove_32x32-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Client/Resources/Excel_ToApprove_48x48-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Client/Resources/Excel_approved_16x16-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 691 B

BIN
Client/Resources/Excel_approved_24x24-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Client/Resources/Excel_approved_256x256-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
Client/Resources/Excel_approved_32x32-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Client/Resources/Excel_approved_48x48-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Client/Resources/Word_ToApprove_16x16-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 728 B

BIN
Client/Resources/Word_ToApprove_24x24-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Client/Resources/Word_ToApprove_256x256-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
Client/Resources/Word_ToApprove_32x32-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Client/Resources/Word_ToApprove_48x48-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Client/Resources/Word_approved_16x16-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 694 B

BIN
Client/Resources/Word_approved_24x24-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Client/Resources/Word_approved_256x256-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
Client/Resources/Word_approved_32x32-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Client/Resources/Word_approved_48x48-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

6
Client/Start.cs
Unescape View File

@ -5,6 +5,7 @@ using OnDoc.DocMgmt;
using OnDoc.Klassen;
using Syncfusion.WinForms.Controls;
using System;
using System.Deployment.Application;
using System.IO;
using System.Windows.Forms;
@ -184,6 +185,11 @@ namespace OnDoc
if (ExternalCall.sourceparam != "" && ExternalCall.parseparams())
{
if (ExternalCall.function.ToLower()=="ucheck")
{
dokList1.StartPruefung();
return;
}
if (ExternalCall.Interaktion == "Yes")
{
dokList1.createnewdoc(Convert.ToInt32(ExternalCall.partnernr), Convert.ToInt32(ExternalCall.dokumenttypnr));

2
Client/UIControls/Administrator/Dokumenttyp.cs
Unescape View File

@ -74,6 +74,8 @@ namespace OnDoc.UIControls.Administrator
return;
}
private void Update_Details(int id) {
db.Get_Tabledata("Select office_vorlagenr, bezeichnung from office_vorlage", false, true);
cbboxofficevorlage.DataSource = db.dsdaten.Tables[0];

3
Client/UIControls/Approval.Designer.cs generated
Unescape View File

@ -459,7 +459,8 @@
this.ribbonButtonApproved.LargeImage = global::OnDoc.Properties.Resources.Approval_OK_32x32_32;
this.ribbonButtonApproved.Name = "ribbonButtonApproved";
this.ribbonButtonApproved.SmallImage = global::OnDoc.Properties.Resources.Approval_OK_24x24_32;
this.ribbonButtonApproved.Text = "Bewilligt";
this.ribbonButtonApproved.Text = "Geprüft";
this.ribbonButtonApproved.Click += new System.EventHandler(this.ribbonButtonApproved_Click);
//
// ribbonButtonNotApproved
//

38
Client/UIControls/Approval.cs
Unescape View File

@ -104,8 +104,8 @@ namespace OnDoc.UIControls
TreeNodeAdv tn2 = new TreeNodeAdv();
TreeNodeAdv tnpartner = null;
tn1.Text = "Dokument-Inhalt";
tn2.Text = "Unterschriften";
tn1.Text = "Unterschfit links";
tn2.Text = "Unterschrift rechts";
int tmppartner = 0;
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
{
@ -137,17 +137,47 @@ namespace OnDoc.UIControls
DB db = new DB(AppParams.connectionstring);
string sql = "update dokument_bewilligung set abgelehnt=1, abgelehnt_am = '" + DateTime.Now.ToString() + "' where id=" + dr["id"].ToString();
db.Exec_SQL(sql);
db = null;
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
if (dr["Bewilligungstyp"].ToString() == "2")
{
db.Exec_SQL("Update dokument set approved=0, approval2=0 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
else
{
db.Exec_SQL("Update dokument set approved=0, approval1=0 where dokumentid='" + dr["dokumentid"].ToString());
}
if (tp.Nodes.Count < 1)
{
tp.Parent.Nodes.Remove(tp);
}
db = null;
}
}
private void ribbonButtonApproved_Click(object sender, EventArgs e)
{
DB db = new DB(AppParams.connectionstring);
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
string sql = "update dokument_bewilligung set bewilligt=1, bewilligt_am = '" + DateTime.Now.ToString() + "' where id=" + dr["id"].ToString();
db.Exec_SQL(sql);
treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
if (dr["Bewilligungstyp"].ToString() == "2")
{
db.Exec_SQL("Update dokument set approval2=1 where dokumentid='" + dr["dokumentid"].ToString() + "'");
}
else
{
db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString());
}
db = null;
}
}
}

3
Client/UIControls/DokList.Designer.cs generated
Unescape View File

@ -864,9 +864,8 @@ namespace OnDoc.UICintrols
this.lblToApprove.ForeColor = System.Drawing.Color.Red;
this.lblToApprove.Location = new System.Drawing.Point(407, 88);
this.lblToApprove.Name = "lblToApprove";
this.lblToApprove.Size = new System.Drawing.Size(26, 18);
this.lblToApprove.Size = new System.Drawing.Size(0, 18);
this.lblToApprove.TabIndex = 6;
this.lblToApprove.Text = "12";
//
// timer1
//

50
Client/UIControls/DokList.cs
Unescape View File

@ -456,6 +456,11 @@ namespace OnDoc.UICintrols
{
createnewdoc(0, 0);
}
public void StartPruefung()
{
ribbonButtonApproval_Click(null, null);
}
public void createnewdoc(int partnernr, int dokumenttypnr, bool Favoriten = false, string interaktion = "Yes", string showdoc = "Yes")
{
@ -593,6 +598,11 @@ namespace OnDoc.UICintrols
public void hide_panels()
{
this.RibbonButtonFavoriten.Visible = false;
this.RibbonPanelSuche.Visible = false;
this.RibbonPannelAproval.Visible = false;
this.lblToApprove.Visible = false;
this.cbboxMitarbeiter.Visible = false;
this.RibbonPanelExit.Visible = false;
this.RibbonPanelProfil.Visible = false;
this.RibbonPanelCreate.Visible = false;
@ -621,9 +631,25 @@ namespace OnDoc.UICintrols
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "D")
{
//word
if (dataRow[11].ToString() != "1")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
if (Convert.ToBoolean(dataRow[16]) == true)
{
if (Convert.ToBoolean(dataRow[17]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
else
{
@ -633,9 +659,21 @@ namespace OnDoc.UICintrols
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
if (dataRow[11].ToString() != "1")
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
if (Convert.ToBoolean(dataRow[16]) == true)
{
if (Convert.ToBoolean(dataRow[17]) == true)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_approved_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_ToApprove_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
else
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Excel_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
@ -806,7 +844,7 @@ namespace OnDoc.UICintrols
private void ribbonButtonApproval_Click(object sender, EventArgs e)
{
if (this.lblToApprove.Text == "") { MessageBox.Show("Es sind keine Bewilligungen ausstehend.", "Bewilligung", MessageBoxButtons.OK, MessageBoxIcon.Information); return; }
if (this.lblToApprove.Text == "") { MessageBox.Show("Es stehen keine Dokumente zur Unterschriftenprüfung an.", "Unterschriftenprüfung", MessageBoxButtons.OK, MessageBoxIcon.Information); return; }
frmBewilligung bw = new frmBewilligung();
bw.Show();
}
@ -821,7 +859,7 @@ namespace OnDoc.UICintrols
private void Refresh_Bewilligungen()
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select count(*) from view_relaunch_offene_Bewilligungen where mitarbeiter_bewilligung=" + AppParams.CurrentMitarbieter.ToString(), false, true);
db.Get_Tabledata("Select count(*) from view_relaunch_approval where bewilligt=0 and abgelehnt = 0 and mitarbeiter_bewilligung=" + AppParams.CurrentMitarbieter.ToString(), false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) == 0)
{
this.lblToApprove.Text = "";

92
Client/UIControls/UCAllgemeineDokumentParam.cs
Unescape View File

@ -16,6 +16,11 @@ using Syncfusion.Pdf.Graphics;
using Windows.UI.WebUI;
using OnDoc.Diverses;
using System.Web.Security;
using System.Drawing.Text;
using BroadcastListener.Classes;
using static BroadcastListener.Classes.Factory;
using System.Web.UI.WebControls;
namespace OnDoc.UIControls
{
@ -32,6 +37,11 @@ namespace OnDoc.UIControls
public string check_error { get; set; } = "";
public clsdocgendata docgendata { get; set; }
private bool bpperson_error { get; set; }=false;
public int bpperson_error_type { get; set; } = 0;
public bool personendokument { get; set; } = false;
public string uniqid { get; set; } = Guid.NewGuid().ToString();
public bool ausDokumentpaket { get; set; } = false;
public UCAllgemeineDokumentParam()
@ -83,6 +93,7 @@ namespace OnDoc.UIControls
if (dokumenttypnr != 0)
{
set_personendokument();
db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + dokumenttypnr, false, true);
System.Data.DataRow dr = db.dsdaten.Tables[0].Rows[0];
this.txtbezeichnung.Text = dr["Bezeichnung"].ToString();
@ -110,6 +121,7 @@ namespace OnDoc.UIControls
}
catch { interop = false; }
barcode = Convert.ToBoolean(dr["Vertrag"])== true;
}
else
{
@ -158,11 +170,64 @@ namespace OnDoc.UIControls
gridDokwertlist.Columns.Add(new GridImageColumn() { MappingName = "S", ImageLayout = ImageLayout.Center });
gridDokwertlist.Columns["S"].Width = 25;
gridDokwertlist.QueryImageCellStyle += gridDokwertlist_QueryImageCellStyle;
gridDokwertlist.Columns["userinterface"].FilterPredicates.Add(new Syncfusion.Data.FilterPredicate() { FilterType=Syncfusion.Data.FilterType.Equals,FilterValue=true });
db = null;
Refresh_Team();
this.cbboxteam.SelectedIndex = 0;
}
public bool FilterRecords(object o)
{
string filterText = "FRANS";
var item = o as DataRowView;
if (item != null)
{
//if (item.CustomerID.Equals(filterText))
// return true;
}
return false;
}
public bool set_personendokument()
{
DB db1 = new DB(AppParams.connectionstring);
db1.Get_Tabledata("select * from Dokumenttyp_BP_Person_Erstellung where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true);
if (db1.dsdaten.Tables[0].Rows.Count == 0) {
personendokument = false;
}
else
{
if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "2") personendokument=true;
if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "1") personendokument = false;
}
return personendokument;
}
public bool check_bp_person()
{
DB db1 = new DB(AppParams.connectionstring);
db1.Get_Tabledata("select * from Dokumenttyp_BP_Person_Erstellung where dokumenttypnr=" + this.dokumenttypnr.ToString(), false, true);
bpperson_error_type = 0;
if (db1.dsdaten.Tables[0].Rows.Count > 0)
{
if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "2" && this.partnernr.ToString().Length < 9)
{
bpperson_error = true;
bpperson_error_type = 1;
if (!ausDokumentpaket) MessageBox.Show("Das gewöhlte Dokument muss für eine Person erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
if (db1.dsdaten.Tables[0].Rows[0][1].ToString() == "1" && this.partnernr.ToString().Length > 8)
{
bpperson_error = true;
bpperson_error_type = 2;
if(!ausDokumentpaket) MessageBox.Show("Das gewöhlte Dokument muss für ein BP erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
}
return true;
}
public void update_partner()
{
DB db = new DB(AppParams.connectionstring);
@ -192,7 +257,17 @@ namespace OnDoc.UIControls
db = null;
if (check_bp_person() == true)
{
if (!ausDokumentpaket) Broadcaster().Broadcast("BtnErstellung", new SenderInfo("UIGenDoc", "Enable", uniqid));
}
else
{
if (!ausDokumentpaket) Broadcaster().Broadcast("BtnErstellung", new SenderInfo("UIGenDoc", "Disable", uniqid));
}
}
private void gridDokwertlist_QueryImageCellStyle(object sender, Syncfusion.WinForms.DataGrid.Events.QueryImageCellStyleEventArgs e)
{
var rowdata = (DataRowView)e.Record;
@ -210,7 +285,7 @@ namespace OnDoc.UIControls
try
{
if (datenherkunft.ToString().Trim() != "")
if (datenherkunft.ToString().Trim() != "" && datenherkunft.ToString().Trim()!="&Freitext&")
{
e.Image = (System.Drawing.Image.FromFile(System.Windows.Forms.Application.StartupPath + @"\images\Search.png"));
@ -255,7 +330,9 @@ namespace OnDoc.UIControls
var feldwert = dataRowView.Row["feldwert"].ToString().Trim();
var bezeichnung = dataRowView.Row["bezeichnung"];
if (zwingend==true && feldwert=="")
{ check_error = check_error + "- " + bezeichnung + " Feldwert ist zwingend" + "//"; }
{
if (check_error != "") { check_error=check_error+Environment.NewLine; }
check_error = check_error + "- " + bezeichnung + " Feldwert ist zwingend" ; }
}
}
if (check_error == "") { return true; } else { return false; }
@ -282,7 +359,7 @@ namespace OnDoc.UIControls
{
docgendata.zustaendigmitarbeiter = cbboxzustaendigmitarbeiter.SelectedValue.ToString();
}
docgendata.status = "-1";
docgendata.status = " - 1";
docgendata.ersteller = AppParams.CurrentMitarbieter.ToString();
docgendata.dokumentdatum = DateDokumentDatum.DateTimeText.ToString();
docgendata.bezeichnung = txtbezeichnung.Text;
@ -351,6 +428,7 @@ namespace OnDoc.UIControls
private string data_select(string datenherkunft, string feldtyp)
{
if (datenherkunft=="" || datenherkunft=="&Freitext&") { return ""; }
switch (feldtyp.ToUpper())
{
case "DATUMSHORT":
@ -381,7 +459,7 @@ namespace OnDoc.UIControls
break;
case "TEXT":
if (datenherkunft.Substring(0, 1) != "&") { return ""; }
if (datenherkunft.Substring(0, 8).ToUpper() == "&PARTNER")
if (datenherkunft.Length >= 8 && datenherkunft.Substring(0, 8).ToUpper() == "&PARTNER")
{
Partnersuche p = new Partnersuche();
p.ShowDialog();
@ -455,6 +533,9 @@ namespace OnDoc.UIControls
private void gridDokwertlist_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
try
{
if (e.DataColumn.Index == 15)
{
var selectedItem = e.DataRow;
@ -466,6 +547,9 @@ namespace OnDoc.UIControls
dataRow["feldwert"] = data_select(datenherkunft, feldtyp);
}
}
}
catch { }
}
}
}

BIN
Client/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
Unescape View File

@ -1 +1 @@
944eef1b4599a2ae0c3ecce3daf63741cc7f200139514a40b8adfdffce2c01de
6d19ef59527180b68da16e17ca121e889b7ca8f0078a8a13a54a1a1868f81e50

122
Client/obj/Debug/Client.csproj.FileListAbsolute.txt
Unescape View File

@ -109,49 +109,6 @@ E:\Software-Projekte\OnDoc\OnDoc\EDOKA_2024\obj\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\EDOKA_2024\obj\Debug\Client.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\EDOKA_2024\obj\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\EDOKA_2024\obj\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\libSkiaSharp.dylib
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\x86\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\x64\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\arm64\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.exe.config
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Office.Interop.Excel.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Office.Interop.Word.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Toolkit.Uwp.Notifications.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Toolkit.Uwp.Notifications.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Newtonsoft.Json.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\NLog.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\NLog.Database.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\System.Windows.Forms.Ribbon.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Compression.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Licensing.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Pdf.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\System.ValueTuple.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\BarcodeLib.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Database.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\ExcelNet.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Helper.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Logging.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Model.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\QRCoder.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DocIO.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DocToPDFConverter.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OfficePrinter.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Database.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.dll.config
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Logging.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Helper.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Model.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\BarcodeLib.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\ExcelNet.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DocIO.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DocToPDFConverter.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OfficePrinter.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.AssemblyReference.cache
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.SuggestedBindingRedirects.cache
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe.config
@ -161,6 +118,7 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.InputDialog.res
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.MitarbeiterProfil.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.NativVorlagen.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.testx.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.valueselector.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.DokTypFavoritenOrdner.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.Dokumenterstellung.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmBewilligung.resources
@ -176,6 +134,7 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Resources.Syncfusion.SfD
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Start.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.Dokumenttyp.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.DokumenttypListe.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.frmDokTypCopy.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.OfficeVorlage.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.TableEditor.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.Verbindungseditor.resources
@ -192,16 +151,35 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Versandstrasse.Versandst
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Resources.Syncfusion.SfDataGrid.WinForms.de-DE.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.GenerateResource.cache
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.CoreCompileInputs.cache
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.frmDokTypCopy.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Presentation.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Presentation.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.OfficeChart.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.OfficeChart.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.valueselector.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\libSkiaSharp.dylib
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\x86\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\x64\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\arm64\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.exe.config
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Office.Interop.Excel.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Office.Interop.Word.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Toolkit.Uwp.Notifications.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Toolkit.Uwp.Notifications.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Newtonsoft.Json.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\NLog.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\NLog.Database.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\System.Windows.Forms.Ribbon.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Compression.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Licensing.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Pdf.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\System.ValueTuple.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\BarcodeLib.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Database.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\ExcelNet.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Helper.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Logging.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Model.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDocOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\QRCoder.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Core.WinForms.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Data.WinForms.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DataSource.WinForms.dll
@ -219,7 +197,27 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.SpellChecker.Base.d
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Spreadsheet.Windows.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Tools.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Tools.Windows.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DocIO.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.XlsIO.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DocToPDFConverter.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OfficePrinter.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Presentation.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.OfficeChart.Base.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.Compat.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.Bars.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.DataVisualization.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.Editor.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Database.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\DOCGEN.dll.config
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Logging.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Helper.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Model.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\BarcodeLib.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\ExcelNet.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDocOffice.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Core.WinForms.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Data.WinForms.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DataSource.WinForms.xml
@ -237,13 +235,15 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.SpellChecker.Base.x
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Spreadsheet.Windows.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Tools.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Tools.Windows.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DocIO.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.XlsIO.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Grid.Windows.XmlSerializers.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.Compat.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.Bars.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.DataVisualization.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.Editor.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.DocToPDFConverter.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OfficePrinter.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Presentation.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDocOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDocOffice.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.OfficeChart.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Grid.Windows.XmlSerializers.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.DokTypSelect.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.Dokumentpaket.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.frmToApproval.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.Properties.Resources.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

BIN
DOCGEN/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
DOCGEN/bin/Debug/Database.pdb
View File

Binary file not shown.

4
DOCGEN/obj/Debug/DOCGEN.csproj.FileListAbsolute.txt
Unescape View File

@ -66,6 +66,8 @@ X:\docdemo\EDOKA_2024\DOCGEN\bin\Debug\EDOKA_Barcode.dll
X:\docdemo\EDOKA_2024\DOCGEN\bin\Debug\BarcodeStandard.dll
X:\docdemo\EDOKA_2024\DOCGEN\bin\Debug\EDOKA_Barcode.pdb
X:\docdemo\EDOKA_2024\DOCGEN\bin\Debug\EDOKA_Barcode.dll.config
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.AssemblyReference.cache
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.CoreCompileInputs.cache
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\libSkiaSharp.dylib
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\x86\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\x64\libSkiaSharp.dll
@ -127,8 +129,6 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Runtime.CompilerService
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\System.Text.Encoding.CodePages.xml
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\Logging.pdb
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\FastReport.xml
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.AssemblyReference.cache
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.CoreCompileInputs.cache
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DocGen.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.dll
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\obj\Debug\DOCGEN.pdb

BIN
DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Database/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
Database/bin/Debug/Database.pdb
View File

Binary file not shown.

46
Database/db.cs
Unescape View File

@ -259,7 +259,7 @@ namespace Database
}
public DataTable Get_Vorlage_By_DokumentID(string dokumentid)
{
string sql = "Select dbo.BinaryToBase64(vorlage) as Data, dbo.office_vorlage_datei.office_vorlagenr as nr from dbo.Office_Vorlage_Datei INNER JOIN ";
string sql = "Select dbo.BinaryToBase64(vorlage) as Data, dbo.office_vorlage.office_vorlagenr as nr from dbo.Office_Vorlage_Datei INNER JOIN ";
sql = sql + " dbo.office_vorlage ON dbo.Office_Vorlage_Datei.office_vorlage_dateinr = dbo.office_vorlage.office_vorlagenr INNER JOIN ";
sql = sql + "dbo.dokumenttyp INNER JOIN ";
sql = sql + "dbo.dokument ON dbo.dokumenttyp.dokumenttypnr = dbo.dokument.dokumenttypnr ON dbo.office_vorlage.office_vorlagenr = dbo.dokumenttyp.office_vorlagenr ";
@ -300,8 +300,8 @@ namespace Database
string sql = "SELECT RIGHT(dbo.anwendung.bezeichnung, CHARINDEX(' ', REVERSE(dbo.anwendung.bezeichnung)) - 1) AS ApplType, ";
sql = sql + " RIGHT(dbo.Office_Vorlage_Datei.dateiname, CHARINDEX('.', REVERSE(dbo.Office_Vorlage_Datei.dateiname)) - 1) as Extension";
sql = sql + " FROM dbo.office_vorlage INNER JOIN dbo.anwendung ON dbo.office_vorlage.anwendungnr = dbo.anwendung.anwendungnr INNER JOIN";
sql = sql + " dbo.Office_Vorlage_Datei ON dbo.office_vorlage.office_vorlagenr = dbo.Office_Vorlage_Datei.office_vorlagenr ";
sql = sql + "WHERE dbo.office_vorlage.office_vorlagenr = " + vorlagenr.ToString();
sql = sql + " dbo.Office_Vorlage_Datei ON dbo.office_vorlage.office_vorlagenr = dbo.Office_Vorlage_Datei.office_vorlage_dateinr ";
sql = sql + " WHERE dbo.office_vorlage.office_vorlagenr = " + vorlagenr.ToString();
// string sql = "Select RIGHT(dbo.anwendung.bezeichnung, CHARINDEX(' ', REVERSE(dbo.anwendung.bezeichnung)) - 1) AS Expr1 FROM dbo.office_vorlage INNER JOIN dbo.anwendung ON dbo.office_vorlage.anwendungnr = dbo.anwendung.anwendungnr where dbo.office_vorlage.office_vorlagenr=" + vorlagenr.ToString();
Get_Tabledata(sql, false, true);
return dsdaten.Tables[0];
@ -459,10 +459,48 @@ namespace Database
db.Get_Tabledata("SP_Dokument_Cold_Index_Update", true, false);
}
}
db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + dok.iDokumenttypnr.ToString(), false, true);
int toapprove = 0;
int approved = 0;
int approved1 = 0;
int approved2 = 0;
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["Unterschrift_Pruefung"])==true)
{
toapprove = 1;
if (dok.iUnterschriftlinks == dok.iErsteller) { approved1 = 1; }
if (dok.iUnterschriftrechts == dok.iErsteller) { approved2 = 1; }
}
int unterschriftlinks = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschrift_links"]);
int unterschriftrechts = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschrift_rechts"]);
if (unterschriftlinks==1 && unterschriftrechts==0 && approved1==1) { approved = 1; }
db.Exec_SQL("Update dokument set toapprove=" + toapprove.ToString() + ", approved=" + approved.ToString() + ", approval1=" + approved1.ToString() + ", approval2=" + approved2.ToString() + " where dokumentid = '" + dokumentid+"'");
return dokumentid;
}
public void set_approvalstate(string dokumentid, bool init = false)
{
int toapprove = 0;
int approved = 0;
int approval1 = 0;
int approval2 = 0;
if (init)
{
}
Get_Tabledata("Select * from dokument where dokumentid='" + dokumentid + "'", false, true);
if (Convert.ToBoolean(dsdaten.Tables[0].Rows[0]["toapprove"]) == true)
{
if ( dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString()== dsdaten.Tables[0].Rows[0]["ersteller"].ToString()) approval1 = 1;
if (dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString() == dsdaten.Tables[0].Rows[0]["ersteller"].ToString()) approval2 = 1;
if (approval1 != approval2) approved = 0;
Exec_SQL("Update dokument set approved=" + approved.ToString() + ", approval1=" + approval1.ToString() + ", approval2=" + approval2.ToString() + " where dokumentid = '" + dokumentid + "'");
}
}
public DataTable COLD_Index_Sichern(int indextyp, string dokumentid)
{
SqlCommand scmCmdToExecute = new SqlCommand();

BIN
Database/obj/Debug/Database.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
Database/obj/Debug/Database.dll
View File

Binary file not shown.

BIN
Database/obj/Debug/Database.pdb
View File

Binary file not shown.

BIN
Images/Icons/Icons/Blue/Excel_ToApprove.ico
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 35 KiB

BIN
Images/Icons/Icons/Blue/Excel_approved.ico
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
Images/Icons/Icons/Blue/Images/Excel_ToApprove_16x16-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 717 B

BIN
Images/Icons/Icons/Blue/Images/Excel_ToApprove_24x24-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Images/Icons/Icons/Blue/Images/Excel_ToApprove_256x256-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
Images/Icons/Icons/Blue/Images/Excel_ToApprove_32x32-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Images/Icons/Icons/Blue/Images/Excel_ToApprove_48x48-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Images/Icons/Icons/Blue/Images/Excel_approved_16x16-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 691 B

BIN
Images/Icons/Icons/Blue/Images/Excel_approved_24x24-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Images/Icons/Icons/Blue/Images/Excel_approved_256x256-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
Images/Icons/Icons/Blue/Images/Excel_approved_32x32-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Images/Icons/Icons/Blue/Images/Excel_approved_48x48-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Images/Icons/Icons/Blue/Images/Word_ToApprove_16x16-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 728 B

BIN
Images/Icons/Icons/Blue/Images/Word_ToApprove_24x24-32.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save