update 20250113
This commit is contained in:
2
Client/Diverses/SplashScreen.Designer.cs
generated
2
Client/Diverses/SplashScreen.Designer.cs
generated
@@ -64,7 +64,7 @@
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(168, 26);
|
||||
this.label2.TabIndex = 2;
|
||||
this.label2.Text = "12. Januar 2025";
|
||||
this.label2.Text = "13. Januar 2025";
|
||||
//
|
||||
// SplashScreen
|
||||
//
|
||||
|
||||
@@ -336,7 +336,7 @@ namespace OnDoc.DocMgmt
|
||||
Helper.FileHelper fh = new Helper.FileHelper();
|
||||
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
|
||||
fh.SaveBase64ToFile(dok.dokument, Filename);
|
||||
op.PrintInWord(Filename, AppParams.wordprintmacro);
|
||||
op.PrintInWord(Filename, AppParams.wordprintmacro, AppParams.OfficeSpleep1);
|
||||
op = null;
|
||||
}
|
||||
if (dok.doktype == "P")
|
||||
|
||||
@@ -269,7 +269,7 @@ namespace OnDoc.DocMgmt
|
||||
{
|
||||
if (Convert.ToInt32(r[4])==1 && Convert.ToInt32(r[4]) != zwingend)
|
||||
{
|
||||
MessageBox.Show("Zwingende Dokumentte können nicht abgewählt werden");
|
||||
MessageBox.Show("Zwingende Dokumente können nicht abgewählt werden");
|
||||
dataRow[4] = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -51,6 +51,8 @@ namespace OnDoc.UIControls
|
||||
//private int dokumenttypnr = 0;
|
||||
private int officevorlagenr = 0;
|
||||
private int profilnr = 0;
|
||||
private string partnernr = "";
|
||||
private string partnernr_inserted = "";
|
||||
private serienbrief sb = new serienbrief();
|
||||
private int serienbriefnr = 0;
|
||||
private DOCGEN.DocGen dg = null;
|
||||
@@ -85,8 +87,8 @@ namespace OnDoc.UIControls
|
||||
{
|
||||
Refresh_Lists();
|
||||
Refresh_Team();
|
||||
//Broadcaster().AddListener(this);
|
||||
//Closing += Form_Closing;
|
||||
Broadcaster().AddListener(this);
|
||||
Closing += Form_Closing;
|
||||
|
||||
}
|
||||
private void Form_Closing(object sender, CancelEventArgs e)
|
||||
@@ -122,6 +124,18 @@ namespace OnDoc.UIControls
|
||||
{
|
||||
ribbonbuttonsave_Click(sender, null);
|
||||
}
|
||||
if (message== "SBPartnersuche")
|
||||
{
|
||||
this.partnernr=sender.Details.ToString();
|
||||
if (partnernr_inserted == partnernr)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
partnernr_inserted = partnernr;
|
||||
add_partner(this.partnernr);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
private void enable_disable_functions(int type, bool enabled)
|
||||
@@ -925,10 +939,18 @@ namespace OnDoc.UIControls
|
||||
private void ribbonbuttonaddpartner_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
Partnersuche ps = new Partnersuche();
|
||||
Partnersuche ps = new Partnersuche(true);
|
||||
ps.ShowDialog();
|
||||
if (ps.DialogResult == DialogResult.OK)
|
||||
{
|
||||
add_partner(ps.partnernr.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
private void add_partner(string ipartnernr)
|
||||
{
|
||||
if (ipartnernr == "") { return; }
|
||||
this.partnernr = "";
|
||||
bool found = false;
|
||||
foreach (System.Data.DataColumn dc in sb.dsempfaenger.Tables[0].Columns)
|
||||
{
|
||||
@@ -938,7 +960,7 @@ namespace OnDoc.UIControls
|
||||
int lastid = sb.dsempfaenger.Tables[0].Rows.Count;
|
||||
|
||||
DB db = new DB(AppParams.connectionstring);
|
||||
db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + ps.partnernr.ToString(), false, true);
|
||||
db.Get_Tabledata("Select bkpar00 from partner where nrpar00=" + ipartnernr, false, true);
|
||||
if (db.dsdaten.Tables[0].Rows.Count > 0)
|
||||
{
|
||||
System.Data.DataRow dr = sb.dsempfaenger.Tables[0].NewRow();
|
||||
@@ -946,17 +968,17 @@ namespace OnDoc.UIControls
|
||||
{
|
||||
dr[i] = "";
|
||||
}
|
||||
dr["partnernr"] = Convert.ToInt32(ps.partnernr.ToString());
|
||||
dr["partnernr"] = Convert.ToInt32(ipartnernr);
|
||||
dr["kurzbezeichnung"] = db.dsdaten.Tables[0].Rows[0][0].ToString();
|
||||
dr["STATUS"] = 0;
|
||||
dr["FEHLERCODE"] = 0;
|
||||
dr["IntEintragnr"] = lastid;
|
||||
|
||||
sb.dsempfaenger.Tables[0].Rows.Add(dr);
|
||||
this.partnernr = "";
|
||||
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
|
||||
}
|
||||
db = null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1814,6 +1836,7 @@ namespace OnDoc.UIControls
|
||||
|
||||
DB db = new DB(AppParams.connectionstring);
|
||||
DataView dv = new DataView(sb.dsempfaenger.Tables[0]);
|
||||
|
||||
init_progressbar("Dokumente archivieren", dv.Count);
|
||||
dv.RowFilter = "Status = 1";
|
||||
dv.Sort = "Partnernr";
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace OnDoc.Klassen
|
||||
Connectionstring = connectionstring;
|
||||
}
|
||||
|
||||
public static DataTable search_partner(string query, int anzahl, int fnkt, bool personendokument, bool bpdokument)
|
||||
public static DataTable search_partner(string query, int anzahl, int fnkt, bool personendokument, bool bpdokument, bool saldiert)
|
||||
{
|
||||
DB db = new DB(Connectionstring);
|
||||
try
|
||||
@@ -33,11 +33,26 @@ namespace OnDoc.Klassen
|
||||
db.add_parameter("@anz", anzahl.ToString());
|
||||
db.add_parameter("@fnkt", fnkt.ToString());
|
||||
partnerliste = db.Get_Tabledata("sp_partner_search", true, false);
|
||||
|
||||
string selectstring = "";
|
||||
if (saldiert == false)
|
||||
{
|
||||
selectstring = " saldiert = false ";
|
||||
}
|
||||
if (!personendokument && !bpdokument)
|
||||
{
|
||||
DataRow[] rowsToKeep = partnerliste.Select(selectstring);
|
||||
DataTable tempDataTable = rowsToKeep.CopyToDataTable();
|
||||
partnerliste.Clear();
|
||||
partnerliste.Merge(tempDataTable);
|
||||
tempDataTable.Dispose();
|
||||
|
||||
} else { selectstring = selectstring + " and "; }
|
||||
if (personendokument)
|
||||
{
|
||||
try
|
||||
{
|
||||
DataRow[] rowsToKeep = partnerliste.Select("nrpar00 > 100000000");
|
||||
DataRow[] rowsToKeep = partnerliste.Select(selectstring + "nrpar00 > 100000000");
|
||||
DataTable tempDataTable = rowsToKeep.CopyToDataTable();
|
||||
partnerliste.Clear();
|
||||
partnerliste.Merge(tempDataTable);
|
||||
@@ -52,7 +67,7 @@ namespace OnDoc.Klassen
|
||||
{
|
||||
try
|
||||
{
|
||||
DataRow[] rowsToKeep = partnerliste.Select("nrpar00 < 100000000");
|
||||
DataRow[] rowsToKeep = partnerliste.Select(selectstring+ "nrpar00 < 100000000");
|
||||
DataTable tempDataTable = rowsToKeep.CopyToDataTable();
|
||||
partnerliste.Clear();
|
||||
partnerliste.Merge(tempDataTable);
|
||||
|
||||
38
Client/UIControls/DokList.Designer.cs
generated
38
Client/UIControls/DokList.Designer.cs
generated
@@ -56,7 +56,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();
|
||||
@@ -152,6 +151,8 @@ namespace OnDoc.UICintrols
|
||||
this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig();
|
||||
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
|
||||
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
|
||||
this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.docPreview1 = new OnDoc.UIControls.DocPreview();
|
||||
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
|
||||
this.ctxMenuDokList.SuspendLayout();
|
||||
this.toolStrip1.SuspendLayout();
|
||||
@@ -180,9 +181,10 @@ namespace OnDoc.UICintrols
|
||||
this.dokumentAnVersandstrasseToolStripMenuItem,
|
||||
this.wordInterOPEditToolStripMenuItem,
|
||||
this.attributeAnzeigenVersteckenToolStripMenuItem,
|
||||
this.historyToolStripMenuItem});
|
||||
this.historyToolStripMenuItem,
|
||||
this.dokumentFürPartnerErstellenToolStripMenuItem});
|
||||
this.ctxMenuDokList.Name = "ctxMenuDokList";
|
||||
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 318);
|
||||
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 362);
|
||||
//
|
||||
// dokumentAnzeigenToolStripMenuItem
|
||||
//
|
||||
@@ -410,16 +412,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;
|
||||
@@ -533,6 +525,7 @@ namespace OnDoc.UICintrols
|
||||
this.RibbonButtonNewDoc.Name = "RibbonButtonNewDoc";
|
||||
this.RibbonButtonNewDoc.SmallImage = global::OnDoc.Properties.Resources.NewDoc_32x32_32;
|
||||
this.RibbonButtonNewDoc.Text = "Neu";
|
||||
this.RibbonButtonNewDoc.DoubleClick += new System.EventHandler(this.RibbonButtonNewDoc_DoubleClick);
|
||||
this.RibbonButtonNewDoc.Click += new System.EventHandler(this.RibbonButtonNewDoc_Click);
|
||||
//
|
||||
// RibbonButtonFavoriten
|
||||
@@ -1248,6 +1241,24 @@ namespace OnDoc.UICintrols
|
||||
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
|
||||
this.ribbonButton5.Text = "Load";
|
||||
//
|
||||
// dokumentFürPartnerErstellenToolStripMenuItem
|
||||
//
|
||||
this.dokumentFürPartnerErstellenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.NewDoc_16x16_32;
|
||||
this.dokumentFürPartnerErstellenToolStripMenuItem.Name = "dokumentFürPartnerErstellenToolStripMenuItem";
|
||||
this.dokumentFürPartnerErstellenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
|
||||
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
|
||||
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
|
||||
//
|
||||
// docPreview1
|
||||
//
|
||||
this.docPreview1.BackColor = System.Drawing.SystemColors.Control;
|
||||
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.docPreview1.Location = new System.Drawing.Point(0, 0);
|
||||
this.docPreview1.Name = "docPreview1";
|
||||
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
|
||||
this.docPreview1.TabIndex = 0;
|
||||
this.docPreview1.ZoomPercentage = 0;
|
||||
//
|
||||
// dokwerte1
|
||||
//
|
||||
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
@@ -1404,5 +1415,6 @@ namespace OnDoc.UICintrols
|
||||
private UIControls.DocPreview docPreview1;
|
||||
private System.Windows.Forms.RibbonPanel ribbonPanel3;
|
||||
private System.Windows.Forms.RibbonButton ribbonButton4;
|
||||
private System.Windows.Forms.ToolStripMenuItem dokumentFürPartnerErstellenToolStripMenuItem;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,6 +44,12 @@ using Syncfusion.Windows.Forms;
|
||||
using System.Runtime.Remoting.Messaging;
|
||||
using Syncfusion.WinForms.DataGrid.Enums;
|
||||
using System.Security.Cryptography;
|
||||
using Syncfusion.WinForms.DataGrid.Renderers;
|
||||
using Syncfusion.WinForms.DataGrid.Styles;
|
||||
using Syncfusion.Data;
|
||||
using Syncfusion.WinForms.Input;
|
||||
using Syncfusion.Windows.Forms.CellGrid.ScrollAxis;
|
||||
using Syncfusion.Windows.Forms.Edit.Utils;
|
||||
|
||||
|
||||
|
||||
@@ -82,10 +88,21 @@ namespace OnDoc.UICintrols
|
||||
|
||||
System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("de-DE");
|
||||
InitializeComponent();
|
||||
//this.sfDataGrid1.AutoGeneratingColumn += datagrid_AutoGeneratingColumn;
|
||||
Broadcaster().AddListener(this);
|
||||
//t_functions();
|
||||
pos_elements();
|
||||
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
public void OnListen(string message, SenderInfo sender)
|
||||
{
|
||||
@@ -111,7 +128,8 @@ namespace OnDoc.UICintrols
|
||||
// Helper.Security security = new Helper.Security();
|
||||
// security.set_security(this);
|
||||
//Refresh_Bewilligungen();
|
||||
|
||||
//this.sfDataGrid1.CellRenderers.Remove("DateTime");
|
||||
//this.sfDataGrid.CellRenderers.Add("DateTime", new GridDateTimeCellRendererExt());
|
||||
}
|
||||
|
||||
public void load_Profile()
|
||||
@@ -1081,7 +1099,7 @@ namespace OnDoc.UICintrols
|
||||
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
|
||||
Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
|
||||
fh.SaveBase64ToFile(dok.dokument, Filename);
|
||||
op.PrintInWord(Filename, AppParams.wordprintmacro);
|
||||
op.PrintInWord(Filename, AppParams.wordprintmacro, AppParams.OfficeSpleep1);
|
||||
System.IO.File.Delete(Filename);
|
||||
op = null;
|
||||
break;
|
||||
@@ -1564,6 +1582,7 @@ namespace OnDoc.UICintrols
|
||||
{
|
||||
this.selected_dokumentid = "";
|
||||
}
|
||||
|
||||
System.Windows.Forms.Application.DoEvents();
|
||||
|
||||
|
||||
@@ -2052,6 +2071,23 @@ namespace OnDoc.UICintrols
|
||||
AdminDokTypGenerierung ag = new AdminDokTypGenerierung();
|
||||
ag.Show();
|
||||
}
|
||||
|
||||
private void RibbonButtonNewDoc_DoubleClick(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void dokumentFürPartnerErstellenToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
createnewdoc(Convert.ToInt32(selected_partnernr), 0);
|
||||
}
|
||||
catch { }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -524,19 +524,19 @@
|
||||
<data name="ribbonButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
|
||||
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
|
||||
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="ribbonButton4.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
|
||||
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
|
||||
vQAADr0BR/uQrQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="ribbonButton4.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
|
||||
wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
|
||||
vQAADr0BR/uQrQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
|
||||
57
Client/UIControls/Partnersuche.Designer.cs
generated
57
Client/UIControls/Partnersuche.Designer.cs
generated
@@ -37,10 +37,12 @@
|
||||
this.btnsuche = new Syncfusion.WinForms.Controls.SfButton();
|
||||
this.groupBox1 = new System.Windows.Forms.GroupBox();
|
||||
this.trefferlistedata = new Syncfusion.WinForms.DataGrid.SfDataGrid();
|
||||
this.sfButton1 = new Syncfusion.WinForms.Controls.SfButton();
|
||||
this.sfButton2 = new Syncfusion.WinForms.Controls.SfButton();
|
||||
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.partnerDetailsToolStripMenuItem = 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.groupBox1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.trefferlistedata)).BeginInit();
|
||||
this.contextMenuStrip1.SuspendLayout();
|
||||
@@ -66,7 +68,7 @@
|
||||
//
|
||||
// txtPartnerNr
|
||||
//
|
||||
this.txtPartnerNr.Location = new System.Drawing.Point(126, 26);
|
||||
this.txtPartnerNr.Location = new System.Drawing.Point(147, 26);
|
||||
this.txtPartnerNr.Name = "txtPartnerNr";
|
||||
this.txtPartnerNr.Size = new System.Drawing.Size(164, 20);
|
||||
this.txtPartnerNr.TabIndex = 2;
|
||||
@@ -74,7 +76,7 @@
|
||||
//
|
||||
// txtKurzname
|
||||
//
|
||||
this.txtKurzname.Location = new System.Drawing.Point(126, 54);
|
||||
this.txtKurzname.Location = new System.Drawing.Point(147, 54);
|
||||
this.txtKurzname.Name = "txtKurzname";
|
||||
this.txtKurzname.Size = new System.Drawing.Size(164, 20);
|
||||
this.txtKurzname.TabIndex = 3;
|
||||
@@ -83,7 +85,7 @@
|
||||
// btnsuche
|
||||
//
|
||||
this.btnsuche.Font = new System.Drawing.Font("Segoe UI Semibold", 9F);
|
||||
this.btnsuche.Location = new System.Drawing.Point(307, 38);
|
||||
this.btnsuche.Location = new System.Drawing.Point(328, 38);
|
||||
this.btnsuche.Name = "btnsuche";
|
||||
this.btnsuche.Size = new System.Drawing.Size(96, 28);
|
||||
this.btnsuche.TabIndex = 4;
|
||||
@@ -117,6 +119,21 @@
|
||||
this.trefferlistedata.SelectionChanged += new Syncfusion.WinForms.DataGrid.Events.SelectionChangedEventHandler(this.trefferlistedata_SelectionChanged);
|
||||
this.trefferlistedata.DoubleClick += new System.EventHandler(this.trefferlistedata_DoubleClick);
|
||||
//
|
||||
// contextMenuStrip1
|
||||
//
|
||||
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.partnerDetailsToolStripMenuItem});
|
||||
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
||||
this.contextMenuStrip1.Size = new System.Drawing.Size(153, 26);
|
||||
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.Text = "Partner-Details";
|
||||
this.partnerDetailsToolStripMenuItem.Click += new System.EventHandler(this.partnerDetailsToolStripMenuItem_Click);
|
||||
//
|
||||
// sfButton1
|
||||
//
|
||||
this.sfButton1.Enabled = false;
|
||||
@@ -138,26 +155,32 @@
|
||||
this.sfButton2.Text = "Abbruch";
|
||||
this.sfButton2.Click += new System.EventHandler(this.sfButton2_Click);
|
||||
//
|
||||
// contextMenuStrip1
|
||||
// chksaldiert
|
||||
//
|
||||
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.partnerDetailsToolStripMenuItem});
|
||||
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
||||
this.contextMenuStrip1.Size = new System.Drawing.Size(181, 48);
|
||||
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
|
||||
this.chksaldiert.AutoSize = true;
|
||||
this.chksaldiert.Location = new System.Drawing.Point(147, 80);
|
||||
this.chksaldiert.Name = "chksaldiert";
|
||||
this.chksaldiert.Size = new System.Drawing.Size(15, 14);
|
||||
this.chksaldiert.TabIndex = 8;
|
||||
this.chksaldiert.UseVisualStyleBackColor = true;
|
||||
this.chksaldiert.CheckedChanged += new System.EventHandler(this.chksaldiert_CheckedChanged);
|
||||
//
|
||||
// partnerDetailsToolStripMenuItem
|
||||
// label1
|
||||
//
|
||||
this.partnerDetailsToolStripMenuItem.Name = "partnerDetailsToolStripMenuItem";
|
||||
this.partnerDetailsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
|
||||
this.partnerDetailsToolStripMenuItem.Text = "Partner-Details";
|
||||
this.partnerDetailsToolStripMenuItem.Click += new System.EventHandler(this.partnerDetailsToolStripMenuItem_Click);
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(15, 80);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(114, 13);
|
||||
this.label1.TabIndex = 9;
|
||||
this.label1.Text = "inkl. saldierten Kunden";
|
||||
//
|
||||
// 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.Controls.Add(this.label1);
|
||||
this.Controls.Add(this.chksaldiert);
|
||||
this.Controls.Add(this.sfButton2);
|
||||
this.Controls.Add(this.sfButton1);
|
||||
this.Controls.Add(this.groupBox1);
|
||||
@@ -194,5 +217,7 @@
|
||||
private Syncfusion.WinForms.Controls.SfButton sfButton2;
|
||||
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
|
||||
private System.Windows.Forms.ToolStripMenuItem partnerDetailsToolStripMenuItem;
|
||||
private System.Windows.Forms.CheckBox chksaldiert;
|
||||
private System.Windows.Forms.Label label1;
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,10 @@ using System.IO;
|
||||
using Database;
|
||||
using System.Linq.Expressions;
|
||||
using OnDoc.Diverses;
|
||||
using Windows.AI.MachineLearning.Preview;
|
||||
using BroadcastListener.Classes;
|
||||
using BroadcastListener.Interfaces;
|
||||
using static BroadcastListener.Classes.Factory;
|
||||
|
||||
namespace OnDoc.UIControls
|
||||
{
|
||||
@@ -36,11 +40,15 @@ namespace OnDoc.UIControls
|
||||
|
||||
public int dokumenttypnr { get; set; } = 0;
|
||||
|
||||
public Partnersuche()
|
||||
public bool keepalive { get; set; } = false;
|
||||
|
||||
|
||||
public Partnersuche(bool keepalive = false)
|
||||
{
|
||||
InitializeComponent();
|
||||
clsPartner.set_connectionstring(AppParams.connectionstring);
|
||||
this.trefferlistedata.TableControl.DoubleClick += TableControl_DoubleClick;
|
||||
this.keepalive = keepalive;
|
||||
}
|
||||
|
||||
public Partnersuche(bool personendokument, bool check_bp_person,bool bpdokument)
|
||||
@@ -94,7 +102,7 @@ namespace OnDoc.UIControls
|
||||
string s = txtPartnerNr.Text.Replace(".", "").Trim();
|
||||
if (DivFnkt.IsNumeric(s))
|
||||
{
|
||||
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0,personendokument,bpdokument);
|
||||
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0,personendokument,bpdokument, chksaldiert.Checked);
|
||||
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
|
||||
try
|
||||
{
|
||||
@@ -111,7 +119,7 @@ namespace OnDoc.UIControls
|
||||
if (txtKurzname.Text.Trim() != "")
|
||||
{
|
||||
string s = txtKurzname.Text.Trim();
|
||||
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 1, personendokument, bpdokument);
|
||||
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 1, personendokument, bpdokument, chksaldiert.Checked);
|
||||
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
|
||||
try
|
||||
{
|
||||
@@ -181,8 +189,11 @@ namespace OnDoc.UIControls
|
||||
|
||||
if (get_details())
|
||||
{
|
||||
this.DialogResult = DialogResult.OK;
|
||||
this.Close();
|
||||
if (!keepalive)
|
||||
{
|
||||
this.DialogResult = DialogResult.OK;
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
} catch { }
|
||||
}
|
||||
@@ -303,8 +314,15 @@ namespace OnDoc.UIControls
|
||||
//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"));
|
||||
if (!keepalive) {
|
||||
this.DialogResult = DialogResult.OK;
|
||||
this.Close();
|
||||
}
|
||||
else
|
||||
{
|
||||
//Broadcaster().Broadcast("AdminDokErstellung", new SenderInfo("AdminDokErstellung", "", this.dokumenttypnr.ToString()));
|
||||
Broadcaster().Broadcast("SBPartnersuche", new SenderInfo("Partnersuche","SelectedPartner",this.partnernr.ToString()));
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
@@ -347,5 +365,10 @@ namespace OnDoc.UIControls
|
||||
PartnerDetails pd = new PartnerDetails(Convert.ToInt32(datarow[0]));
|
||||
pd.ShowDialog();
|
||||
}
|
||||
|
||||
private void chksaldiert_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
btnsuche_Click(sender, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
this.GrpPartner = new System.Windows.Forms.GroupBox();
|
||||
this.lblAnrede = new System.Windows.Forms.Label();
|
||||
this.btneditadresse = new System.Windows.Forms.Button();
|
||||
this.btnweitereadressen = new System.Windows.Forms.Button();
|
||||
this.txtanrede = new System.Windows.Forms.TextBox();
|
||||
@@ -69,6 +70,7 @@
|
||||
this.rbzustaendigmitarbeiter = new System.Windows.Forms.RadioButton();
|
||||
this.rbzustaendigkube = new System.Windows.Forms.RadioButton();
|
||||
this.groupBox9 = new System.Windows.Forms.GroupBox();
|
||||
this.DateTerminText = new System.Windows.Forms.TextBox();
|
||||
this.DateTermin = new Syncfusion.WinForms.Input.SfDateTimeEdit();
|
||||
this.lblTermin = new System.Windows.Forms.Label();
|
||||
this.DateDokumentDatum = new Syncfusion.WinForms.Input.SfDateTimeEdit();
|
||||
@@ -76,9 +78,8 @@
|
||||
this.cbboxpostzustellung = new Syncfusion.WinForms.ListView.SfComboBox();
|
||||
this.lblPostzustellung = new System.Windows.Forms.Label();
|
||||
this.btnErneutGenerierung = new System.Windows.Forms.Button();
|
||||
this.lblAnrede = new System.Windows.Forms.Label();
|
||||
this.DateTerminText = new System.Windows.Forms.TextBox();
|
||||
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.lblohneUnterschrift = new System.Windows.Forms.Label();
|
||||
this.GrpPartner.SuspendLayout();
|
||||
this.groupBox5.SuspendLayout();
|
||||
this.groupBox6.SuspendLayout();
|
||||
@@ -119,6 +120,15 @@
|
||||
this.GrpPartner.TabStop = false;
|
||||
this.GrpPartner.Text = "Partner";
|
||||
//
|
||||
// lblAnrede
|
||||
//
|
||||
this.lblAnrede.AutoSize = true;
|
||||
this.lblAnrede.Location = new System.Drawing.Point(298, 153);
|
||||
this.lblAnrede.Name = "lblAnrede";
|
||||
this.lblAnrede.Size = new System.Drawing.Size(151, 13);
|
||||
this.lblAnrede.TabIndex = 8;
|
||||
this.lblAnrede.Text = "Anrede (sofern nicht Standard)";
|
||||
//
|
||||
// btneditadresse
|
||||
//
|
||||
this.btneditadresse.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32;
|
||||
@@ -399,6 +409,7 @@
|
||||
//
|
||||
// GrpUnterschrift
|
||||
//
|
||||
this.GrpUnterschrift.Controls.Add(this.lblohneUnterschrift);
|
||||
this.GrpUnterschrift.Controls.Add(this.cbformularohneunterschrfit);
|
||||
this.GrpUnterschrift.Controls.Add(this.cbfaksimile);
|
||||
this.GrpUnterschrift.Controls.Add(this.cbboxunterschriftrechts);
|
||||
@@ -422,6 +433,7 @@
|
||||
this.cbformularohneunterschrfit.TabIndex = 11;
|
||||
this.cbformularohneunterschrfit.Text = "Formular ohne Unterschrift";
|
||||
this.cbformularohneunterschrfit.UseVisualStyleBackColor = true;
|
||||
this.cbformularohneunterschrfit.Visible = false;
|
||||
//
|
||||
// cbfaksimile
|
||||
//
|
||||
@@ -555,6 +567,13 @@
|
||||
this.groupBox9.TabStop = false;
|
||||
this.groupBox9.Text = "Allgemein";
|
||||
//
|
||||
// DateTerminText
|
||||
//
|
||||
this.DateTerminText.Location = new System.Drawing.Point(406, 43);
|
||||
this.DateTerminText.Name = "DateTerminText";
|
||||
this.DateTerminText.Size = new System.Drawing.Size(69, 20);
|
||||
this.DateTerminText.TabIndex = 6;
|
||||
//
|
||||
// DateTermin
|
||||
//
|
||||
this.DateTermin.DateTimeIcon = null;
|
||||
@@ -624,27 +643,21 @@
|
||||
this.btnErneutGenerierung.Visible = false;
|
||||
this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click);
|
||||
//
|
||||
// lblAnrede
|
||||
//
|
||||
this.lblAnrede.AutoSize = true;
|
||||
this.lblAnrede.Location = new System.Drawing.Point(298, 153);
|
||||
this.lblAnrede.Name = "lblAnrede";
|
||||
this.lblAnrede.Size = new System.Drawing.Size(151, 13);
|
||||
this.lblAnrede.TabIndex = 8;
|
||||
this.lblAnrede.Text = "Anrede (sofern nicht Standard)";
|
||||
//
|
||||
// DateTerminText
|
||||
//
|
||||
this.DateTerminText.Location = new System.Drawing.Point(406, 43);
|
||||
this.DateTerminText.Name = "DateTerminText";
|
||||
this.DateTerminText.Size = new System.Drawing.Size(69, 20);
|
||||
this.DateTerminText.TabIndex = 6;
|
||||
//
|
||||
// contextMenuStrip1
|
||||
//
|
||||
this.contextMenuStrip1.Name = "contextMenuStrip1";
|
||||
this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
|
||||
//
|
||||
// lblohneUnterschrift
|
||||
//
|
||||
this.lblohneUnterschrift.AutoSize = true;
|
||||
this.lblohneUnterschrift.Location = new System.Drawing.Point(19, 34);
|
||||
this.lblohneUnterschrift.Name = "lblohneUnterschrift";
|
||||
this.lblohneUnterschrift.Size = new System.Drawing.Size(131, 13);
|
||||
this.lblohneUnterschrift.TabIndex = 12;
|
||||
this.lblohneUnterschrift.Text = "Formular ohne Unterschrift";
|
||||
this.lblohneUnterschrift.Visible = false;
|
||||
//
|
||||
// UCAllgemeineDokumentParam
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@@ -745,5 +758,6 @@
|
||||
private System.Windows.Forms.Label lblAnrede;
|
||||
private System.Windows.Forms.TextBox DateTerminText;
|
||||
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
|
||||
private System.Windows.Forms.Label lblohneUnterschrift;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@ using System.Web.UI.WebControls;
|
||||
using Windows.UI;
|
||||
using edoka_dms;
|
||||
using Syncfusion.Windows.Forms.Tools.XPMenus;
|
||||
using Windows.Graphics.Printing3D;
|
||||
|
||||
|
||||
namespace OnDoc.UIControls
|
||||
@@ -128,10 +129,23 @@ namespace OnDoc.UIControls
|
||||
this.cbboxunterschriftlinks.Enabled = Convert.ToBoolean(dr["unterschrift_links"]) == true;
|
||||
this.cbboxunterschriftrechts.Enabled = Convert.ToBoolean(dr["unterschrift_rechts"]) == true;
|
||||
this.cbformularohneunterschrfit.Enabled = Convert.ToBoolean(dr["unterschrift_ohne"]) == true;
|
||||
|
||||
this.cbfaksimile.Enabled = Convert.ToBoolean(dr["unterschrift_faksimile"]) == true;
|
||||
if (this.cbfaksimile.Enabled == true) { this.cbfaksimile.Checked=true; }
|
||||
this.cbformularohneunterschrfit.Checked = false;
|
||||
|
||||
|
||||
if (cbformularohneunterschrfit.Enabled)
|
||||
{
|
||||
lblUnterschriftlinks.Visible = false;
|
||||
lblUnterschriftrechts.Visible = false;
|
||||
cbboxunterschriftlinks.Visible = false;
|
||||
cbboxunterschriftrechts.Visible = false;
|
||||
cbfaksimile.Visible = false;
|
||||
lblohneUnterschrift.Visible = true;
|
||||
}
|
||||
if (this.cbfaksimile.Enabled==false) { cbfaksimile.Visible=false; }
|
||||
|
||||
|
||||
try {
|
||||
if (Convert.ToBoolean(dr["ErstellungInOffice"]) == true){
|
||||
this.ErstellungInOffice = true;
|
||||
@@ -587,6 +601,13 @@ namespace OnDoc.UIControls
|
||||
{
|
||||
dokdata.PartnerNr = docgendata.partnernr;
|
||||
dokdata.UseEDOKA_Values = "True";
|
||||
try
|
||||
{
|
||||
dokdata.postzustellung = cbboxpostzustellung.SelectedValue.ToString();
|
||||
} catch { dokdata.postzustellung = "0"; }
|
||||
|
||||
|
||||
|
||||
dokdata.DokumenttypNr = docgendata.dokumenttypnr;
|
||||
dokdata.Unterschrift_Links = docgendata.unterschriftLinks;
|
||||
dokdata.Unterschrift_Rechts = docgendata.unterschriftRehts;
|
||||
@@ -601,6 +622,8 @@ namespace OnDoc.UIControls
|
||||
if (docgendata.erstellungsart == Erstellungsart.DokumentAlsPDF) { dokdata.Result_as_PDF = "True"; } else { dokdata.Result_as_PDF = "False"; }
|
||||
if (docgendata.digitaleunterschrift == true) { dokdata.As_Faksimile = "True"; } else { dokdata.As_Faksimile = "False"; }
|
||||
if (docgendata.frormularOhneUnterschrift==true) { dokdata.Form_ohne_Unterschrift = "True" ; } else { dokdata.Form_ohne_Unterschrift = "False"; }
|
||||
|
||||
|
||||
dokdata.dokumentwerte = docgendata.dokumentwerte;
|
||||
dokdata.Barcode = barcode;
|
||||
dokdata.VorlageNr = this.vorlagenr.ToString();
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user