diff --git a/API_NetFramework/bin/Database.dll b/API_NetFramework/bin/Database.dll index 0ed86fb2..685295bc 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 3feb8b24..b7c20860 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 12ec47dd..d092a985 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 3c7e8fe9..2b89df9f 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 ac034daa..b41c8506 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 12ec47dd..d092a985 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 3c7e8fe9..2b89df9f 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/Client/Client.csproj b/Client/Client.csproj index 540918b3..951896c6 100644 --- a/Client/Client.csproj +++ b/Client/Client.csproj @@ -596,6 +596,7 @@ + diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/DocMgmt/Serienbrief.cs index db71e791..7060df3e 100644 --- a/Client/DocMgmt/Serienbrief.cs +++ b/Client/DocMgmt/Serienbrief.cs @@ -948,7 +948,7 @@ namespace OnDoc.UIControls { add_progress(); System.Windows.Forms.Application.DoEvents(); - dr = sb.dsempfaenger.Tables[0].Select("Partnernr='" + dt.Rows[i][0].ToString() + "' and status<>'1'"); + dr = sb.dsempfaenger.Tables[0].Select("Partnernr='" + dt.Rows[i][0].ToString() + "' and status<>1"); if (dr.Length == 0) { dr = sb.dsempfaenger.Tables[0].Select("Partnernr=''"); diff --git a/Client/Properties/Resources.Designer.cs b/Client/Properties/Resources.Designer.cs index cf3dad6f..267bfc14 100644 --- a/Client/Properties/Resources.Designer.cs +++ b/Client/Properties/Resources.Designer.cs @@ -2770,6 +2770,16 @@ namespace OnDoc.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Word_Edit_20x20_32 { + get { + object obj = ResourceManager.GetObject("Word_Edit_20x20_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 52a8de9a..92a704a2 100644 --- a/Client/Properties/Resources.resx +++ b/Client/Properties/Resources.resx @@ -931,6 +931,9 @@ ..\Resources\Word_Edit_16x16-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Word_Edit_20x20-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Word_Edit_24x24-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Client/Resources/Word_Edit_20x20-32.png b/Client/Resources/Word_Edit_20x20-32.png new file mode 100644 index 00000000..828cd90f Binary files /dev/null and b/Client/Resources/Word_Edit_20x20-32.png differ diff --git a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs index 9a8f1705..f29a4fdf 100644 --- a/Client/UIControls/Administrator/Dokumenttyp.Designer.cs +++ b/Client/UIControls/Administrator/Dokumenttyp.Designer.cs @@ -50,7 +50,6 @@ this.tsbtncopy = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.GrpUnterschrifte = new System.Windows.Forms.GroupBox(); - this.cbUnterschriftpruefung = new System.Windows.Forms.CheckBox(); this.lblStandard = new System.Windows.Forms.Label(); this.lbUnterschriftStandard = new System.Windows.Forms.ListBox(); this.cbUnterschriftrechts = new System.Windows.Forms.CheckBox(); @@ -58,6 +57,7 @@ this.cbDigitaleUnterschrift = new System.Windows.Forms.CheckBox(); this.cbUnterschriftlinks = new System.Windows.Forms.CheckBox(); this.GrpBewilligung = new System.Windows.Forms.GroupBox(); + this.cbUnterschriftpruefung = new System.Windows.Forms.CheckBox(); this.chkBewilliigungZwingend = new System.Windows.Forms.CheckBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.chkboxInOffice = new System.Windows.Forms.CheckBox(); @@ -297,16 +297,6 @@ this.GrpUnterschrifte.TabStop = false; this.GrpUnterschrifte.Text = "Unterschriften"; // - // cbUnterschriftpruefung - // - this.cbUnterschriftpruefung.AutoSize = true; - this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19); - this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung"; - this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17); - this.cbUnterschriftpruefung.TabIndex = 1; - this.cbUnterschriftpruefung.Text = "Unterschriftenprüfung zwingend"; - this.cbUnterschriftpruefung.UseVisualStyleBackColor = true; - // // lblStandard // this.lblStandard.AutoSize = true; @@ -315,6 +305,7 @@ this.lblStandard.Size = new System.Drawing.Size(50, 13); this.lblStandard.TabIndex = 26; this.lblStandard.Text = "Standard"; + this.lblStandard.Visible = false; // // lbUnterschriftStandard // @@ -327,6 +318,7 @@ this.lbUnterschriftStandard.Name = "lbUnterschriftStandard"; this.lbUnterschriftStandard.Size = new System.Drawing.Size(133, 43); this.lbUnterschriftStandard.TabIndex = 25; + this.lbUnterschriftStandard.Visible = false; // // cbUnterschriftrechts // @@ -350,7 +342,7 @@ this.cbDigitaleUnterschrift.Name = "cbDigitaleUnterschrift"; this.cbDigitaleUnterschrift.Size = new System.Drawing.Size(216, 24); this.cbDigitaleUnterschrift.TabIndex = 24; - this.cbDigitaleUnterschrift.Text = "Faksimie Unterschrift"; + this.cbDigitaleUnterschrift.Text = "Faksimile Unterschrift"; // // cbUnterschriftlinks // @@ -371,6 +363,16 @@ this.GrpBewilligung.TabStop = false; this.GrpBewilligung.Text = "Unterschriftenprüfung"; // + // cbUnterschriftpruefung + // + this.cbUnterschriftpruefung.AutoSize = true; + this.cbUnterschriftpruefung.Location = new System.Drawing.Point(15, 19); + this.cbUnterschriftpruefung.Name = "cbUnterschriftpruefung"; + this.cbUnterschriftpruefung.Size = new System.Drawing.Size(176, 17); + this.cbUnterschriftpruefung.TabIndex = 1; + this.cbUnterschriftpruefung.Text = "Unterschriftenprüfung zwingend"; + this.cbUnterschriftpruefung.UseVisualStyleBackColor = true; + // // chkBewilliigungZwingend // this.chkBewilliigungZwingend.AutoSize = true; @@ -1452,7 +1454,7 @@ this.Name = "Dokumenttyp"; this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center; this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center; - this.Text = "Dokumenttyp"; + this.Text = "Vorlagentyp"; this.Load += new System.EventHandler(this.Dokumenttyp_Load); ((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).EndInit(); this.tabControlAdv1.ResumeLayout(false); diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index 199a9846..61c01d89 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -53,6 +53,7 @@ namespace OnDoc.UICintrols this.tsbtnpreviewbottom = new System.Windows.Forms.ToolStripButton(); this.tsbtnpreviewright = new System.Windows.Forms.ToolStripButton(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + 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(); @@ -65,6 +66,7 @@ namespace OnDoc.UICintrols this.RibbonButtonFavoriten = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditEditDoc = new System.Windows.Forms.RibbonButton(); this.RibbonButtonEditDelete = new System.Windows.Forms.RibbonButton(); + this.ribbonPanelZuweisung = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonZuweisen = new System.Windows.Forms.RibbonButton(); this.ribbonButtonToApproval = new System.Windows.Forms.RibbonButton(); this.RibbonPannelAproval = new System.Windows.Forms.RibbonPanel(); @@ -97,7 +99,7 @@ namespace OnDoc.UICintrols this.RibbonButtonViewStandard = new System.Windows.Forms.RibbonButton(); this.RibbonButtonViewSave = new System.Windows.Forms.RibbonButton(); this.RibbonButtonViewDelete = new System.Windows.Forms.RibbonButton(); - this.ribbonButton4 = new System.Windows.Forms.RibbonButton(); + this.ribbonSaveGridView = new System.Windows.Forms.RibbonButton(); this.ribbonPanelVorschau = new System.Windows.Forms.RibbonPanel(); this.RibbonBtnVorschauNo = new System.Windows.Forms.RibbonButton(); this.RibbonBtnVorschauUnten = new System.Windows.Forms.RibbonButton(); @@ -105,6 +107,8 @@ namespace OnDoc.UICintrols this.RibbonBtnVorschauSepparat = new System.Windows.Forms.RibbonButton(); this.ribbonPanelAttribute = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonAttributeEinAusblenden = new System.Windows.Forms.RibbonButton(); + this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); + this.ribbonButton6 = new System.Windows.Forms.RibbonButton(); this.ribbonTabDokpaket_Serienbrief = new System.Windows.Forms.RibbonTab(); this.RibbonPanelCreate = new System.Windows.Forms.RibbonPanel(); this.RibbonButtonCreateNewPaket = new System.Windows.Forms.RibbonButton(); @@ -139,13 +143,10 @@ namespace OnDoc.UICintrols this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig(); this.lblToApprove = new System.Windows.Forms.Label(); this.timer1 = new System.Windows.Forms.Timer(this.components); + this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig(); this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton(); this.ribbonButton5 = new System.Windows.Forms.RibbonButton(); - this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig(); this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); - this.docPreview1 = new OnDoc.UIControls.DocPreview(); - this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel(); - this.ribbonButton6 = new System.Windows.Forms.RibbonButton(); ((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit(); this.ctxMenuDokList.SuspendLayout(); this.toolStrip1.SuspendLayout(); @@ -167,6 +168,7 @@ namespace OnDoc.UICintrols this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill; this.sfDataGrid1.Location = new System.Drawing.Point(0, 0); this.sfDataGrid1.Name = "sfDataGrid1"; + this.sfDataGrid1.RowHeight = 30; this.sfDataGrid1.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Multiple; this.sfDataGrid1.ShowGroupDropArea = true; this.sfDataGrid1.ShowToolTip = true; @@ -375,6 +377,16 @@ namespace OnDoc.UICintrols this.splitContainer1.SplitterDistance = 343; this.splitContainer1.TabIndex = 2; // + // 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; @@ -443,6 +455,7 @@ namespace OnDoc.UICintrols this.RibbonTabUserFunctions.Name = "RibbonTabUserFunctions"; this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelExit); this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelBearbeiten); + this.RibbonTabUserFunctions.Panels.Add(this.ribbonPanelZuweisung); this.RibbonTabUserFunctions.Panels.Add(this.RibbonPannelAproval); this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelArchiv); this.RibbonTabUserFunctions.Panels.Add(this.RibbonPanelDemo); @@ -476,8 +489,6 @@ namespace OnDoc.UICintrols this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonFavoriten); this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditEditDoc); this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonEditDelete); - this.RibbonPanelBearbeiten.Items.Add(this.RibbonButtonZuweisen); - this.RibbonPanelBearbeiten.Items.Add(this.ribbonButtonToApproval); this.RibbonPanelBearbeiten.Name = "RibbonPanelBearbeiten"; this.RibbonPanelBearbeiten.Text = "Dokument"; // @@ -517,6 +528,13 @@ namespace OnDoc.UICintrols this.RibbonButtonEditDelete.Text = "Löschen"; this.RibbonButtonEditDelete.Click += new System.EventHandler(this.RibbonButtonEditDelete_Click); // + // ribbonPanelZuweisung + // + this.ribbonPanelZuweisung.Items.Add(this.RibbonButtonZuweisen); + this.ribbonPanelZuweisung.Items.Add(this.ribbonButtonToApproval); + this.ribbonPanelZuweisung.Name = "ribbonPanelZuweisung"; + this.ribbonPanelZuweisung.Text = "Zuweisen"; + // // RibbonButtonZuweisen // this.RibbonButtonZuweisen.Image = global::OnDoc.Properties.Resources.Zuweisen_32x32_32; @@ -541,7 +559,7 @@ namespace OnDoc.UICintrols this.RibbonPannelAproval.Items.Add(this.ribbonButtonApproval); this.RibbonPannelAproval.Items.Add(this.ribbonButtonRefresh_Bewilligungen); this.RibbonPannelAproval.Name = "RibbonPannelAproval"; - this.RibbonPannelAproval.Text = ""; + this.RibbonPannelAproval.Text = "Dokumentprüfung"; // // ribbonButtonApproval // @@ -760,7 +778,7 @@ namespace OnDoc.UICintrols this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewStandard); this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewSave); this.ribbonItemGroup3.Items.Add(this.RibbonButtonViewDelete); - this.ribbonItemGroup3.Items.Add(this.ribbonButton4); + this.ribbonItemGroup3.Items.Add(this.ribbonSaveGridView); this.ribbonItemGroup3.Name = "ribbonItemGroup3"; // // RibbonButtonViewStandard @@ -794,15 +812,15 @@ namespace OnDoc.UICintrols this.RibbonButtonViewDelete.ToolTip = "Ansichtseinstellung löschen"; this.RibbonButtonViewDelete.Click += new System.EventHandler(this.RibbonButtonViewDelete_Click); // - // ribbonButton4 + // ribbonSaveGridView // - this.ribbonButton4.Image = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.Image"))); - this.ribbonButton4.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.LargeImage"))); - this.ribbonButton4.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; - this.ribbonButton4.Name = "ribbonButton4"; - this.ribbonButton4.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton4.SmallImage"))); - this.ribbonButton4.Visible = false; - this.ribbonButton4.Click += new System.EventHandler(this.ribbonButton4_Click_1); + this.ribbonSaveGridView.Image = global::OnDoc.Properties.Resources.EditDoc_24x24_32; + this.ribbonSaveGridView.LargeImage = global::OnDoc.Properties.Resources.EditDoc_24x24_32; + this.ribbonSaveGridView.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonSaveGridView.Name = "ribbonSaveGridView"; + this.ribbonSaveGridView.SmallImage = global::OnDoc.Properties.Resources.EditDoc_16x16_32; + this.ribbonSaveGridView.Visible = false; + this.ribbonSaveGridView.Click += new System.EventHandler(this.ribbonButton4_Click_1); // // ribbonPanelVorschau // @@ -867,6 +885,21 @@ namespace OnDoc.UICintrols this.RibbonButtonAttributeEinAusblenden.Text = "Ein-/Ausblenden"; this.RibbonButtonAttributeEinAusblenden.Click += new System.EventHandler(this.RibbonButtonAttributeEinAusblenden_Click); // + // ribbonPanel1 + // + this.ribbonPanel1.Items.Add(this.ribbonButton6); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Text = "Dokumentliste"; + // + // ribbonButton6 + // + this.ribbonButton6.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; + this.ribbonButton6.LargeImage = global::OnDoc.Properties.Resources.Refresh_32x32_32; + this.ribbonButton6.Name = "ribbonButton6"; + this.ribbonButton6.SmallImage = global::OnDoc.Properties.Resources.Refresh_24x24_32; + this.ribbonButton6.Text = "Aktualisieren"; + this.ribbonButton6.Click += new System.EventHandler(this.ribbonButton6_Click); + // // ribbonTabDokpaket_Serienbrief // this.ribbonTabDokpaket_Serienbrief.Name = "ribbonTabDokpaket_Serienbrief"; @@ -1160,31 +1193,6 @@ namespace OnDoc.UICintrols this.dokwerte1.Size = new System.Drawing.Size(0, 694); this.dokwerte1.TabIndex = 7; // - // 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; - // - // ribbonPanel1 - // - this.ribbonPanel1.Items.Add(this.ribbonButton6); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Text = "Dokumentliste"; - // - // ribbonButton6 - // - this.ribbonButton6.Image = global::OnDoc.Properties.Resources.Refresh_32x32_32; - this.ribbonButton6.LargeImage = global::OnDoc.Properties.Resources.Refresh_32x32_32; - this.ribbonButton6.Name = "ribbonButton6"; - this.ribbonButton6.SmallImage = global::OnDoc.Properties.Resources.Refresh_24x24_32; - this.ribbonButton6.Text = "Aktualisieren"; - this.ribbonButton6.Click += new System.EventHandler(this.ribbonButton6_Click); - // // DokList // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1310,7 +1318,7 @@ namespace OnDoc.UICintrols private System.Windows.Forms.RibbonButton RibbonButtonViewStandard; private System.Windows.Forms.RibbonButton RibbonButtonViewSave; private System.Windows.Forms.RibbonButton RibbonButtonViewDelete; - private System.Windows.Forms.RibbonButton ribbonButton4; + private System.Windows.Forms.RibbonButton ribbonSaveGridView; private System.Windows.Forms.RibbonTab ribbonTabDokpaket_Serienbrief; private System.Windows.Forms.RibbonTab ribbonTabAnsicht; private System.Windows.Forms.RibbonTab ribbonTabProfil; @@ -1329,5 +1337,6 @@ namespace OnDoc.UICintrols private UIControls.Dokwerte dokwerte1; private System.Windows.Forms.RibbonPanel ribbonPanel1; private System.Windows.Forms.RibbonButton ribbonButton6; + private System.Windows.Forms.RibbonPanel ribbonPanelZuweisung; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 2818912c..c1deda2c 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -40,6 +40,7 @@ using NLog.Config; using OnDoc.Versandstrasse; using System.Data.SqlClient; using Windows.ApplicationModel.VoiceCommands; +using Syncfusion.Windows.Forms; @@ -64,6 +65,9 @@ namespace OnDoc.UICintrols public bool interop { get; set; } = false; public bool runmacros { get; set; } = false; + private string currentview { get; set; } = ""; + private string paketview { get; set; }=""; + public string Search_Docid { get; set; } = ""; private System.Data.DataTable Ansichten { get; set; } @@ -130,10 +134,23 @@ namespace OnDoc.UICintrols string standardview = ""; foreach (System.Data.DataRow dr in Ansichten.Rows) { + RibbonLabel rl = new RibbonLabel(); rl.Text = dr["bezeichnung"].ToString(); rl.Tag = Convert.ToInt32(dr["id"]); - ribbonCBAnsicht.DropDownItems.Add(rl); + if (Convert.ToInt32(rl.Tag)==-102 && AppParams.isSysadmin) + { + ribbonCBAnsicht.DropDownItems.Add(rl); + } + if (Convert.ToInt32(rl.Tag)==-102) + { + paketview = dr["gridsettings"].ToString(); + } + if (Convert.ToInt32(rl.Tag) != -102 ) + { + ribbonCBAnsicht.DropDownItems.Add(rl); + } + if (Convert.ToBoolean(dr["standard"]) == true && Bezeichnung == "") { ribbonCBAnsicht.SelectedItem = rl; @@ -184,6 +201,14 @@ namespace OnDoc.UICintrols if (datafilter != "") { refresh_dokumente_filtered(layout); + if (layout == "view_dokumentpaket") + { + refresh_view(paketview); + } else + { + refresh_view(currentview); + + } return; } DB db = new DB(AppParams.connectionstring); @@ -201,10 +226,12 @@ namespace OnDoc.UICintrols //this.sfDataGrid1.DataSource = dokumente; sfDataGrid1.View.AutoExpandGroups = true; this.timer1.Enabled = true; + refresh_view(currentview); //foreach (GridColumn gd in sfDataGrid1.Columns) //{ // sfDataGrid1.GroupColumnDescriptions.Add(new GroupColumnDescription() { ColumnName = gd.MappingName }); //} + //sfDataGrid1.RowHeight = 60; } public void refresh_dokumente_filtered(string layout = "") @@ -802,11 +829,11 @@ namespace OnDoc.UICintrols var dataRow = (e.DataRow.RowData as DataRowView).Row; if (Convert.ToBoolean(dataRow["zu_retournieren"]) == true) { - e.Graphics.DrawImage(OnDoc.Properties.Resources.Barcode_24x24_32, e.Bounds.X + 20, e.Bounds.Y + 3); - Pen borderPen = new Pen(Color.LightGray); - e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom); - e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom); + e.Graphics.DrawImage(OnDoc.Properties.Resources.Barcode_16x16_32, e.Bounds.X + 20, e.Bounds.Y + 3); } + Pen borderPen = new Pen(Color.LightGray); + e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom); + e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom); return; } if (e.Column.MappingName == "fileext") @@ -823,7 +850,6 @@ namespace OnDoc.UICintrols if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "D") { //word - Logging.Logging.Debug("IdonHandler", "OnDocClient", dataRow["dokumentid"].ToString() + Convert.ToString(dataRow["Bearbeitung_Zwingend"])); if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"])== false) { if (Convert.ToBoolean(dataRow["ToApprove"]) == true) @@ -847,7 +873,8 @@ namespace OnDoc.UICintrols { e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y); } - return; + + // return; } if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X") { @@ -1224,10 +1251,9 @@ namespace OnDoc.UICintrols ribbonpanelanalyse.Visible = AppParams.isSysadmin; RibbonTabAdmin.Visible = false; RibbonTabAdmin.Visible = true; - if (AppParams.isSysadmin) - { + ribbonSaveGridView.Enabled = AppParams.isSysadmin; + ribbonSaveGridView.Visible = AppParams.isSysadmin; - } //pos_elements(); } @@ -1341,7 +1367,8 @@ namespace OnDoc.UICintrols private void refresh_view(string base64string) { - //return; + + byte[] bytes = Convert.FromBase64String(base64string); string plaintext = Strings.Base64Decode(base64string); string tagesdatum = DateTime.Now.ToString("yyyy-MM-ddT00:00:00"); @@ -1349,6 +1376,13 @@ namespace OnDoc.UICintrols plaintext = plaintext.Replace("@today@", tagesdatum); plaintext = Strings.Base64Encode(plaintext); bytes = Convert.FromBase64String(plaintext); + if (plaintext == "") + { + if (AppParams.isSysadmin) { ribbonCBAnsicht.SelectedIndex = 1; } else { ribbonCBAnsicht.SelectedIndex = 0; } + return; + } + currentview=plaintext; + using (MemoryStream ms = new MemoryStream(bytes)) { this.sfDataGrid1.Deserialize(ms); @@ -1418,7 +1452,7 @@ namespace OnDoc.UICintrols sfDataGrid1.ClearGrouping(); sfDataGrid1.ClearSelection(); sfDataGrid1.ClearSorting(); - ribbonCBAnsicht.SelectedIndex = 0; + ribbonCBAnsicht.SelectedIndex = 1; } private void RibbonButtonViewSave_Click(object sender, EventArgs e) @@ -1456,9 +1490,8 @@ namespace OnDoc.UICintrols { string bez = ribbonCBAnsicht.SelectedItem.Text.Trim(); - if (bez.Length < 4) { bez = bez + " "; } - if (bez == "" || bez == " Heu") - { + int ID = Convert.ToInt32(ribbonCBAnsicht.SelectedItem.Tag); + if (ID < 0) { MessageBox.Show("Die gewählte Standard-Ansicht kann nicht gelöscht werden", "Ansicht löschen", MessageBoxButtons.OK, MessageBoxIcon.Information); return; } @@ -1479,21 +1512,27 @@ namespace OnDoc.UICintrols private void ribbonButton4_Click_1(object sender, EventArgs e) { + string bez = ribbonCBAnsicht.SelectedItem.Text.Trim(); + string id = ribbonCBAnsicht.SelectedItem.Tag.ToString(); - FileHelper fh = new FileHelper(); - string b = fh.Base64FromFile(@"x:\gridsettings2.xml"); - - DB db = new DB(AppParams.connectionstring); - db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + b + "' where id=-100"); - using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open)) + if (id=="-100" || id == "-101") { - this.sfDataGrid1.Deserialize(file); - } - using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open)) - { - this.sfDataGrid1.Serialize(file); + if (MessageBox.Show("Standard-Ansicht " + bez + " überschreiben?", "Ansichten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + MemoryStream ms = new MemoryStream(); + this.sfDataGrid1.Serialize(ms); + string inputAsString = Convert.ToBase64String(ms.ToArray()); + DB db = new DB(AppParams.connectionstring); + db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + inputAsString + "' where id=" + id.ToString()); + db = null; + + + } + + } + } private void archivierenToolStripMenuItem_Click(object sender, EventArgs e) @@ -1717,6 +1756,7 @@ namespace OnDoc.UICintrols private void ribbonButton6_Click(object sender, EventArgs e) { refresh_dokumente(); + } } diff --git a/Client/UIControls/DokList.resx b/Client/UIControls/DokList.resx index 8f58fc7b..9d1b01d3 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= @@ -563,6 +545,9 @@ 376, 17 + + 464, 17 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -581,7 +566,4 @@ vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII= - - 464, 17 - \ No newline at end of file diff --git a/Client/UIControls/Partnersuche.cs b/Client/UIControls/Partnersuche.cs index 999af6d2..f66e6106 100644 --- a/Client/UIControls/Partnersuche.cs +++ b/Client/UIControls/Partnersuche.cs @@ -16,6 +16,8 @@ using System.Web.UI.WebControls; using Syncfusion.Data; using Syncfusion.WinForms.DataGrid.Interactivity; using System.IO; +using Database; +using System.Linq.Expressions; namespace OnDoc.UIControls { @@ -24,8 +26,12 @@ namespace OnDoc.UIControls public int partnernr = 0; public string partnerkurzname = ""; + public bool bpperson_changed { get; set; } = false; public bool partnersaldiert = false; public bool person = false; + public bool personendokument { get; set; } = false; + public bool check_bp_person { get; set; } = false; + public Partnersuche() { InitializeComponent(); @@ -33,6 +39,14 @@ namespace OnDoc.UIControls this.trefferlistedata.TableControl.DoubleClick += TableControl_DoubleClick; } + public Partnersuche(bool personendokument, bool check_bp_person) + { + InitializeComponent(); + this.personendokument = personendokument; + this.check_bp_person = check_bp_person; + clsPartner.set_connectionstring(AppParams.connectionstring); + this.trefferlistedata.TableControl.DoubleClick += TableControl_DoubleClick; + } private void Form1_Load(object sender, EventArgs e) { this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y); @@ -40,8 +54,8 @@ namespace OnDoc.UIControls try { TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true); - - if (trefferlistedata.RowCount > 0) {sfButton1.Enabled = true;} + + if (trefferlistedata.RowCount > 0) { sfButton1.Enabled = true; } trefferlistedata.SelectedIndex = 0; } catch { } @@ -56,7 +70,7 @@ namespace OnDoc.UIControls if (DivFnkt.IsNumeric(s)) { trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0); - TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata,true); + TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true); if (clsPartner.partnerliste.Rows.Count == 1) { @@ -69,7 +83,7 @@ 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); + TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true); if (clsPartner.partnerliste.Rows.Count == 1) { trefferlistedata.SelectedIndex = 0; @@ -78,12 +92,17 @@ namespace OnDoc.UIControls } try { - TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata,true); + TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true); trefferlistedata.SelectedIndex = 0; try { - partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref trefferlistedata, "nrpar00")); - partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + if (!bpperson_changed) + { + get_details(); + + //partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref trefferlistedata, "nrpar00")); + //partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + } } catch { } } @@ -93,7 +112,7 @@ namespace OnDoc.UIControls if (trefferlistedata.View.Records.Count > 0) sfButton1.Enabled = true; else sfButton1.Enabled = false; } - catch { sfButton1.Enabled=false; } + catch { sfButton1.Enabled = false; } } @@ -108,9 +127,10 @@ namespace OnDoc.UIControls try { - partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref trefferlistedata, "nrpar00")); - partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); - partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); + get_details(); + //partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref trefferlistedata, "nrpar00")); + //partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + //partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); } catch { } } @@ -119,22 +139,93 @@ namespace OnDoc.UIControls { try { + + if (get_details()) + { + this.DialogResult = DialogResult.OK; + this.Close(); + } + } catch { } + } + + public bool get_details() + { + try { + partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); - this.DialogResult = DialogResult.OK; - this.Close(); + if (!check_bp_person) return true; + + + if (check_bp_person && personendokument && partnernr < 99999999) + { + DB dB = new DB(AppParams.connectionstring); + dB.Get_Tabledata("SELECT TOP 1 person_nummer FROM Partner_Rel WHERE BP_Nr=" + partnernr.ToString() + " AND BP_Person_Rel_Typ=6 AND aktiv=1", false, true); + if (dB.dsdaten.Tables[0].Rows.Count > 0) + { + partnernr = Convert.ToInt32(dB.dsdaten.Tables[0].Rows[0][0]); + dB.Get_Tabledata("Select bkpar00, saldiert from partner where nrpar00=" + partnernr.ToString(), false, true); + if (dB.dsdaten.Tables[0].Rows.Count > 0) + { + partnerkurzname = dB.dsdaten.Tables[0].Rows[0][0].ToString(); + partnersaldiert = Convert.ToBoolean(dB.dsdaten.Tables[0].Rows[0][1]); + bpperson_changed = true; + } + } + dB = null; + return true; + } + + if (check_bp_person && !personendokument && partnernr > 100000000) + { + DB db = new DB(AppParams.connectionstring); + try + { + db.clear_parameter(); + db.add_parameter("@personnr", partnernr.ToString()); + + db.Get_Tabledata("ondoc_bps_zur_person", true, false); + if (db.dsdaten.Tables[0].Rows.Count == 0) { return false; } + if (db.dsdaten.Tables[0].Rows.Count == 1) + { + partnerkurzname = db.dsdaten.Tables[0].Rows[0][0].ToString(); + partnersaldiert = Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][1]); + partnernr = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]); + bpperson_changed = true; + return true; + } + if (db.dsdaten.Tables[0].Rows.Count > 1) + { + MessageBox.Show("Für die gewählte Person exisieren mehrere BP's." + Environment.NewLine + "Bitte erneut suchen.", "Partnersuche", MessageBoxButtons.OK, MessageBoxIcon.Information); + return false; + } + + } + catch { return false; } + finally { db=null; } + } + + + return true; + } - catch { } + catch { return false; } + + } private void sfButton1_Click(object sender, EventArgs e) { - partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); - partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); - partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); - this.DialogResult = DialogResult.OK; - this.Close(); + if (get_details()) + { + this.DialogResult = DialogResult.OK; + this.Close(); + + } + //partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); + //partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + //partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); } private void sfButton2_Click(object sender, EventArgs e) @@ -143,14 +234,15 @@ namespace OnDoc.UIControls this.Close(); } - + void TableControl_DoubleClick(object sender, System.EventArgs e) { - try + try { - partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); - partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); - partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); + get_details(); + //partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); + //partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + //partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); this.DialogResult = DialogResult.OK; this.Close(); } @@ -166,11 +258,11 @@ 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.Partner_16x16_32, e.Bounds.X + 5, e.Bounds.Y + 3); } else { - e.Graphics.DrawImage(OnDoc.Properties.Resources.Person_16x16_32,e.Bounds.X + 5, e.Bounds.Y + 3); + e.Graphics.DrawImage(OnDoc.Properties.Resources.Person_16x16_32, e.Bounds.X + 5, e.Bounds.Y + 3); } Pen borderPen = new Pen(Color.LightGray); e.Graphics.DrawLine(borderPen, e.Bounds.Right, e.Bounds.Top, e.Bounds.Right, e.Bounds.Bottom); diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index b1763713..837db67f 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -20,6 +20,8 @@ using System.Drawing.Text; using BroadcastListener.Classes; using static BroadcastListener.Classes.Factory; using System.Web.UI.WebControls; +using Windows.UI; +using edoka_dms; namespace OnDoc.UIControls @@ -97,8 +99,12 @@ namespace OnDoc.UIControls db.add_parameter("@bck", "0"); db.Get_Tabledata("SP_Dokumentbearbeitung_StatusSelektion", true, false); + if (dokumenttypnr != 0) + { + set_personendokument(); + } - if (partnernr != 0) + if (partnernr != 0) { update_partner(); } @@ -107,7 +113,7 @@ namespace OnDoc.UIControls if (dokumenttypnr != 0) { - set_personendokument(); + //set_personendokument(); db.Get_Tabledata("Select * from dokumenttyp where dokumenttypnr=" + dokumenttypnr, false, true); System.Data.DataRow dr = db.dsdaten.Tables[0].Rows[0]; this.txtbezeichnung.Text = dr["Bezeichnung"].ToString(); @@ -498,11 +504,12 @@ namespace OnDoc.UIControls private void show_partnerdialog() { - Partnersuche ps = new Partnersuche(); + Partnersuche ps = new Partnersuche(personendokument,true); ps.ShowDialog(); if (ps.DialogResult == DialogResult.OK) { this.partnernr = ps.partnernr; + if (ps.bpperson_changed) { lblPartner.ForeColor = System.Drawing.Color.Red; } else { lblPartner.ForeColor = System.Drawing.Color.Black; } update_partner(); } } @@ -514,6 +521,7 @@ namespace OnDoc.UIControls private void gridDokwertlist_CellDoubleClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) { + if (e.DataColumn.ColumnIndex!=15) { return; } var selectedItem = e.DataRow; var dataRow = (e.DataRow.RowData as DataRowView).Row; string datenherkunft = dataRow["datenherkunft"].ToString(); diff --git a/Client/bin/Debug/Database.dll b/Client/bin/Debug/Database.dll index 0ed86fb2..685295bc 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 3feb8b24..b7c20860 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 2cd94495..b3705a6c 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 cb209cca..3c1561e1 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 8e5abbfc..fab461a1 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 f93e436b..f08f3d6d 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 19eb6900..8c7d2ee4 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/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 7934ea07..9917c1af 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 7155cdac..65040e3c 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/obj/Debug/OnDoc.Properties.Resources.resources b/Client/obj/Debug/OnDoc.Properties.Resources.resources index b28bfbc5..b6314d33 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 3f27de4b..abab421d 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 2cd94495..b3705a6c 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 cb209cca..3c1561e1 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 c4a83a22..77d937a1 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 f93e436b..f08f3d6d 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 0ed86fb2..685295bc 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 3feb8b24..b7c20860 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 e872baef..f2172263 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 0ed86fb2..685295bc 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 3feb8b24..b7c20860 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 ed13a50e..2d55d862 100644 --- a/Database/db.cs +++ b/Database/db.cs @@ -1573,22 +1573,15 @@ namespace Database dv = sb.dsempfaenger.Tables[0].Select(); i = 0; - foreach (var DR in dv) + foreach(System.Data.DataRow dr in sb.dsempfaenger.Tables[0].Rows) { - int ii; - try + int ii = 0; + ii = Convert.ToInt32(dr["status"]); + if (ii != 1) { - ii = Convert.ToInt32(DR["Status"]); - } - catch - { - ii = 0; - } - if (ii !=1 ) - { - DR["Status"] = -1; + //dr["Status"] = -1; tdr = tdt.NewRow(); - if (DR["Partnernr"].ToString() == "") + if (dr["Partnernr"].ToString() == "") { tdr[0] = 0; tdr[1] = -1; @@ -1599,7 +1592,7 @@ namespace Database } else { - tdr[0] = DR["Partnernr"]; + tdr[0] = dr["Partnernr"]; tdr[1] = 0; tdr[2] = i; tdr[3] = 3; @@ -1608,9 +1601,47 @@ namespace Database } tdt.Rows.Add(tdr); } - i = i + 1; + i=i+1; ; } + //foreach (var DR in dv) + //{ + // int ii; + // try + // { + // ii = Convert.ToInt32(DR["Status"]); + // } + // catch + // { + // ii = 0; + // } + // if (ii !=1 ) + // { + // DR["Status"] = -1; + // tdr = tdt.NewRow(); + // if (DR["Partnernr"].ToString() == "") + // { + // tdr[0] = 0; + // tdr[1] = -1; + // tdr[2] = i; + // tdr[3] = 0; + // // Rel. 4.1 BLKunde initialisieren + // tdr[4] = 0; + // } + // else + // { + // tdr[0] = DR["Partnernr"]; + // tdr[1] = 0; + // tdr[2] = i; + // tdr[3] = 3; + // // Rel. 4.1 BLKunde initialisieren + // tdr[4] = 0; + // } + // tdt.Rows.Add(tdr); + // } + // i = i + 1; + //} + var connection = new SqlConnection(); var da = new SqlDataAdapter("Select * from TMPSB_" + mitarbeiternr.ToString(), connection); var cb = new SqlCommandBuilder(da); diff --git a/Database/obj/Debug/Database.dll b/Database/obj/Debug/Database.dll index 0ed86fb2..685295bc 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 3feb8b24..b7c20860 100644 Binary files a/Database/obj/Debug/Database.pdb and b/Database/obj/Debug/Database.pdb differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Edit_16x16-32 (2).png b/Images/Icons/Icons/Blue/Images/Word_Edit_16x16-32 (2).png new file mode 100644 index 00000000..e3da5a2e Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Edit_16x16-32 (2).png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Edit_20x20-32.png b/Images/Icons/Icons/Blue/Images/Word_Edit_20x20-32.png new file mode 100644 index 00000000..828cd90f Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Edit_20x20-32.png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Edit_24x24-32 (2).png b/Images/Icons/Icons/Blue/Images/Word_Edit_24x24-32 (2).png new file mode 100644 index 00000000..66684b24 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Edit_24x24-32 (2).png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Edit_256x256-32 (2).png b/Images/Icons/Icons/Blue/Images/Word_Edit_256x256-32 (2).png new file mode 100644 index 00000000..7c26ff08 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Edit_256x256-32 (2).png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Edit_32x32-32 (2).png b/Images/Icons/Icons/Blue/Images/Word_Edit_32x32-32 (2).png new file mode 100644 index 00000000..e67560b7 Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Edit_32x32-32 (2).png differ diff --git a/Images/Icons/Icons/Blue/Images/Word_Edit_48x48-32 (2).png b/Images/Icons/Icons/Blue/Images/Word_Edit_48x48-32 (2).png new file mode 100644 index 00000000..ec57f74d Binary files /dev/null and b/Images/Icons/Icons/Blue/Images/Word_Edit_48x48-32 (2).png differ diff --git a/Images/Icons/Icons/Blue/Word_Edit.ico b/Images/Icons/Icons/Blue/Word_Edit.ico index f8e7487c..fda196cc 100644 Binary files a/Images/Icons/Icons/Blue/Word_Edit.ico and b/Images/Icons/Icons/Blue/Word_Edit.ico differ