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

update 20241203

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-03 20:52:10 +01:00
parent ce2c0555b3
commit 9c0f9cd3b9
12 changed files with 98 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ namespace OnDoc.UICintrols
this.pDFGenerierenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentAnVersandstrasseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.tsrbvorschau = new System.Windows.Forms.ToolStripComboBox();
@@ -52,6 +53,8 @@ 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();
@@ -102,6 +105,8 @@ namespace OnDoc.UICintrols
this.RibbonBtnVorschauUnten = new System.Windows.Forms.RibbonButton();
this.RibbonButtonVorschauRechts = new System.Windows.Forms.RibbonButton();
this.RibbonBtnVorschauSepparat = new System.Windows.Forms.RibbonButton();
this.ribbonPanelAttribute = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonAttributeEinAusblenden = 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();
@@ -133,11 +138,6 @@ 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.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ribbonPanelAttribute = new System.Windows.Forms.RibbonPanel();
this.RibbonButtonAttributeEinAusblenden = new System.Windows.Forms.RibbonButton();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -151,23 +151,23 @@ namespace OnDoc.UICintrols
// sfDataGrid1
//
this.sfDataGrid1.AccessibleName = "Table";
this.sfDataGrid1.AllowEditing = false;
this.sfDataGrid1.AllowFiltering = true;
this.sfDataGrid1.AllowResizingColumns = true;
this.sfDataGrid1.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
this.sfDataGrid1.AllowSelectionOnMouseDown = true;
this.sfDataGrid1.ContextMenuStrip = this.ctxMenuDokList;
this.sfDataGrid1.CopyOption = Syncfusion.WinForms.DataGrid.Enums.CopyOptions.None;
this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGrid1.Location = new System.Drawing.Point(0, 0);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Extended;
this.sfDataGrid1.SelectionMode = Syncfusion.WinForms.DataGrid.Enums.GridSelectionMode.Multiple;
this.sfDataGrid1.ShowGroupDropArea = true;
this.sfDataGrid1.ShowToolTip = true;
this.sfDataGrid1.Size = new System.Drawing.Size(1709, 343);
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.CellClick += new Syncfusion.WinForms.DataGrid.Events.CellClickEventHandler(this.sfDataGrid1_CellClick);
this.sfDataGrid1.CurrentCellActivated += new Syncfusion.WinForms.DataGrid.Events.CurrentCellActivatedEventHandler(this.sfDataGrid1_CurrentCellActivated);
this.sfDataGrid1.CurrentCellKeyDown += new Syncfusion.WinForms.DataGrid.Events.CurrentCellKeyEventHandler(this.sfDataGrid1_CurrentCellKeyDown);
this.sfDataGrid1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sfDataGrid1_KeyDown);
this.sfDataGrid1.CopyContent += new Syncfusion.WinForms.DataGrid.Events.CutCopyPasteEventHandler(this.sfDataGrid1_CopyContent);
//
// ctxMenuDokList
//
@@ -272,6 +272,13 @@ namespace OnDoc.UICintrols
this.wordInterOPEditToolStripMenuItem.Visible = false;
this.wordInterOPEditToolStripMenuItem.Click += new System.EventHandler(this.wordInterOPEditToolStripMenuItem_Click);
//
// attributeAnzeigenVersteckenToolStripMenuItem
//
this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem";
this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute anzeigen / ausblenden";
this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -358,6 +365,24 @@ 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;
@@ -782,7 +807,6 @@ namespace OnDoc.UICintrols
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);
//
// ribbonPanelVorschau
@@ -833,6 +857,21 @@ namespace OnDoc.UICintrols
this.RibbonBtnVorschauSepparat.Text = "Eigenes Fenster";
this.RibbonBtnVorschauSepparat.Click += new System.EventHandler(this.RibbonBtnVorschauSepparat_Click);
//
// ribbonPanelAttribute
//
this.ribbonPanelAttribute.Items.Add(this.RibbonButtonAttributeEinAusblenden);
this.ribbonPanelAttribute.Name = "ribbonPanelAttribute";
this.ribbonPanelAttribute.Text = "Attribute";
//
// RibbonButtonAttributeEinAusblenden
//
this.RibbonButtonAttributeEinAusblenden.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.Image")));
this.RibbonButtonAttributeEinAusblenden.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.LargeImage")));
this.RibbonButtonAttributeEinAusblenden.Name = "RibbonButtonAttributeEinAusblenden";
this.RibbonButtonAttributeEinAusblenden.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.SmallImage")));
this.RibbonButtonAttributeEinAusblenden.Text = "Einblenden_/_Ausblenden";
this.RibbonButtonAttributeEinAusblenden.Click += new System.EventHandler(this.RibbonButtonAttributeEinAusblenden_Click);
//
// ribbonTabDokpaket_Serienbrief
//
this.ribbonTabDokpaket_Serienbrief.Name = "ribbonTabDokpaket_Serienbrief";
@@ -1072,46 +1111,6 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// attributeAnzeigenVersteckenToolStripMenuItem
//
this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem";
this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute anzeigen / ausblenden";
this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click);
//
// ribbonPanelAttribute
//
this.ribbonPanelAttribute.Items.Add(this.RibbonButtonAttributeEinAusblenden);
this.ribbonPanelAttribute.Name = "ribbonPanelAttribute";
this.ribbonPanelAttribute.Text = "Attribute";
//
// RibbonButtonAttributeEinAusblenden
//
this.RibbonButtonAttributeEinAusblenden.Image = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.Image")));
this.RibbonButtonAttributeEinAusblenden.LargeImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.LargeImage")));
this.RibbonButtonAttributeEinAusblenden.Name = "RibbonButtonAttributeEinAusblenden";
this.RibbonButtonAttributeEinAusblenden.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.SmallImage")));
this.RibbonButtonAttributeEinAusblenden.Text = "Enblenden_/_Ausblenden";
this.RibbonButtonAttributeEinAusblenden.Click += new System.EventHandler(this.RibbonButtonAttributeEinAusblenden_Click);
//
// 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;
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

81
Client/UIControls/DokList.cs
View File

@@ -90,7 +90,7 @@ namespace OnDoc.UICintrols
private void DokList_Load(object sender, EventArgs e)
{
tsrbvorschau.SelectedIndex = 0;
sfDataGrid1.AllowDraggingColumns = true;
//sfDataGrid1.AllowDraggingColumns = true;
// Helper.Security security = new Helper.Security();
// security.set_security(this);
//Refresh_Bewilligungen();
@@ -193,6 +193,7 @@ namespace OnDoc.UICintrols
//this.sfDataGrid1.DataSource = dokumente;
sfDataGrid1.View.AutoExpandGroups = true;
this.timer1.Enabled = true;
}
public void refresh_dokumente_filtered()
@@ -223,27 +224,18 @@ namespace OnDoc.UICintrols
string documentid = "";
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;
documentid = dataRow["dokumentid"].ToString();
selected_dokumentid = documentid;
selected_partnernr = dataRow["Partner-Nr"].ToString();
selected_cellvalue = dataRow[e.DataColumn.ColumnIndex].ToString();
//var reflector = this.sfDataGrid1.View.GetPropertyAccessProvider();
//foreach (var row in this.sfDataGrid1.SelectedItems)
//{
// foreach (var column in sfDataGrid1.Columns)
// {
// //Get the value from data object based on MappingName
// var cellvalue = reflector.GetValue(row, column.MappingName);
// //Returns the display value of the cell from data object based on MappingName
// //var displayValue = reflector.GetFormattedValue(row, column.MappingName);
// var s = (cellvalue.ToString());
// }
//}
selected_cellvalue = dataRow[columnIndex].ToString();
selected_cellvalue=this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString();
if (dokwerte1.Width > 0)
{
dokwerte1.Update_Werte(selected_dokumentid);
@@ -718,6 +710,7 @@ namespace OnDoc.UICintrols
private void sfDataGrid1_DrawCell(object sender, DrawCellEventArgs e)
{
if (e.Column.MappingName == "zu_retournieren")
{
e.Column.CellStyle.HorizontalAlignment = HorizontalAlignment.Center;
@@ -812,17 +805,9 @@ namespace OnDoc.UICintrols
System.Windows.Forms.Clipboard.SetText(selected_cellvalue);
}
private void sfDataGrid1_CurrentCellKeyDown(object sender, CurrentCellKeyEventArgs e)
{
}
private void sfDataGrid1_KeyDown(object sender, KeyEventArgs e)
{
if (e.Control && e.KeyCode == Keys.C)
{
System.Windows.Forms.Clipboard.SetText(selected_cellvalue);
e.SuppressKeyPress = true;
}
}
private void druckenToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1202,7 +1187,7 @@ 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");
@@ -1215,6 +1200,10 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.Deserialize(ms);
}
sfDataGrid1.ShowToolTip = true;
sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
sfDataGrid1.ToolTipOption.InitialDelay = 500;
System.Windows.Forms.Application.DoEvents();
}
public static string Decode(string text)
@@ -1338,15 +1327,15 @@ namespace OnDoc.UICintrols
string b = fh.Base64FromFile(@"x:\gridsettings2.xml");
DB db = new DB(AppParams.connectionstring);
db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + b + "' where id=-101");
// using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open))
// {
// this.sfDataGrid1.Deserialize(file);
// }
//using (var file = File.Open(@"x:\gridsettings3.xml", FileMode.Open))
//{
// this.sfDataGrid1.Serialize(file);
//}
db.Exec_SQL("Update mitarbeiter_gridsettings set gridsettings='" + b + "' where id=-100");
using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open))
{
this.sfDataGrid1.Deserialize(file);
}
using (var file = File.Open(@"x:\gridsettings2.xml", FileMode.Open))
{
this.sfDataGrid1.Serialize(file);
}
}
@@ -1387,6 +1376,28 @@ namespace OnDoc.UICintrols
{
}
private void sfDataGrid1_ToolTipOpening(object sender, ToolTipOpeningEventArgs e)
{
e.ToolTipInfo.Items.Clear();
Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
tt.Text = "Hallo Du";
e.ToolTipInfo.Items.Add(tt);
}
private void sfDataGrid1_CopyContent(object sender, CutCopyPasteEventArgs e)
{
e.Cancel = true;
zellenwertInZwischenablageKopierenToolStripMenuItem_Click(sender, e);
}
private void sfDataGrid1_ToolTipOpening_1(object sender, ToolTipOpeningEventArgs e)
{
e.ToolTipInfo.Items.Clear();
Syncfusion.WinForms.Controls.ToolTipItem tt = new Syncfusion.WinForms.Controls.ToolTipItem();
tt.Text = "Hallo Du";
e.ToolTipInfo.Items.Add(tt);
}
}
}

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

@@ -41,6 +41,7 @@
this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGrid1.Location = new System.Drawing.Point(0, 100);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.ShowToolTip = true;
this.sfDataGrid1.Size = new System.Drawing.Size(381, 611);
this.sfDataGrid1.TabIndex = 0;
this.sfDataGrid1.Text = "sfDataGrid1";