shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20241211

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-11 22:24:49 +01:00
parent 2c42687a40
commit 220e5ff9cf
97 changed files with 1649 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
Client/UIControls/DokList.Designer.cs generated
View File

@@ -53,8 +53,6 @@ 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.dokwerte1 = new OnDoc.UIControls.Dokwerte();
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();
@@ -135,7 +133,7 @@ namespace OnDoc.UICintrols
this.ribbonButton2 = new System.Windows.Forms.RibbonButton();
this.RibbonButtonBerechtigungsgruppe = new System.Windows.Forms.RibbonButton();
this.ribbonButtonSysadmins = new System.Windows.Forms.RibbonButton();
this.ribbonPanel1 = new System.Windows.Forms.RibbonPanel();
this.ribbonpanelanalyse = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonedklog = new System.Windows.Forms.RibbonButton();
this.ribbonbuttonedkverarbeitung = new System.Windows.Forms.RibbonButton();
this.pdfConfig1 = new Syncfusion.Pdf.PdfConfig();
@@ -143,6 +141,11 @@ namespace OnDoc.UICintrols
this.timer1 = new System.Windows.Forms.Timer(this.components);
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();
@@ -171,6 +174,7 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.ToolTipOpening += new Syncfusion.WinForms.DataGrid.Events.ToolTipOpeningEventHandler(this.sfDataGrid1_ToolTipOpening_1);
this.sfDataGrid1.DrawCell += new Syncfusion.WinForms.DataGrid.Events.DrawCellEventHandler(this.sfDataGrid1_DrawCell);
this.sfDataGrid1.SelectionChanged += new Syncfusion.WinForms.DataGrid.Events.SelectionChangedEventHandler(this.sfDataGrid1_SelectionChanged);
this.sfDataGrid1.FilterChanged += new Syncfusion.WinForms.DataGrid.Events.FilterChangedEventHandler(this.sfDataGrid1_FilterChanged);
this.sfDataGrid1.DataSourceChanged += new Syncfusion.WinForms.DataGrid.Events.DataSourceChangedEventHandler(this.sfDataGrid1_DataSourceChanged);
this.sfDataGrid1.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick);
@@ -363,7 +367,6 @@ namespace OnDoc.UICintrols
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.sfDataGrid1);
this.splitContainer1.Panel1.Controls.Add(this.dokwerte1);
//
// splitContainer1.Panel2
//
@@ -372,24 +375,6 @@ namespace OnDoc.UICintrols
this.splitContainer1.SplitterDistance = 343;
this.splitContainer1.TabIndex = 2;
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
this.dokwerte1.Location = new System.Drawing.Point(1709, 0);
this.dokwerte1.Name = "dokwerte1";
this.dokwerte1.Size = new System.Drawing.Size(0, 343);
this.dokwerte1.TabIndex = 1;
//
// 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;
@@ -740,6 +725,7 @@ namespace OnDoc.UICintrols
this.ribbonTabAnsicht.Panels.Add(this.RibbonPannelAnsicht);
this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelVorschau);
this.ribbonTabAnsicht.Panels.Add(this.ribbonPanelAttribute);
this.ribbonTabAnsicht.Panels.Add(this.ribbonPanel1);
this.ribbonTabAnsicht.Text = "Ansicht";
//
// RibbonPannelAnsicht
@@ -1003,7 +989,7 @@ namespace OnDoc.UICintrols
this.RibbonTabAdmin.Panels.Add(this.ribbonAnmelden);
this.RibbonTabAdmin.Panels.Add(this.ribbonVorlagen);
this.RibbonTabAdmin.Panels.Add(this.ribbonBerechtigung);
this.RibbonTabAdmin.Panels.Add(this.ribbonPanel1);
this.RibbonTabAdmin.Panels.Add(this.ribbonpanelanalyse);
this.RibbonTabAdmin.Text = "Administration";
//
// RibbonPanelDiverses
@@ -1039,7 +1025,7 @@ namespace OnDoc.UICintrols
// ribbonVorlagen
//
this.ribbonVorlagen.ButtonMoreVisible = false;
this.ribbonVorlagen.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Right;
this.ribbonVorlagen.FlowsTo = System.Windows.Forms.RibbonPanelFlowDirection.Left;
this.ribbonVorlagen.Items.Add(this.RibbonButtonDokumenttyp);
this.ribbonVorlagen.Items.Add(this.RibbonButtonVorlagen);
this.ribbonVorlagen.Items.Add(this.ribbonButtonVorlagenfeldregel);
@@ -1052,7 +1038,7 @@ namespace OnDoc.UICintrols
this.RibbonButtonDokumenttyp.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonDokumenttyp.LargeImage")));
this.RibbonButtonDokumenttyp.Name = "RibbonButtonDokumenttyp";
this.RibbonButtonDokumenttyp.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonDokumenttyp.SmallImage")));
this.RibbonButtonDokumenttyp.Text = "Dokumenttyp";
this.RibbonButtonDokumenttyp.Text = "Vorlagentyp";
this.RibbonButtonDokumenttyp.Click += new System.EventHandler(this.RibbonButtonDokumenttyp_Click);
//
// RibbonButtonVorlagen
@@ -1109,12 +1095,12 @@ namespace OnDoc.UICintrols
this.ribbonButtonSysadmins.Text = "Sys-Admins";
this.ribbonButtonSysadmins.Click += new System.EventHandler(this.ribbonButtonSysadmins_Click);
//
// ribbonPanel1
// ribbonpanelanalyse
//
this.ribbonPanel1.Items.Add(this.ribbonbuttonedklog);
this.ribbonPanel1.Items.Add(this.ribbonbuttonedkverarbeitung);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Analyse-Tools";
this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedklog);
this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedkverarbeitung);
this.ribbonpanelanalyse.Name = "ribbonpanelanalyse";
this.ribbonpanelanalyse.Text = "Analyse-Tools";
//
// ribbonbuttonedklog
//
@@ -1166,12 +1152,46 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
this.dokwerte1.Location = new System.Drawing.Point(1709, 153);
this.dokwerte1.Name = "dokwerte1";
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);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lblToApprove);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.dokwerte1);
this.Controls.Add(this.lblToApprove);
this.Controls.Add(this.panel2);
this.Controls.Add(this.ribbon2);
this.Name = "DokList";
@@ -1297,14 +1317,17 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonTab RibbonTabNativVorlagen;
private System.Windows.Forms.RibbonPanel ribbonPanelNativVorlagen;
private System.Windows.Forms.RibbonButton ribbonButtonNativVorlagen;
private UIControls.Dokwerte dokwerte1;
private System.Windows.Forms.ToolStripMenuItem attributeAnzeigenVersteckenToolStripMenuItem;
private System.Windows.Forms.RibbonPanel ribbonPanelAttribute;
private System.Windows.Forms.RibbonButton RibbonButtonAttributeEinAusblenden;
private System.Windows.Forms.RibbonButton ribbonButtonVorlagenfeldregel;
private System.Windows.Forms.RibbonButton ribbonButtonSysadmins;
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonPanel ribbonpanelanalyse;
private System.Windows.Forms.RibbonButton ribbonbuttonedklog;
private System.Windows.Forms.RibbonButton ribbonbuttonedkverarbeitung;
private Syncfusion.Pdf.PdfConfig pdfConfig2;
private UIControls.Dokwerte dokwerte1;
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonButton ribbonButton6;
}
}

60
Client/UIControls/DokList.cs
View File

@@ -180,6 +180,7 @@ namespace OnDoc.UICintrols
}
public void refresh_dokumente(string layout = "")
{
if (datafilter != "")
{
refresh_dokumente_filtered(layout);
@@ -200,7 +201,10 @@ namespace OnDoc.UICintrols
//this.sfDataGrid1.DataSource = dokumente;
sfDataGrid1.View.AutoExpandGroups = true;
this.timer1.Enabled = true;
//foreach (GridColumn gd in sfDataGrid1.Columns)
//{
// sfDataGrid1.GroupColumnDescriptions.Add(new GroupColumnDescription() { ColumnName = gd.MappingName });
//}
}
public void refresh_dokumente_filtered(string layout = "")
@@ -253,6 +257,8 @@ namespace OnDoc.UICintrols
archivierenToolStripMenuItem.Enabled = true;
}
}
if (vorschauposition == "Keine Vorschau") { return; }
if (Separate_Vorschau_offen)
{
@@ -528,7 +534,7 @@ namespace OnDoc.UICintrols
docPreview1.Hide_Editbuttons();
break;
case "Vorschau rechts":
this.splitContainer1.SplitterDistance = this.Width / 2;
this.splitContainer1.SplitterDistance = this.Width / 3;
this.splitContainer1.Orientation = Orientation.Vertical;
docPreview1.Visible = true;
docPreview1.Show_Doc(selected_dokumentid);
@@ -596,6 +602,10 @@ namespace OnDoc.UICintrols
createnewdoc(0, 0);
}
public void set_vorschau_aus_dp()
{
tsrbvorschau.SelectedIndex = 2;
}
public void StartPruefung()
{
ribbonButtonApproval_Click(null, null);
@@ -726,6 +736,7 @@ namespace OnDoc.UICintrols
dB.Exec_SQL("Update dokument set verantwortlich=" + ma.result + " where dokumentid = '" + selected_dokumentid + "'");
dB = null;
Logging.DocLog.Info("Verantwortung zugewiesen auf " + ma.result.ToString(), "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung zugewiesen");
refresh_dokumente();
}
}
@@ -781,9 +792,10 @@ namespace OnDoc.UICintrols
private void sfDataGrid1_DrawCell(object sender, DrawCellEventArgs e)
{
if (e.Column.MappingName == "zu_retournieren")
{
e.Handled = true;
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
e.Handled = true;
var selectedItem = e.DataRow;
@@ -795,6 +807,7 @@ namespace OnDoc.UICintrols
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")
{
@@ -834,6 +847,7 @@ namespace OnDoc.UICintrols
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Word_Edit_24x24_32, e.Bounds.X + 20, e.Bounds.Y);
}
return;
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
@@ -867,9 +881,11 @@ namespace OnDoc.UICintrols
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;
}
catch { }
}
e.Handled = false;
}
private void zellenwertInZwischenablageKopierenToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1205,6 +1221,7 @@ namespace OnDoc.UICintrols
security = null;
ribbonVorlagen.Visible = AppParams.isSysadmin;
ribbonBerechtigung.Visible = AppParams.isSysadmin;
ribbonpanelanalyse.Visible = AppParams.isSysadmin;
RibbonTabAdmin.Visible = false;
RibbonTabAdmin.Visible = true;
if (AppParams.isSysadmin)
@@ -1337,9 +1354,9 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.Deserialize(ms);
}
//sfDataGrid1.ShowToolTip = true;
//sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
//sfDataGrid1.ToolTipOption.InitialDelay = 500;
sfDataGrid1.ShowToolTip = true;
sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
sfDataGrid1.ToolTipOption.InitialDelay = 500;
sfDataGrid1.ShowToolTip = true;
System.Windows.Forms.Application.DoEvents();
@@ -1521,6 +1538,7 @@ namespace OnDoc.UICintrols
{
e.ToolTipInfo.Items.Clear();
Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
tt.Text = "Ich bin der Tooltip";
e.ToolTipInfo.Items.Add(tt);
}
@@ -1670,6 +1688,36 @@ namespace OnDoc.UICintrols
TableEditor tb = new TableEditor("OnDoc_EDK_Routing");
tb.Show();
}
private void sfDataGrid1_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count > 1)
{
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["Bearbeitung_Zwingend"].ToString();
if (datarow["Bearbeitung_Zwingend"].ToString() == "True")
{
RibbonButtonArchivToOnBase.Enabled = false;
archivierenToolStripMenuItem.Enabled = false;
break;
}
if (datarow["ToApprove"].ToString() == "True" && datarow["approved"].ToString() == "False")
{
RibbonButtonArchivToOnBase.Enabled = false;
archivierenToolStripMenuItem.Enabled = false;
break;
}
}
}
}
private void ribbonButton6_Click(object sender, EventArgs e)
{
refresh_dokumente();
}
}
}

21
Client/UIControls/DokList.resx
View File

@@ -506,55 +506,55 @@
<data name="ribbonButtonSysadmins.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonSysadmins.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonSysadmins.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vwAADr8BOAVTJAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonedklog.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedklog.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedklog.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonbuttonedkverarbeitung.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -581,4 +581,7 @@
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="pdfConfig2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>464, 17</value>
</metadata>
</root>

2
Client/UIControls/Dokwerte.Designer.cs generated
View File

@@ -65,7 +65,7 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(3, 9);
this.label1.Location = new System.Drawing.Point(3, 13);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(79, 20);
this.label1.TabIndex = 0;

1
Client/UIControls/Partnersuche.Designer.cs generated
View File

@@ -107,6 +107,7 @@
this.trefferlistedata.Size = new System.Drawing.Size(531, 222);
this.trefferlistedata.TabIndex = 0;
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.DoubleClick += new System.EventHandler(this.trefferlistedata_DoubleClick);
//

36
Client/UIControls/Partnersuche.cs
View File

@@ -15,6 +15,7 @@ using Syncfusion.WinForms.DataGrid;
using System.Web.UI.WebControls;
using Syncfusion.Data;
using Syncfusion.WinForms.DataGrid.Interactivity;
using System.IO;
namespace OnDoc.UIControls
{
@@ -38,7 +39,8 @@ namespace OnDoc.UIControls
trefferlistedata.DataSource = clsPartner.get_partnerliste();
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
if (trefferlistedata.RowCount > 0) {sfButton1.Enabled = true;}
trefferlistedata.SelectedIndex = 0;
}
@@ -47,12 +49,15 @@ namespace OnDoc.UIControls
private void btnsuche_Click(object sender, EventArgs e)
{
if (txtPartnerNr.Text.Trim() != "")
{
string s = txtPartnerNr.Text.Replace(".", "").Trim();
if (DivFnkt.IsNumeric(s))
{
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata,true);
if (clsPartner.partnerliste.Rows.Count == 1)
{
trefferlistedata.SelectedIndex = 0;
@@ -64,6 +69,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);
if (clsPartner.partnerliste.Rows.Count == 1)
{
trefferlistedata.SelectedIndex = 0;
@@ -72,7 +78,7 @@ namespace OnDoc.UIControls
}
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata,true);
trefferlistedata.SelectedIndex = 0;
try
{
@@ -140,8 +146,7 @@ namespace OnDoc.UIControls
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");
@@ -152,5 +157,28 @@ namespace OnDoc.UIControls
catch { }
}
private void trefferlistedata_DrawCell(object sender, Syncfusion.WinForms.DataGrid.Events.DrawCellEventArgs e)
{
if (e.Column.MappingName == "Typ")
{
var selectedItem = e.DataRow;
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);
}
else
{
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);
e.Graphics.DrawLine(borderPen, e.Bounds.Left, e.Bounds.Bottom, e.Bounds.Right, e.Bounds.Bottom);
e.Handled = true;
return;
}
e.Handled = false;
}
}
}

4
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -291,7 +291,7 @@ namespace OnDoc.UIControls
{
bpperson_error = true;
bpperson_error_type = 1;
if (!ausDokumentpaket) MessageBox.Show("Das gewöhlte Dokument muss für eine Person erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
if (!ausDokumentpaket) MessageBox.Show("Das gewählte Dokument muss für eine Person erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
@@ -299,7 +299,7 @@ namespace OnDoc.UIControls
{
bpperson_error = true;
bpperson_error_type = 2;
if(!ausDokumentpaket) MessageBox.Show("Das gewöhlte Dokument muss für ein BP erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
if(!ausDokumentpaket) MessageBox.Show("Das gewählte Dokument muss für ein BP erstellt werden", "BP/Person", MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}
}