diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll
index 238059d4..6a5785f6 100644
Binary files a/API_NetFramework/bin/Database.dll and b/API_NetFramework/bin/Database.dll differ
diff --git a/API_NetFramework/bin/Database.pdb b/API_NetFramework/bin/Database.pdb
index 751a5659..2af6c559 100644
Binary files a/API_NetFramework/bin/Database.pdb and b/API_NetFramework/bin/Database.pdb differ
diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll
index f35dd52e..b382bbf7 100644
Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ
diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb
index 44adf345..bb97c2f1 100644
Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ
diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt
index 497af037..c9885e7c 100644
--- a/API_NetFramework/log.txt
+++ b/API_NetFramework/log.txt
@@ -2860,3 +2860,179 @@ Parametername: encoder
2025-01-16 21:56:58.4530|ERROR|OnDoc|Unberechtigter Zugriff
2025-01-16 21:56:59.3632|DEBUG|OnDoc|Mailversand: 855
2025-01-16 21:56:59.3972|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 13:37:21.2521|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 13:37:21.3279|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 13:37:21.3840|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 13:37:21.4063|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 13:38:59.1543|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 13:38:59.1809|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 13:38:59.2063|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 13:38:59.2316|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:16:14.5802|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:16:14.6454|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:16:14.7134|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:16:14.7379|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:19:24.7710|DEBUG|OnDoc|
+2025-01-17 15:19:24.7825|DEBUG|OnDoc|
+2025-01-17 15:19:24.8081|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-01-17 15:19:24.8135|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-01-17 15:19:24.8712|DEBUG|OnDoc|
+2025-01-17 15:19:24.8742|DEBUG|OnDoc|
+2025-01-17 15:19:24.8976|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
+2025-01-17 15:19:24.8976|INFO|OnDoc|Unterschrift-Bezug: TG9665
+2025-01-17 15:19:44.0948|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:19:44.1203|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:19:44.1423|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:19:44.1658|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:19:50.7003|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:19:50.7258|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:19:50.7483|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:19:50.7714|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:20:17.5692|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:20:17.5961|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:20:17.6200|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:20:17.6430|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:20:22.7805|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:20:22.8125|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:20:22.8361|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:20:22.8642|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:21:17.0298|DEBUG|OnDoc|
+2025-01-17 15:21:17.0298|DEBUG|OnDoc|
+2025-01-17 15:21:17.0626|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
+2025-01-17 15:21:17.0626|INFO|OnDoc|Unterschrift-Bezug: 1234
+2025-01-17 15:21:17.1005|DEBUG|OnDoc|
+2025-01-17 15:21:17.1005|DEBUG|OnDoc|
+2025-01-17 15:21:17.1266|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
+2025-01-17 15:21:17.1266|INFO|OnDoc|Unterschrift-Bezug: TG9665
+2025-01-17 15:21:25.5212|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:21:25.5483|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:21:25.5751|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:21:25.5981|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:22:08.1314|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:22:08.1555|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:22:08.1815|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:22:08.2050|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:22:11.0100|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:22:11.0325|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:22:11.0575|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:22:11.0818|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:22:13.5859|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:22:13.6091|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:22:13.6322|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:22:13.6557|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:23:31.9011|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:23:31.9269|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:23:31.9504|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:23:31.9732|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:23:34.8773|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:23:34.9055|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:23:34.9295|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:23:34.9525|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:23:37.7925|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:23:37.8235|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:23:37.8470|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:23:37.8695|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:44:27.6960|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:44:27.7579|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:44:27.8120|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:44:27.8351|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:44:32.9271|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:44:32.9516|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:44:32.9818|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:44:33.0074|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:44:36.0063|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:44:36.0308|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:44:36.0520|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:44:36.0765|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:45:40.3845|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 15:45:40.4091|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 15:45:40.4346|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 15:45:40.4576|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 16:03:28.4462|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 16:03:28.5114|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 16:03:28.5659|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 16:03:28.5890|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:10:23.6866|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:10:23.7473|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:12:59.1901|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:12:59.2554|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:13:45.3884|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:13:45.4544|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:15:17.3942|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:15:17.4584|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:22:08.2965|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:22:08.3580|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:24:01.1882|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:24:01.2542|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:24:05.0569|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:24:05.0829|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:24:07.8358|DEBUG|OnDoc|Mailversand: 2
+2025-01-17 18:24:07.8604|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:24:07.8794|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:24:07.9024|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:26:10.5392|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:26:10.5742|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:26:11.7516|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:26:11.7796|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:26:56.3138|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:26:56.3389|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-17 18:26:57.9625|DEBUG|OnDoc|Mailversand: 855
+2025-01-17 18:26:57.9865|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:35:06.0653|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 07:35:06.1422|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:35:06.1920|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:35:06.2164|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:35:06.2459|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 07:35:06.2699|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:35:06.2894|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:35:06.3125|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:35:06.3791|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:35:06.4031|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:36:12.1394|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:36:12.1624|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:36:12.1874|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 07:36:12.2122|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:36:12.2308|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:36:12.2557|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:36:12.2833|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 07:36:12.3053|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:36:12.3215|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:36:12.3463|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:54:29.1919|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 07:54:29.2200|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:54:29.2431|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:54:29.2661|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:55:15.5795|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 07:55:15.6045|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:55:15.6225|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:55:15.6465|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:55:15.6706|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 07:55:15.6951|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 07:55:15.7125|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 07:55:15.7364|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:01:59.4604|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 09:01:59.4921|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:01:59.5156|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 09:01:59.5366|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:02:01.9613|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 09:02:01.9885|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:02:02.0117|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 09:02:02.0347|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:04:18.8941|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 09:04:18.9548|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:04:19.0268|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 09:04:19.0496|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:24:05.5643|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 09:24:05.5938|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:24:05.6218|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 09:24:05.6468|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:24:05.6659|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 09:24:05.6889|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:24:55.8040|DEBUG|OnDoc|Mailversand: 2
+2025-01-18 09:24:55.8297|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:24:55.8539|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 09:24:55.8759|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:41:30.2276|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 09:41:30.2909|ERROR|OnDoc|Unberechtigter Zugriff
+2025-01-18 09:42:00.4149|DEBUG|OnDoc|Mailversand: 855
+2025-01-18 09:42:00.4418|ERROR|OnDoc|Unberechtigter Zugriff
diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
index a6a21a78..9e3873cc 100644
Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ
diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
index f35dd52e..b382bbf7 100644
Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ
diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb
index 44adf345..bb97c2f1 100644
Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ
diff --git a/BarcodeLib/bin/Debug/Database.dll b/BarcodeLib/bin/Debug/Database.dll
index 238059d4..6a5785f6 100644
Binary files a/BarcodeLib/bin/Debug/Database.dll and b/BarcodeLib/bin/Debug/Database.dll differ
diff --git a/BarcodeLib/bin/Debug/Database.pdb b/BarcodeLib/bin/Debug/Database.pdb
index 751a5659..2af6c559 100644
Binary files a/BarcodeLib/bin/Debug/Database.pdb and b/BarcodeLib/bin/Debug/Database.pdb differ
diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache
index 35015e49..a983ae4e 100644
Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ
diff --git a/Client/Client.csproj b/Client/Client.csproj
index 10dd9d93..20305964 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -536,6 +536,12 @@
FrmDokumenterstellung.cs
+
+ Form
+
+
+ frmDokumentpaketNeugenerierung.cs
+
Form
@@ -776,6 +782,9 @@
FrmDokumenterstellung.cs
+
+ frmDokumentpaketNeugenerierung.cs
+
frmNote.cs
diff --git a/Client/DocMgmt/DokTypDetails.cs b/Client/DocMgmt/DokTypDetails.cs
index a612eef6..37d09b3a 100644
--- a/Client/DocMgmt/DokTypDetails.cs
+++ b/Client/DocMgmt/DokTypDetails.cs
@@ -16,6 +16,9 @@ namespace OnDoc.DocMgmt
public partial class DokTypDetails : SfForm
{
private int dokumenttypnr { get; set; } = 0;
+ private int einzeldokument { get; set; } = 0;
+
+ private bool dokumentpaket { get; set; } = false;
public DokTypDetails()
{
InitializeComponent();
@@ -33,12 +36,39 @@ namespace OnDoc.DocMgmt
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
this.dokumenttypnr=dokumenttypnr;
-
+
+ }
+
+ public DokTypDetails(int dokumenttypnr, int einzeldokument)
+ {
+ InitializeComponent();
+ this.Style.TitleBar.BackColor = Theaming.Titelbar();
+ this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
+ this.Style.ShadowOpacity = Theaming.ShadowOpacity;
+ this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
+ this.dokumenttypnr = dokumenttypnr;
+ this.einzeldokument=einzeldokument;
+
}
+ public DokTypDetails(int dokumenttypnr, bool dokumentpaket)
+ {
+ InitializeComponent();
+ this.Style.TitleBar.BackColor = Theaming.Titelbar();
+ this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
+ this.Style.ShadowOpacity = Theaming.ShadowOpacity;
+ this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
+ this.dokumenttypnr = dokumenttypnr;
+ this.dokumentpaket = dokumentpaket;
+
+ }
+
+
private void DokTypDetails_Load(object sender, EventArgs e)
{
dokTypDetail1.dokumenttypnr=dokumenttypnr;
+ dokTypDetail1.einzeldokument = einzeldokument;
+ dokTypDetail1.dokumentpaket = dokumentpaket;
dokTypDetail1.Refresh_Details();
}
}
diff --git a/Client/DocMgmt/DokTypSelect.cs b/Client/DocMgmt/DokTypSelect.cs
index d5534967..9b53edba 100644
--- a/Client/DocMgmt/DokTypSelect.cs
+++ b/Client/DocMgmt/DokTypSelect.cs
@@ -58,7 +58,7 @@ namespace OnDoc.DocMgmt
grpFavoriten.Visible = false;
grpVorlagen.Visible = true;
RibbonButtonVorlagen.Checked = true;
-
+
}
else
{
@@ -86,26 +86,61 @@ namespace OnDoc.DocMgmt
{
toolstripCombobox_Fachverantwortung.Items.Add(dr[0].ToString());
}
-
- if (this.favoriten) {
+
+ if (this.favoriten)
+ {
RibbonButtonVorlagen.Checked = false;
RibbonButtonFavoriten.Checked = true;
RibbonButtonFavoriten_Click(sender, e);
- }
- else {
- load_standard("");
+ }
+ else
+ {
+ load_standard("");
toolstriptextboxsearch.Focus();
+ }
+ if (vorlagentype == 2) { this.ribbonPanel4.Visible = false; }else { this.ribbonPanel4.Visible=true; }
+ }
-
+ public void get_einzeldokumente(string where)
+ {
+ DB db = new DB(AppParams.connectionstring);
+ db.clear_parameter();
+ db.add_parameter("@manr", AppParams.CurrentMitarbeiter.ToString());
+ db.add_parameter("@where", where);
+ db.add_parameter("@einzeldokumente", "1");
+ db.Get_Tabledata("sp_ondoc_dokerstellung", true, false);
+ if (db.dsdaten.Tables[0].Rows.Count < 1)
+ {
+ db = null;
+ return;
+ }
+ TreeNodeAdv tnnativ = new TreeNodeAdv();
+ tnnativ.Text = "Dokumente ohne Archivierung";
+ tnnativ.LeftImageIndices = new int[] { 0 };
+ foreach (System.Data.DataRow dr in db.dsdaten.Tables[0].Rows)
+ {
+ TreeNodeAdv tnnativ2 = new TreeNodeAdv();
+ tnnativ2.Tag = dr[0].ToString();
+ tnnativ2.Text = dr[1].ToString()+" [Ohne Archivierung]";
+ tnnativ2.TagObject = dr;
+ tnnativ2.LeftImageIndices = new int[] { Convert.ToInt32(dr["apptype"]) };
+ tnnativ.Nodes.Add(tnnativ2);
+
+ }
+ if (tnnativ.Nodes.Count > 0)
+ {
+ treeViewAdv1.Nodes.Add(tnnativ);
}
+ db = null;
+ if (where != "") { tnnativ.ExpandAll(); }
}
TreeNodeAdv[] nodestoexpand = new TreeNodeAdv[50];
int nodextoexpandindex = 1;
- public void load_standard(string filter, string filter_fachverantwortung="")
+ public void load_standard(string filter, string filter_fachverantwortung = "")
{
-
+
Cursor = Cursors.WaitCursor;
if (AppParams.connectionstring == "")
{
@@ -136,6 +171,7 @@ namespace OnDoc.DocMgmt
}
}
+
if (vorlagentype == 1)
{
this.Text = "Vorlage auswählen";
@@ -173,7 +209,7 @@ namespace OnDoc.DocMgmt
{
//Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
- // if (dr["OnBase_Dokumenttyp]"].ToString().Trim() != "") { root.Text = root.Text + " [" + dr["OnBase_Dokumenttyp"].ToString() + "]"; }
+ // if (dr["OnBase_Dokumenttyp]"].ToString().Trim() != "") { root.Text = root.Text + " [" + dr["OnBase_Dokumenttyp"].ToString() + "]"; }
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
@@ -192,9 +228,14 @@ namespace OnDoc.DocMgmt
}
}
catch { }
- } else
- { treeViewAdv1.ExpandAll();
}
+ else
+ {
+ treeViewAdv1.ExpandAll();
+ }
+ db = null;
+ get_einzeldokumente(where);
+
}
else
{
@@ -236,9 +277,10 @@ namespace OnDoc.DocMgmt
}
}
treeViewAdv1.ExpandAll();
+ db = null;
}
-
+
@@ -353,7 +395,7 @@ namespace OnDoc.DocMgmt
//Recursively builds the tree
PopulateTree_Favoriten(dr, root);
}
-
+
}
treeViewAdv2.ExpandAll();
@@ -483,7 +525,7 @@ namespace OnDoc.DocMgmt
//toolStrip1.Visible = treeViewAdv2.Visible;
//if (treeViewAdv2.Visible == false)
//{
-
+
// this.Width = treeViewAdv1.Width + 10;
//}
//else
@@ -515,7 +557,7 @@ namespace OnDoc.DocMgmt
private void RibbonButtonVorlagen_Click(object sender, EventArgs e)
{
-
+
if (RibbonButtonVorlagen.Checked == true)
{
@@ -534,7 +576,7 @@ namespace OnDoc.DocMgmt
{
if (RibbonButtonFavoriten.Checked == true)
{
-
+
Load_Favoriten("");
favoriten = true;
treevisibility();
@@ -551,7 +593,7 @@ namespace OnDoc.DocMgmt
public void New_Favoriten()
{
RibbonButtonVorlagen.Checked = false;
- this.favoriten= true;
+ this.favoriten = true;
RibbonButtonVorlagen_Click(null, null);
RibbonButtonFavoriten_Click(null, null);
@@ -564,12 +606,12 @@ namespace OnDoc.DocMgmt
private void treevisibility()
{
- if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked==false)
- {
- grpVorlagen.Visible = true;
- grpFavoriten.Visible = false;
- grpVorlagen.Dock = DockStyle.Fill;
- }
+ if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == false)
+ {
+ grpVorlagen.Visible = true;
+ grpFavoriten.Visible = false;
+ grpVorlagen.Dock = DockStyle.Fill;
+ }
if (RibbonButtonVorlagen.Checked == false & RibbonButtonFavoriten.Checked == true)
{
grpVorlagen.Visible = false;
@@ -578,11 +620,11 @@ namespace OnDoc.DocMgmt
}
if (RibbonButtonVorlagen.Checked == false & RibbonButtonFavoriten.Checked == false)
{
- grpVorlagen.Visible= false;
+ grpVorlagen.Visible = false;
grpFavoriten.Visible = false;
}
- if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == true)
+ if (RibbonButtonVorlagen.Checked == true & RibbonButtonFavoriten.Checked == true)
{
grpVorlagen.Visible = true;
grpFavoriten.Visible = true;
@@ -917,16 +959,42 @@ namespace OnDoc.DocMgmt
{
System.Data.DataRow row = treeViewAdv1.SelectedNode.TagObject as System.Data.DataRow;
dokumenttypnr = Convert.ToInt32(row["ID"]);
- DokTypDetails dd = new DokTypDetails(dokumenttypnr);
- dd.ShowDialog();
+ if (vorlagentype == 2)
+ {
+ DokTypDetails dd = new DokTypDetails(dokumenttypnr, true);
+ dd.ShowDialog();
+ return;
+ }
+ if (treeViewAdv1.SelectedNode.Text.Contains("Ohne Archivierung]"))
+ {
+ DokTypDetails dd = new DokTypDetails(dokumenttypnr,1);
+ dd.ShowDialog();
+ } else
+ {
+ DokTypDetails dd = new DokTypDetails(dokumenttypnr);
+ dd.ShowDialog();
+ }
+
+
}
private void detailsAnzeigenToolStripMenuItem1_Click(object sender, EventArgs e)
{
System.Data.DataRow row = treeViewAdv2.SelectedNode.TagObject as System.Data.DataRow;
dokumenttypnr = Convert.ToInt32(row[6]);
- DokTypDetails dd = new DokTypDetails(dokumenttypnr);
- dd.ShowDialog();
+
+ if (treeViewAdv2.SelectedNode.Text.Contains("Ohne Archivierung]"))
+ {
+ DokTypDetails dd = new DokTypDetails(dokumenttypnr, 1);
+ dd.ShowDialog();
+ }
+ else
+ {
+ DokTypDetails dd = new DokTypDetails(dokumenttypnr);
+ dd.ShowDialog();
+ }
+ // DokTypDetails dd = new DokTypDetails(dokumenttypnr);
+ // dd.ShowDialog();
}
private void DokTypSelect_SizeChanged(object sender, EventArgs e)
diff --git a/Client/DocMgmt/Dokumentpaket.Designer.cs b/Client/DocMgmt/Dokumentpaket.Designer.cs
index 9fd5e540..1066f1be 100644
--- a/Client/DocMgmt/Dokumentpaket.Designer.cs
+++ b/Client/DocMgmt/Dokumentpaket.Designer.cs
@@ -233,6 +233,7 @@
this.sfListView1.TabIndex = 18;
this.sfListView1.Text = "sfListView1";
this.sfListView1.SelectionChanged += new System.EventHandler(this.sfListView1_SelectionChanged);
+ this.sfListView1.ItemChecking += new System.EventHandler(this.sfListView1_ItemChecking);
this.sfListView1.ItemChecked += new System.EventHandler(this.sfListView1_ItemChecked);
//
// TabControlDokuments
diff --git a/Client/DocMgmt/Dokumentpaket.cs b/Client/DocMgmt/Dokumentpaket.cs
index 987da7d2..bd4e19b6 100644
--- a/Client/DocMgmt/Dokumentpaket.cs
+++ b/Client/DocMgmt/Dokumentpaket.cs
@@ -26,6 +26,7 @@ using NLog.LayoutRenderers.Wrappers;
using BroadcastListener.Classes;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
+using Windows.Graphics.Display;
namespace OnDoc.DocMgmt
{
@@ -89,6 +90,11 @@ namespace OnDoc.DocMgmt
dokList1.dokument_loeschen(dokumentid);
Generate_Docs(dokumentid);
}
+ if (sender.Function == "Generierung")
+ {
+ string dokumenttypnr = sender.Details;
+ Generate_Docs(dokumenttypnr);
+ }
}
}
private bool NeuesDokumentpaket()
@@ -100,6 +106,7 @@ namespace OnDoc.DocMgmt
}
private void Dokumentpaket_Load(object sender, EventArgs e)
{
+ //sfListView1.CheckBoxSelectionMode = CheckBoxSelectionMode.CheckOnItemClick;
this.BeginUpdate();
if (dokumentpaketnr == 0)
{
@@ -237,10 +244,12 @@ namespace OnDoc.DocMgmt
{
if (txtbpnummer.Text != "") { newdoc.partnernr = Convert.ToInt32(txtbpnummer.Text); }
}
-
+
newdoc.Refresh_Details();
+
TabPageAdv tabPage = new TabPageAdv(r[3].ToString());
tabPage.Controls.Add(newdoc);
+
TabControlDokuments.TabPages.Add(tabPage);
}
private void remove_uc(System.Data.DataRow r)
@@ -372,6 +381,7 @@ namespace OnDoc.DocMgmt
this.Close();
}
+
private bool check_all_doks()
{
string errormessage = "";
@@ -381,6 +391,7 @@ namespace OnDoc.DocMgmt
{
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
uc.ausDokumentpaket = true;
+ uc.genertated_dokumentid=uc.genertated_dokumentid;
dokumenterror = "";
if (uc.partnernr == 0) { dokumenterror = dokumenterror + "- Kein Partner gewählt" + Environment.NewLine; }
@@ -418,8 +429,18 @@ namespace OnDoc.DocMgmt
}
if (!dokList1.grid_empty() && dokList1.get_selected_records() != 0)
{
- if (MessageBox.Show("Die bereits generierten Dokumente löschen?", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+ if (MessageBox.Show("Alle Dokumente neu genererieren?"+Environment.NewLine+"(Bestehende Dokumente werden gelöscht)", "Generierung", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
+ if (MessageBox.Show("Neu hinzugefügte Dokumente generieren?","Generierung",MessageBoxButtons.YesNo, MessageBoxIcon.Question)== DialogResult.No) { return; }
+ foreach (TabPageAdv tab in TabControlDokuments.TabPages)
+ {
+ UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
+ if (uc.genertated_dokumentid == null)
+ {
+ Generate_Docs("", uc);
+ }
+
+ }
return;
}
else
@@ -434,7 +455,7 @@ namespace OnDoc.DocMgmt
progressBarAdv1.Visible = true;
Generate_Docs();
}
- private void Generate_Docs(string idokumentid="") {
+ private void Generate_Docs(string idokumentid="",UCAllgemeineDokumentParam iuc = null) {
string filter = "dokumentid in ('";
foreach (TabPageAdv tab in TabControlDokuments.TabPages)
{
@@ -442,9 +463,8 @@ namespace OnDoc.DocMgmt
Application.DoEvents();
UCAllgemeineDokumentParam uc = (UCAllgemeineDokumentParam)tab.Controls[0];
- if (idokumentid == "" || uc.genertated_dokumentid == idokumentid)
+ if (((idokumentid == "" || uc.genertated_dokumentid == idokumentid) && iuc==null) || uc==iuc)
{
-
//uc.Set_Edit_later();
uc.Update_DocGenData();
clsDocData dokdata = new clsDocData();
@@ -551,16 +571,26 @@ namespace OnDoc.DocMgmt
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;
+ TabControlDokuments.SelectedTab=p;
+ return;
}
}
+
+ sfListView1.CheckedItems.Add(this.sfListView1.SelectedItem);
+
return;
}
+
+ private void sfListView1_ItemChecking(object sender, ItemCheckingEventArgs e)
+ {
+ //int a = 1;
+ }
}
}
diff --git a/Client/DocMgmt/Serienbrief.Designer.cs b/Client/DocMgmt/Serienbrief.Designer.cs
index 2a56efe5..5bd06745 100644
--- a/Client/DocMgmt/Serienbrief.Designer.cs
+++ b/Client/DocMgmt/Serienbrief.Designer.cs
@@ -1226,7 +1226,7 @@
//
this.panelLoad.BackColor = System.Drawing.Color.Silver;
this.panelLoad.Controls.Add(this.label4);
- this.panelLoad.Location = new System.Drawing.Point(488, 46);
+ this.panelLoad.Location = new System.Drawing.Point(488, 71);
this.panelLoad.Name = "panelLoad";
this.panelLoad.Size = new System.Drawing.Size(578, 100);
this.panelLoad.TabIndex = 6;
diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/DocMgmt/Serienbrief.cs
index b2b230e4..0098a69a 100644
--- a/Client/DocMgmt/Serienbrief.cs
+++ b/Client/DocMgmt/Serienbrief.cs
@@ -982,6 +982,14 @@ namespace OnDoc.UIControls
ps.ShowDialog();
if (ps.DialogResult == DialogResult.OK)
{
+ try
+ {
+ if (sb.dsempfaenger.Tables[0].Rows[0]["Status"].ToString() == "-1")
+ {
+ sb.dsempfaenger.Tables[0].Rows.RemoveAt(0);
+ }
+ }
+ catch { }
add_partner(ps.partnernr.ToString());
}
}
diff --git a/Client/DocMgmt/frmDokumentpaketNeugenerierung.Designer.cs b/Client/DocMgmt/frmDokumentpaketNeugenerierung.Designer.cs
new file mode 100644
index 00000000..b6a3fd41
--- /dev/null
+++ b/Client/DocMgmt/frmDokumentpaketNeugenerierung.Designer.cs
@@ -0,0 +1,46 @@
+namespace OnDoc.DocMgmt
+{
+ partial class frmDokumentpaketNeugenerierung
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.SuspendLayout();
+ //
+ // frmDokumentpaketNeugenerierung
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(518, 258);
+ this.Name = "frmDokumentpaketNeugenerierung";
+ this.Text = "frmDokumentpaketNeugenerierung";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/Client/DocMgmt/frmDokumentpaketNeugenerierung.cs b/Client/DocMgmt/frmDokumentpaketNeugenerierung.cs
new file mode 100644
index 00000000..ea74a5cc
--- /dev/null
+++ b/Client/DocMgmt/frmDokumentpaketNeugenerierung.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace OnDoc.DocMgmt
+{
+ public partial class frmDokumentpaketNeugenerierung : Form
+ {
+ public frmDokumentpaketNeugenerierung()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/Client/DocMgmt/frmDokumentpaketNeugenerierung.resx b/Client/DocMgmt/frmDokumentpaketNeugenerierung.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/Client/DocMgmt/frmDokumentpaketNeugenerierung.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Client/DocMgmt/frmNote.Designer.cs b/Client/DocMgmt/frmNote.Designer.cs
index e45f719f..3a91ec3d 100644
--- a/Client/DocMgmt/frmNote.Designer.cs
+++ b/Client/DocMgmt/frmNote.Designer.cs
@@ -76,7 +76,7 @@
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 4;
- this.button1.Text = "Speichern";
+ this.button1.Text = "Ablehnen";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
diff --git a/Client/DocMgmt/frmNote.cs b/Client/DocMgmt/frmNote.cs
index de14f5a2..d50ba5c4 100644
--- a/Client/DocMgmt/frmNote.cs
+++ b/Client/DocMgmt/frmNote.cs
@@ -25,7 +25,7 @@ namespace OnDoc.DocMgmt
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
}
- public frmNote(string dokumentid)
+ public frmNote(string dokumentid, string SaveButtonText ="")
{
InitializeComponent();
this.Style.TitleBar.BackColor = Theaming.Titelbar();
@@ -33,6 +33,7 @@ namespace OnDoc.DocMgmt
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
this.dokumentid= dokumentid;
+ if ( SaveButtonText != "" ) {this.button1.Text= SaveButtonText;}
}
diff --git a/Client/DocMgmt/frmToApproval.cs b/Client/DocMgmt/frmToApproval.cs
index ff93dc8a..8c9889b1 100644
--- a/Client/DocMgmt/frmToApproval.cs
+++ b/Client/DocMgmt/frmToApproval.cs
@@ -18,6 +18,9 @@ namespace OnDoc.DocMgmt
public partial class frmToApproval : SfForm
{
public string dokumentid { get; set; } ="";
+ DB db = new DB(AppParams.connectionstring);
+ DB db1 = new DB(AppParams.connectionstring);
+
public frmToApproval()
{
InitializeComponent();
@@ -25,49 +28,64 @@ namespace OnDoc.DocMgmt
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
this.Style.ShadowOpacity = Theaming.ShadowOpacity;
this.Style.InactiveShadowOpacity = Theaming.InactivShadowOpacity;
+ Closing += Form_Closing;
}
- private void frmToApproval_Load(object sender, EventArgs e)
+ private void Form_Closing(object sender, CancelEventArgs e)
+ {
+ db = null;
+ db1 = null;
+ }
+
+
+ private void frmToApproval_Load(object sender, EventArgs e)
{
- DB db = new DB(AppParams.connectionstring);
db.clear_parameter();
db.Get_Tabledata("SP_Dokumentbearbeitung_Mitarbeiter", true, false);
-
+
cbboxunterschriftlinks.DataSource = db.dsdaten.Tables[0];
cbboxunterschriftrechts.DataSource = db.dsdaten.Tables[0];
-
+
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();
+ if (dokumentid=="") { return; }
+ update_dokdetails();
+ }
+ public void update_dokdetails() {
+
+
+ btntoapproval.Enabled = true;
+
+ db1.Get_Tabledata("Select * from dokument where dokumentid='"+dokumentid+"'",false,true);
+ cbboxunterschriftlinks.SelectedValue = db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString();
+ cbboxunterschriftrechts.SelectedValue = db1.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())
+ if (db1.dsdaten.Tables[0].Rows[0]["ersteller"].ToString()== db1.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())
+ if (db1.dsdaten.Tables[0].Rows[0]["ersteller"].ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
{
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
}
- if (db.dsdaten.Tables[0].Rows[0]["toApprove"].ToString() == "True")
+ if (db1.dsdaten.Tables[0].Rows[0]["toApprove"].ToString() == "True")
{
- if (cbboxunterschriftlinks.SelectedValue.ToString() == db.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString())
+ if (cbboxunterschriftlinks.SelectedValue.ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftlinks"].ToString())
{
cbboxunterschriftlinks.Enabled = false;
//pxapproval2.Visible = true;
}
- if (cbboxunterschriftrechts.SelectedValue.ToString() == db.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
+ if (cbboxunterschriftrechts.SelectedValue.ToString() == db1.dsdaten.Tables[0].Rows[0]["unterschriftrechts"].ToString())
{
cbboxunterschriftrechts.Enabled = false;
//pxapproval2.Visible = true;
@@ -75,19 +93,19 @@ namespace OnDoc.DocMgmt
}
- if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approved"])){
+ if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["approved"])){
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
btntoapproval.Enabled = false;
}
- if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approval1"]))
+ if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["approval1"]))
{
cbboxunterschriftlinks.Enabled = false;
pxapproval1.Visible = true;
}
- if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0]["approval2"]))
+ if (Convert.ToBoolean(db1.dsdaten.Tables[0].Rows[0]["approval2"]))
{
cbboxunterschriftrechts.Enabled = false;
pxapproval2.Visible = true;
@@ -97,10 +115,16 @@ namespace OnDoc.DocMgmt
private void btntoapproval_Click(object sender, EventArgs e)
{
- DB dB = new DB(AppParams.connectionstring);
+ insert_bewilligung();
+ this.DialogResult = DialogResult.OK;
+ this.Close();
+ }
+ public void insert_bewilligung() {
+ if (!btntoapproval.Enabled) { return; };
+ DB dB = new DB(AppParams.connectionstring);
string sql = "Update dokument_Bewilligung set aktiv=0, mutiert_am=getdate(), mutierer = " + AppParams.CurrentMitarbeiter.ToString();
sql = sql + " where dokumentid='" + dokumentid + "' and abgelehnt=0 and bewilligt=0";
dB.Exec_SQL(sql);
@@ -167,9 +191,13 @@ namespace OnDoc.DocMgmt
{
dB.insert_note(AppParams.CurrentMitarbeiter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid);
}
- this.Close();
+
}
+ public void close_window()
+ {
+ this.Close();
+ }
private void btncancel_Click(object sender, EventArgs e)
{
diff --git a/Client/Klassen/clsAppParams.cs b/Client/Klassen/clsAppParams.cs
index c5872358..4e5cdbd7 100644
--- a/Client/Klassen/clsAppParams.cs
+++ b/Client/Klassen/clsAppParams.cs
@@ -48,6 +48,8 @@ namespace OnDoc.Klassen
public static string pathNativVorlagen { get; set; } = "";
public static int Office_Fill_DocIO { get; set; } = 0;
+
+ public static bool StartApp { get; set; } = false;
static AppParams()
{
diff --git a/Client/Klassen/clsProcessWatch.cs b/Client/Klassen/clsProcessWatch.cs
index ffa4b19a..5b36e43d 100644
--- a/Client/Klassen/clsProcessWatch.cs
+++ b/Client/Klassen/clsProcessWatch.cs
@@ -89,6 +89,7 @@ namespace OnDoc.Klassen
RemoveFromList(fc.dokumentid);
Remove_Dok_in_Bearbeitung(fc.dokumentid);
Remove_Dokumentbearbeitung_Zwingend(fc.dokumentid);
+ Remove_Approvals(fc.dokumentid);
return;
}
else
@@ -116,6 +117,14 @@ namespace OnDoc.Klassen
db.Exec_SQL("Update dokument set bearbeitung_zwingend=0 where dokumentid='" + dokumentid + "'");
db = null;
}
+
+ private static void Remove_Approvals(string dokumentid)
+ {
+ DB db = new DB(AppParams.connectionstring);
+ db.Exec_SQL("Update dokument_bewilligung set aktiv=0, mutiert_am=getdate(), mutierer="+AppParams.CurrentMitarbeiter.ToString()+" where dokumentid='" + dokumentid + "'");
+ db = null;
+
+ }
private static void Save_File(string dokumentid, string filename)
{
DB db = new DB(AppParams.connectionstring);
diff --git a/Client/Program.cs b/Client/Program.cs
index a7f46c2e..ae8286e9 100644
--- a/Client/Program.cs
+++ b/Client/Program.cs
@@ -113,8 +113,10 @@ namespace OnDoc
// // MyForm = new Start();
// Application.Run(MyForm);
-
+
+ AppParams.StartApp = true;
Application.Run(new Start());
+ AppParams.StartApp = false;
//Application.Run(new Dummy());
diff --git a/Client/Start.cs b/Client/Start.cs
index 38192dc2..dd654400 100644
--- a/Client/Start.cs
+++ b/Client/Start.cs
@@ -111,7 +111,8 @@ namespace OnDoc
Logging.Logging.Debug("Start - Ende", "start.cs", "");
-
+ AppParams.StartApp = false;
+ dokList1.refresh_dokumente();
}
diff --git a/Client/UIControls/Approval.Designer.cs b/Client/UIControls/Approval.Designer.cs
index af5d5acc..645243bd 100644
--- a/Client/UIControls/Approval.Designer.cs
+++ b/Client/UIControls/Approval.Designer.cs
@@ -63,6 +63,8 @@
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonApproved = new System.Windows.Forms.RibbonButton();
this.ribbonButtonNotApproved = new System.Windows.Forms.RibbonButton();
+ this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
+ this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -101,7 +103,7 @@
this.groupBox1.Size = new System.Drawing.Size(300, 876);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Dokumente zum Bewilligen";
+ this.groupBox1.Text = "Dokumente";
//
// treeViewAdv1
//
@@ -250,6 +252,7 @@
// sfListView1
//
this.sfListView1.AccessibleName = "ScrollControl";
+ this.sfListView1.AutoHideScrollBars = true;
this.sfListView1.BackColor = System.Drawing.SystemColors.Window;
this.sfListView1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.sfListView1.Location = new System.Drawing.Point(3, 369);
@@ -414,6 +417,7 @@
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1083, 790);
this.docPreview1.TabIndex = 0;
+ this.docPreview1.ZoomPercentage = 0;
//
// ribbon3
//
@@ -443,6 +447,7 @@
//
this.ribbonTab1.Name = "ribbonTab1";
this.ribbonTab1.Panels.Add(this.ribbonPanel1);
+ this.ribbonTab1.Panels.Add(this.ribbonPanel2);
this.ribbonTab1.Text = "";
//
// ribbonPanel1
@@ -471,6 +476,22 @@
this.ribbonButtonNotApproved.Text = "Abgelehnt";
this.ribbonButtonNotApproved.Click += new System.EventHandler(this.ribbonButtonNotApproved_Click);
//
+ // ribbonPanel2
+ //
+ this.ribbonPanel2.ButtonMoreVisible = false;
+ this.ribbonPanel2.Items.Add(this.ribbonButton1);
+ this.ribbonPanel2.Name = "ribbonPanel2";
+ this.ribbonPanel2.Text = "";
+ //
+ // ribbonButton1
+ //
+ this.ribbonButton1.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32;
+ this.ribbonButton1.LargeImage = global::OnDoc.Properties.Resources.Refresh_32x32_32;
+ this.ribbonButton1.Name = "ribbonButton1";
+ this.ribbonButton1.SmallImage = global::OnDoc.Properties.Resources.Refresh_24x24_32;
+ this.ribbonButton1.Text = "Aktualisieren";
+ this.ribbonButton1.Click += new System.EventHandler(this.ribbonButton1_Click);
+ //
// Approval
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -521,5 +542,7 @@
private System.Windows.Forms.TextBox txtNote;
private System.Windows.Forms.TextBox txtnotewriter;
private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.RibbonPanel ribbonPanel2;
+ private System.Windows.Forms.RibbonButton ribbonButton1;
}
}
diff --git a/Client/UIControls/Approval.cs b/Client/UIControls/Approval.cs
index 21ea27c6..c6ceee1f 100644
--- a/Client/UIControls/Approval.cs
+++ b/Client/UIControls/Approval.cs
@@ -1,6 +1,7 @@
using Database;
using OnDoc.DocMgmt;
using OnDoc.Klassen;
+using Syncfusion.Windows.Forms.Edit;
using Syncfusion.Windows.Forms.Tools;
using System;
using System.Collections.Generic;
@@ -45,6 +46,9 @@ namespace OnDoc.UIControls
}
private void treeViewAdv1_NodeMouseClick(object sender, Syncfusion.Windows.Forms.Tools.TreeViewAdvMouseClickEventArgs e)
{
+ update_details(e.Node.Tag as string);
+ }
+ private void update_details(string nodetag){
try {
notes.Rows.Clear(); ;
notes.Columns.Clear();
@@ -52,9 +56,9 @@ namespace OnDoc.UIControls
notes.Columns.Add("Betreff");
notes.Columns.Add("Note");
notes.Columns.Add("Notewriter");
- this.docPreview1.Show_Doc(e.Node.Tag as string);
+ this.docPreview1.Show_Doc(nodetag);
Database.DB db = new Database.DB(AppParams.connectionstring);
- db.Get_Tabledata("Select * from View_Relaunach_Approval_Doc where dokumentid='" + e.Node.Tag as string + "'", false, true);
+ db.Get_Tabledata("Select * from View_Relaunach_Approval_Doc where dokumentid='" + nodetag + "'", false, true);
this.txtdokumentid.Text = db.dsdaten.Tables[0].Rows[0]["Dokumentid"].ToString();
this.txtbezeichnung.Text = db.dsdaten.Tables[0].Rows[0]["bezeichnung"].ToString();
this.txtPartnerNr.Text = db.dsdaten.Tables[0].Rows[0]["nrpar00"].ToString();
@@ -101,12 +105,12 @@ namespace OnDoc.UIControls
db.Get_Tabledata("Select * from view_relaunch_approval where mitarbeiter_bewilligung=" + manr.ToString() + " order by bewilligungstyp, nrpar00, bezeichnung", false, true);
- TreeNodeAdv tn1 = new TreeNodeAdv();
- TreeNodeAdv tn2 = new TreeNodeAdv();
+ //TreeNodeAdv tn1 = new TreeNodeAdv();
+ //TreeNodeAdv tn2 = new TreeNodeAdv();
TreeNodeAdv tnpartner = null;
- tn1.Text = "Unterschfit links";
- tn2.Text = "Unterschrift rechts";
+ //tn1.Text = "Unterschfit links";
+ //tn2.Text = "Unterschrift rechts";
int tmppartner = 0;
foreach (DataRow dr in db.dsdaten.Tables[0].Rows)
{
@@ -115,7 +119,8 @@ namespace OnDoc.UIControls
tmppartner = Convert.ToInt32(dr["nrpar00"]);
tnpartner = new TreeNodeAdv();
tnpartner.Text = dr["nrpar00"].ToString() + " " + dr["bkpar00"].ToString();
- if (dr["bewilligungstyp"].ToString() == "1") { tn1.Nodes.Add(tnpartner); } else { tn2.Nodes.Add(tnpartner); }
+ if (dr["bewilligungstyp"].ToString() == "1") {
+ treeViewAdv1.Nodes.Add(tnpartner); } else { treeViewAdv1.Nodes.Add(tnpartner); }
}
TreeNodeAdv tndok = new TreeNodeAdv();
tndok.Text = dr["bezeichnung"].ToString();
@@ -123,14 +128,19 @@ namespace OnDoc.UIControls
tndok.TagObject = dr;
tnpartner.Nodes.Add(tndok);
}
- if (tn1.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn1); }
- if (tn2.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn2); }
+ //if (tn1.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn1); }
+ //if (tn2.Nodes.Count > 0) { treeViewAdv1.Nodes.Add(tn2); }
treeViewAdv1.ExpandAll();
+ if (treeViewAdv1.Nodes.Count > 0)
+ {
+ treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
+ update_details(treeViewAdv1.SelectedNode.Tag as string);
+ }
}
private void ribbonButtonNotApproved_Click(object sender, EventArgs e)
{
- frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString());
+ frmNote note = new frmNote(treeViewAdv1.SelectedNode.Tag.ToString(),"Ablehnen");
DataRow dr = treeViewAdv1.SelectedNode.TagObject as DataRow;
if (note.ShowDialog() == DialogResult.OK)
@@ -139,9 +149,9 @@ namespace OnDoc.UIControls
string sql = "update dokument_bewilligung set abgelehnt=1, abgelehnt_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);
+ // 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()+"'");
@@ -150,10 +160,12 @@ namespace OnDoc.UIControls
{
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);
- }
+
+ remove_node();
+ //if (tp.Nodes.Count < 1)
+ //{
+ // tp.Parent.Nodes.Remove(tp);
+ //}
db = null;
Logging.DocLog.Info("Dokument geprüft - abgelehnt", "Dokumentprüfung", dr["dokumentid"].ToString(),"","");
@@ -167,10 +179,6 @@ namespace OnDoc.UIControls
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() + "'");
@@ -181,6 +189,58 @@ namespace OnDoc.UIControls
}
db = null;
Logging.DocLog.Info("Dokument geprüft", "Dokumentprüfung", dr["dokumentid"].ToString(), "", "");
+ remove_node();
+ }
+
+ private void remove_node()
+ {
+
+ this.txtdokumentid.Text = "";
+ this.txtbezeichnung.Text = "";
+ this.txtPartnerNr.Text = "";
+ this.txtPartner.Text = "";
+ this.txterstelltam.Text = "";
+ this.txtersteller.Text = "";
+ this.txtmutiertam.Text = "";
+ this.txtmutierer.Text = "";
+ this.txtVerantwortlich.Text = "";
+ this.docPreview1.clear_viewer();
+ TreeNodeAdv tparent = treeViewAdv1.SelectedNode.Parent;
+ tparent.Nodes.Remove(treeViewAdv1.SelectedNode);
+ treeViewAdv1.Nodes.Remove(treeViewAdv1.SelectedNode);
+ if (tparent.Nodes.Count < 1)
+ {
+ treeViewAdv1.Nodes.Remove(tparent);
+ }
+ else
+ {
+ treeViewAdv1.SelectedNode = tparent.Nodes[0];
+ }
+ if (treeViewAdv1.Nodes.Count < 1)
+ {
+
+ }
+ else
+ {
+ treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
+ }
+ try
+ {
+ update_details(treeViewAdv1.SelectedNode.Tag as string);
+ }
+ catch { }
+
+ }
+
+ private void ribbonButton1_Click(object sender, EventArgs e)
+ {
+ Update_Docs(AppParams.CurrentMitarbeiter);
+ try
+ {
+ treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0].Nodes[0];
+ update_details(treeViewAdv1.SelectedNode.Tag as string);
+ }
+ catch { }
}
}
}
diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs
index 25e5b4b7..09acb2a3 100644
--- a/Client/UIControls/DokList.Designer.cs
+++ b/Client/UIControls/DokList.Designer.cs
@@ -48,6 +48,7 @@ namespace OnDoc.UICintrols
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox();
@@ -56,6 +57,7 @@ namespace OnDoc.UICintrols
this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
+ this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.panel2 = new System.Windows.Forms.Panel();
this.lblTitel = new System.Windows.Forms.Label();
this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
@@ -151,9 +153,9 @@ namespace OnDoc.UICintrols
this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
- this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
+ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
+ this.zurUnterschriftenPrüfungToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -170,6 +172,8 @@ namespace OnDoc.UICintrols
this.dokumentAnzeigenToolStripMenuItem,
this.dokumentBearbeitenToolStripMenuItem,
this.dokumentLöschenToolStripMenuItem,
+ this.toolStripMenuItem2,
+ this.zurUnterschriftenPrüfungToolStripMenuItem,
this.archivierenToolStripMenuItem,
this.druckenToolStripMenuItem,
this.dokumentKopierenToolStripMenuItem,
@@ -184,14 +188,13 @@ namespace OnDoc.UICintrols
this.historyToolStripMenuItem,
this.dokumentFürPartnerErstellenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
- this.ctxMenuDokList.Size = new System.Drawing.Size(280, 362);
+ this.ctxMenuDokList.Size = new System.Drawing.Size(280, 390);
//
// dokumentAnzeigenToolStripMenuItem
//
this.dokumentAnzeigenToolStripMenuItem.Name = "dokumentAnzeigenToolStripMenuItem";
this.dokumentAnzeigenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentAnzeigenToolStripMenuItem.Text = "Dokument anzeigen";
- this.dokumentAnzeigenToolStripMenuItem.Visible = false;
this.dokumentAnzeigenToolStripMenuItem.Click += new System.EventHandler(this.dokumentAnzeigenToolStripMenuItem_Click);
//
// dokumentBearbeitenToolStripMenuItem
@@ -300,6 +303,14 @@ namespace OnDoc.UICintrols
this.historyToolStripMenuItem.Text = "History";
this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
//
+ // dokumentFürPartnerErstellenToolStripMenuItem
+ //
+ this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
+ this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
+ this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+ this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
+ this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
+ //
// toolStrip1
//
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -412,6 +423,16 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ColumnResizing += new Syncfusion.WinForms.DataGrid.Events.ColumnResizingEventHandler(this.sfDataGrid1_ColumnResizing);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
+ // docPreview1
+ //
+ this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
+ this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.docPreview1.Location = new System.Drawing.Point(0, 0);
+ this.docPreview1.Name = "docPreview1";
+ this.docPreview1.Size = new System.Drawing.Size(1709, 347);
+ this.docPreview1.TabIndex = 0;
+ this.docPreview1.ZoomPercentage = 0;
+ //
// panel2
//
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke;
@@ -587,7 +608,7 @@ namespace OnDoc.UICintrols
this.RibbonPannelAproval.Items.Add(this.ribbonButtonApproval);
this.RibbonPannelAproval.Items.Add(this.ribbonItemGroupApproveCounter);
this.RibbonPannelAproval.Name = "RibbonPannelAproval";
- this.RibbonPannelAproval.Text = "Prüfung";
+ this.RibbonPannelAproval.Text = "Unterschriftenprüfung";
//
// ribbonButtonApproval
//
@@ -595,7 +616,7 @@ namespace OnDoc.UICintrols
this.ribbonButtonApproval.LargeImage = global::OnDoc.Properties.Resources.Approval_32x32_32;
this.ribbonButtonApproval.Name = "ribbonButtonApproval";
this.ribbonButtonApproval.SmallImage = global::OnDoc.Properties.Resources.Approval_24x24_32;
- this.ribbonButtonApproval.Text = "Bewilligen";
+ this.ribbonButtonApproval.Text = "Offene Prüfungen";
this.ribbonButtonApproval.Click += new System.EventHandler(this.ribbonButtonApproval_Click_1);
//
// ribbonItemGroupApproveCounter
@@ -1241,24 +1262,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
- // dokumentFürPartnerErstellenToolStripMenuItem
- //
- this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
- this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
- this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
- this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
- this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
- //
- // docPreview1
- //
- this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
- this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.docPreview1.Location = new System.Drawing.Point(0, 0);
- this.docPreview1.Name = "docPreview1";
- this.docPreview1.Size = new System.Drawing.Size(1709, 347);
- this.docPreview1.TabIndex = 0;
- this.docPreview1.ZoomPercentage = 0;
- //
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
@@ -1267,6 +1270,19 @@ namespace OnDoc.UICintrols
this.dokwerte1.Size = new System.Drawing.Size(0, 694);
this.dokwerte1.TabIndex = 7;
//
+ // toolStripMenuItem2
+ //
+ this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+ this.toolStripMenuItem2.Size = new System.Drawing.Size(276, 6);
+ //
+ // zurUnterschriftenPrüfungToolStripMenuItem
+ //
+ this.zurUnterschriftenPrüfungToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Approval_16x16_32;
+ this.zurUnterschriftenPrüfungToolStripMenuItem.Name = "zurUnterschriftenPrüfungToolStripMenuItem";
+ this.zurUnterschriftenPrüfungToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+ this.zurUnterschriftenPrüfungToolStripMenuItem.Text = "Zur Unterschriften-Prüfung";
+ this.zurUnterschriftenPrüfungToolStripMenuItem.Click += new System.EventHandler(this.zurUnterschriftenPrüfungToolStripMenuItem_Click);
+ //
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1416,5 +1432,7 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonPanel ribbonPanel3;
private System.Windows.Forms.RibbonButton ribbonButton4;
private System.Windows.Forms.ToolStripMenuItem dokumentFürPartnerErstellenToolStripMenuItem;
+ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
+ private System.Windows.Forms.ToolStripMenuItem zurUnterschriftenPrüfungToolStripMenuItem;
}
}
diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs
index cded821e..4aec160d 100644
--- a/Client/UIControls/DokList.cs
+++ b/Client/UIControls/DokList.cs
@@ -102,6 +102,7 @@ namespace OnDoc.UICintrols
GridDateTimeColumn gdt = e.Column as GridDateTimeColumn;
gdt.Pattern = (Syncfusion.WinForms.Input.Enums.DateTimePattern)Syncfusion.Windows.Shared.DateTimePattern.FullDateTime;
}
+
}
public void OnListen(string message, SenderInfo sender)
@@ -324,9 +325,11 @@ namespace OnDoc.UICintrols
dokwerte1.Update_Werte(selected_dokumentid);
}
ribbonButtonToApproval.Enabled = false;
+ zurUnterschriftenPrüfungToolStripMenuItem.Enabled = false;
if (faksimile == "True")
{
ribbonButtonToApproval.Enabled=true;
+ zurUnterschriftenPrüfungToolStripMenuItem.Enabled = true;
}
if (bearbeitung_zwingend == "True")
{
@@ -356,8 +359,13 @@ namespace OnDoc.UICintrols
Broadcaster().Broadcast(selected_dokumentid, new SenderInfo("Doklist", "UpdateView", ""));
return;
}
+ if (AppParams.StartApp == false)
+ {
+
+
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
+ }
}
private void sfDataGrid1_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
@@ -623,6 +631,7 @@ namespace OnDoc.UICintrols
private void tsrbvorschau_SelectedIndexChanged(object sender, EventArgs e)
{
+
vorschauposition = tsrbvorschau.Text;
switch (vorschauposition)
{
@@ -644,6 +653,7 @@ namespace OnDoc.UICintrols
docPreview1.Visible = true;
docPreview1.Show_Doc(selected_dokumentid);
docPreview1.Hide_Editbuttons();
+
break;
case "Eigenes Fenster":
this.splitContainer1.SplitterDistance = this.Height;
@@ -690,7 +700,8 @@ namespace OnDoc.UICintrols
if (RibbonButtonAttributeEinAusblenden.Checked) { currentview["Attributes"] = 1; } else { currentview["Attributes"] = 0; }
currentview["Splitterdistance"] = splitContainer1.SplitterDistance;
MemoryStream ms = new MemoryStream();
- this.sfDataGrid1.Serialize(ms);
+ //gaga
+ //this.sfDataGrid1.Serialize(ms);
currentview["Gridsettings"]= Convert.ToBase64String(ms.ToArray());
}
@@ -963,6 +974,7 @@ namespace OnDoc.UICintrols
{
try
{
+ //MessageBox.Show(e.Column.MappingName);
if (e.Column.MappingName == "zu_retournieren")
{
e.Handled = true;
@@ -997,6 +1009,14 @@ namespace OnDoc.UICintrols
//e.DisplayText = e.DisplayText.ToString("dd.MM.yyyy hh:mm:ss");
//int i = 0;
}
+ if (e.Column.MappingName == "Termin")
+ {
+ var dataRow = (e.DataRow.RowData as DataRowView).Row;
+ if (Convert.ToDateTime(dataRow["Mutiert am"]) < new DateTime(2000,1,1))
+ {
+ e.DisplayText = "";
+ }
+ }
if (e.Column.MappingName == "fileext")
{
try
@@ -1337,10 +1357,51 @@ namespace OnDoc.UICintrols
{
if (!row_selected()) return;
+ var records = sfDataGrid1.View.GetSelectedRecords();
+ if (records.Count == 1) {
+ frmToApproval fa = new frmToApproval();
+ fa.dokumentid = selected_dokumentid;
+ fa.ShowDialog();
+ return;
+ }
+
+ int error = 0;
+ foreach (var record in records)
+ {
+ var datarow = record as DataRowView;
+ string toapprove = datarow["toapprove"].ToString();
+ if (toapprove == "False") { error = 1; }
+ }
+ if (error != 0){
+ MessageBox.Show("Es sind Dokumente in der Auswahl, welche keine Prüfung benötigten. Bitte auswahl anpassen.", "Prüfung", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+return;
+ }
+
+ if (MessageBox.Show("Gewählte Dokumente zur Unterschriftenprüfung "+Environment.NewLine+"(ohne Kommentar-Möglichkeit)?", "Dokument zur Unterschriftenprüfung?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) {
+ frmToApproval fa = new frmToApproval();
+ fa.Visible = false;
+ fa.Show();
+
+ foreach (var record in records)
+ {
+ var datarow = record as DataRowView;
+ string documentid = datarow["dokumentid"].ToString();
+ string toapprove = datarow["toapprove"].ToString();
+ if (toapprove == "True") {
+ fa.dokumentid = documentid;
+ fa.update_dokdetails();
+ fa.insert_bewilligung();
+ }
+ }
+ fa.close_window();
+ }
+
+
+ refresh_dokumente();
- frmToApproval fa = new frmToApproval();
- fa.dokumentid = selected_dokumentid;
- fa.ShowDialog();
+ //frmToApproval fa = new frmToApproval();
+ //fa.dokumentid = selected_dokumentid;
+ //fa.ShowDialog();
}
public void upruefung()
@@ -1620,16 +1681,16 @@ namespace OnDoc.UICintrols
}
return Encoding.UTF8.GetString(Convert.FromBase64String(text));
}
- private void ribbonButton4_Click(object sender, EventArgs e)
- {
- if (System.IO.File.Exists(@"x:\gridsettings.xml"))
- {
- using (var file = File.Open(@"x:\gridsettings.xml", FileMode.Open))
- {
- this.sfDataGrid1.Deserialize(file);
- }
- }
- }
+ //private void ribbonButton4_Click(object sender, EventArgs e)
+ //{
+ // if (System.IO.File.Exists(@"x:\gridsettings.xml"))
+ // {
+ // using (var file = File.Open(@"x:\gridsettings.xml", FileMode.Open))
+ // {
+ // this.sfDataGrid1.Deserialize(file);
+ // }
+ // }
+ //}
private void ribbonCBAnsicht_DropDownItemClicked(object sender, System.Windows.Forms.RibbonItemEventArgs e)
@@ -1693,14 +1754,27 @@ namespace OnDoc.UICintrols
string sql = "insert Mitarbeiter_GridSettings (mitarbeiterid, erstellt_am, aktiv, bezeichnung, gridsettings,standard, Preview, Attributes,splitterdistance) values(";
sql = sql + AppParams.CurrentMitarbeiter.ToString() + ",getdate(),1,'" + sa.selectedtext + "','" + inputAsString + "'," + sa.alsStandard.ToString();
sql = sql + ", "+ tsrbvorschau.SelectedIndex.ToString()+", "+Attribute.ToString()+ ", "+distance.ToString()+")";
- db.Exec_SQL(sql);
+ //db.Exec_SQL(sql);
+
+ db.Get_Tabledata_for_Update("Select * from mitarbeiter_gridsettings where id = -1", false, true);
+ System.Data.DataRow dr = db.daten.Tables[0].NewRow();
+ dr[1]=AppParams.CurrentMitarbeiter.ToString();
+ dr[2]=DateTime.Now;
+ dr[3] = true;
+ dr[4] = sa.selectedtext;
+ dr[5] = inputAsString;
+ dr[6] = sa.alsStandard;
+ dr[7] = tsrbvorschau.SelectedIndex;
+ dr[8] = Attribute;
+ dr[9] = distance;
+ db.daten.Tables[0].Rows.Add(dr);
+ db.Update_Data();
+
+
db = null;
if (sa.alsStandard != 1) { refresh_ansichten(sa.selectedtext); } else { refresh_ansichten(); }
- //using (var file = File.Create(@"x:\gridsettings4.xml"))
- //{
- // this.sfDataGrid1.Serialize(file);
- //}
+
}
}
@@ -2105,6 +2179,11 @@ namespace OnDoc.UICintrols
}
+
+ private void zurUnterschriftenPrüfungToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ ribbonButtonToApproval_Click(sender, e);
+ }
}
diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx
index 65791621..cd88d383 100644
--- a/Client/UIControls/DokList.resx
+++ b/Client/UIControls/DokList.resx
@@ -524,19 +524,19 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+ vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+ vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vQAADr0BR/uQrQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+ vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
diff --git a/Client/UIControls/DokTypDetail.Designer.cs b/Client/UIControls/DokTypDetail.Designer.cs
index 5c8eca18..6b7294c7 100644
--- a/Client/UIControls/DokTypDetail.Designer.cs
+++ b/Client/UIControls/DokTypDetail.Designer.cs
@@ -30,17 +30,24 @@
{
this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.sfDataGrid2 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
+ this.groupBox1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid2)).BeginInit();
+ this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// sfDataGrid1
//
this.sfDataGrid1.AccessibleName = "Table";
+ this.sfDataGrid1.AllowEditing = false;
this.sfDataGrid1.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.LastColumnFill;
- this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Left;
- this.sfDataGrid1.Location = new System.Drawing.Point(0, 0);
+ this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.sfDataGrid1.Location = new System.Drawing.Point(3, 16);
this.sfDataGrid1.Name = "sfDataGrid1";
- this.sfDataGrid1.Size = new System.Drawing.Size(406, 720);
+ this.sfDataGrid1.Size = new System.Drawing.Size(405, 341);
this.sfDataGrid1.Style.HeaderStyle.FilterIconColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(29)))), ((int)(((byte)(29)))));
this.sfDataGrid1.TabIndex = 1;
this.sfDataGrid1.Text = "sfDataGrid1";
@@ -48,21 +55,60 @@
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.docPreview1.Location = new System.Drawing.Point(406, 0);
+ this.docPreview1.Location = new System.Drawing.Point(411, 0);
this.docPreview1.Name = "docPreview1";
- this.docPreview1.Size = new System.Drawing.Size(606, 720);
+ this.docPreview1.Size = new System.Drawing.Size(601, 720);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.groupBox2);
+ this.groupBox1.Controls.Add(this.sfDataGrid1);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.groupBox1.Location = new System.Drawing.Point(0, 0);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(411, 720);
+ this.groupBox1.TabIndex = 2;
+ this.groupBox1.TabStop = false;
+ //
+ // sfDataGrid2
+ //
+ this.sfDataGrid2.AccessibleName = "Table";
+ this.sfDataGrid2.AllowEditing = false;
+ this.sfDataGrid2.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.LastColumnFill;
+ this.sfDataGrid2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.sfDataGrid2.Location = new System.Drawing.Point(3, 16);
+ this.sfDataGrid2.Name = "sfDataGrid2";
+ this.sfDataGrid2.Size = new System.Drawing.Size(399, 341);
+ this.sfDataGrid2.Style.HeaderStyle.FilterIconColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(29)))), ((int)(((byte)(29)))));
+ this.sfDataGrid2.TabIndex = 2;
+ this.sfDataGrid2.Text = "sfDataGrid2";
+ this.sfDataGrid2.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid2_CellClick);
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.sfDataGrid2);
+ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox2.Location = new System.Drawing.Point(3, 357);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(405, 360);
+ this.groupBox2.TabIndex = 3;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Vorlagen im Paket (für Vorschau Eintrag auswählen)";
+ //
// DokTypDetail
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.docPreview1);
- this.Controls.Add(this.sfDataGrid1);
+ this.Controls.Add(this.groupBox1);
this.Name = "DokTypDetail";
this.Size = new System.Drawing.Size(1012, 720);
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid2)).EndInit();
+ this.groupBox2.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -71,5 +117,8 @@
private DocPreview docPreview1;
private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid2;
+ private System.Windows.Forms.GroupBox groupBox2;
}
}
diff --git a/Client/UIControls/DokTypDetail.cs b/Client/UIControls/DokTypDetail.cs
index f510ecad..7b1378dc 100644
--- a/Client/UIControls/DokTypDetail.cs
+++ b/Client/UIControls/DokTypDetail.cs
@@ -18,6 +18,9 @@ namespace OnDoc.UIControls
public partial class DokTypDetail : UserControl
{
public int dokumenttypnr { get; set; } = 0;
+ public int einzeldokument { get; set; } = 0;
+
+ public bool dokumentpaket { get; set; } = false;
public DokTypDetail()
{
InitializeComponent();
@@ -32,12 +35,62 @@ namespace OnDoc.UIControls
public void Refresh_Details()
{
- DB dB = new DB(AppParams.connectionstring);
- dB.Get_Tabledata("Select * from view_ondoc_doctypdetail where nr=" + dokumenttypnr.ToString(), false, true);
DataTable details = new DataTable();
details.Columns.Add("Element");
details.Columns.Add("Inhalt");
+ if (dokumentpaket)
+ {
+ sfDataGrid1.Dock = DockStyle.Top;
+ groupBox2.Dock = DockStyle.Fill;
+ groupBox2.Visible = true;
+ }
+ else
+ {
+ sfDataGrid1.Dock = DockStyle.Fill;
+ groupBox2.Visible = false;
+ }
+ DB dB = new DB(AppParams.connectionstring);
+ if (einzeldokument == 0)
+ {
+ dB.Get_Tabledata("Select * from view_ondoc_doctypdetail where nr=" + dokumenttypnr.ToString(), false, true);
+ }
+ if (einzeldokument==1)
+ {
+ dB.Get_Tabledata("Select * from view_ondoc_doctypdetail_nativ where nr=" + dokumenttypnr.ToString(), false, true);
+ }
+
+
+ if (dokumentpaket)
+ {
+
+ dB.Get_Tabledata("Select [Nr],[Bezeichung],[Beschreibung],[Hinweis],[zwingend],[sort],[ID],[DokTyp] from view_ondoc_docpacdetail where nr=" + dokumenttypnr.ToString()+" order by sort", false, true);
+ for (int i = 0; i < 4; i++)
+ {
+ System.Data.DataRow dr1 = details.NewRow();
+ dr1[0]= dB.dsdaten.Tables[0].Columns[i].ColumnName;
+ dr1[1] = dB.dsdaten.Tables[0].Rows[0][i].ToString();
+ details.Rows.Add(dr1);
+ }
+ sfDataGrid1.DataSource= details;
+ dB.dsdaten.Tables[0].Columns.RemoveAt(0);
+ dB.dsdaten.Tables[0].Columns.RemoveAt(0);
+ dB.dsdaten.Tables[0].Columns.RemoveAt(0);
+ dB.dsdaten.Tables[0].Columns.RemoveAt(0);
+ dB.dsdaten.Tables[0].Columns.RemoveAt(0);
+ dB.dsdaten.Tables[0].Columns.RemoveAt(0);
+
+ sfDataGrid2.DataSource = dB.dsdaten.Tables[0];
+ //sfDataGrid2.Columns[0].Visible = false;
+ //sfDataGrid2.Columns[1].Visible = false;
+ //sfDataGrid2.Columns[2].Visible = false;
+ //sfDataGrid2.Columns[3].Visible = false;
+ dB = null;
+
+ return;
+ }
+
+
foreach (DataColumn dc in dB.dsdaten.Tables[0].Columns)
{
if (dc.ColumnName != "Image")
@@ -96,5 +149,46 @@ namespace OnDoc.UIControls
dB = null;
}
+ private void sfDataGrid2_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
+ {
+ string id = "";
+ string apptype = "";
+ string image = "";
+ try
+ {
+ var rowIndex = e.DataRow.RowIndex;
+ //Get the column index value
+ var columnIndex = e.DataColumn.ColumnIndex;
+ var selectedItem = e.DataRow;
+ var dataRow = (e.DataRow.RowData as DataRowView).Row;
+ id = dataRow["id"].ToString();
+
+ DB db = new DB(AppParams.connectionstring);
+ db.Get_Tabledata("Select apptype,image from view_ondoc_docpacdetail where nr= " + this.dokumenttypnr.ToString() + " and id=" + id, false, true);
+ apptype = db.dsdaten.Tables[0].Rows[0][0].ToString().ToUpper();
+ image = db.dsdaten.Tables[0].Rows[0][1].ToString();
+ db = null;
+
+ DocGet dg = new DocGet(AppParams.connectionstring);
+ string PDF = "";
+ switch (apptype)
+ {
+ case "WORD":
+ PDF = dg.Convert_Word_To_PDF(image);
+ break;
+ case "EXCEL":
+ PDF = dg.Convert_Excel_To_PDF(image);
+ break;
+ case "PDF":
+ PDF = image;
+ break;
+ default:
+ break;
+ }
+ docPreview1.show_base64(PDF, "Dokumenttyp: " + dokumenttypnr.ToString());
+ dg = null;
+ }
+ catch { }
+ }
}
}
diff --git a/Client/UIControls/Dokwerte.Designer.cs b/Client/UIControls/Dokwerte.Designer.cs
index 1d148880..42ba2974 100644
--- a/Client/UIControls/Dokwerte.Designer.cs
+++ b/Client/UIControls/Dokwerte.Designer.cs
@@ -42,6 +42,7 @@
// sfDataGrid1
//
this.sfDataGrid1.AccessibleName = "Table";
+ this.sfDataGrid1.AllowEditing = false;
this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGrid1.Location = new System.Drawing.Point(0, 100);
this.sfDataGrid1.Name = "sfDataGrid1";
@@ -87,6 +88,7 @@
// sfdatagridpruefung
//
this.sfdatagridpruefung.AccessibleName = "Table";
+ this.sfdatagridpruefung.AllowEditing = false;
this.sfdatagridpruefung.BackColor = System.Drawing.SystemColors.Window;
this.sfdatagridpruefung.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfdatagridpruefung.Location = new System.Drawing.Point(3, 16);
diff --git a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs
index d2736cf3..568287c0 100644
--- a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs
+++ b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs
@@ -645,12 +645,13 @@
//
// btnErneutGenerierung
//
+ this.btnErneutGenerierung.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.btnErneutGenerierung.Location = new System.Drawing.Point(900, 64);
this.btnErneutGenerierung.Name = "btnErneutGenerierung";
this.btnErneutGenerierung.Size = new System.Drawing.Size(138, 23);
this.btnErneutGenerierung.TabIndex = 25;
this.btnErneutGenerierung.Text = "Erneut generieren";
- this.btnErneutGenerierung.UseVisualStyleBackColor = true;
+ this.btnErneutGenerierung.UseVisualStyleBackColor = false;
this.btnErneutGenerierung.Visible = false;
this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click);
//
diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs
index 677b50b5..30ac80d2 100644
--- a/Client/UIControls/UCAllgemeineDokumentParam.cs
+++ b/Client/UIControls/UCAllgemeineDokumentParam.cs
@@ -827,11 +827,15 @@ namespace OnDoc.UIControls
{
Broadcaster().Broadcast("DokumentPaket", new SenderInfo("NeuGenerierung", "NeuGenerierung", genertated_dokumentid));
}
-
+ private void btnGenerieren_Click(object sender, EventArgs e)
+ {
+ Broadcaster().Broadcast("DokumentPaket", new SenderInfo("NeuGenerierung", "Generierung", dokumenttypnr.ToString()));
+ }
public void Show_Neugenerieren()
{
btnErneutGenerierung.Visible = true;
}
+
private void rbzustaendigkube_CheckedChanged(object sender, EventArgs e)
{
@@ -931,5 +935,7 @@ namespace OnDoc.UIControls
}
catch { }
}
+
+
}
}
diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll
index 238059d4..6a5785f6 100644
Binary files a/Client/bin/Debug/Database.dll and b/Client/bin/Debug/Database.dll differ
diff --git a/Client/bin/Debug/Database.pdb b/Client/bin/Debug/Database.pdb
index 751a5659..2af6c559 100644
Binary files a/Client/bin/Debug/Database.pdb and b/Client/bin/Debug/Database.pdb differ
diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe
index 700dbee4..c110e0a9 100644
Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ
diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb
index 4336a45c..602f6507 100644
Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ
diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip
index fa65bc5f..660bd73e 100644
Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ
diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll
index 672d9abf..08a5c326 100644
Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ
diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache
index 87d11af2..02bdef00 100644
Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ
diff --git a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
index eae460dc..78398ae0 100644
--- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
+++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0ebfa8660e9a4803f2c070035283fb2abe7589fb363960199b8d3b0282a9d215
+6ee05635a2fc158c8632aa1f66864359a3e91ff6455341d3d86f10936b410e21
diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt
index d3b4ee5f..8ad86899 100644
--- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt
+++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt
@@ -367,3 +367,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\vbBarcodes.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\MW6.SDK.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.AdminDokTypGenerierung.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.SerienbriefTemplateLoad.resources
+E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmDokumentpaketNeugenerierung.resources
diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache
index f3b042c2..83d4b43e 100644
Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ
diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 4b9946aa..3ae16f31 100644
Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Client/obj/Debug/OnDoc.DocMgmt.frmDokumentpaketNeugenerierung.resources b/Client/obj/Debug/OnDoc.DocMgmt.frmDokumentpaketNeugenerierung.resources
new file mode 100644
index 00000000..6c05a977
Binary files /dev/null and b/Client/obj/Debug/OnDoc.DocMgmt.frmDokumentpaketNeugenerierung.resources differ
diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe
index 700dbee4..c110e0a9 100644
Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ
diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb
index 4336a45c..602f6507 100644
Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ
diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll
index 672d9abf..08a5c326 100644
Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ
diff --git a/DOCGEN/bin/Debug/Database.dll b/DOCGEN/bin/Debug/Database.dll
index 238059d4..6a5785f6 100644
Binary files a/DOCGEN/bin/Debug/Database.dll and b/DOCGEN/bin/Debug/Database.dll differ
diff --git a/DOCGEN/bin/Debug/Database.pdb b/DOCGEN/bin/Debug/Database.pdb
index 751a5659..2af6c559 100644
Binary files a/DOCGEN/bin/Debug/Database.pdb and b/DOCGEN/bin/Debug/Database.pdb differ
diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
index 14baff1b..b8155da7 100644
Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ
diff --git a/Database/bin/Debug/Database.dll b/Database/bin/Debug/Database.dll
index 238059d4..6a5785f6 100644
Binary files a/Database/bin/Debug/Database.dll and b/Database/bin/Debug/Database.dll differ
diff --git a/Database/bin/Debug/Database.pdb b/Database/bin/Debug/Database.pdb
index 751a5659..2af6c559 100644
Binary files a/Database/bin/Debug/Database.pdb and b/Database/bin/Debug/Database.pdb differ
diff --git a/Database/db.cs b/Database/db.cs
index 475bbf15..f81188d7 100644
--- a/Database/db.cs
+++ b/Database/db.cs
@@ -425,7 +425,11 @@ namespace Database
{
dok.iColdstatus = 0;
}
-
+ if (doktyp.bNurnative == true)
+ {
+ dok.bAktiv = false;
+ dok.sLoeschgrund = "Einzeldokument";
+ }
db.Get_Tabledata("Select * from office_vorlage where office_vorlagenr=" + doktyp.iOffice_vorlagenr.ToString(), false, true);
string dokumentname = "";
diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll
index 238059d4..6a5785f6 100644
Binary files a/Database/obj/Debug/Database.dll and b/Database/obj/Debug/Database.dll differ
diff --git a/Database/obj/Debug/Database.pdb b/Database/obj/Debug/Database.pdb
index 751a5659..2af6c559 100644
Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ
diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll
index 238059d4..6a5785f6 100644
Binary files a/OnDocOffice/bin/Debug/Database.dll and b/OnDocOffice/bin/Debug/Database.dll differ
diff --git a/OnDocOffice/bin/Debug/Database.pdb b/OnDocOffice/bin/Debug/Database.pdb
index 751a5659..2af6c559 100644
Binary files a/OnDocOffice/bin/Debug/Database.pdb and b/OnDocOffice/bin/Debug/Database.pdb differ
diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache
index b7e74d52..db525065 100644
Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ
diff --git a/Sonstige DateienError2025-01-17.log b/Sonstige DateienError2025-01-17.log
new file mode 100644
index 00000000..d6a9be95
--- /dev/null
+++ b/Sonstige DateienError2025-01-17.log
@@ -0,0 +1,10 @@
+
+
+Date:2025-01-17 18:02:15,586
+Thread:[1]
+Level:ERROR
+Logger:InsertBlazorCode.SyncfusionCodeGeneratorMenuCommand [(null)]
+Message:System.ArgumentException: Der Pfad hat ein ungültiges Format.
+ bei System.IO.Path.NormalizePath(String path, Boolean fullCheck, Int32 maxPathLength, Boolean expandShortPaths)
+ bei System.IO.Path.InternalGetDirectoryName(String path)
+ bei InsertBlazorCode.SyncfusionCodeGeneratorMenuCommand.queryStatusMenuCommand_BeforeQueryStatus(Object sender, EventArgs e) in C:\Git\RP\vsext_insertblazorcode\SyncfusionBlazorcodegenerator\SyncfusionCodeGeneratorMenuCommand.cs:Zeile 331.