diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll
index 38ae82c6..cfa10177 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 3de10ea3..1c08dd6f 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 7d81910f..cf83520f 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 5ba9a7ba..0f212a2a 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 9c43dbd0..7754d212 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 7d81910f..cf83520f 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 5ba9a7ba..0f212a2a 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 38ae82c6..cfa10177 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 3de10ea3..1c08dd6f 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 03c46f9f..dfd54874 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/Diverses/MitarbeiterProfil.Designer.cs b/Client/Diverses/MitarbeiterProfil.Designer.cs
index fcf30e9b..c81354a7 100644
--- a/Client/Diverses/MitarbeiterProfil.Designer.cs
+++ b/Client/Diverses/MitarbeiterProfil.Designer.cs
@@ -76,6 +76,8 @@
this.txtName = new System.Windows.Forms.TextBox();
this.lblName = new System.Windows.Forms.Label();
this.GrpGetSignature = new System.Windows.Forms.GroupBox();
+ this.label18 = new System.Windows.Forms.Label();
+ this.btnSaveForUser = new System.Windows.Forms.Button();
this.label17 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.label15 = new System.Windows.Forms.Label();
@@ -85,8 +87,6 @@
this.btnDeleteImage = new System.Windows.Forms.Button();
this.btnSaveSignature = new System.Windows.Forms.Button();
this.sign1 = new WinSign.Sign();
- this.btnSaveForUser = new System.Windows.Forms.Button();
- this.label18 = new System.Windows.Forms.Label();
this.GrpBoxProfile.SuspendLayout();
this.GrpBoxDetails.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxTeam)).BeginInit();
@@ -367,7 +367,7 @@
this.GrpBoxMitarbeiter.Controls.Add(this.lblVorname);
this.GrpBoxMitarbeiter.Controls.Add(this.txtName);
this.GrpBoxMitarbeiter.Controls.Add(this.lblName);
- this.GrpBoxMitarbeiter.Location = new System.Drawing.Point(5, 129);
+ this.GrpBoxMitarbeiter.Location = new System.Drawing.Point(5, 148);
this.GrpBoxMitarbeiter.Name = "GrpBoxMitarbeiter";
this.GrpBoxMitarbeiter.Size = new System.Drawing.Size(793, 340);
this.GrpBoxMitarbeiter.TabIndex = 3;
@@ -569,7 +569,7 @@
this.GrpGetSignature.Controls.Add(this.btnDeleteImage);
this.GrpGetSignature.Controls.Add(this.btnSaveSignature);
this.GrpGetSignature.Controls.Add(this.sign1);
- this.GrpGetSignature.Location = new System.Drawing.Point(101, 99);
+ this.GrpGetSignature.Location = new System.Drawing.Point(72, 88);
this.GrpGetSignature.Name = "GrpGetSignature";
this.GrpGetSignature.Size = new System.Drawing.Size(644, 394);
this.GrpGetSignature.TabIndex = 21;
@@ -577,6 +577,26 @@
this.GrpGetSignature.Text = "Unterschrift erfassen";
this.GrpGetSignature.Visible = false;
//
+ // label18
+ //
+ this.label18.AutoSize = true;
+ this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label18.Location = new System.Drawing.Point(11, 60);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(130, 17);
+ this.label18.TabIndex = 30;
+ this.label18.Text = "Starten links unten.";
+ //
+ // btnSaveForUser
+ //
+ this.btnSaveForUser.Location = new System.Drawing.Point(462, 40);
+ this.btnSaveForUser.Name = "btnSaveForUser";
+ this.btnSaveForUser.Size = new System.Drawing.Size(176, 23);
+ this.btnSaveForUser.TabIndex = 29;
+ this.btnSaveForUser.Text = "Unterschrift für andere Benutzer";
+ this.btnSaveForUser.UseVisualStyleBackColor = true;
+ this.btnSaveForUser.Click += new System.EventHandler(this.btnSaveForUser_Click);
+ //
// label17
//
this.label17.AutoSize = true;
@@ -674,26 +694,6 @@
this.sign1.Size = new System.Drawing.Size(616, 228);
this.sign1.TabIndex = 20;
//
- // btnSaveForUser
- //
- this.btnSaveForUser.Location = new System.Drawing.Point(462, 40);
- this.btnSaveForUser.Name = "btnSaveForUser";
- this.btnSaveForUser.Size = new System.Drawing.Size(176, 23);
- this.btnSaveForUser.TabIndex = 29;
- this.btnSaveForUser.Text = "Unterschrift für andere Benutzer";
- this.btnSaveForUser.UseVisualStyleBackColor = true;
- this.btnSaveForUser.Click += new System.EventHandler(this.btnSaveForUser_Click);
- //
- // label18
- //
- this.label18.AutoSize = true;
- this.label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label18.Location = new System.Drawing.Point(11, 60);
- this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(130, 17);
- this.label18.TabIndex = 30;
- this.label18.Text = "Starten links unten.";
- //
// MitarbeiterProfil
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/Client/Diverses/MitarbeiterProfil.cs b/Client/Diverses/MitarbeiterProfil.cs
index c4915525..ea05200c 100644
--- a/Client/Diverses/MitarbeiterProfil.cs
+++ b/Client/Diverses/MitarbeiterProfil.cs
@@ -56,6 +56,7 @@ namespace OnDoc.Diverses
refresh_unterschriften_team();
onLoad = false;
lbprofile.SelectedIndex = 0;
+ lbprofile_SelectedValueChanged(sender, e);
sign1.PenWidth = Convert.ToInt32(AppParams.SignatureWidth);
var arrColorFragments = AppParams.SignatureColor.Split(',').Select(sFragment => { int.TryParse(sFragment, out int fragment); return fragment; }).ToArray();
@@ -107,14 +108,18 @@ namespace OnDoc.Diverses
private void lbprofile_SelectedValueChanged(object sender, EventArgs e)
{
if (onLoad) { return; }
- DB db = new DB(AppParams.connectionstring);
- db.Get_Tabledata("Select * from profil where profilnr=" + lbprofile.SelectedValue, false, true);
- cbboxUnterschriftLinks.SelectedValue = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschriftlinks"].ToString());
- cbboxUnterschriftRechts.SelectedValue = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschriftrechts"].ToString());
- cbboxTeam.SelectedValue = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["team"].ToString());
- cbStandard.Checked = db.dsdaten.Tables[0].Rows[0]["standard"].ToString() == "True";
- txtbezeichnung.Text = db.dsdaten.Tables[0].Rows[0]["bezeichnung"].ToString();
- db = null;
+ try
+ {
+ DB db = new DB(AppParams.connectionstring);
+ db.Get_Tabledata("Select * from profil where profilnr=" + lbprofile.SelectedValue, false, true);
+ cbboxUnterschriftLinks.SelectedValue = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschriftlinks"].ToString());
+ cbboxUnterschriftRechts.SelectedValue = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["Unterschriftrechts"].ToString());
+ cbboxTeam.SelectedValue = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["team"].ToString());
+ cbStandard.Checked = db.dsdaten.Tables[0].Rows[0]["standard"].ToString() == "True";
+ txtbezeichnung.Text = db.dsdaten.Tables[0].Rows[0]["bezeichnung"].ToString();
+ db = null;
+ }
+ catch { }
}
private void btnSave_Click(object sender, EventArgs e)
diff --git a/Client/Diverses/PartnerDetails.Designer.cs b/Client/Diverses/PartnerDetails.Designer.cs
index 85efd145..d52c9520 100644
--- a/Client/Diverses/PartnerDetails.Designer.cs
+++ b/Client/Diverses/PartnerDetails.Designer.cs
@@ -47,22 +47,22 @@
this.label6 = new System.Windows.Forms.Label();
this.grpadressen = new System.Windows.Forms.GroupBox();
this.sfGridAdressen = new Syncfusion.WinForms.DataGrid.SfDataGrid();
+ this.ctxmenuadresse = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.adresseÜbernehmenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.GrpVV = new System.Windows.Forms.GroupBox();
this.sfGridVV = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.btnclose = new System.Windows.Forms.Button();
- this.ctxmenuadresse = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.adresseÜbernehmenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
this.grpadressen.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfGridAdressen)).BeginInit();
+ this.ctxmenuadresse.SuspendLayout();
this.GrpVV.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfGridVV)).BeginInit();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
- this.ctxmenuadresse.SuspendLayout();
this.SuspendLayout();
//
// label1
@@ -234,6 +234,20 @@
this.sfGridAdressen.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfGridAdressen_CellDoubleClick);
this.sfGridAdressen.DoubleClick += new System.EventHandler(this.sfGridAdressen_DoubleClick);
//
+ // ctxmenuadresse
+ //
+ this.ctxmenuadresse.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.adresseÜbernehmenToolStripMenuItem});
+ this.ctxmenuadresse.Name = "ctxmenuadresse";
+ this.ctxmenuadresse.Size = new System.Drawing.Size(187, 26);
+ //
+ // adresseÜbernehmenToolStripMenuItem
+ //
+ this.adresseÜbernehmenToolStripMenuItem.Name = "adresseÜbernehmenToolStripMenuItem";
+ this.adresseÜbernehmenToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+ this.adresseÜbernehmenToolStripMenuItem.Text = "Adresse übernehmen";
+ this.adresseÜbernehmenToolStripMenuItem.Click += new System.EventHandler(this.adresseÜbernehmenToolStripMenuItem_Click);
+ //
// GrpVV
//
this.GrpVV.Controls.Add(this.sfGridVV);
@@ -299,20 +313,6 @@
this.btnclose.UseVisualStyleBackColor = true;
this.btnclose.Click += new System.EventHandler(this.btnclose_Click);
//
- // ctxmenuadresse
- //
- this.ctxmenuadresse.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.adresseÜbernehmenToolStripMenuItem});
- this.ctxmenuadresse.Name = "ctxmenuadresse";
- this.ctxmenuadresse.Size = new System.Drawing.Size(187, 26);
- //
- // adresseÜbernehmenToolStripMenuItem
- //
- this.adresseÜbernehmenToolStripMenuItem.Name = "adresseÜbernehmenToolStripMenuItem";
- this.adresseÜbernehmenToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
- this.adresseÜbernehmenToolStripMenuItem.Text = "Adresse übernehmen";
- this.adresseÜbernehmenToolStripMenuItem.Click += new System.EventHandler(this.adresseÜbernehmenToolStripMenuItem_Click);
- //
// PartnerDetails
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -326,7 +326,7 @@
this.Name = "PartnerDetails";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
- this.Text = "PartnerDetails";
+ this.Text = "§";
this.Load += new System.EventHandler(this.PartnerDetails_Load);
this.groupBox5.ResumeLayout(false);
this.groupBox5.PerformLayout();
@@ -334,12 +334,12 @@
this.groupBox6.PerformLayout();
this.grpadressen.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfGridAdressen)).EndInit();
+ this.ctxmenuadresse.ResumeLayout(false);
this.GrpVV.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfGridVV)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.panel2.ResumeLayout(false);
- this.ctxmenuadresse.ResumeLayout(false);
this.ResumeLayout(false);
}
diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs
index 866ecc5a..259a4e43 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(138, 26);
this.label2.TabIndex = 2;
- this.label2.Text = "3. März 2025";
+ this.label2.Text = "6. März 2025";
//
// SplashScreen
//
diff --git a/Client/Diverses/frmCalendar.Designer.cs b/Client/Diverses/frmCalendar.Designer.cs
index d0b569b3..8f19043a 100644
--- a/Client/Diverses/frmCalendar.Designer.cs
+++ b/Client/Diverses/frmCalendar.Designer.cs
@@ -35,6 +35,7 @@
//
// sfCalendar1
//
+ this.sfCalendar1.FirstDayOfWeek = System.DayOfWeek.Monday;
this.sfCalendar1.Location = new System.Drawing.Point(1, 2);
this.sfCalendar1.MinimumSize = new System.Drawing.Size(196, 196);
this.sfCalendar1.Name = "sfCalendar1";
diff --git a/Client/DocMgmt/SerienbriefBearbeitung.cs b/Client/DocMgmt/SerienbriefBearbeitung.cs
index 3e1b03dd..d61e3a4c 100644
--- a/Client/DocMgmt/SerienbriefBearbeitung.cs
+++ b/Client/DocMgmt/SerienbriefBearbeitung.cs
@@ -474,6 +474,7 @@ namespace OnDoc.DocMgmt
word.ActiveDocument.Save();
word.ActiveDocument.SaveAs2(word.ActiveDocument.FullName + ".tmp");
word.ActiveDocument.Close();
+ Thread.Sleep(AppParams.OfficeSpleep1);
word.Documents.Open(FileName);
this.docPreview1.Visible = true;
this.Width = groupBox2.Width * 3;
diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs
index 92bdcef4..bc6b649a 100644
--- a/Client/UIControls/DokList.Designer.cs
+++ b/Client/UIControls/DokList.Designer.cs
@@ -30,8 +30,9 @@ namespace OnDoc.UICintrols
///
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DokList));
- this.ctxMenuDokList = new System.Windows.Forms.ContextMenuStrip();
+ this.ctxMenuDokList = new System.Windows.Forms.ContextMenuStrip(this.components);
this.dokumentAnzeigenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentBearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -63,7 +64,6 @@ 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();
@@ -160,13 +160,14 @@ namespace OnDoc.UICintrols
this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
this.ribbonButtonDokinBearbeitung = new System.Windows.Forms.RibbonButton();
this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
- this.timer1 = new System.Windows.Forms.Timer();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig();
- this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip();
+ this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components);
this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
+ this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -206,7 +207,7 @@ namespace OnDoc.UICintrols
this.gruppenÖffnenToolStripMenuItem,
this.gruppenSchliessenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
- this.ctxMenuDokList.Size = new System.Drawing.Size(280, 446);
+ this.ctxMenuDokList.Size = new System.Drawing.Size(280, 468);
this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
//
// dokumentAnzeigenToolStripMenuItem
@@ -490,16 +491,6 @@ 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;
@@ -1401,6 +1392,16 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
+ // 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;
diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs
index 7fa0bb0e..3c46136c 100644
--- a/Client/UIControls/DokList.cs
+++ b/Client/UIControls/DokList.cs
@@ -98,15 +98,22 @@ namespace OnDoc.UICintrols
Broadcaster().AddListener(this);
//t_functions();
pos_elements();
-
+ this.sfDataGrid1.FilterPopupShowing += SfDataGrid1_FilterPopupShowing;
+ }
+ private void SfDataGrid1_FilterPopupShowing(object sender, Syncfusion.WinForms.DataGrid.Events.FilterPopupShowingEventArgs e)
+ {
+ if (e.Column is GridDateTimeColumn)
+ {
+ e.Control.DatePicker.FirstDayOfWeek = DayOfWeek.Monday;
+ }
}
-
private void datagrid_AutoGeneratingColumn(object sender, AutoGeneratingColumnArgs e)
{
if (e.Column.MappingName == "Erstellt am" || e.Column.MappingName == "Mutiert am")
{
GridDateTimeColumn gdt = e.Column as GridDateTimeColumn;
gdt.Pattern = (Syncfusion.WinForms.Input.Enums.DateTimePattern)Syncfusion.Windows.Shared.DateTimePattern.FullDateTime;
+
}
@@ -279,6 +286,7 @@ namespace OnDoc.UICintrols
catch { }
finally { db = null; }
}
+
public void refresh_dokumente(string layout = "")
{
update_currentview();
@@ -300,10 +308,14 @@ namespace OnDoc.UICintrols
int selectedIndex = RibbonCBProfil.SelectedIndex;
profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
-
+
+
// profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag.ToString());
System.Data.DataTable dokumente = new System.Data.DataTable();
- dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false);
+
+
+ dokumente = db.Get_Dokumente(partnernr, docartnr, profilnr, forMaNr, Search_Docid, false);
+
// TableHelper.SetColumnsOrder(dokumente, "trefferliste");
if (layout == "") { layout = "trefferliste_relaunch"; }
TableHelper.FormatTable(ref dokumente, layout, ref this.sfDataGrid1);
@@ -2624,6 +2636,8 @@ namespace OnDoc.UICintrols
TableEditor te = new TableEditor("DokInBearbeitung");
te.Show();
}
+
+
}
diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx
index 47171f4d..f2916b69 100644
--- a/Client/UIControls/DokList.resx
+++ b/Client/UIControls/DokList.resx
@@ -546,6 +546,6 @@
- 25
+ 67
\ No newline at end of file
diff --git a/Client/UIControls/Serienbrief.Designer.cs b/Client/UIControls/Serienbrief.Designer.cs
index d96c2085..dfe168c9 100644
--- a/Client/UIControls/Serienbrief.Designer.cs
+++ b/Client/UIControls/Serienbrief.Designer.cs
@@ -29,12 +29,12 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
- Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv5 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
- Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv6 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
- Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv7 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
- Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv8 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv3 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
+ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Serienbrief));
this.GrpDokumentInhalt = new System.Windows.Forms.GroupBox();
this.grpFaktura = new System.Windows.Forms.GroupBox();
@@ -47,14 +47,6 @@
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.progressBar1 = new System.Windows.Forms.ProgressBar();
- this.pnlLoad = new System.Windows.Forms.Panel();
- this.sfdatagridsbload = new Syncfusion.WinForms.DataGrid.SfDataGrid();
- this.btnsbloadcancel = new System.Windows.Forms.Button();
- this.btnsbloadok = new System.Windows.Forms.Button();
- this.panel1 = new System.Windows.Forms.Panel();
- this.label1 = new System.Windows.Forms.Label();
- this.panelLoad = new System.Windows.Forms.Panel();
- this.label4 = new System.Windows.Forms.Label();
this.grpDruckstapel = new System.Windows.Forms.GroupBox();
this.panel2 = new System.Windows.Forms.Panel();
this.label6 = new System.Windows.Forms.Label();
@@ -86,6 +78,14 @@
this.lblPostzustellung = new System.Windows.Forms.Label();
this.lblBezeichnung = new System.Windows.Forms.Label();
this.txtbezeichnung = new System.Windows.Forms.TextBox();
+ this.pnlLoad = new System.Windows.Forms.Panel();
+ this.sfdatagridsbload = new Syncfusion.WinForms.DataGrid.SfDataGrid();
+ this.btnsbloadcancel = new System.Windows.Forms.Button();
+ this.btnsbloadok = new System.Windows.Forms.Button();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.label1 = new System.Windows.Forms.Label();
+ this.panelLoad = new System.Windows.Forms.Panel();
+ this.label4 = new System.Windows.Forms.Label();
this.GrpEmpfaenger = new System.Windows.Forms.GroupBox();
this.sfDataGridEmpfaenger = new Syncfusion.WinForms.DataGrid.SfDataGrid();
this.ctxmenuEmpfaenger = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -138,10 +138,6 @@
this.grpFaktura.SuspendLayout();
this.pnlprogress.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit();
- this.pnlLoad.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.sfdatagridsbload)).BeginInit();
- this.panel1.SuspendLayout();
- this.panelLoad.SuspendLayout();
this.grpDruckstapel.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit();
@@ -155,6 +151,10 @@
this.groupBox5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).BeginInit();
+ this.pnlLoad.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.sfdatagridsbload)).BeginInit();
+ this.panel1.SuspendLayout();
+ this.panelLoad.SuspendLayout();
this.GrpEmpfaenger.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).BeginInit();
this.ctxmenuEmpfaenger.SuspendLayout();
@@ -301,98 +301,6 @@
this.progressBar1.Size = new System.Drawing.Size(448, 23);
this.progressBar1.TabIndex = 16;
//
- // pnlLoad
- //
- this.pnlLoad.BackColor = System.Drawing.Color.Silver;
- this.pnlLoad.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.pnlLoad.Controls.Add(this.sfdatagridsbload);
- this.pnlLoad.Controls.Add(this.btnsbloadcancel);
- this.pnlLoad.Controls.Add(this.btnsbloadok);
- this.pnlLoad.Controls.Add(this.panel1);
- this.pnlLoad.Location = new System.Drawing.Point(292, 106);
- this.pnlLoad.Name = "pnlLoad";
- this.pnlLoad.Size = new System.Drawing.Size(493, 634);
- this.pnlLoad.TabIndex = 4;
- this.pnlLoad.Visible = false;
- //
- // sfdatagridsbload
- //
- this.sfdatagridsbload.AccessibleName = "Table";
- this.sfdatagridsbload.AllowEditing = false;
- this.sfdatagridsbload.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.Fill;
- this.sfdatagridsbload.Dock = System.Windows.Forms.DockStyle.Top;
- this.sfdatagridsbload.Location = new System.Drawing.Point(0, 47);
- this.sfdatagridsbload.Name = "sfdatagridsbload";
- this.sfdatagridsbload.ShowToolTip = true;
- this.sfdatagridsbload.Size = new System.Drawing.Size(489, 489);
- this.sfdatagridsbload.TabIndex = 3;
- this.sfdatagridsbload.Text = "sfDataGrid1";
- this.sfdatagridsbload.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfdatagridsbload_ToolTipOpening);
- this.sfdatagridsbload.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfdatagridsbload_DrawCell);
- this.sfdatagridsbload.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridsbload_CellClick);
- this.sfdatagridsbload.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridsbload_CellDoubleClick);
- this.sfdatagridsbload.Click += new System.EventHandler(this.Serienbrief_Load);
- this.sfdatagridsbload.DoubleClick += new System.EventHandler(this.sfdatagridsbload_DoubleClick);
- //
- // btnsbloadcancel
- //
- this.btnsbloadcancel.Location = new System.Drawing.Point(9, 600);
- this.btnsbloadcancel.Name = "btnsbloadcancel";
- this.btnsbloadcancel.Size = new System.Drawing.Size(75, 23);
- this.btnsbloadcancel.TabIndex = 2;
- this.btnsbloadcancel.Text = "Abbrechen";
- this.btnsbloadcancel.UseVisualStyleBackColor = true;
- this.btnsbloadcancel.Click += new System.EventHandler(this.btnsbloadcancel_Click);
- //
- // btnsbloadok
- //
- this.btnsbloadok.Location = new System.Drawing.Point(870, 600);
- this.btnsbloadok.Name = "btnsbloadok";
- this.btnsbloadok.Size = new System.Drawing.Size(75, 23);
- this.btnsbloadok.TabIndex = 0;
- this.btnsbloadok.Text = "Öffnen";
- this.btnsbloadok.UseVisualStyleBackColor = true;
- this.btnsbloadok.Click += new System.EventHandler(this.bntsbloadok_Click);
- //
- // panel1
- //
- this.panel1.Controls.Add(this.label1);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(489, 47);
- this.panel1.TabIndex = 1;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(385, 13);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(154, 20);
- this.label1.TabIndex = 0;
- this.label1.Text = "Serienbrief öffnen";
- //
- // panelLoad
- //
- this.panelLoad.BackColor = System.Drawing.Color.Silver;
- this.panelLoad.Controls.Add(this.label4);
- this.panelLoad.Location = new System.Drawing.Point(303, 95);
- this.panelLoad.Name = "panelLoad";
- this.panelLoad.Size = new System.Drawing.Size(832, 94);
- this.panelLoad.TabIndex = 6;
- this.panelLoad.Visible = false;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(12, 37);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(469, 20);
- this.label4.TabIndex = 0;
- this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten....";
- //
// grpDruckstapel
//
this.grpDruckstapel.Controls.Add(this.panel2);
@@ -457,15 +365,15 @@
//
// treeviewDruckstapel
//
- treeNodeAdvStyleInfo3.CheckBoxTickThickness = 1;
- treeNodeAdvStyleInfo3.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdvStyleInfo3.EnsureDefaultOptionedChild = true;
- treeNodeAdvStyleInfo3.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdvStyleInfo3.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdvStyleInfo3.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdvStyleInfo3.TextColor = System.Drawing.Color.Black;
+ treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
+ treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
+ treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
this.treeviewDruckstapel.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
- new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo3)});
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
this.treeviewDruckstapel.BeforeTouchSize = new System.Drawing.Size(215, 191);
this.treeviewDruckstapel.Dock = System.Windows.Forms.DockStyle.Left;
//
@@ -697,6 +605,7 @@
this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21);
this.DateDokumentDatum.TabIndex = 3;
this.DateDokumentDatum.ToolTipText = "";
+ this.DateDokumentDatum.DropDownOpening += new System.ComponentModel.CancelEventHandler(this.DateDokumentDatum_DropDownOpening);
//
// lblDokumentDatum
//
@@ -765,6 +674,98 @@
this.txtbezeichnung.Size = new System.Drawing.Size(354, 20);
this.txtbezeichnung.TabIndex = 9;
//
+ // pnlLoad
+ //
+ this.pnlLoad.BackColor = System.Drawing.Color.Silver;
+ this.pnlLoad.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.pnlLoad.Controls.Add(this.sfdatagridsbload);
+ this.pnlLoad.Controls.Add(this.btnsbloadcancel);
+ this.pnlLoad.Controls.Add(this.btnsbloadok);
+ this.pnlLoad.Controls.Add(this.panel1);
+ this.pnlLoad.Location = new System.Drawing.Point(292, 106);
+ this.pnlLoad.Name = "pnlLoad";
+ this.pnlLoad.Size = new System.Drawing.Size(493, 634);
+ this.pnlLoad.TabIndex = 4;
+ this.pnlLoad.Visible = false;
+ //
+ // sfdatagridsbload
+ //
+ this.sfdatagridsbload.AccessibleName = "Table";
+ this.sfdatagridsbload.AllowEditing = false;
+ this.sfdatagridsbload.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.Fill;
+ this.sfdatagridsbload.Dock = System.Windows.Forms.DockStyle.Top;
+ this.sfdatagridsbload.Location = new System.Drawing.Point(0, 47);
+ this.sfdatagridsbload.Name = "sfdatagridsbload";
+ this.sfdatagridsbload.ShowToolTip = true;
+ this.sfdatagridsbload.Size = new System.Drawing.Size(489, 489);
+ this.sfdatagridsbload.TabIndex = 3;
+ this.sfdatagridsbload.Text = "sfDataGrid1";
+ this.sfdatagridsbload.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfdatagridsbload_ToolTipOpening);
+ this.sfdatagridsbload.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfdatagridsbload_DrawCell);
+ this.sfdatagridsbload.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridsbload_CellClick);
+ this.sfdatagridsbload.CellDoubleClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfdatagridsbload_CellDoubleClick);
+ this.sfdatagridsbload.Click += new System.EventHandler(this.Serienbrief_Load);
+ this.sfdatagridsbload.DoubleClick += new System.EventHandler(this.sfdatagridsbload_DoubleClick);
+ //
+ // btnsbloadcancel
+ //
+ this.btnsbloadcancel.Location = new System.Drawing.Point(9, 600);
+ this.btnsbloadcancel.Name = "btnsbloadcancel";
+ this.btnsbloadcancel.Size = new System.Drawing.Size(75, 23);
+ this.btnsbloadcancel.TabIndex = 2;
+ this.btnsbloadcancel.Text = "Abbrechen";
+ this.btnsbloadcancel.UseVisualStyleBackColor = true;
+ this.btnsbloadcancel.Click += new System.EventHandler(this.btnsbloadcancel_Click);
+ //
+ // btnsbloadok
+ //
+ this.btnsbloadok.Location = new System.Drawing.Point(870, 600);
+ this.btnsbloadok.Name = "btnsbloadok";
+ this.btnsbloadok.Size = new System.Drawing.Size(75, 23);
+ this.btnsbloadok.TabIndex = 0;
+ this.btnsbloadok.Text = "Öffnen";
+ this.btnsbloadok.UseVisualStyleBackColor = true;
+ this.btnsbloadok.Click += new System.EventHandler(this.bntsbloadok_Click);
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(489, 47);
+ this.panel1.TabIndex = 1;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(385, 13);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(154, 20);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Serienbrief öffnen";
+ //
+ // panelLoad
+ //
+ this.panelLoad.BackColor = System.Drawing.Color.Silver;
+ this.panelLoad.Controls.Add(this.label4);
+ this.panelLoad.Location = new System.Drawing.Point(303, 95);
+ this.panelLoad.Name = "panelLoad";
+ this.panelLoad.Size = new System.Drawing.Size(832, 94);
+ this.panelLoad.TabIndex = 6;
+ this.panelLoad.Visible = false;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label4.Location = new System.Drawing.Point(12, 37);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(469, 20);
+ this.label4.TabIndex = 0;
+ this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten....";
+ //
// GrpEmpfaenger
//
this.GrpEmpfaenger.Controls.Add(this.sfDataGridEmpfaenger);
@@ -791,6 +792,7 @@
this.sfDataGridEmpfaenger.Size = new System.Drawing.Size(666, 563);
this.sfDataGridEmpfaenger.TabIndex = 4;
this.sfDataGridEmpfaenger.Text = "sfDataGrid1";
+ this.sfDataGridEmpfaenger.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfDataGridEmpfaenger_DrawCell);
this.sfDataGridEmpfaenger.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGridEmpfaenger_CellClick);
//
// ctxmenuEmpfaenger
@@ -825,15 +827,15 @@
//
// treeViewAdv1
//
- treeNodeAdvStyleInfo1.CheckBoxTickThickness = 1;
- treeNodeAdvStyleInfo1.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdvStyleInfo1.EnsureDefaultOptionedChild = true;
- treeNodeAdvStyleInfo1.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdvStyleInfo1.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdvStyleInfo1.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdvStyleInfo1.TextColor = System.Drawing.Color.Black;
+ treeNodeAdvStyleInfo2.CheckBoxTickThickness = 1;
+ treeNodeAdvStyleInfo2.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo2.EnsureDefaultOptionedChild = true;
+ treeNodeAdvStyleInfo2.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo2.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdvStyleInfo2.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdvStyleInfo2.TextColor = System.Drawing.Color.Black;
this.treeViewAdv1.BaseStylePairs.AddRange(new Syncfusion.Windows.Forms.Tools.StyleNamePair[] {
- new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo1)});
+ new Syncfusion.Windows.Forms.Tools.StyleNamePair("Standard", treeNodeAdvStyleInfo2)});
this.treeViewAdv1.BeforeTouchSize = new System.Drawing.Size(230, 563);
this.treeViewAdv1.ContextMenuStrip = this.ctxmenutree;
this.treeViewAdv1.Dock = System.Windows.Forms.DockStyle.Left;
@@ -851,51 +853,51 @@
this.treeViewAdv1.Location = new System.Drawing.Point(3, 16);
this.treeViewAdv1.MetroColor = System.Drawing.Color.FromArgb(((int)(((byte)(22)))), ((int)(((byte)(165)))), ((int)(((byte)(220)))));
this.treeViewAdv1.Name = "treeViewAdv1";
- treeNodeAdv5.ChildStyle.CheckBoxTickThickness = 1;
- treeNodeAdv5.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv5.ChildStyle.EnsureDefaultOptionedChild = true;
- treeNodeAdv5.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv5.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv5.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdv5.EnsureDefaultOptionedChild = true;
- treeNodeAdv5.MultiLine = true;
- treeNodeAdv5.ShowLine = true;
- treeNodeAdv5.Text = "In Bearbeitung";
- treeNodeAdv6.ChildStyle.CheckBoxTickThickness = 1;
- treeNodeAdv6.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv6.ChildStyle.EnsureDefaultOptionedChild = true;
- treeNodeAdv6.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv6.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv6.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdv6.EnsureDefaultOptionedChild = true;
- treeNodeAdv6.MultiLine = true;
- treeNodeAdv6.ShowLine = true;
- treeNodeAdv6.Text = "Fehlerhaft";
- treeNodeAdv7.ChildStyle.CheckBoxTickThickness = 1;
- treeNodeAdv7.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv7.ChildStyle.EnsureDefaultOptionedChild = true;
- treeNodeAdv7.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv7.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv7.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdv7.EnsureDefaultOptionedChild = true;
- treeNodeAdv7.MultiLine = true;
- treeNodeAdv7.ShowLine = true;
- treeNodeAdv7.Text = "Generierte Dokumente";
- treeNodeAdv8.ChildStyle.CheckBoxTickThickness = 1;
- treeNodeAdv8.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv8.ChildStyle.EnsureDefaultOptionedChild = true;
- treeNodeAdv8.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv8.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
- treeNodeAdv8.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
- treeNodeAdv8.EnsureDefaultOptionedChild = true;
- treeNodeAdv8.MultiLine = true;
- treeNodeAdv8.ShowLine = true;
- treeNodeAdv8.Text = "Abgeschlossen";
+ treeNodeAdv1.ChildStyle.CheckBoxTickThickness = 1;
+ treeNodeAdv1.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv1.ChildStyle.EnsureDefaultOptionedChild = true;
+ treeNodeAdv1.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv1.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv1.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdv1.EnsureDefaultOptionedChild = true;
+ treeNodeAdv1.MultiLine = true;
+ treeNodeAdv1.ShowLine = true;
+ treeNodeAdv1.Text = "In Bearbeitung";
+ treeNodeAdv2.ChildStyle.CheckBoxTickThickness = 1;
+ treeNodeAdv2.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv2.ChildStyle.EnsureDefaultOptionedChild = true;
+ treeNodeAdv2.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv2.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv2.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdv2.EnsureDefaultOptionedChild = true;
+ treeNodeAdv2.MultiLine = true;
+ treeNodeAdv2.ShowLine = true;
+ treeNodeAdv2.Text = "Fehlerhaft";
+ treeNodeAdv3.ChildStyle.CheckBoxTickThickness = 1;
+ treeNodeAdv3.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv3.ChildStyle.EnsureDefaultOptionedChild = true;
+ treeNodeAdv3.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv3.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv3.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdv3.EnsureDefaultOptionedChild = true;
+ treeNodeAdv3.MultiLine = true;
+ treeNodeAdv3.ShowLine = true;
+ treeNodeAdv3.Text = "Generierte Dokumente";
+ treeNodeAdv4.ChildStyle.CheckBoxTickThickness = 1;
+ treeNodeAdv4.ChildStyle.CheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv4.ChildStyle.EnsureDefaultOptionedChild = true;
+ treeNodeAdv4.ChildStyle.IntermediateCheckColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv4.ChildStyle.OptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109)))));
+ treeNodeAdv4.ChildStyle.SelectedOptionButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(210)))), ((int)(((byte)(210)))), ((int)(((byte)(210)))));
+ treeNodeAdv4.EnsureDefaultOptionedChild = true;
+ treeNodeAdv4.MultiLine = true;
+ treeNodeAdv4.ShowLine = true;
+ treeNodeAdv4.Text = "Abgeschlossen";
this.treeViewAdv1.Nodes.AddRange(new Syncfusion.Windows.Forms.Tools.TreeNodeAdv[] {
- treeNodeAdv5,
- treeNodeAdv6,
- treeNodeAdv7,
- treeNodeAdv8});
+ treeNodeAdv1,
+ treeNodeAdv2,
+ treeNodeAdv3,
+ treeNodeAdv4});
this.treeViewAdv1.SelectedNodeForeColor = System.Drawing.SystemColors.HighlightText;
this.treeViewAdv1.Size = new System.Drawing.Size(230, 563);
this.treeViewAdv1.TabIndex = 3;
@@ -1324,12 +1326,6 @@
this.pnlprogress.ResumeLayout(false);
this.pnlprogress.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit();
- this.pnlLoad.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.sfdatagridsbload)).EndInit();
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- this.panelLoad.ResumeLayout(false);
- this.panelLoad.PerformLayout();
this.grpDruckstapel.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
@@ -1347,6 +1343,12 @@
this.groupBox5.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.cbboxverantwortlich)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.cbboxpostzustellung)).EndInit();
+ this.pnlLoad.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.sfdatagridsbload)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.panelLoad.ResumeLayout(false);
+ this.panelLoad.PerformLayout();
this.GrpEmpfaenger.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.sfDataGridEmpfaenger)).EndInit();
this.ctxmenuEmpfaenger.ResumeLayout(false);
diff --git a/Client/UIControls/Serienbrief.cs b/Client/UIControls/Serienbrief.cs
index 85879bf8..390bb83d 100644
--- a/Client/UIControls/Serienbrief.cs
+++ b/Client/UIControls/Serienbrief.cs
@@ -42,6 +42,9 @@ using static BroadcastListener.Classes.Factory;
using Microsoft.Office.Interop.Excel;
using Microsoft.SqlServer.Server;
using OnDoc.Diverses;
+using Syncfusion.Windows.Shared;
+using System.Web.UI.WebControls;
+using Syncfusion.Windows.Forms.CellGrid.ScrollAxis;
namespace OnDoc.UIControls
@@ -79,6 +82,7 @@ namespace OnDoc.UIControls
this.profilnr = profilnr;
//Broadcaster().AddListener(this);
//Closing += Form_Closing;
+
}
private void Serienbrief_Load(object sender, EventArgs e)
@@ -493,6 +497,11 @@ namespace OnDoc.UIControls
}
private void refresh_spalten()
{
+ int hasbl = 0;
+ foreach(System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows)
+ {
+ if (dr["blkunde"].ToString() == "1") { hasbl = 1; }
+ }
try
{
// sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = false;
@@ -505,8 +514,15 @@ namespace OnDoc.UIControls
{
sfDataGridEmpfaenger.Columns["IntEintragnr"].Visible = true;
//sfDataGridEmpfaenger.Columns["STATUS"].Visible = false;
+
sfDataGridEmpfaenger.Columns["FEHLERCODE"].Visible = false;
sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = false;
+ if (hasbl > 0)
+ {
+ sfDataGridEmpfaenger.Columns["BLKUNDE"].Visible = true;
+ sfDataGridEmpfaenger.Columns["BLKUNDE"].Width = 50;
+ }
+
sfDataGridEmpfaenger.Columns["DOKUMENT_GEDRUCKT"].Visible = false;
sfDataGridEmpfaenger.Columns["DOKUMENTID"].Visible = true;
sfDataGridEmpfaenger.Columns["DOKUMENTIDBDR"].Visible = false;
@@ -1212,9 +1228,11 @@ namespace OnDoc.UIControls
{
dr = sb.dsempfaenger.Tables[0].Select("Partnernr=''");
}
+
foreach (var dr1 in dr)
{
+ dr1["blkunde"] = dt.Rows[i]["blkunde"].ToString();
dr1["Status"] = dt.Rows[i]["status"];
// Logging.Logging.Debug("dr1 ", "OnDoc", dr1["Status"].ToString());
try
@@ -1998,39 +2016,95 @@ namespace OnDoc.UIControls
dv.Sort = "Partnernr";
PdfDocument finalDoc = new PdfDocument();
+ int normalcount = 0;
+ int blcount = 0;
+ foreach (DataRowView rowView in dv)
+ {
+ System.Data.DataRow dr = rowView.Row;
+ if (dr["blkunde"].ToString()=="1") { blcount++; } else { normalcount++; }
+ }
+
DB db = new DB(AppParams.connectionstring);
int stapelgroesse = 200;
int stapel = 1;
int i = 0;
- int anzahl_stapel = (dv.Count / 100) + 1;
+ int anzahl_stapel = (normalcount / 100) + 1;
Stream[] streams = null;
- if (dv.Count > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[dv.Count];
+ if (normalcount > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[normalcount];
init_progressbar("Druckstapel generieren", dv.Count);
- foreach (DataRowView rowView in dv)
+ if (normalcount > 0)
{
- add_progress();
- System.Data.DataRow dr = rowView.Row;
- db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
- var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
- if (stream.Length > 0)
+ foreach (DataRowView rowView in dv)
{
- streams[i] = stream;
- i++;
- if (i >= stapelgroesse)
+ add_progress();
+ System.Data.DataRow dr = rowView.Row;
+ if (dr["blkunde"].ToString() != "1")
{
- save_stapel(stapel, ref streams);
-
- i = 0;
- if (dv.Count-(stapel * stapelgroesse) >= stapelgroesse) { streams = new Stream[stapelgroesse]; } else
+
+ db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
+ var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
+ if (stream.Length > 0)
{
- streams = new Stream[dv.Count - (stapel * stapelgroesse)];
+ streams[i] = stream;
+ i++;
+ if (i >= stapelgroesse)
+ {
+ save_stapel(stapel, ref streams);
+
+ i = 0;
+ if (dv.Count - (stapel * stapelgroesse) >= stapelgroesse) { streams = new Stream[stapelgroesse]; }
+ else
+ {
+ streams = new Stream[dv.Count - (stapel * stapelgroesse)];
+ }
+ //streams = new Stream[dv.Count - (stapel * stapelgroesse)];
+ stapel++;
+ }
}
- //streams = new Stream[dv.Count - (stapel * stapelgroesse)];
- stapel++;
}
}
+ save_stapel(stapel, ref streams);
+ }
+ if (blcount > 0)
+ {
+ i = 0;
+ anzahl_stapel = (blcount / 100) + 1;
+ streams = null;
+ if (blcount > stapelgroesse) { streams = new Stream[stapelgroesse]; } else streams = new Stream[blcount];
+ stapel = stapel + 1;
+ i = 0;
+ foreach (DataRowView rowView in dv)
+ {
+ add_progress();
+ System.Data.DataRow dr = rowView.Row;
+ if (dr["blkunde"].ToString() == "1")
+ {
+
+ db.Get_Tabledata("Select dbo.BinaryToBase64(dokument) from edex_sb_serienbrief_dokument where dokumentid='" + dr["Dokumentid"].ToString() + "'", false, true);
+ var stream = new MemoryStream(Convert.FromBase64String(db.dsdaten.Tables[0].Rows[0][0].ToString()));
+ if (stream.Length > 0)
+ {
+ streams[i] = stream;
+ i++;
+ if (i >= stapelgroesse)
+ {
+ save_stapel(stapel, ref streams);
+
+ i = 0;
+ if (dv.Count - (stapel * stapelgroesse) >= stapelgroesse) { streams = new Stream[stapelgroesse]; }
+ else
+ {
+ streams = new Stream[dv.Count - (stapel * stapelgroesse)];
+ }
+ //streams = new Stream[dv.Count - (stapel * stapelgroesse)];
+ stapel++;
+ }
+ }
+ }
+ }
+ save_stapel(stapel, ref streams);
+
}
- save_stapel(stapel, ref streams);
//PdfDocumentBase.Merge(finalDoc, streams);
//FileStream fs = new FileStream(AppParams.tempdir+sb.serienbriefnr.ToString()+".pdf",FileMode.Create);
//finalDoc.Save(fs);
@@ -2609,5 +2683,29 @@ namespace OnDoc.UIControls
}
}
- }
+
+ private void DateDokumentDatum_DropDownOpening(object sender, CancelEventArgs e)
+ {
+ DateDokumentDatum.MonthCalendar.FirstDayOfWeek=DayOfWeek.Monday;
+ }
+
+ private void sfDataGridEmpfaenger_DrawCell(object sender, Syncfusion.WinForms.DataGrid.Events.DrawCellEventArgs e)
+ {
+ var selectedItem = e.DataRow;
+ var dataRow = (e.DataRow.RowData as DataRowView).Row;
+ if (e.Column.MappingName == "BLKUNDE")
+ {
+ if (dataRow["blkunde"].ToString() == "1")
+ {
+
+ e.Style.BackColor = Color.Red;
+
+
+
+ }
+
+ }
+ }
+
+ }
}
diff --git a/Client/UIControls/Serienbrief.resx b/Client/UIControls/Serienbrief.resx
index be710bcd..c9abfe21 100644
--- a/Client/UIControls/Serienbrief.resx
+++ b/Client/UIControls/Serienbrief.resx
@@ -133,19 +133,19 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
+ vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
+ vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAEAAADvBhAgAAHBYCyfAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wAAADsABataJCQAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
+ vgAADr4B6kKxwAAAABJJREFUOE9jYBgFo2AUjAIIAAAEEAABTLtGVQAAAABJRU5ErkJggg==
diff --git a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs
index c9871103..831814f0 100644
--- a/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs
+++ b/Client/UIControls/UCAllgemeineDokumentParam.Designer.cs
@@ -593,6 +593,7 @@
this.DateTermin.Size = new System.Drawing.Size(29, 21);
this.DateTermin.TabIndex = 5;
this.DateTermin.ToolTipText = "";
+ this.DateTermin.DropDownOpening += new System.ComponentModel.CancelEventHandler(this.DateTermin_DropDownOpening);
this.DateTermin.ValueChanged += new Syncfusion.WinForms.Input.Events.DateTimeValueChangedEventHandler(this.DateTermin_ValueChanged);
//
// lblTermin
@@ -606,12 +607,15 @@
//
// DateDokumentDatum
//
+ this.DateDokumentDatum.CanApplyTheme = false;
+ this.DateDokumentDatum.Cursor = System.Windows.Forms.Cursors.IBeam;
this.DateDokumentDatum.DateTimeIcon = null;
- this.DateDokumentDatum.Location = new System.Drawing.Point(151, 43);
+ this.DateDokumentDatum.Location = new System.Drawing.Point(151, 42);
this.DateDokumentDatum.Name = "DateDokumentDatum";
this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21);
this.DateDokumentDatum.TabIndex = 3;
this.DateDokumentDatum.ToolTipText = "";
+ this.DateDokumentDatum.DropDownOpening += new System.ComponentModel.CancelEventHandler(this.DateDokumentDatum_DropDownOpening);
//
// lblDokumentDatum
//
diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs
index 323280fb..be00114e 100644
--- a/Client/UIControls/UCAllgemeineDokumentParam.cs
+++ b/Client/UIControls/UCAllgemeineDokumentParam.cs
@@ -28,6 +28,10 @@ using System.IO;
using System.Net;
using Syncfusion.Windows.Shared;
using System.Xml.Linq;
+using Syncfusion.WinForms.Input;
+using System.Globalization;
+using System.Threading;
+using System.ComponentModel.Design;
namespace OnDoc.UIControls
@@ -80,11 +84,14 @@ namespace OnDoc.UIControls
{
InitializeComponent();
docgendata = new clsdocgendata();
+
+
}
public void Refresh_Details()
{
+ var x = DateDokumentDatum.Culture.DateTimeFormat.FirstDayOfWeek;
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select nreintrag, bezeichnung from Postzustellung where aktiv=1 order by bezeichnung", false, true);
cbboxpostzustellung.DataSource = db.dsdaten.Tables[0];
@@ -1178,6 +1185,14 @@ namespace OnDoc.UIControls
}
+ private void DateDokumentDatum_DropDownOpening(object sender, CancelEventArgs e)
+ {
+ DateDokumentDatum.MonthCalendar.FirstDayOfWeek = DayOfWeek.Monday;
+ }
+ private void DateTermin_DropDownOpening(object sender, CancelEventArgs e)
+ {
+ DateTermin.MonthCalendar.FirstDayOfWeek=DayOfWeek.Monday;
+ }
}
}
diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll
index 38ae82c6..cfa10177 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 3de10ea3..1c08dd6f 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 a056e704..0ad5b0a3 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 8e0d70da..77ef648b 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 2d724458..77c2972a 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 e2a76e8f..21397e21 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 de15155c..e3ad83d9 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.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache
index fc05dccc..1e3bb828 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 e406ae6d..f2fa846c 100644
Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources
index 70876586..90239711 100644
Binary files a/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources and b/Client/obj/Debug/OnDoc.UIControls.Serienbrief.resources differ
diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe
index a056e704..0ad5b0a3 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 8e0d70da..77ef648b 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 e2a76e8f..21397e21 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 38ae82c6..cfa10177 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 3de10ea3..1c08dd6f 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 f6dfd966..97431ad5 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 38ae82c6..cfa10177 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 3de10ea3..1c08dd6f 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 8217d99d..0a59e201 100644
--- a/Database/db.cs
+++ b/Database/db.cs
@@ -2227,7 +2227,7 @@ namespace Database
int unterschriftrechts = Convert.ToInt32(dsdaten.Tables[0].Rows[0]["Unterschrift_rechts"]);
int bearbeitung_zwingend = Convert.ToInt32(dsdaten.Tables[0].Rows[0]["bearbeitung_zwingend"]);
//if (unterschriftlinks == 1 && unterschriftrechts == 0 && approved1 == 1) { approved = 1; }
- Get_Tabledata("Select faksimile from dokument where dokumentid=" + dokumentid, false, true);
+ Get_Tabledata("Select faksimile from dokument where dokumentid='" + dokumentid+"'", false, true);
try
{
faksimile = Convert.ToInt32(dsdaten.Tables[0].Rows[0][0]);
diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll
index 38ae82c6..cfa10177 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 3de10ea3..1c08dd6f 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 38ae82c6..cfa10177 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 3de10ea3..1c08dd6f 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 87056aae..928bf674 100644
Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ