diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll
index 685295bc..3538e5ef 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 b7c20860..695e7480 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 d092a985..ac8a5c6d 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 2b89df9f..ecb3c359 100644
Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ
diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache
index b41c8506..b4f1d387 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 d092a985..ac8a5c6d 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 2b89df9f..ecb3c359 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 0ed86fb2..3538e5ef 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 3feb8b24..695e7480 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 c06c019a..d410ba67 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 951896c6..3e4ea386 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -52,7 +52,8 @@
OnDoc.Program
- OnDoc6_Transparent.ico
+
+
@@ -113,6 +114,12 @@
+
+ Form
+
+
+ DokHistory.cs
+
Form
@@ -370,6 +377,9 @@
Versandstrasse.cs
+
+ DokHistory.cs
+
frmCalendar.cs
@@ -596,12 +606,17 @@
-
+
+
+
+
+
+
+
-
-
+
diff --git a/Client/Diverses/DokHistory.Designer.cs b/Client/Diverses/DokHistory.Designer.cs
new file mode 100644
index 00000000..336eea93
--- /dev/null
+++ b/Client/Diverses/DokHistory.Designer.cs
@@ -0,0 +1,66 @@
+namespace OnDoc.Diverses
+{
+ partial class DokHistory
+ {
+ ///
+ /// 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()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokHistory));
+ this.sfDataGrid1 = new Syncfusion.WinForms.DataGrid.SfDataGrid();
+ ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // sfDataGrid1
+ //
+ this.sfDataGrid1.AccessibleName = "Table";
+ this.sfDataGrid1.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCellsWithLastColumnFill;
+ this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.sfDataGrid1.Location = new System.Drawing.Point(0, 0);
+ this.sfDataGrid1.Name = "sfDataGrid1";
+ this.sfDataGrid1.Size = new System.Drawing.Size(1259, 450);
+ this.sfDataGrid1.TabIndex = 0;
+ this.sfDataGrid1.Text = "sfDataGrid1";
+ //
+ // DokHistory
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1259, 450);
+ this.Controls.Add(this.sfDataGrid1);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Name = "DokHistory";
+ this.Text = "Dokument-History";
+ this.Load += new System.EventHandler(this.DokHistory_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private Syncfusion.WinForms.DataGrid.SfDataGrid sfDataGrid1;
+ }
+}
\ No newline at end of file
diff --git a/Client/Diverses/DokHistory.cs b/Client/Diverses/DokHistory.cs
new file mode 100644
index 00000000..3609b264
--- /dev/null
+++ b/Client/Diverses/DokHistory.cs
@@ -0,0 +1,39 @@
+using Database;
+using OnDoc.Klassen;
+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.Diverses
+{
+ public partial class DokHistory : Form
+ {
+
+ private string dokumentid { get; set; } = "";
+ public DokHistory()
+ {
+ InitializeComponent();
+ }
+
+ public DokHistory(string dokumentid)
+ {
+ InitializeComponent();
+ this.dokumentid = dokumentid;
+ }
+
+ private void DokHistory_Load(object sender, EventArgs e)
+ {
+ DB dB = new DB(AppParams.connectionstring);
+ dB.Get_Tabledata("Select * from edoka_journale.dbo.nlog_doc where dokumentid='"+dokumentid+"' order by id desc",false,true);
+ sfDataGrid1.DataSource = dB.dsdaten.Tables[0];
+ this.sfDataGrid1.Columns["CreatedOn"].Format = "yyyy-MM-dd hh:mm:ss";
+
+ }
+ }
+}
diff --git a/Client/Diverses/DokHistory.resx b/Client/Diverses/DokHistory.resx
new file mode 100644
index 00000000..4a8bf1d6
--- /dev/null
+++ b/Client/Diverses/DokHistory.resx
@@ -0,0 +1,493 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+ AAABAAUAAAAAAAEAIACSEQAAVgAAADAwAAABACAAqCUAAOgRAAAgIAAAAQAgAKgQAACQNwAAGBgAAAEA
+ IACICQAAOEgAABAQAAABACAAaAQAAMBRAACJUE5HDQoaCgAAAA1JSERSAAABAAAAAQAIBgAAAFxyqGYA
+ ABFZSURBVHja7Z15rF1VFYcPtiIq1gJSS2OimGBsqyJBZVIiU5UiMiQCggIOQYMGcEAZJAEURYxKkIBG
+ jJYAFhliaKEqg0TCIEoDVUBwIKjFWrVlKiCP9vnbnttYCV3c17ff/e2z7/clK6t/3Lf32ueu8/W+d885
+ e6OmO8xQ7KXYVTFLsbViyucvGn2xuzAYO1/9wEbPKK1SPKT4veJWxXWKX7trGyY2chfQB/sojlXsrpN9
+ krsYmFgkhj8qXaD4ruJf7npqp2QBvF1xjk767dyFwOCRCFYqnao4T/GMu55aKVEAGyvOUhyjk7/E+mCA
+ SAS/VDpccb+7lhop7QTbQrFQJ/6O7kKgHCSBFUoHKH7hrqU2ShLANMWNOvlnuguB8pAEnlI6WHGVu5aa
+ KEUAmzbtyb+9uxAoF0lgROlQxeXuWmqhFAFcqJP/g+4ioHx6Xx9+SHGRu5YaKEEAB+vkn+8uArqDJLBG
+ 6eNN+1UhjAO3ANJH//skgBnuAwHdQhIYVTpOcY67li7jFsDxOvnPch8E6C4SwYlKZ7rr6CpOAUxWPMj/
+ /jBeJIHTmvaiIRgjTgHsrZP/mrH+kN7s1UqXKH6guFOxwrgG2DCO1Hv//ZwDqi++pvQ598K6hlMA31YT
+ fGwsP6A3eWnTXhDyK2PdMH6yCyCh/vhW0943MupeYFdwCuB+NcE2/b5Yb+5jSrsofmOsGfIwIQJIqE++
+ p3SUYo17kV3AJYCXKh4by7X+/LGnKiZMAAn1ysVpjoabiJ4XlwC2VQPc2e+Le1eAvVKx0lQv5GVCBZBQ
+ z1zRtFcNPu1ebMm4BLCbGuCGfl+sN3OxEpcJ18OECyChvrla6X2KJ90LLhWXAN6jBljQ74v1Ri5Smmuq
+ FfIzEAEk1DvXK+3XtE8fgmfhEsC+aoC+7+rSm5hk8V5TrZCfgQkgof65uWn/A3nUvfDSQADgYKACSKiH
+ 0lfH72r4O9L/gQDAwcAFkFAf3dW0D5b9h/sAlAICAAcWASTUS/c2rQSWug9CCSAAcGATQEL99AelPRUP
+ ug+EGwQADqwCSKin/qy0m+JP7oPhBAGAA7sAEuqrtCnJHorfuWtxgQDAQRECSKi3livNUdzlrsUBAgAH
+ xQggof5KOxDt3QzhXaYIABwUJYCEeuyRpt2G7mZ3LYMEAYCD4gSQUJ893rSXDfd9n0rXQQDgoEgBJHob
+ kByoWOSuZRAgAHBQrAAS6rd0C3HahejH7lomGgQADooWQKK3AUnarKbqPSsQADgoXgCJ3gNoP9q0D6Ct
+ EgQADjohgERvA5JPKs5z1zIRIABw0BkBJHoSOF7xdXctuUEA4KBTAliL+vAUpS+568gJAgAHnRRAQr2Y
+ nkx9oruOXCAAcNBZASTUj2crfbqpYAMSBAAOOi2AhHryO0pHNx3fgAQBgIPiBHDmNzdqTvjU2P5DV1/O
+ U/qIYrW7/g1lmAWwreL9ipmKl5iOw7Cyld7/2e4icqDeTBcKpQuGOrkL0TAKYGPFOYqjxrI1GcD6UH+m
+ S4YPUfzbXctYGUYB/FBzH2JaN1SKevSnTbtzdad2IRo2ARyoea8wrRkqR316o9K+isfdtfTLsAngWs27
+ p2nNMASoV29t2l2IHnbX0g/DJoBHNO8U05phSFC//rppHzH2T3ctz8cwCSCtdUTzTjKtGYYI9eySpt2K
+ bJm7lohhEkDij5r3taY1w5DR24UoPXH4r+5a1sewCeCbmvc405phCFHvPtC0G5AUuQvRsAlghuJuzT3V
+ tG4YQtS/f1HaXfEHdy3PZtgEkEhvxI81/8tMa4chRD38t6bdlPRudy3rMowCSKTLf9NtnXNVx2TTMYAh
+ Q32ctiVPEihmF6JhFcBa0q8Cr1Pw1eBgmaP3/3h3EQ56uxClT6FL3LUkhl0A4KG4uwEHifo5fTX41qaA
+ bwcQADgYagEk1NO3Ke2qGHHWgQDAwdALIKG+PknpK84aEAA4QADNf/s63TmY/gZl+1UAAYADBNBDvf0t
+ pWNc8yMAcIAAeqi3VylNb0y3ECMAcIAA1kH9fYTShY65EQA4QADroP7+UdPuRjxwEAA4OFzv/zx3EaWg
+ /v570/4aMHAQADhIl2Bf7S6iJNTjWzaGB4ggAHDwCsUyHs7yP9TjOyjdPuh5EQC4uFA98EF3EaWgHk83
+ CV036HkRALiYprhdffBqdyEloB5P/b1g0PMiAHCSHtAyX73wDnchbtTj+yn1fU7kAgFACaTbY9+teJWi
+ luczvF09vlW/L0YAAQgAOshV6vF9+30xAghAANBBEEAAAoDaQQABCABqBwEElCCAdBHKTopZik1MxwG8
+ pPvx0+YdaT+/1ZnHRgABbgGksc5WDVub1g8F0du849gm7/fwCCDAKYCPK87T/K61Q4Gox0aVPqE4P9OQ
+ CCDAJYA3Ke5gLwB4LtRn6QGd2zV5Nu9AAAEuAVykeQ8zrRk6gHotPZjjiAxDIYAAlwCWa94tTWuGDtDb
+ wmtGhqEQQIBDAOmv/iP87g8R6rU1TXs58ug4h0IAAa5PACs072amNUMH6O3fNy3DUAggwCWAKzXvAaY1
+ QwdQr12mdFCGoRBAgEsAuyhu4tcAeC56XwXurLgtw3AIIMB5HcDpmvsU07qhYNRnpymdmmk4BBDgvhLw
+ qDSsaphqWj8UhPprpdLJTb6LgBIIIMAtgMQUxd6K2b1/w/DxqOIexTW9f+cEAQSUIACAiQQBBCAAqB0E
+ EIAAoHYQQAACgNpBAAEIAGoHAQQgAKgdBBCAAKB2EEAAAoDaQQABCABqBwEEIACoHQQQgACgdhBAAAKA
+ 2kEAAQgAagcBBCAAqB0EEIAAoHYQQAACgNpBAAEIAGoHAQQgAKgdBBCAAKB2EEBAKQJ4gWK6YhPTcQAv
+ TymWKdZMwNgIIMAtgK0U6dHgB6uOzU3HAApAvbVCab7ii00rg1wggACnALZXLNT8001rhwJRjy1v2qdE
+ L840JAIIcAlgC8USzZ1j91eoDPXZUqU3KlZmGA4BBLgEcIbmPcm0ZugA6rUzlL6QYSgEEOASwP2adxvT
+ mqEDqNfuVZqVYSgEEOAQQPqL/9Oad5JpzdAB1GsjSi9SjI5zKAQQ4PoE8KTm5Ss/WC/qtceVXpZhKAQQ
+ 4BLAzZp3Z9OaoQOo125S2jXDUAggwCWAD2ve75nWDB1AvXak0rwMQyGAAJcAJit+qrl3N60bCkZ9dr3S
+ nCbPlYEIIMB5IdBUxcWaf65p7VAg6rGFSoc1+bYJRwAB7kuBE0kA72/ar3ymmo4DeHlYcY/iEsWizGMj
+ gIASBAAwkSCAAAQAtYMAAhAA1A4CCEAAUDsIIAABQO0ggAAEALWDAAIQANQOAghAAFA7CCAAAUDtIIAA
+ BAC1gwACEADUDgIIQABQOwggAAFA7SCAAAQAtYMAAhAA1A4CCEAAUDsIIAABQO0ggAAEALWDAAIQANQO
+ AghAAFA7CCCgBAGkraAPVcxUsFvQcPKUIu0FyENBB4xTAC9v2seC72NaOxQIjwUfLM6NQX6iufcwrRsK
+ Rn12g9JeDRuDTDhsDQZFwtZgg8ElgFs0706mNUMHYHPQwcD24FAk6rVVSptmGAoBBDgE8ALF05p3kmnN
+ 0AHUayNKL1KMjnMoBBDg+gRwv+bdxrRm6ADqtfS14KwMQyGAAJcAvqx5TzStGTqAeu0MpS9kGAoBBLgE
+ sIViieaeYVo3FIz6bKnSGxUrMwyHAAKcFwJtr1io+aeb1g4Foh5b3rRXhy7ONCQCCHBfCryV4hTFwapj
+ c9MxgAJQb61QulRxumJZxqERQIBbAGtJ3wykTwJTTccBvDzctCd9jiv/ng0CCChFAAATBQIIQABQOwgg
+ AAFA7SCAAAQAtYMAAhAA1A4CCEAAUDsIIAABQO0ggAAEALWDAAIQANQOAghAAFA7CCAAAUDtIIAABAC1
+ gwACEADUDgIIQABQOwggAAFA7SCAAAQAtYMAAhAA1A4CCEAAUDsIIAABQO0ggIASBDBFMVcxs2m3DIfh
+ 4xHFPYpFTb5twdeCAALcAjgqDasaeBgopP5K+wCcrDg/47AIIMApgNM19ymmdUPBqM9OVTot03AIIMAl
+ gF0UN2lu17qhYNRnaUPQnRW3ZRgOAQS4BHCl5j3AtGboAOq1y5QOyjAUAghwCWCF5t3MtGboAOq1fyhN
+ yzAUAghwCGCSYoSP/xChXku7BE1WjI5zKAQQ4PoEsFzzbmlaM3QA9drflHLsHo0AAlwCuEjzHmZaM3QA
+ 9do8pSMzDIUAAlwCeJPiDs092bRuKBj12YjSdoq7MwyHAAKc1wEcrTiXvwXAuvS+AvxEk+9iIAQQ4L4S
+ cH/FN1TD1qb1Q0Govx5QOlaxIOOwCCDALYBE+lZgJ8UsxSam4wBenmraewFuVazOPDYCCChBAAATCQII
+ QABQOwggAAFA7SCAAAQAtYMAAhAA1A4CCEAAUDsIIAABQO0ggAAEALWDAAIQANQOAghAAFA7CCAAAUDt
+ IIAABAC1gwACEADUDgIIQABQOwggAAFA7SCAAAQAtYMAAhAA1A4CCEAAUDsIIAABQO0ggAAEUCdpQ430
+ oNUXuwvpk0cUv1c8PAFjI4AABFAXeynOULyla49bV289o7RIcULTPiA0FwggAAHUw3FN+4j1Tp34z0Y9
+ tkrpQMXPMg2JAAIQQB3sobi26yf/WtRn6VeC2YqlGYZDAAEIoA5u0/u4g7uInKjXzmnaTULGCwIIQADd
+ Z7rioVr+91+Leu1BpddkGAoBBCCA7vM2vYe/dBeRG/XaGqWNm/HvFIQAAhBA95mt9/C37iJy0/tj4KYZ
+ hkIAAQig+6Qt1pfrfdzMXUhO1GvXK+2ZYSgEEIAA6uAsvY/Hu4vIiXrtfUqXZxgKAQQggDqYorhF7+Vs
+ dyE5UJ9doZQEMJphOAQQgADqYZpivt7P3dyFbCjqr3TCX6A4pmm3DM8BAghAAPUxR7F/036F9kJ3MX3y
+ RNNe/jtfcVfmsRFAAAKA2kEAAQgAagcBBCAAqB0EEIAAoHYQQAACgNpBAAEIAGoHAQQgAKgdBBCAAKB2
+ EEAAAoDaQQABCABqBwEEIACoHQQQgACgdhBAAAKA2kEAAQgAagcBBCAAqB0EEIAAoHYQQAACgNpBAAEI
+ AGoHAQQgAKgdBBCAAKB2EEAAAoDaQQABCABqBwEEvEcHZ0G/L9bBWaQ011QrwIZwjXp8735frB5Pslg4
+ 6CJdAthNB+eGfl+sg7NYaXtTrQAbwmL1+Hb9vlg9njZWuXHQRboEsK0Ozp39vlgHZ0TplYqVpnoBxsLm
+ imXq8b43SFGPb6u0ZNCFugTwUsVjOkB9z68DdKLSmaZ6AcbCCertr/T74t7WZGlL8icGXahLAIn7dJBe
+ 1++LdZAeU9pF8RtjzQDPxxsUt6q3N+33B9Tb9ym93lGsUwDf1kH62Fh+QAfqIaUDFLcb6wZYHzsorlRf
+ zxjLD6mvz1c62lGwUwDv1oFaNNYf0sFarXSJ4gdNu6Hjv4xrANhC8WbFoYoj1NOTxjqAevpdSj9zFO8U
+ wGTFg2O1JUBN6ORfqvRqxWrH/E4BJD4rAXzNXAOADQngM0rfcM3vFkD6Q8l9fAqAYUQn/1+b9o9/q1w1
+ uAWQOEgCuNRdBMCgkQAOUrrMWUMJAkjMkwQOdxcBMCh08l+s9AF3HaUIIP0q8HNJ4C3uQgAmGp38dyi9
+ U/G4u5ZSBJCYprhREpjpLgRgotDJf69Suu7/7+5aEiUJIJG+U10gCezkLgQgNzr5b2na29qLuXalNAEk
+ Nm7aa/6PG8u9AgCl0rvW/2zFCYqn3fWsS8kn2I6KcyUBbgOGztL7ff8YxS3uWp6LkgWwlnSZ5KcUe27I
+ ZZYAg6Z3ufp1inMVVytG3TWtjy4IYC3TFXMUuypmKbZWTJEUXuIuDIYXnezpFt5HFX9S3KP4heJaxTJ3
+ bf3wH/FNPqa5x8goAAAAAElFTkSuQmCCKAAAADAAAABgAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE0xIxOqbU+dzINf8P6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2/8yDX/CjaEueTTEjEwAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA797Wcb+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ v3tZxgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVjcoRv6jdv/znHH8
+ kV1DcP6jdkD+o3ZA/qN2QP6jdkD+o3ZA/qN2QP6jdkD+o3ZA/qN2QP6jdkD+o3ZA/qN2QP6jdkD+o3ZA
+ /qN2QP6jdkD+o3ZA/qN2QP6jdkD+o3ZA/qN2QP6jdkD+o3ZA/qN2QP6jdkD+o3ZA/qN2QP6jdkD+o3ZA
+ /qN2QJFdQ3DznHH8/qN2/1Y3KEYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ qW1Pbf6jdv/DfVvVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAADDfVvV/qN2/6ltT20AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ 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
+ d0w3NHdMNzR3TDc0d0w3NHdMNzR3TDc0d0w3NHdMNzR3TDc0d0w3NHdMNzR3TDc0d0w3NHdMNzR3TDc0
+ d0w3NDEfFg8AAAAAAAAAAAAAAADIgV3R/qN2/6ltT24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAArW9Qzf6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2/61vUMwAAAAAAAAAAAAAAADIgV3R/qN2/6ltT24AAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAApmtNsu+Zb/jvmW/4
+ 75lv+O+Zb/jvmW/475lv+O+Zb/jvmW/475lv+O+Zb/jvmW/475lv+O+Zb/jvmW/475lv+O+Zb/jvmW/4
+ 75lv+O+Zb/jvmW/475lv+O+Zb/jvmW/475lv+KZrTbEAAAAAAAAAAAAAAADIgV3R/qN2/6ltT24AAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAA
+ AAAAAgAAABIAAAASAAAAEgAAABIAAAASAAAAEgAAABIAAAASAAAAEgAAABIAAAASAAAAEgAAABIAAAAS
+ AAAAEgAAABIAAAASAAAAEgAAABIAAAASAAAAEgAAABIAAAASAAAAEgAAAAIAAAAAAAAAAAAAAADIgV3R
+ /qN2/6ltT24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3R
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAADIgV3R/qN2/6ltT24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ qW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAADIgV3R/qN2/6ltT24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAAAAAACndMNyd3TDcod0w3KHdMNyh3TDco
+ d0w3KHdMNyh3TDcod0w3KHdMNyh3TDcod0w3KHdMNyh3TDcod0w3KHdMNyh3TDcod0w3KHdMNyh3TDco
+ d0w3KHdMNyh3TDcod0w3JwAAAAoAAAAAAAAAAAAAAADIgV3R/qN2/6ltT24AAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAAqWxOxf6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2/6lsTsUAAAAAAAAAAAAAAADIgV3R/qN2/6ltT24AAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAA
+ rnBRvO+Zb/zvmW/875lv/O+Zb/zvmW/875lv/O+Zb/zvmW/875lv/O+Zb/zvmW/875lv/O+Zb/zvmW/8
+ 75lv/O+Zb/zvmW/875lv/O+Zb/zvmW/875lv/O+Zb/zvmW/875lv/K5wUbsAAAAAAAAAAAAAAADIgV3R
+ /qN2/6ltT24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3R
+ AAAAAAAAAAAAAAAAAAAABgAAABoAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAb
+ AAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGwAAABsAAAAbAAAAGgAAAAYAAAAA
+ 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
+ AAAAAAAAAAAAAAAApmtNsu+Zb/jvmW/475lv+O+Zb/jvmW/475lv+O+Zb/jvmW/475lv+O+Zb/jvmW/4
+ 75lv+O+Zb/jvmW/475lv+O+Zb/jvmW/475lv+O+Zb/jvmW/475lv+O+Zb/jvmW/475lv+KZrTbEAAAAA
+ AAAAAAAAAADIgV3R/qN2/6ltT24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ qm1Pbv+kd//IgV3RAAAAAAAAAAAAAAAArW9Rzf+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf/
+ /6R3//+kd///pHf//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2/61vUcwAAAAAAAAAAAAAAADIgV3R/qN2/6ltT24AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAqm1Pbv+kd//IgV3RAAAAAAAAAAAAAAAAMR8WD3dMNzR3TDc1d0w3NXdMNzV3TDc1
+ d0w3NXdMNzV3TDc1d0w3NXdMNzV3TDc1d0w3NXdMNzV3TDc1d0w3NXdMNzV3TDc1d0w3NXdMNzV3TDc1
+ d0w3NXdMNzV3TDc1d0w3NDEfFg8AAAAAAAAAAAAAAADIgV3R/qN2/6ltT24AAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqm1Pbv+kd//IgV3RAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ PygdK8qBXtLLg1/fy4Nf38uDX9/Lg1/fy4Nf38uDX9/Lg1/fy4Nf38uDX9/smG75/qN2/6ltT20AAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAqW1Pcf6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2/2xFMkoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3R
+ AAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAI
+ AAAACAAAAAgAAAAIAAAACAAAAAgAAAAIl2FGdv6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b/uHZVzAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ qW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAAk15Epu+Zb/PvmW/z75lv8++Zb/PvmW/z75lv8++Zb/PvmW/z
+ 75lv8++Zb/PvmW/z75lv8++Zb/PvmW/z75lv8++Zb/PvmW/z9Z1y+f6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/BfFrRRSwfGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAAvnpY0/+kd///pHf//6R3//+kd///pHf/
+ /6R3//+kd///pHf//6R3//+kd///pHf//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2/797WcooGhIUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAAKRoSFndMN0N3TDdD
+ d0w3Q3dMN0N3TDdDd0w3Q3dMN0N3TDdDd0w3Q3dMN0N3TDdDd0w3Q3dMN0N3TDdDd0w3Q3dMN0N3TDdD
+ pmtNl/6jdv/+o3b//qN2//6jdv/+o3b//qN2//age//+o3b/x4BcxSgaEhAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAqW1Pcv6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv+ucFG+e085DgAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pbv6jdv/IgV3R
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pcv6jdv/+o3b//qN2//6jdv/+o3b//qN2/6BnSrYAAAAK
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ qW1Pbv6jdv/IgV3RAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pcv6jdv/+o3b//qN2//6jdv/+o3b/
+ pmtNrwAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAqW1Pbf6jdv/DfVvVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAqW1Pcv6jdv/+o3b/
+ /qN2//6jdv+ma02nJxkRBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVjcoRv6jdv/znHH8kV1DcP6jdkD+o3ZA/qN2QP+kd0D/pHdA
+ /6R3QP+kd0D/pHdA/6R3QP+kd0D/pHdA/6R3QP+kd0D/pHdA/qN2QP6jdkD+o3ZA/qN2QP6jdkD+o3ZA
+ zYNflf6jdv/+o3b//qN2/7FyUp4AAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA797Wcb+o3b//qN2//6jdv/+o3b/
+ /qN2//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//qN2//6jdv/+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/7oXX/kV1DlgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE0xIxOqbU+e
+ zINf8P6jdv/+o3b//qN2//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b/7Zhu/s2DX+CGVT5xAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAPwAA+AAAAAAfAAD4AAAA
+ AB8AAPj/////HwAA+P////8fAAD4/////x8AAPj/////HwAA+P//4AcfAAD4///ABx8AAPj//8AHHwAA
+ +P//4A8fAAD4/////x8AAPj/////HwAA+OAAAAcfAAD44AAABx8AAPjgAAAHHwAA+OAAAAcfAAD4////
+ /x8AAPj/////HwAA+OAAAAcfAAD44AAABx8AAPjgAAAHHwAA+OAAAAcfAAD4/////x8AAPj/////HwAA
+ +OAAAAcfAAD44AAABx8AAPjgAAAHHwAA+OAAAAcfAAD4/////x8AAPj/////HwAA+OAAAAcfAAD44AAA
+ Bx8AAPjgAAAHHwAA+OAAAAcfAAD4///4AB8AAPj///gAHwAA+PAAAAAfAAD44AAAAD8AAPjgAAAAfwAA
+ +OAAAAD/AAD4///4Af8AAPj///gD/wAA+P//+Af/AAD4///4D/8AAPgAAAAf/wAA+AAAAD//AAD8AAAA
+ f/8AACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ nGRIY9mMZer/pHf//6R3//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf/
+ /6R3//+kd///pHf//6R3//+kd///pHf//6R3/9mMZeqXYUZjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ 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
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKptT0z/pHf/
+ /6R3//OccfmIVz9RAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABOMiQh
+ 955z/NKHYr7/pHeA/6R3gP+kd4D/pHeA/6R3gP+kd4D/pHeA/6R3gP+kd4D/pHeA/6R3gP+kd4D/pHeA
+ 55Vspf+kd//umW/2n2ZKSQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAACcZEhj2Yxl6v+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf//6R3//+kd///pHf/
+ /6R3//+kd//3nnP/2Ipk23lOOEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ 8AAAD+AAAAfj///H4///x+P//8fj/4BH4/+AR+P//8fj///H4gAAR+IAAEfj///H4///x+IAAEfiAABH
+ 4///x+P//8fiAABH4gAAR+P//8fj///H4gAAR+IAAEfj/+AH4//gB+IAAA/iAAAf4//gP+P/4H/j/+D/
+ 4AAB//AAA/8oAAAAGAAAADAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+ x4BdnfKbcfv+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b//qN2//6jdv/+o3b/
+ /qN2//KbcfvDfVueAAAAAQAAAAAAAAAAAAAAAAAAAACIVz8t7plv9LZ0VCz/pHcg/6R3IP6kdiD/pHcg
+ /6R3IP6kdiD/pHcg/6R3IP+kdyD/pHcg/6R3IP+kdyD/pHcg/6R3ILZ0VCzumW/0iFc/LQAAAAAAAAAA
+ AAAAAAAAAACqbU835ZNr6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACqbU835ZNr6AAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRALgp7Tzkhe085IXtPOSF7TzkhKRoSBgAAAADlk2vo
+ qm1PNwAAAAAAAAAAAAAAAAAAAACqbU835ZNr6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAALh2VoP3nnP5955z+feec/n3nnP5oWhLXwAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACqbU83
+ 5ZNr6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAEAAAABAAAAAQAAAAE
+ AAAAAAAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACqbU835ZNr6AAAAAAyHxYEe085GntPORp7Tzka
+ e085GntPORp7Tzkae085GntPORp7Tzkae085GntPORp7TzkaMh8WBAAAAADlk2voqm1PNwAAAAAAAAAA
+ AAAAAAAAAACqbU835ZNr6AAAAACkakxg955z+/eec/z3nnP8955z/Peec/z3nnP8955z/Peec/z3nnP8
+ 955z/Peec/z3nnP7pGpMXwAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACqbU835ZNr6AAAAAAAAAAB
+ AAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAAAQAAAADlk2vo
+ qm1PNwAAAAAAAAAAAAAAAAAAAACqbU835ZNr6AAAAAAAAAACe085FHtPORR7TzkUe085FHtPORR7TzkU
+ e085FHtPORR7TzkUe085FHtPORRxSTQUAAAAAgAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACqbU83
+ 5ZNr6AAAAACkakxg955z/veec/73nnP+955z/veec/73nnP+955z/veec/73nnP+955z/veec/73nnP+
+ pGpMYAAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACqbU835ZNr6AAAAAAAAAABAAAADQAAAA0AAAAN
+ AAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAADQAAAA0AAAANAAAAAQAAAADlk2voqm1PNwAAAAAAAAAA
+ AAAAAAAAAACpbU835ZNr6AAAAAAAAAABAAAADgAAAA4AAAAOAAAADgAAAA4AAAAOAAAADgAAAA4AAAAO
+ AAAADgAAAA4AAAAOAAAAAQAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACpbU835ZNr6AAAAACkakxg
+ 955z/veec/73nnP+955z/veec/73nnP+955z/veec/73nnP+955z/veec/73nnP+pGpMYAAAAADlk2vo
+ qW1PNwAAAAAAAAAAAAAAAAAAAACpbU835ZNr6AAAAAAAAAACe085E3tPORN7TzkTe085E3tPORN7TzkT
+ e085E3tPORN7TzkTe085E3tPORNxSTQTAAAAAgAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACpbU83
+ 5ZNr6AAAAAAAAAABAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJ
+ AAAAAQAAAADlk2voqm1PNwAAAAAAAAAAAAAAAAAAAACpbU835ZNr6AAAAACkakxg955z+/eec/z3nnP8
+ 955z/Peec/z3nnP8955z/Peec/z3nnP8955z/Peec/z3nnP7pGpMXwAAAADlk2voqW1PNwAAAAAAAAAA
+ AAAAAAAAAACpbU835ZNr6AAAAAAyHxYEe085GntPORp7Tzkae085GntPORp7Tzkae085GntPORpxSDQl
+ snJTh7NzU4qzc1OKv3tZc8yDX3DumW/yqm1PNwAAAAAAAAAAAAAAAAAAAACpbU835ZNr6AAAAAAAAAAA
+ AAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAScZEg8/6R3//6kd//+pHf//6R3//6kd//umW/y
+ Yj8tFAAAAAAAAAAAAAAAAAAAAACpbU835ZNr6AAAAACkakxe955z+feec/n3nnP5955z+feec/n3nnP5
+ 955z+feec/n4n3P6/6R3//+kd///pHf//6R3//CacPKbZEg/AAAAAAAAAAAAAAAAAAAAAAAAAACpbU83
+ 5ZNr6AAAAAApGhIGe085IXtPOSF7Tzkhe085IXtPOSF7Tzkhe085IXtPOSGobE5T/6R3//+kd///pHf/
+ 6pdv76tuTzkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACpbU835ZNr6AAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAC5d1Y5/6R3//+kd//rl23riFc/MgAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAACIVz8t7plv9LZ0VCz+o3Yg/qN2IP6jdiD+o3Yg/qN2IP6jdiD+o3Yg/6R3IP+kdyDQhmFS
+ /6R3//CacOeRXUMtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABx4BdnvKbcfv+o3b/
+ /qN2//6jdv/+o3b//qN2//6jdv/+o3b//6R3//+kd//6oXT/2oxm1I5bQicAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAwAADQcAAA0HP//NBz/gTQc/4E0HP+DNByAATQcgAE0HIABNByAATQcgAE0HIABNB
+ yAATQcgAE0HIABNByAATQcgAE0HIAANBzAADQcgAB0HIAA9Bz/wfQcAAP0HAAH9BKAAAABAAAAAgAAAA
+ AQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABOMiQI14pkwv+kd7//pHe//6R3v/+kd7//pHe/
+ /6R3v/+kd7//pHe//6R3v/+kd7/WimTCTjIkCAAAAAAAAAAAqm1PJeSSapsAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5JJqm6ptTyUAAAAAAAAAAKptTyXlk2ubAAAAAAAAAAAAAAAA
+ AAAAAAAAAAA/KR0E14pkaNqMZmvajGZrn2ZKGuWTa5uqbU8lAAAAAAAAAACqbU8l5ZNrmwAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAsqCXlDUiGNU1IhjVJBcQxPlk2ubqm1PJQAAAAAAAAAAqm1PJeWTa5uZYkcY
+ 2oxmZtqMZmbajGZm2oxmZtqMZmbajGZm2oxmZtqMZmaZYkcY5ZNrm6ptTyUAAAAAAAAAAKptTyXlk2ub
+ n2ZKFNSIY1nUiGNZ1IhjWdSIY1nUiGNZ1IhjWdSIY1nUiGNZn2ZKFOWTa5uqbU8lAAAAAAAAAACqbU8l
+ 5ZNrm5VgRRfajGZi2oxmYtqMZmLajGZi2oxmYtqMZmLajGZi2oxmYpVgRRflk2ubqm1PJQAAAAAAAAAA
+ qm1PJeWTa5uma00V1IhjXdSIY13UiGNd1IhjXdSIY13UiGNd1IhjXdSIY12ma00V5ZNrm6ptTyUAAAAA
+ AAAAAKptTyXlk2ubpmtNFtSIY13UiGNe1IhjXtSIY17UiGNe1IhjXtSIY17UiGNdpmtNFeWTa5uqbU8l
+ AAAAAAAAAACqbU8l5ZNrm5VgRRfajGZi2oxmYtqMZmLajGZi2oxmYtqMZmLajGZi2oxmYpVgRRflk2ub
+ qm1PJQAAAAAAAAAAqm1PJeWTa5ufZkoU1IhjWdSIY1nUiGNZ1IhjWdSIY1nUiGNZ1IhjWdSIY1mfZkoU
+ 5ZNrm6ptTyUAAAAAAAAAAKptTyXlk2ubmWJHGNqMZmbajGZm2oxmZtqMZmbajGZm0IVha9SIY6/UiGOx
+ vnpYY+aUa7iqbU8lAAAAAAAAAACqbU8l5ZNrm5BcQxPUiGNU1IhjVNSIY1TUiGNU1IhjVM6EYG3/pHf/
+ /6R3//+kd//ql23bYj8tCQAAAAAAAAAAqm1PJeWTa5ukaUwa2oxma9qMZmvajGZr2oxma9qMZmvUiGOB
+ /6R3//+kd//smG/XlF9FGgAAAAAAAAAAAAAAAKptTyXkkmqbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ qm1PJv+kd//olWzRiFc/FgAAAAAAAAAAAAAAAAAAAABOMiQI14pkwv+kd7//pHe//6R3v/+kd7//pHe/
+ /6R3v/efc8nhkGnEn2ZKEgAAAAAAAAAAAAAAAAAAAACAAaxBn/msQZ8BrEGfAaxBgAGsQYABrEGAAaxB
+ gAGsQYABrEGAAaxBgAGsQYABrEGAAaxBgAOsQZ+HrEGAD6xB
+
+
+
\ No newline at end of file
diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs
index 110f6389..0331df4a 100644
--- a/Client/Diverses/SplashScreen.Designer.cs
+++ b/Client/Diverses/SplashScreen.Designer.cs
@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(203, 26);
this.label2.TabIndex = 2;
- this.label2.Text = "11. Dezember 2024";
+ this.label2.Text = "13. Dezember 2024";
//
// SplashScreen
//
diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/DocMgmt/Serienbrief.cs
index 7060df3e..61890e5b 100644
--- a/Client/DocMgmt/Serienbrief.cs
+++ b/Client/DocMgmt/Serienbrief.cs
@@ -936,10 +936,13 @@ namespace OnDoc.UIControls
private bool Partnerliste_Pruefen()
{
DB db = new DB(AppParams.connectionstring);
+ //Logging.Logging.Debug("Create sb_chechtable", "OnDoc", "");
db.create_sb_check_table(AppParams.CurrentMitarbieter);
+ //Logging.Logging.Debug("Save Check_Data", "OnDoc", "");
db.save_sb_checkdata(AppParams.CurrentMitarbieter, sb);
System.Data.DataTable dt = new System.Data.DataTable();
dt = db.Check_sb_Data(AppParams.CurrentMitarbieter, sb);
+ //Logging.Logging.Debug("Check_sb_Data ", "OnDoc", dt.Rows.Count.ToString());
string msg = "";
init_progressbar("Partnerliste prüfen", dt.Rows.Count);
bool bldossier = false;
@@ -957,6 +960,7 @@ namespace OnDoc.UIControls
foreach (var dr1 in dr)
{
dr1["Status"] = dt.Rows[i]["status"];
+ // Logging.Logging.Debug("dr1 ", "OnDoc", dr1["Status"].ToString());
try
{
if (Convert.ToInt32(dt.Rows[i]["Fehlercode"]) > 0)
@@ -985,7 +989,7 @@ namespace OnDoc.UIControls
if (Convert.ToInt32(dt.Rows[i][4]) == 1) { bldossier = true; };
}
-
+ //Logging.Logging.Debug("Check Duplicates ", "OnDoc", "");
var duplicates = sb.dsempfaenger.Tables[0].AsEnumerable()
.GroupBy(r => r[0])//Using Column Index
.Where(gr => gr.Count() > 1)
@@ -1012,6 +1016,7 @@ namespace OnDoc.UIControls
MessageBox.Show(msg, "Serienbrief", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
+ //Logging.Logging.Debug("Ende Pruefung", "OnDoc","");
return true;
}
@@ -1049,8 +1054,10 @@ namespace OnDoc.UIControls
private void ribbonButton2_Click(object sender, EventArgs e)
{
+
lblProgressTitel.Text = "Partnerliste prüfen";
pnlprogress.Visible = true;
+ //Logging.Logging.Debug("Partnerliste Pruefen", "OnDoc", "");
Partnerliste_Pruefen();
treeViewAdv1_AfterSelect(sender, e);
pnlprogress.Visible = false;
@@ -1806,6 +1813,7 @@ namespace OnDoc.UIControls
}
}
sb.dsempfaenger.AcceptChanges();
+ update_serienbriefdaten(false);
update_zahlen();
}
catch (Exception ex)
diff --git a/Client/DocMgmt/frmDocPreview.cs b/Client/DocMgmt/frmDocPreview.cs
index 7c0af51f..6d889114 100644
--- a/Client/DocMgmt/frmDocPreview.cs
+++ b/Client/DocMgmt/frmDocPreview.cs
@@ -35,6 +35,10 @@ namespace OnDoc.DocMgmt
{
docPreview1.Show_Doc(message);
}
+ if (sender.Function == "Close")
+ {
+ this.Close();
+ }
}
}
private void Form_Closing(object sender, CancelEventArgs e)
diff --git a/Client/DocMgmt/frmToApproval.Designer.cs b/Client/DocMgmt/frmToApproval.Designer.cs
index 2d67648e..1adf6c65 100644
--- a/Client/DocMgmt/frmToApproval.Designer.cs
+++ b/Client/DocMgmt/frmToApproval.Designer.cs
@@ -48,7 +48,6 @@
// cbboxunterschriftrechts
//
this.cbboxunterschriftrechts.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
- this.cbboxunterschriftrechts.ComboBoxMode = Syncfusion.WinForms.ListView.Enums.ComboBoxMode.MultiSelection;
this.cbboxunterschriftrechts.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
this.cbboxunterschriftrechts.Location = new System.Drawing.Point(216, 62);
this.cbboxunterschriftrechts.Name = "cbboxunterschriftrechts";
@@ -61,9 +60,8 @@
// cbboxunterschriftlinks
//
this.cbboxunterschriftlinks.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
- this.cbboxunterschriftlinks.ComboBoxMode = Syncfusion.WinForms.ListView.Enums.ComboBoxMode.MultiSelection;
this.cbboxunterschriftlinks.DropDownPosition = Syncfusion.WinForms.Core.Enums.PopupRelativeAlignment.Center;
- this.cbboxunterschriftlinks.Location = new System.Drawing.Point(216, 27);
+ this.cbboxunterschriftlinks.Location = new System.Drawing.Point(216, 31);
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)))));
diff --git a/Client/DocMgmt/frmToApproval.resx b/Client/DocMgmt/frmToApproval.resx
index 4c43e127..aee25f6e 100644
--- a/Client/DocMgmt/frmToApproval.resx
+++ b/Client/DocMgmt/frmToApproval.resx
@@ -121,7 +121,7 @@
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
+ wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -401,7 +401,7 @@
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
+ wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -681,7 +681,7 @@
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
+ wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
@@ -961,7 +961,7 @@
iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
+ wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEASSURBVHhe7d0J
nBxlmfjxJwcQIBBIuC+5zwQQFBBZ5UbkZkFc5QZBRIRFBdczKGBwRRf/LgiyKuHSAeWKyVRXTzrnkITJ
RcjFkYOE3MlkMpNjzvq/b+dRh+o3yRx9VFf9fn6+RjOTme56q+rt6emuV4go4tXIdpKS/YwTjfPFly+J
J7eZ/32/+fPn5s8njBeM18z/941q879rjPeM+caakCYjCLF/F/68eYb9GjXZr2m/tv0e9nt58rj582Hj
diff --git a/Client/Properties/Resources.Designer.cs b/Client/Properties/Resources.Designer.cs
index 267bfc14..6adaa08d 100644
--- a/Client/Properties/Resources.Designer.cs
+++ b/Client/Properties/Resources.Designer.cs
@@ -410,6 +410,56 @@ namespace OnDoc.Properties {
}
}
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap BP_16x16_32 {
+ get {
+ object obj = ResourceManager.GetObject("BP_16x16_32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap BP_24x24_32 {
+ get {
+ object obj = ResourceManager.GetObject("BP_24x24_32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap BP_256x256_32 {
+ get {
+ object obj = ResourceManager.GetObject("BP_256x256_32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap BP_32x32_32 {
+ get {
+ object obj = ResourceManager.GetObject("BP_32x32_32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap BP_48x48_32 {
+ get {
+ object obj = ResourceManager.GetObject("BP_48x48_32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
///
diff --git a/Client/Properties/Resources.resx b/Client/Properties/Resources.resx
index 92a704a2..1ba67b78 100644
--- a/Client/Properties/Resources.resx
+++ b/Client/Properties/Resources.resx
@@ -223,6 +223,21 @@
..\Resources\Barcode_48x48-32 (2).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\BP_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\BP_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\BP_256x256-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\BP_32x32-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\BP_48x48-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\CloseApplication_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/Client/Resources/BP_16x16-32.png b/Client/Resources/BP_16x16-32.png
new file mode 100644
index 00000000..844aa147
Binary files /dev/null and b/Client/Resources/BP_16x16-32.png differ
diff --git a/Client/Resources/BP_24x24-32.png b/Client/Resources/BP_24x24-32.png
new file mode 100644
index 00000000..afc87f06
Binary files /dev/null and b/Client/Resources/BP_24x24-32.png differ
diff --git a/Client/Resources/BP_256x256-32.png b/Client/Resources/BP_256x256-32.png
new file mode 100644
index 00000000..4f46e996
Binary files /dev/null and b/Client/Resources/BP_256x256-32.png differ
diff --git a/Client/Resources/BP_32x32-32.png b/Client/Resources/BP_32x32-32.png
new file mode 100644
index 00000000..874e97ac
Binary files /dev/null and b/Client/Resources/BP_32x32-32.png differ
diff --git a/Client/Resources/BP_48x48-32.png b/Client/Resources/BP_48x48-32.png
new file mode 100644
index 00000000..e9d0bfec
Binary files /dev/null and b/Client/Resources/BP_48x48-32.png differ
diff --git a/Client/Resources/Person_16x16-32.png b/Client/Resources/Person_16x16-32.png
index ccf1ea02..b39a8e5c 100644
Binary files a/Client/Resources/Person_16x16-32.png and b/Client/Resources/Person_16x16-32.png differ
diff --git a/Client/Resources/Person_24x24-32.png b/Client/Resources/Person_24x24-32.png
index e4504cde..1c8b389a 100644
Binary files a/Client/Resources/Person_24x24-32.png and b/Client/Resources/Person_24x24-32.png differ
diff --git a/Client/Resources/Person_256x256-32.png b/Client/Resources/Person_256x256-32.png
index 823647a9..86c45ce5 100644
Binary files a/Client/Resources/Person_256x256-32.png and b/Client/Resources/Person_256x256-32.png differ
diff --git a/Client/Resources/Person_32x32-32.png b/Client/Resources/Person_32x32-32.png
index 9d5a530e..d00b857e 100644
Binary files a/Client/Resources/Person_32x32-32.png and b/Client/Resources/Person_32x32-32.png differ
diff --git a/Client/Resources/Person_48x48-32.png b/Client/Resources/Person_48x48-32.png
index 4a4444eb..9b7e1fc7 100644
Binary files a/Client/Resources/Person_48x48-32.png and b/Client/Resources/Person_48x48-32.png differ
diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs
index 61c01d89..8106e15b 100644
--- a/Client/UIControls/DokList.Designer.cs
+++ b/Client/UIControls/DokList.Designer.cs
@@ -46,6 +46,8 @@ namespace OnDoc.UICintrols
this.dokumentAnVersandstrasseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.dokumentKopierenToolStripMenuItem = 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();
@@ -196,9 +198,11 @@ namespace OnDoc.UICintrols
this.pDFGenerierenToolStripMenuItem,
this.dokumentAnVersandstrasseToolStripMenuItem,
this.wordInterOPEditToolStripMenuItem,
- this.attributeAnzeigenVersteckenToolStripMenuItem});
+ this.attributeAnzeigenVersteckenToolStripMenuItem,
+ this.historyToolStripMenuItem,
+ this.dokumentKopierenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
- this.ctxMenuDokList.Size = new System.Drawing.Size(280, 268);
+ this.ctxMenuDokList.Size = new System.Drawing.Size(280, 312);
//
// dokumentAnzeigenToolStripMenuItem
//
@@ -287,11 +291,26 @@ namespace OnDoc.UICintrols
//
// attributeAnzeigenVersteckenToolStripMenuItem
//
+ this.attributeAnzeigenVersteckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Attribut_16x16_32;
this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem";
this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
- this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute anzeigen / ausblenden";
+ this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute ein- / ausblenden";
this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click);
//
+ // historyToolStripMenuItem
+ //
+ this.historyToolStripMenuItem.Name = "historyToolStripMenuItem";
+ this.historyToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+ this.historyToolStripMenuItem.Text = "History";
+ this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
+ //
+ // dokumentKopierenToolStripMenuItem
+ //
+ this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem";
+ this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
+ this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren";
+ this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click);
+ //
// toolStrip1
//
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -530,6 +549,7 @@ namespace OnDoc.UICintrols
//
// ribbonPanelZuweisung
//
+ this.ribbonPanelZuweisung.ButtonMoreVisible = false;
this.ribbonPanelZuweisung.Items.Add(this.RibbonButtonZuweisen);
this.ribbonPanelZuweisung.Items.Add(this.ribbonButtonToApproval);
this.ribbonPanelZuweisung.Name = "ribbonPanelZuweisung";
@@ -623,6 +643,7 @@ namespace OnDoc.UICintrols
//
// RibbonPanelSuche
//
+ this.RibbonPanelSuche.ButtonMoreVisible = false;
this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter);
this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter);
this.RibbonPanelSuche.Name = "RibbonPanelSuche";
@@ -748,6 +769,7 @@ namespace OnDoc.UICintrols
//
// RibbonPannelAnsicht
//
+ this.RibbonPannelAnsicht.ButtonMoreVisible = false;
this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup2);
this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup3);
this.RibbonPannelAnsicht.Name = "RibbonPannelAnsicht";
@@ -830,7 +852,7 @@ namespace OnDoc.UICintrols
this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts);
this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat);
this.ribbonPanelVorschau.Name = "ribbonPanelVorschau";
- this.ribbonPanelVorschau.Text = "Vorschau";
+ this.ribbonPanelVorschau.Text = "Vorschau ein-/ausblenden";
//
// RibbonBtnVorschauNo
//
@@ -841,6 +863,7 @@ namespace OnDoc.UICintrols
this.RibbonBtnVorschauNo.SmallImage = global::OnDoc.Properties.Resources.Preview_Now_16x16_32;
this.RibbonBtnVorschauNo.Text = "Keine";
this.RibbonBtnVorschauNo.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center;
+ this.RibbonBtnVorschauNo.Visible = false;
this.RibbonBtnVorschauNo.Click += new System.EventHandler(this.RibbonBtnVorschauNo_Click);
//
// RibbonBtnVorschauUnten
@@ -872,21 +895,23 @@ namespace OnDoc.UICintrols
//
// ribbonPanelAttribute
//
+ this.ribbonPanelAttribute.ButtonMoreVisible = false;
this.ribbonPanelAttribute.Items.Add(this.RibbonButtonAttributeEinAusblenden);
this.ribbonPanelAttribute.Name = "ribbonPanelAttribute";
this.ribbonPanelAttribute.Text = "Attribute";
//
// RibbonButtonAttributeEinAusblenden
//
- this.RibbonButtonAttributeEinAusblenden.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.Image")));
- this.RibbonButtonAttributeEinAusblenden.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.LargeImage")));
+ this.RibbonButtonAttributeEinAusblenden.Image = global::OnDoc.Properties.Resources.Attribut_32x32_32;
+ this.RibbonButtonAttributeEinAusblenden.LargeImage = global::OnDoc.Properties.Resources.Attribut_32x32_32;
this.RibbonButtonAttributeEinAusblenden.Name = "RibbonButtonAttributeEinAusblenden";
- this.RibbonButtonAttributeEinAusblenden.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.SmallImage")));
- this.RibbonButtonAttributeEinAusblenden.Text = "Ein-/Ausblenden";
+ this.RibbonButtonAttributeEinAusblenden.SmallImage = global::OnDoc.Properties.Resources.Attribut_24x24_32;
+ this.RibbonButtonAttributeEinAusblenden.Text = "Attribute ein-/ausblenden";
this.RibbonButtonAttributeEinAusblenden.Click += new System.EventHandler(this.RibbonButtonAttributeEinAusblenden_Click);
//
// ribbonPanel1
//
+ this.ribbonPanel1.ButtonMoreVisible = false;
this.ribbonPanel1.Items.Add(this.ribbonButton6);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Dokumentliste";
@@ -1002,6 +1027,7 @@ namespace OnDoc.UICintrols
//
// ribbonPanelNativVorlagen
//
+ this.ribbonPanelNativVorlagen.ButtonMoreVisible = false;
this.ribbonPanelNativVorlagen.Items.Add(this.ribbonButtonNativVorlagen);
this.ribbonPanelNativVorlagen.Name = "ribbonPanelNativVorlagen";
this.ribbonPanelNativVorlagen.Text = "";
@@ -1042,6 +1068,7 @@ namespace OnDoc.UICintrols
//
// ribbonAnmelden
//
+ this.ribbonAnmelden.ButtonMoreVisible = false;
this.ribbonAnmelden.Items.Add(this.ribbonbuttonlogin);
this.ribbonAnmelden.Name = "ribbonAnmelden";
this.ribbonAnmelden.Text = "";
@@ -1130,6 +1157,7 @@ namespace OnDoc.UICintrols
//
// ribbonpanelanalyse
//
+ this.ribbonpanelanalyse.ButtonMoreVisible = false;
this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedklog);
this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedkverarbeitung);
this.ribbonpanelanalyse.Name = "ribbonpanelanalyse";
@@ -1338,5 +1366,7 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonButton ribbonButton6;
private System.Windows.Forms.RibbonPanel ribbonPanelZuweisung;
+ private System.Windows.Forms.ToolStripMenuItem historyToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem dokumentKopierenToolStripMenuItem;
}
}
diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs
index c1deda2c..4677ce10 100644
--- a/Client/UIControls/DokList.cs
+++ b/Client/UIControls/DokList.cs
@@ -607,15 +607,28 @@ namespace OnDoc.UICintrols
private void RibbonBtnVorschauUnten_Click(object sender, EventArgs e)
{
- tsrbvorschau.SelectedIndex = 1;
+ if (tsrbvorschau.SelectedIndex == 1) { tsrbvorschau.SelectedIndex = 0; } else { tsrbvorschau.SelectedIndex = 1; }
}
private void RibbonButtonVorschauRechts_Click(object sender, EventArgs e)
{
- tsrbvorschau.SelectedIndex = 2;
+ if (tsrbvorschau.SelectedIndex == 2) { tsrbvorschau.SelectedIndex = 0; } else { tsrbvorschau.SelectedIndex = 2; }
}
private void RibbonBtnVorschauSepparat_Click(object sender, EventArgs e)
{
+ if (Separate_Vorschau_offen == true)
+ {
+ try
+ {
+ Broadcaster().Broadcast(selected_dokumentid, new SenderInfo("Doklist", "Close", ""));
+
+ return;
+ }
+ catch {
+ return;
+ }
+
+ }
if (tsrbvorschau.SelectedIndex == 3 && Separate_Vorschau_offen == false)
{
tsrbvorschau_SelectedIndexChanged(sender, e);
@@ -1389,9 +1402,6 @@ namespace OnDoc.UICintrols
}
sfDataGrid1.ShowToolTip = true;
- sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
- sfDataGrid1.ToolTipOption.InitialDelay = 500;
- sfDataGrid1.ShowToolTip = true;
System.Windows.Forms.Application.DoEvents();
}
@@ -1589,10 +1599,10 @@ namespace OnDoc.UICintrols
private void sfDataGrid1_ToolTipOpening_1(object sender, ToolTipOpeningEventArgs e)
{
- e.ToolTipInfo.Items.Clear();
- Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
- tt.Text = "Hallo Du";
- e.ToolTipInfo.Items.Add(tt);
+ //e.ToolTipInfo.Items.Clear();
+ //Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
+ //tt.Text = "Hallo Du";
+ //e.ToolTipInfo.Items.Add(tt);
}
private void ribbonButtonVorlagenfeldregel_Click(object sender, EventArgs e)
@@ -1758,6 +1768,20 @@ namespace OnDoc.UICintrols
refresh_dokumente();
}
+
+ private void historyToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ DokHistory dh = new DokHistory(selected_dokumentid);
+ dh.ShowDialog();
+ }
+
+ private void dokumentKopierenToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ DB db = new DB(AppParams.connectionstring);
+ db.copydoc(selected_dokumentid);
+ db = null;
+
+ }
}
}
diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx
index 9d1b01d3..182e9d48 100644
--- a/Client/UIControls/DokList.resx
+++ b/Client/UIControls/DokList.resx
@@ -375,24 +375,6 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
diff --git a/Client/UIControls/Partnersuche.Designer.cs b/Client/UIControls/Partnersuche.Designer.cs
index 97df5f17..b4520fd1 100644
--- a/Client/UIControls/Partnersuche.Designer.cs
+++ b/Client/UIControls/Partnersuche.Designer.cs
@@ -101,6 +101,7 @@
this.trefferlistedata.AllowEditing = false;
this.trefferlistedata.AllowFiltering = true;
this.trefferlistedata.AllowGrouping = false;
+ this.trefferlistedata.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
this.trefferlistedata.Dock = System.Windows.Forms.DockStyle.Fill;
this.trefferlistedata.Location = new System.Drawing.Point(3, 16);
this.trefferlistedata.Name = "trefferlistedata";
diff --git a/Client/UIControls/Partnersuche.cs b/Client/UIControls/Partnersuche.cs
index f66e6106..58064609 100644
--- a/Client/UIControls/Partnersuche.cs
+++ b/Client/UIControls/Partnersuche.cs
@@ -54,7 +54,11 @@ namespace OnDoc.UIControls
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
-
+ try
+ {
+ trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
+ }
+ catch { }
if (trefferlistedata.RowCount > 0) { sfButton1.Enabled = true; }
trefferlistedata.SelectedIndex = 0;
}
@@ -71,7 +75,11 @@ namespace OnDoc.UIControls
{
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
-
+ try
+ {
+ trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
+ }
+ catch { }
if (clsPartner.partnerliste.Rows.Count == 1)
{
trefferlistedata.SelectedIndex = 0;
@@ -84,6 +92,11 @@ namespace OnDoc.UIControls
string s = txtKurzname.Text.Trim();
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 1);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
+ try
+ {
+ trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
+ }
+ catch { }
if (clsPartner.partnerliste.Rows.Count == 1)
{
trefferlistedata.SelectedIndex = 0;
@@ -93,6 +106,11 @@ namespace OnDoc.UIControls
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
+ try
+ {
+ trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
+ }
+ catch { }
trefferlistedata.SelectedIndex = 0;
try
{
@@ -258,7 +276,7 @@ namespace OnDoc.UIControls
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToInt32(dataRow["Typ"]) == 1)
{
- e.Graphics.DrawImage(OnDoc.Properties.Resources.Partner_16x16_32, e.Bounds.X + 5, e.Bounds.Y + 3);
+ e.Graphics.DrawImage(OnDoc.Properties.Resources.BP_16x16_32, e.Bounds.X + 5, e.Bounds.Y + 3);
}
else
{
diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll
index 685295bc..3538e5ef 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 b7c20860..695e7480 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 b3705a6c..4c69ac35 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 3c1561e1..15e0a27e 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 fab461a1..54c5daf2 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 f08f3d6d..2a5d85b3 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 8c7d2ee4..4c14b2ff 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 2086a006..fa2bc4d2 100644
--- a/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
+++ b/Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-270bbf90fe53a42fd6861f8675c74b142541c27c71ac5fd345ee101d7df54cce
+2aa4539229342c8d383b43aa2c7e2d9c18cfc67d9350c31a8c9d0fb8891e7803
diff --git a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt
index 22c748d6..f753be57 100644
--- a/Client/obj/Debug/Client.csproj.FileListAbsolute.txt
+++ b/Client/obj/Debug/Client.csproj.FileListAbsolute.txt
@@ -255,3 +255,4 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.SaveAnsicht.res
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Dokwerte.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator.edk_viewer.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.SplashScreen.resources
+E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.DokHistory.resources
diff --git a/Client/obj/Debug/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache
index 2a760809..53117109 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 9917c1af..f2c9beda 100644
Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 65040e3c..7c538587 100644
Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Client/obj/Debug/OnDoc.Diverses.DokHistory.resources b/Client/obj/Debug/OnDoc.Diverses.DokHistory.resources
new file mode 100644
index 00000000..80ef68bc
Binary files /dev/null and b/Client/obj/Debug/OnDoc.Diverses.DokHistory.resources differ
diff --git a/Client/obj/Debug/OnDoc.DocMgmt.frmToApproval.resources b/Client/obj/Debug/OnDoc.DocMgmt.frmToApproval.resources
index 70820df5..552112f8 100644
Binary files a/Client/obj/Debug/OnDoc.DocMgmt.frmToApproval.resources and b/Client/obj/Debug/OnDoc.DocMgmt.frmToApproval.resources differ
diff --git a/Client/obj/Debug/OnDoc.Properties.Resources.resources b/Client/obj/Debug/OnDoc.Properties.Resources.resources
index b6314d33..0372995d 100644
Binary files a/Client/obj/Debug/OnDoc.Properties.Resources.resources and b/Client/obj/Debug/OnDoc.Properties.Resources.resources differ
diff --git a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources
index abab421d..e6eb6d50 100644
Binary files a/Client/obj/Debug/OnDoc.UICintrols.DokList.resources and b/Client/obj/Debug/OnDoc.UICintrols.DokList.resources differ
diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe
index b3705a6c..4c69ac35 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 3c1561e1..15e0a27e 100644
Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ
diff --git a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
index 77d937a1..384de989 100644
Binary files a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ
diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll
index f08f3d6d..2a5d85b3 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 685295bc..3538e5ef 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 b7c20860..695e7480 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 f2172263..0cfbd456 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 685295bc..3538e5ef 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 b7c20860..695e7480 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 2d55d862..ee1d7490 100644
--- a/Database/db.cs
+++ b/Database/db.cs
@@ -1559,6 +1559,7 @@ namespace Database
{
var tdt = new DataTable("TMPSB_" + mitarbeiternr.ToString());
DataRow tdr;
+ //Logging.Logging.Debug("save sb check data ", "OnDoc","");
int i;
tdt.Columns.Add("Partnernr");
@@ -1573,11 +1574,14 @@ namespace Database
dv = sb.dsempfaenger.Tables[0].Select();
i = 0;
- foreach(System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
+ //Logging.Logging.Debug("save_sb_checkdata: " + sb.dsempfaenger.Tables[0].Rows.ToString(), "OnDoc", "");
+ foreach (System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
{
+
int ii = 0;
ii = Convert.ToInt32(dr["status"]);
- if (ii != 1)
+ Logging.Logging.Debug("checkdata 1", "OnDoc", ii.ToString());
+ if (ii.ToString() != "1")
{
//dr["Status"] = -1;
tdr = tdt.NewRow();
@@ -1599,6 +1603,8 @@ namespace Database
// Rel. 4.1 BLKunde initialisieren
tdr[4] = 0;
}
+ Logging.Logging.Debug("checkdata addrow ", "OnDoc", tdr[0].ToString());
+
tdt.Rows.Add(tdr);
}
i=i+1; ;
@@ -1641,7 +1647,7 @@ namespace Database
// }
// i = i + 1;
//}
-
+ tdt.AcceptChanges();
var connection = new SqlConnection();
var da = new SqlDataAdapter("Select * from TMPSB_" + mitarbeiternr.ToString(), connection);
var cb = new SqlCommandBuilder(da);
@@ -1649,6 +1655,7 @@ namespace Database
connection.Open();
da.Update(tdt);
connection.Close();
+ //Logging.Logging.Debug("Update data ", "OnDoc", tdt.Rows.Count.ToString());
return;
}
@@ -1903,6 +1910,22 @@ namespace Database
return false;
}
}
+
+ public bool copydoc(string dokumentid)
+ {
+ try
+ {
+ string newdokumentid = get_dbkey("Dokument");
+ clear_parameter();
+ add_parameter("UrsprungID", dokumentid);
+ add_parameter("NewDokID", newdokumentid);
+ Get_Tabledata("sp_ondoc_copy_doc");
+
+
+ }
+ catch{ }
+ return true;
+ }
}
diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll
index 685295bc..3538e5ef 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 b7c20860..695e7480 100644
Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ
diff --git a/Images/Icons/BP.png b/Images/Icons/BP.png
new file mode 100644
index 00000000..3f636462
Binary files /dev/null and b/Images/Icons/BP.png differ
diff --git a/Images/Icons/Icons/Blue/BP.ico b/Images/Icons/Icons/Blue/BP.ico
new file mode 100644
index 00000000..ea17f7c2
Binary files /dev/null and b/Images/Icons/Icons/Blue/BP.ico differ
diff --git a/Images/Icons/Icons/Blue/Images/BP_16x16-32.png b/Images/Icons/Icons/Blue/Images/BP_16x16-32.png
new file mode 100644
index 00000000..844aa147
Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/BP_16x16-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/BP_24x24-32.png b/Images/Icons/Icons/Blue/Images/BP_24x24-32.png
new file mode 100644
index 00000000..afc87f06
Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/BP_24x24-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/BP_256x256-32.png b/Images/Icons/Icons/Blue/Images/BP_256x256-32.png
new file mode 100644
index 00000000..4f46e996
Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/BP_256x256-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/BP_32x32-32.png b/Images/Icons/Icons/Blue/Images/BP_32x32-32.png
new file mode 100644
index 00000000..874e97ac
Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/BP_32x32-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/BP_48x48-32.png b/Images/Icons/Icons/Blue/Images/BP_48x48-32.png
new file mode 100644
index 00000000..e9d0bfec
Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/BP_48x48-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/Person_16x16-32.png b/Images/Icons/Icons/Blue/Images/Person_16x16-32.png
index ccf1ea02..b39a8e5c 100644
Binary files a/Images/Icons/Icons/Blue/Images/Person_16x16-32.png and b/Images/Icons/Icons/Blue/Images/Person_16x16-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/Person_24x24-32.png b/Images/Icons/Icons/Blue/Images/Person_24x24-32.png
index e4504cde..1c8b389a 100644
Binary files a/Images/Icons/Icons/Blue/Images/Person_24x24-32.png and b/Images/Icons/Icons/Blue/Images/Person_24x24-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/Person_256x256-32.png b/Images/Icons/Icons/Blue/Images/Person_256x256-32.png
index 823647a9..86c45ce5 100644
Binary files a/Images/Icons/Icons/Blue/Images/Person_256x256-32.png and b/Images/Icons/Icons/Blue/Images/Person_256x256-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/Person_32x32-32.png b/Images/Icons/Icons/Blue/Images/Person_32x32-32.png
index 9d5a530e..d00b857e 100644
Binary files a/Images/Icons/Icons/Blue/Images/Person_32x32-32.png and b/Images/Icons/Icons/Blue/Images/Person_32x32-32.png differ
diff --git a/Images/Icons/Icons/Blue/Images/Person_48x48-32.png b/Images/Icons/Icons/Blue/Images/Person_48x48-32.png
index 4a4444eb..9b7e1fc7 100644
Binary files a/Images/Icons/Icons/Blue/Images/Person_48x48-32.png and b/Images/Icons/Icons/Blue/Images/Person_48x48-32.png differ
diff --git a/Images/Icons/Icons/Blue/Person.ico b/Images/Icons/Icons/Blue/Person.ico
index 4d0f5324..029be175 100644
Binary files a/Images/Icons/Icons/Blue/Person.ico and b/Images/Icons/Icons/Blue/Person.ico differ
diff --git a/Images/Icons/Person.png b/Images/Icons/Person.png
new file mode 100644
index 00000000..6f9e78b4
Binary files /dev/null and b/Images/Icons/Person.png differ
diff --git a/OnDocOffice/bin/Debug/Database.dll b/OnDocOffice/bin/Debug/Database.dll
index 0ed86fb2..3538e5ef 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 3feb8b24..695e7480 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 0d97e06a..da7d440e 100644
Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ