diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 99c1e287..964e133b 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(168, 26); this.label2.TabIndex = 2; - this.label2.Text = "20. Januar 2025"; + this.label2.Text = "21. Januar 2025"; // // SplashScreen // diff --git a/Client/Klassen/clsPartner.cs b/Client/Klassen/clsPartner.cs index f2d013e1..b52ab018 100644 --- a/Client/Klassen/clsPartner.cs +++ b/Client/Klassen/clsPartner.cs @@ -9,6 +9,7 @@ using System.Data; using Syncfusion.Styles; using Syncfusion.Windows.Forms.Tools; using Database; +using System.Collections; namespace OnDoc.Klassen { @@ -58,9 +59,9 @@ namespace OnDoc.Klassen partnerliste.Clear(); partnerliste.Merge(tempDataTable); tempDataTable.Dispose(); - } - catch { + catch + { partnerliste.Rows.Clear(); } } @@ -96,6 +97,27 @@ namespace OnDoc.Klassen } finally { db = null; } } + + public static DataTable partnerderperson(int partnernr, int fnkt) + { + string result = ""; + DB db = new DB(Connectionstring); + db.clear_parameter(); + db.add_parameter("@query", partnernr.ToString()); + db.add_parameter("@table", "dbo.partner"); + db.add_parameter("@anz", "5"); + db.add_parameter("@fnkt", fnkt.ToString()); + partnerliste = db.Get_Tabledata("sp_partner_search", true, false); + return partnerliste; + //if (db.dsdaten.Tables[0].Rows.Count > 0) + //{ + // result=db.dsdaten.Tables[0].Rows[0][0].ToString(); + //} + //db = null; + //return result; + + + } public static DataTable get_partnerliste() { return partnerliste; } } } diff --git a/Client/Klassen/clsProcessWatch.cs b/Client/Klassen/clsProcessWatch.cs index 5b36e43d..bc428142 100644 --- a/Client/Klassen/clsProcessWatch.cs +++ b/Client/Klassen/clsProcessWatch.cs @@ -132,6 +132,7 @@ namespace OnDoc.Klassen db.Save_To_DB(dokumentid, filename); db.set_approvalstate(dokumentid, false); + db.Exec_SQL("Update dokument set mutiertam = getdate(), mutierer="+AppParams.CurrentMitarbeiter+" where dokumentid='"+dokumentid+"'"); Logging.DocLog.Info("Dokument gespeichert", "Processwatch", dokumentid, "", filename); db = null; } diff --git a/Client/UIControls/DokList.Designer.cs b/Client/UIControls/DokList.Designer.cs index d91ef091..8f6f11c4 100644 --- a/Client/UIControls/DokList.Designer.cs +++ b/Client/UIControls/DokList.Designer.cs @@ -162,6 +162,7 @@ namespace OnDoc.UICintrols this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.dokwerte1 = new OnDoc.UIControls.Dokwerte(); + this.ribbonbuttonnewparterdoc = new System.Windows.Forms.RibbonButton(); this.ctxMenuDokList.SuspendLayout(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -781,6 +782,7 @@ namespace OnDoc.UICintrols this.RibbonGroupFilter.Items.Add(this.RibbonFilterLabel); this.RibbonGroupFilter.Items.Add(this.RibbonPartnerSaldiert); this.RibbonGroupFilter.Items.Add(this.RibbonFilterDelete); + this.RibbonGroupFilter.Items.Add(this.ribbonbuttonnewparterdoc); this.RibbonGroupFilter.Name = "RibbonGroupFilter"; this.RibbonGroupFilter.Text = ""; // @@ -877,12 +879,11 @@ namespace OnDoc.UICintrols // this.ribbonCBAnsicht.AllowTextEdit = false; this.ribbonCBAnsicht.DrawIconsBar = false; - this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium; + this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; this.ribbonCBAnsicht.Name = "ribbonCBAnsicht"; this.ribbonCBAnsicht.SelectedIndex = -1; this.ribbonCBAnsicht.TextBoxText = ""; this.ribbonCBAnsicht.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.ribbonCBAnsicht_DropDownItemClicked); - // // ribbonItemGroup3 // @@ -1342,6 +1343,16 @@ namespace OnDoc.UICintrols this.dokwerte1.Size = new System.Drawing.Size(0, 694); this.dokwerte1.TabIndex = 7; // + // ribbonbuttonnewparterdoc + // + this.ribbonbuttonnewparterdoc.Image = global::OnDoc.Properties.Resources.NewDoc_24x24_32; + this.ribbonbuttonnewparterdoc.LargeImage = global::OnDoc.Properties.Resources.NewDoc_24x24_32; + this.ribbonbuttonnewparterdoc.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact; + this.ribbonbuttonnewparterdoc.Name = "ribbonbuttonnewparterdoc"; + this.ribbonbuttonnewparterdoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_16x16_32; + this.ribbonbuttonnewparterdoc.Visible = false; + this.ribbonbuttonnewparterdoc.Click += new System.EventHandler(this.ribbonbuttonnewparterdoc_Click); + // // DokList // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1500,5 +1511,6 @@ namespace OnDoc.UICintrols private System.Windows.Forms.ContextMenuStrip ctxMenuGroups; private System.Windows.Forms.ToolStripMenuItem gruppenÖffnenToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem gruppenSchliessenToolStripMenuItem1; + private System.Windows.Forms.RibbonButton ribbonbuttonnewparterdoc; } } diff --git a/Client/UIControls/DokList.cs b/Client/UIControls/DokList.cs index 39698076..8fee4961 100644 --- a/Client/UIControls/DokList.cs +++ b/Client/UIControls/DokList.cs @@ -1560,6 +1560,7 @@ return; RibbonFilterLabel.Text = ps.partnernr + " " + ps.partnerkurzname; RibbonFilterLabel.Visible = true; RibbonFilterDelete.Visible = true; + ribbonbuttonnewparterdoc.Visible = true; if (ps.partnersaldiert) { RibbonPartnerSaldiert.Visible = true; } else { RibbonPartnerSaldiert.Visible = false; } refresh_dokumente(); } @@ -1595,6 +1596,7 @@ return; this.RibbonFilterLabel.Visible = false; this.RibbonFilterLabel.Text = ""; this.RibbonPartnerSaldiert.Visible = false; + this.ribbonbuttonnewparterdoc.Visible = false; RibbonFilterDelete.Visible = false; } @@ -2265,7 +2267,11 @@ return; gruppenSchliessenToolStripMenuItem_Click(sender, e); } - + private void ribbonbuttonnewparterdoc_Click(object sender, EventArgs e) + { + + createnewdoc(this.partnernr,0); + } } diff --git a/Client/UIControls/Partnersuche.Designer.cs b/Client/UIControls/Partnersuche.Designer.cs index 92192756..02a4b21f 100644 --- a/Client/UIControls/Partnersuche.Designer.cs +++ b/Client/UIControls/Partnersuche.Designer.cs @@ -39,10 +39,15 @@ this.trefferlistedata = new Syncfusion.WinForms.DataGrid.SfDataGrid(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.partnerDetailsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.personDesKundenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.kundenDerPersonToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton(); this.sfButton2 = new Syncfusion.WinForms.Controls.SfButton(); this.chksaldiert = new System.Windows.Forms.CheckBox(); this.label1 = new System.Windows.Forms.Label(); + this.chkkeepalive = new System.Windows.Forms.CheckBox(); + this.btnbpperson = new System.Windows.Forms.Button(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trefferlistedata)).BeginInit(); this.contextMenuStrip1.SuspendLayout(); @@ -95,7 +100,7 @@ // groupBox1 // this.groupBox1.Controls.Add(this.trefferlistedata); - this.groupBox1.Location = new System.Drawing.Point(15, 96); + this.groupBox1.Location = new System.Drawing.Point(12, 116); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(537, 241); this.groupBox1.TabIndex = 5; @@ -117,28 +122,46 @@ this.trefferlistedata.Text = "sfDataGrid1"; this.trefferlistedata.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.trefferlistedata_DrawCell); this.trefferlistedata.SelectionChanged += new Syncfusion.WinForms.DataGrid.Events.SelectionChangedEventHandler(this.trefferlistedata_SelectionChanged); + this.trefferlistedata.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.trefferlistedata_CellClick); this.trefferlistedata.DoubleClick += new System.EventHandler(this.trefferlistedata_DoubleClick); // // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.partnerDetailsToolStripMenuItem}); + this.partnerDetailsToolStripMenuItem, + this.personDesKundenToolStripMenuItem, + this.kundenDerPersonToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(153, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(202, 70); this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); // // partnerDetailsToolStripMenuItem // this.partnerDetailsToolStripMenuItem.Name = "partnerDetailsToolStripMenuItem"; - this.partnerDetailsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.partnerDetailsToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.partnerDetailsToolStripMenuItem.Text = "Partner-Details"; this.partnerDetailsToolStripMenuItem.Click += new System.EventHandler(this.partnerDetailsToolStripMenuItem_Click); // + // personDesKundenToolStripMenuItem + // + this.personDesKundenToolStripMenuItem.Name = "personDesKundenToolStripMenuItem"; + this.personDesKundenToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.personDesKundenToolStripMenuItem.Text = "Person des BP\'s"; + this.personDesKundenToolStripMenuItem.Click += new System.EventHandler(this.personDesKundenToolStripMenuItem_Click); + this.personDesKundenToolStripMenuItem.EnabledChanged += new System.EventHandler(this.personDesKundenToolStripMenuItem_EnabledChanged); + // + // kundenDerPersonToolStripMenuItem + // + this.kundenDerPersonToolStripMenuItem.Name = "kundenDerPersonToolStripMenuItem"; + this.kundenDerPersonToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.kundenDerPersonToolStripMenuItem.Text = "Partner (BPs) der Person"; + this.kundenDerPersonToolStripMenuItem.Click += new System.EventHandler(this.kundenDerPersonToolStripMenuItem_Click); + // // sfButton1 // this.sfButton1.Enabled = false; this.sfButton1.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton1.Location = new System.Drawing.Point(394, 343); + this.sfButton1.Location = new System.Drawing.Point(391, 363); this.sfButton1.Name = "sfButton1"; this.sfButton1.Size = new System.Drawing.Size(155, 28); this.sfButton1.TabIndex = 6; @@ -148,7 +171,7 @@ // sfButton2 // this.sfButton2.Font = new System.Drawing.Font("Segoe UI Semibold", 9F); - this.sfButton2.Location = new System.Drawing.Point(15, 343); + this.sfButton2.Location = new System.Drawing.Point(12, 363); this.sfButton2.Name = "sfButton2"; this.sfButton2.Size = new System.Drawing.Size(108, 28); this.sfButton2.TabIndex = 7; @@ -158,7 +181,7 @@ // chksaldiert // this.chksaldiert.AutoSize = true; - this.chksaldiert.Location = new System.Drawing.Point(147, 80); + this.chksaldiert.Location = new System.Drawing.Point(144, 100); this.chksaldiert.Name = "chksaldiert"; this.chksaldiert.Size = new System.Drawing.Size(15, 14); this.chksaldiert.TabIndex = 8; @@ -168,17 +191,41 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(15, 80); + this.label1.Location = new System.Drawing.Point(12, 100); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(114, 13); this.label1.TabIndex = 9; this.label1.Text = "inkl. saldierten Kunden"; // + // chkkeepalive + // + this.chkkeepalive.AutoSize = true; + this.chkkeepalive.Location = new System.Drawing.Point(388, 96); + this.chkkeepalive.Name = "chkkeepalive"; + this.chkkeepalive.Size = new System.Drawing.Size(161, 17); + this.chkkeepalive.TabIndex = 10; + this.chkkeepalive.Text = "nicht automatisch schliessen"; + this.chkkeepalive.UseVisualStyleBackColor = true; + this.chkkeepalive.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // btnbpperson + // + this.btnbpperson.Enabled = false; + this.btnbpperson.Image = global::OnDoc.Properties.Resources.Refresh_16x16_32; + this.btnbpperson.Location = new System.Drawing.Point(555, 132); + this.btnbpperson.Name = "btnbpperson"; + this.btnbpperson.Size = new System.Drawing.Size(24, 27); + this.btnbpperson.TabIndex = 11; + this.btnbpperson.UseVisualStyleBackColor = true; + this.btnbpperson.Click += new System.EventHandler(this.btnbpperson_Click); + // // Partnersuche // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(564, 376); + this.ClientSize = new System.Drawing.Size(583, 399); + this.Controls.Add(this.btnbpperson); + this.Controls.Add(this.chkkeepalive); this.Controls.Add(this.label1); this.Controls.Add(this.chksaldiert); this.Controls.Add(this.sfButton2); @@ -219,5 +266,10 @@ private System.Windows.Forms.ToolStripMenuItem partnerDetailsToolStripMenuItem; private System.Windows.Forms.CheckBox chksaldiert; private System.Windows.Forms.Label label1; + private System.Windows.Forms.ToolStripMenuItem personDesKundenToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem kundenDerPersonToolStripMenuItem; + private System.Windows.Forms.CheckBox chkkeepalive; + private System.Windows.Forms.Button btnbpperson; + private System.Windows.Forms.ToolTip toolTip1; } } \ No newline at end of file diff --git a/Client/UIControls/Partnersuche.cs b/Client/UIControls/Partnersuche.cs index 646ea657..6c2810af 100644 --- a/Client/UIControls/Partnersuche.cs +++ b/Client/UIControls/Partnersuche.cs @@ -23,6 +23,7 @@ using Windows.AI.MachineLearning.Preview; using BroadcastListener.Classes; using BroadcastListener.Interfaces; using static BroadcastListener.Classes.Factory; +using Windows.Phone.Notification.Management; namespace OnDoc.UIControls { @@ -42,6 +43,8 @@ namespace OnDoc.UIControls public bool keepalive { get; set; } = false; + public bool keepopen { get; set; } = false; + public Partnersuche(bool keepalive = false) { @@ -76,6 +79,7 @@ namespace OnDoc.UIControls private void Form1_Load(object sender, EventArgs e) { this.SetDesktopLocation(Cursor.Position.X, Cursor.Position.Y); + this.toolTip1.SetToolTip(this.btnbpperson, "Partner (BP's) von der Person / Person vom Partner (BP)"); trefferlistedata.DataSource = clsPartner.get_partnerliste(); try { @@ -90,13 +94,21 @@ namespace OnDoc.UIControls } catch { } this.Text = "Kunde suchen"; - if (personendokument) { this.Text = "Person suchen"; } - if (bpdokument) { this.Text = "Partner suchen"; } + this.lblPartnerNr.Text = "Kunde-Nr"; + if (personendokument) { + this.Text = "Person suchen"; + this.lblPartnerNr.Text = "Person-Nr."; + } + if (bpdokument) { + this.Text = "Partner suchen"; + this.lblPartnerNr.Text = "Partner-Nr."; + } } private void btnsuche_Click(object sender, EventArgs e) { - + + if (chkkeepalive.Checked) { keepopen = true; } if (txtPartnerNr.Text.Trim() != "") { string s = txtPartnerNr.Text.Replace(".", "").Trim(); @@ -112,6 +124,8 @@ namespace OnDoc.UIControls if (clsPartner.partnerliste.Rows.Count == 1) { trefferlistedata.SelectedIndex = 0; + get_details(); + if (keepopen) { keepopen = false; return; } trefferlistedata_DoubleClick(sender, e); } } @@ -201,9 +215,12 @@ namespace OnDoc.UIControls public bool get_details() { try { - + partnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); partnerkurzname = TableHelper.GetCellCValue(ref this.trefferlistedata, "bkpar00"); + + personpartner_function(partnernr.ToString()); + if (personendokument && partnernr < 100000000) return false; if (bpdokument && partnernr > 100000000) return false; partnersaldiert = Convert.ToBoolean(TableHelper.GetCellCValue(ref this.trefferlistedata, "saldiert")); @@ -211,54 +228,9 @@ namespace OnDoc.UIControls if (check_bp_person && personendokument && partnernr < 99999999) { return false; } - //{ - // 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 (personendokument && partnernr < 100000000) return false; - //if (bpdokument && partnernr > 100000000) return false; - 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; } - } if (partnersaldiert) { DB db = new DB(AppParams.connectionstring); @@ -354,8 +326,26 @@ namespace OnDoc.UIControls private void contextMenuStrip1_Opening(object sender, CancelEventArgs e) { var records = trefferlistedata.View.GetSelectedRecords(); - if (records.Count < 1) { return; } - + if (records.Count < 1) { + + this.partnerDetailsToolStripMenuItem.Enabled = false; + this.personDesKundenToolStripMenuItem.Enabled = false; + this.kundenDerPersonToolStripMenuItem.Enabled = false; + return; + } + this.partnerDetailsToolStripMenuItem.Enabled = true; + + int ipartnernr = Convert.ToInt32(TableHelper.GetCellCValue(ref this.trefferlistedata, "nrpar00")); + if (ipartnernr < 99999999) + { + personDesKundenToolStripMenuItem.Enabled = true; + kundenDerPersonToolStripMenuItem.Enabled = false; + } + else + { + personDesKundenToolStripMenuItem.Enabled = false; + kundenDerPersonToolStripMenuItem.Enabled = true; + } } private void partnerDetailsToolStripMenuItem_Click(object sender, EventArgs e) @@ -370,5 +360,117 @@ namespace OnDoc.UIControls { btnsuche_Click(sender, e); } + + private void personDesKundenToolStripMenuItem_Click(object sender, EventArgs e) + { + int nr = 0; + var records = trefferlistedata.View.GetSelectedRecords(); + var datarow = records[0] as DataRowView; + nr = Convert.ToInt32(datarow[0]); + clsPartner.partnerderperson(nr, 8); + if (clsPartner.partnerliste.Rows.Count > 0) + { + trefferlistedata.DataSource = clsPartner.partnerliste; + this.txtPartnerNr.Text = clsPartner.partnerliste.Rows[0][0].ToString(); + this.txtKurzname.Text = ""; + keepopen = true; + btnsuche_Click(sender, e); + + } + + //string pers = clsPartner.partnerderperson(nr, 8); + //if (pers != "") + //{ + // this.txtPartnerNr.Text = pers; + // keepopen = true; + // btnsuche_Click(sender, e); + //} + } + + private void kundenDerPersonToolStripMenuItem_Click(object sender, EventArgs e) + { + int nr = 0; + var records = trefferlistedata.View.GetSelectedRecords(); + var datarow = records[0] as DataRowView; + nr = Convert.ToInt32(datarow[0]); + clsPartner.partnerderperson(nr, 9); + if (clsPartner.partnerliste.Rows.Count > 0) + { + trefferlistedata.DataSource = clsPartner.partnerliste; + TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true); + trefferlistedata.SelectedIndex = 0; + get_details(); + + } + + } + + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + + } + + private void personDesKundenToolStripMenuItem_EnabledChanged(object sender, EventArgs e) + { + + } + + private void btnbpperson_Click(object sender, EventArgs e) + { + + if (kundenDerPersonToolStripMenuItem.Enabled) + { + kundenDerPersonToolStripMenuItem_Click(sender, e); + keepopen = true; + return; + } + if (personDesKundenToolStripMenuItem.Enabled) + { + personDesKundenToolStripMenuItem_Click(sender, e); + keepopen = true; + return; + } + } + + private void trefferlistedata_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e) + { + try + { + var rowIndex = e.DataRow.RowIndex; + //Get the column index value + var columnIndex = e.DataColumn.ColumnIndex; + var selectedItem = e.DataRow; + var dataRow = (e.DataRow.RowData as DataRowView).Row; + string pnr = dataRow[0].ToString(); + + personpartner_function(pnr); + } + catch { } + } + + private void personpartner_function(string pnr) + { + int ipartnernr = Convert.ToInt32(pnr); + if (ipartnernr < 99999999) + { + personDesKundenToolStripMenuItem.Enabled = true; + kundenDerPersonToolStripMenuItem.Enabled = false; + } + else + { + personDesKundenToolStripMenuItem.Enabled = false; + kundenDerPersonToolStripMenuItem.Enabled = true; + } + + var records = trefferlistedata.View.GetSelectedRecords(); + if (records.Count < 1) + { + btnbpperson.Enabled = false; + } + else + { + btnbpperson.Enabled = true; + } + } } } diff --git a/Client/UIControls/Partnersuche.resx b/Client/UIControls/Partnersuche.resx index ad361caa..379968a2 100644 --- a/Client/UIControls/Partnersuche.resx +++ b/Client/UIControls/Partnersuche.resx @@ -120,6 +120,9 @@ 17, 17 + + 172, 17 + diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index 2887f8ca..d2584a16 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -114,9 +114,10 @@ namespace OnDoc.UIControls set_personendokument(); } - if (partnernr != 0) + if (partnernr != 0) { update_partner(); + //check_bp_person(); } else { if (checkpartner == true) { show_partnerdialog(); } } @@ -562,11 +563,17 @@ namespace OnDoc.UIControls ur = Convert.ToInt32(cbboxunterschriftrechts.SelectedValue); } catch { } - if (ul==0 || ur == 0) - { - if (check_error != "") { check_error = check_error + Environment.NewLine + Environment.NewLine; } - check_error = check_error + "- " + "Bitte Unterschrift links und rechts auswählen"; - } + + if (cbboxunterschriftlinks.Text == "") { ul = 0; } + if (cbboxunterschriftrechts.Text == "") { ur = 0; } + + + //20250121 - ausblenden + //if (ul==0 || ur == 0) + //{ + // if (check_error != "") { check_error = check_error + Environment.NewLine + Environment.NewLine; } + // check_error = check_error + "- " + "Bitte Unterschrift links und rechts auswählen"; + //} } @@ -586,6 +593,13 @@ namespace OnDoc.UIControls docgendata.dokumenttypnr = dokumenttypnr.ToString(); try { docgendata.unterschriftLinks = cbboxunterschriftlinks.SelectedValue.ToString(); } catch { docgendata.unterschriftLinks = ""; } try { docgendata.unterschriftRehts = cbboxunterschriftrechts.SelectedValue.ToString(); } catch { docgendata.unterschriftRehts = ""; } + + try + { + if (cbboxunterschriftlinks.Text == "") { docgendata.unterschriftLinks = "-1"; } + if (cbboxunterschriftrechts.Text == "") { docgendata.unterschriftRehts = "-1"; } + } + catch { } if (cbfaksimile.Checked) { docgendata.digitaleunterschrift = true; } else { docgendata.digitaleunterschrift = false; } if (cbformularohneunterschrfit.Checked) { docgendata.frormularOhneUnterschrift = true; } else { docgendata.frormularOhneUnterschrift = false; } if (lblohneUnterschrift.Visible) { docgendata.frormularOhneUnterschrift = true; } diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 4dedfe9d..a8b6c304 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 a86d9639..1102a929 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 b0ebc058..ebf548ec 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 466cbc9b..e24ef335 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.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index ecbbf743..10a43629 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 e44b4aba..5a13ae12 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 4dedfe9d..a8b6c304 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 a86d9639..1102a929 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 466cbc9b..e24ef335 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ