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

update 20241213

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-13 20:39:38 +01:00
parent 67ad74f145
commit 608fc730f0
81 changed files with 822 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,8 @@ namespace OnDoc.UICintrols
this.dokumentAnVersandstrasseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.wordInterOPEditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentKopierenToolStripMenuItem = 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();
@@ -196,9 +198,11 @@ namespace OnDoc.UICintrols
this.pDFGenerierenToolStripMenuItem,
this.dokumentAnVersandstrasseToolStripMenuItem,
this.wordInterOPEditToolStripMenuItem,
this.attributeAnzeigenVersteckenToolStripMenuItem});
this.attributeAnzeigenVersteckenToolStripMenuItem,
this.historyToolStripMenuItem,
this.dokumentKopierenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 268);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 312);
//
// dokumentAnzeigenToolStripMenuItem
//
@@ -287,11 +291,26 @@ namespace OnDoc.UICintrols
//
// attributeAnzeigenVersteckenToolStripMenuItem
//
this.attributeAnzeigenVersteckenToolStripMenuItem.Image = global::OnDoc.Properties.Resources.Attribut_16x16_32;
this.attributeAnzeigenVersteckenToolStripMenuItem.Name = "attributeAnzeigenVersteckenToolStripMenuItem";
this.attributeAnzeigenVersteckenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute anzeigen / ausblenden";
this.attributeAnzeigenVersteckenToolStripMenuItem.Text = "Attribute ein- / ausblenden";
this.attributeAnzeigenVersteckenToolStripMenuItem.Click += new System.EventHandler(this.attributeAnzeigenVersteckenToolStripMenuItem_Click);
//
// historyToolStripMenuItem
//
this.historyToolStripMenuItem.Name = "historyToolStripMenuItem";
this.historyToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.historyToolStripMenuItem.Text = "History";
this.historyToolStripMenuItem.Click += new System.EventHandler(this.historyToolStripMenuItem_Click);
//
// dokumentKopierenToolStripMenuItem
//
this.dokumentKopierenToolStripMenuItem.Name = "dokumentKopierenToolStripMenuItem";
this.dokumentKopierenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.dokumentKopierenToolStripMenuItem.Text = "Dokument kopieren";
this.dokumentKopierenToolStripMenuItem.Click += new System.EventHandler(this.dokumentKopierenToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -530,6 +549,7 @@ namespace OnDoc.UICintrols
//
// ribbonPanelZuweisung
//
this.ribbonPanelZuweisung.ButtonMoreVisible = false;
this.ribbonPanelZuweisung.Items.Add(this.RibbonButtonZuweisen);
this.ribbonPanelZuweisung.Items.Add(this.ribbonButtonToApproval);
this.ribbonPanelZuweisung.Name = "ribbonPanelZuweisung";
@@ -623,6 +643,7 @@ namespace OnDoc.UICintrols
//
// RibbonPanelSuche
//
this.RibbonPanelSuche.ButtonMoreVisible = false;
this.RibbonPanelSuche.Items.Add(this.ribbonGroupMitarbeiter);
this.RibbonPanelSuche.Items.Add(this.RibbonGroupFilter);
this.RibbonPanelSuche.Name = "RibbonPanelSuche";
@@ -748,6 +769,7 @@ namespace OnDoc.UICintrols
//
// RibbonPannelAnsicht
//
this.RibbonPannelAnsicht.ButtonMoreVisible = false;
this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup2);
this.RibbonPannelAnsicht.Items.Add(this.ribbonItemGroup3);
this.RibbonPannelAnsicht.Name = "RibbonPannelAnsicht";
@@ -830,7 +852,7 @@ namespace OnDoc.UICintrols
this.ribbonPanelVorschau.Items.Add(this.RibbonButtonVorschauRechts);
this.ribbonPanelVorschau.Items.Add(this.RibbonBtnVorschauSepparat);
this.ribbonPanelVorschau.Name = "ribbonPanelVorschau";
this.ribbonPanelVorschau.Text = "Vorschau";
this.ribbonPanelVorschau.Text = "Vorschau ein-/ausblenden";
//
// RibbonBtnVorschauNo
//
@@ -841,6 +863,7 @@ namespace OnDoc.UICintrols
this.RibbonBtnVorschauNo.SmallImage = global::OnDoc.Properties.Resources.Preview_Now_16x16_32;
this.RibbonBtnVorschauNo.Text = "Keine";
this.RibbonBtnVorschauNo.TextAlignment = System.Windows.Forms.RibbonItem.RibbonItemTextAlignment.Center;
this.RibbonBtnVorschauNo.Visible = false;
this.RibbonBtnVorschauNo.Click += new System.EventHandler(this.RibbonBtnVorschauNo_Click);
//
// RibbonBtnVorschauUnten
@@ -872,21 +895,23 @@ namespace OnDoc.UICintrols
//
// ribbonPanelAttribute
//
this.ribbonPanelAttribute.ButtonMoreVisible = false;
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.Image = global::OnDoc.Properties.Resources.Attribut_32x32_32;
this.RibbonButtonAttributeEinAusblenden.LargeImage = global::OnDoc.Properties.Resources.Attribut_32x32_32;
this.RibbonButtonAttributeEinAusblenden.Name = "RibbonButtonAttributeEinAusblenden";
this.RibbonButtonAttributeEinAusblenden.SmallImage = ((System.Drawing.Image)(resources.GetObject("RibbonButtonAttributeEinAusblenden.SmallImage")));
this.RibbonButtonAttributeEinAusblenden.Text = "Ein-/Ausblenden";
this.RibbonButtonAttributeEinAusblenden.SmallImage = global::OnDoc.Properties.Resources.Attribut_24x24_32;
this.RibbonButtonAttributeEinAusblenden.Text = "Attribute ein-/ausblenden";
this.RibbonButtonAttributeEinAusblenden.Click += new System.EventHandler(this.RibbonButtonAttributeEinAusblenden_Click);
//
// ribbonPanel1
//
this.ribbonPanel1.ButtonMoreVisible = false;
this.ribbonPanel1.Items.Add(this.ribbonButton6);
this.ribbonPanel1.Name = "ribbonPanel1";
this.ribbonPanel1.Text = "Dokumentliste";
@@ -1002,6 +1027,7 @@ namespace OnDoc.UICintrols
//
// ribbonPanelNativVorlagen
//
this.ribbonPanelNativVorlagen.ButtonMoreVisible = false;
this.ribbonPanelNativVorlagen.Items.Add(this.ribbonButtonNativVorlagen);
this.ribbonPanelNativVorlagen.Name = "ribbonPanelNativVorlagen";
this.ribbonPanelNativVorlagen.Text = "";
@@ -1042,6 +1068,7 @@ namespace OnDoc.UICintrols
//
// ribbonAnmelden
//
this.ribbonAnmelden.ButtonMoreVisible = false;
this.ribbonAnmelden.Items.Add(this.ribbonbuttonlogin);
this.ribbonAnmelden.Name = "ribbonAnmelden";
this.ribbonAnmelden.Text = "";
@@ -1130,6 +1157,7 @@ namespace OnDoc.UICintrols
//
// ribbonpanelanalyse
//
this.ribbonpanelanalyse.ButtonMoreVisible = false;
this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedklog);
this.ribbonpanelanalyse.Items.Add(this.ribbonbuttonedkverarbeitung);
this.ribbonpanelanalyse.Name = "ribbonpanelanalyse";
@@ -1338,5 +1366,7 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonPanel ribbonPanel1;
private System.Windows.Forms.RibbonButton ribbonButton6;
private System.Windows.Forms.RibbonPanel ribbonPanelZuweisung;
private System.Windows.Forms.ToolStripMenuItem historyToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem dokumentKopierenToolStripMenuItem;
}
}

42
Client/UIControls/DokList.cs
View File

@@ -607,15 +607,28 @@ namespace OnDoc.UICintrols
private void RibbonBtnVorschauUnten_Click(object sender, EventArgs e)
{
tsrbvorschau.SelectedIndex = 1;
if (tsrbvorschau.SelectedIndex == 1) { tsrbvorschau.SelectedIndex = 0; } else { tsrbvorschau.SelectedIndex = 1; }
}
private void RibbonButtonVorschauRechts_Click(object sender, EventArgs e)
{
tsrbvorschau.SelectedIndex = 2;
if (tsrbvorschau.SelectedIndex == 2) { tsrbvorschau.SelectedIndex = 0; } else { tsrbvorschau.SelectedIndex = 2; }
}
private void RibbonBtnVorschauSepparat_Click(object sender, EventArgs e)
{
if (Separate_Vorschau_offen == true)
{
try
{
Broadcaster().Broadcast(selected_dokumentid, new SenderInfo("Doklist", "Close", ""));
return;
}
catch {
return;
}
}
if (tsrbvorschau.SelectedIndex == 3 && Separate_Vorschau_offen == false)
{
tsrbvorschau_SelectedIndexChanged(sender, e);
@@ -1389,9 +1402,6 @@ namespace OnDoc.UICintrols
}
sfDataGrid1.ShowToolTip = true;
sfDataGrid1.ToolTipOption.AutoPopDelay = 500;
sfDataGrid1.ToolTipOption.InitialDelay = 500;
sfDataGrid1.ShowToolTip = true;
System.Windows.Forms.Application.DoEvents();
}
@@ -1589,10 +1599,10 @@ namespace OnDoc.UICintrols
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);
//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 ribbonButtonVorlagenfeldregel_Click(object sender, EventArgs e)
@@ -1758,6 +1768,20 @@ namespace OnDoc.UICintrols
refresh_dokumente();
}
private void historyToolStripMenuItem_Click(object sender, EventArgs e)
{
DokHistory dh = new DokHistory(selected_dokumentid);
dh.ShowDialog();
}
private void dokumentKopierenToolStripMenuItem_Click(object sender, EventArgs e)
{
DB db = new DB(AppParams.connectionstring);
db.copydoc(selected_dokumentid);
db = null;
}
}
}

18
Client/UIControls/DokList.resx
View File

@@ -375,24 +375,6 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="RibbonButtonAttributeEinAusblenden.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="RibbonButtonAttributeEinAusblenden.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
</value>
</data>
<data name="RibbonButtonAttributeEinAusblenden.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="RibbonButtonDokumenttyp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

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

@@ -101,6 +101,7 @@
this.trefferlistedata.AllowEditing = false;
this.trefferlistedata.AllowFiltering = true;
this.trefferlistedata.AllowGrouping = false;
this.trefferlistedata.AutoSizeColumnsMode = Syncfusion.WinForms.DataGrid.Enums.AutoSizeColumnsMode.AllCells;
this.trefferlistedata.Dock = System.Windows.Forms.DockStyle.Fill;
this.trefferlistedata.Location = new System.Drawing.Point(3, 16);
this.trefferlistedata.Name = "trefferlistedata";

24
Client/UIControls/Partnersuche.cs
View File

@@ -54,7 +54,11 @@ namespace OnDoc.UIControls
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
try
{
trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
}
catch { }
if (trefferlistedata.RowCount > 0) { sfButton1.Enabled = true; }
trefferlistedata.SelectedIndex = 0;
}
@@ -71,7 +75,11 @@ namespace OnDoc.UIControls
{
trefferlistedata.DataSource = clsPartner.search_partner(s, 50, 0);
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
try
{
trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
}
catch { }
if (clsPartner.partnerliste.Rows.Count == 1)
{
trefferlistedata.SelectedIndex = 0;
@@ -84,6 +92,11 @@ 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);
try
{
trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
}
catch { }
if (clsPartner.partnerliste.Rows.Count == 1)
{
trefferlistedata.SelectedIndex = 0;
@@ -93,6 +106,11 @@ namespace OnDoc.UIControls
try
{
TableHelper.FormatTable(ref clsPartner.partnerliste, "Partner", ref trefferlistedata, true);
try
{
trefferlistedata.Columns[0].Width = trefferlistedata.Columns[0].Width + 20;
}
catch { }
trefferlistedata.SelectedIndex = 0;
try
{
@@ -258,7 +276,7 @@ namespace OnDoc.UIControls
var dataRow = (e.DataRow.RowData as DataRowView).Row;
if (Convert.ToInt32(dataRow["Typ"]) == 1)
{
e.Graphics.DrawImage(OnDoc.Properties.Resources.Partner_16x16_32, e.Bounds.X + 5, e.Bounds.Y + 3);
e.Graphics.DrawImage(OnDoc.Properties.Resources.BP_16x16_32, e.Bounds.X + 5, e.Bounds.Y + 3);
}
else
{