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

20250120

Browse Source
This commit is contained in:
Stefan Hutter
2025-01-20 19:30:28 +01:00
parent 578525cfc4
commit b211ffb29d
35 changed files with 305 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/Diverses/SplashScreen.Designer.cs
Generated
+1 -1
View File
@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(168, 26);
this.label2.TabIndex = 2;
this.label2.Text = "19. Januar 2025";
this.label2.Text = "20. Januar 2025";
//
// SplashScreen
//
Client/UIControls/DokList.Designer.cs
Generated
+67 -3
View File
@@ -51,6 +51,9 @@ namespace OnDoc.UICintrols
this.attributeAnzeigenVersteckenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.historyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dokumentFürPartnerErstellenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator();
this.gruppenÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.gruppenSchliessenToolStripMenuItem = 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();
@@ -155,6 +158,9 @@ namespace OnDoc.UICintrols
this.pdfConfig2 = new Syncfusion.Pdf.PdfConfig();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.ctxMenuGroups = new System.Windows.Forms.ContextMenuStrip(this.components);
this.gruppenÖffnenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -164,6 +170,7 @@ namespace OnDoc.UICintrols
this.splitContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.panel2.SuspendLayout();
this.ctxMenuGroups.SuspendLayout();
this.SuspendLayout();
//
// ctxMenuDokList
@@ -186,9 +193,13 @@ namespace OnDoc.UICintrols
this.wordInterOPEditToolStripMenuItem,
this.attributeAnzeigenVersteckenToolStripMenuItem,
this.historyToolStripMenuItem,
this.dokumentFürPartnerErstellenToolStripMenuItem});
this.dokumentFürPartnerErstellenToolStripMenuItem,
this.toolStripMenuItem3,
this.gruppenÖffnenToolStripMenuItem,
this.gruppenSchliessenToolStripMenuItem});
this.ctxMenuDokList.Name = "ctxMenuDokList";
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 368);
this.ctxMenuDokList.Size = new System.Drawing.Size(280, 418);
this.ctxMenuDokList.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenuDokList_Opening);
//
// dokumentAnzeigenToolStripMenuItem
//
@@ -324,6 +335,25 @@ namespace OnDoc.UICintrols
this.dokumentFürPartnerErstellenToolStripMenuItem.Text = "Dokument für Partner erstellen";
this.dokumentFürPartnerErstellenToolStripMenuItem.Click += new System.EventHandler(this.dokumentFürPartnerErstellenToolStripMenuItem_Click);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(276, 6);
//
// gruppenÖffnenToolStripMenuItem
//
this.gruppenÖffnenToolStripMenuItem.Name = "gruppenÖffnenToolStripMenuItem";
this.gruppenÖffnenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.gruppenÖffnenToolStripMenuItem.Text = "Alle Gruppen aufklappen";
this.gruppenÖffnenToolStripMenuItem.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem_Click);
//
// gruppenSchliessenToolStripMenuItem
//
this.gruppenSchliessenToolStripMenuItem.Name = "gruppenSchliessenToolStripMenuItem";
this.gruppenSchliessenToolStripMenuItem.Size = new System.Drawing.Size(279, 22);
this.gruppenSchliessenToolStripMenuItem.Text = "Alle Gruppen einklappen";
this.gruppenSchliessenToolStripMenuItem.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -418,6 +448,7 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.AllowSelectionOnMouseDown = true;
this.sfDataGrid1.ContextMenuStrip = this.ctxMenuDokList;
this.sfDataGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfDataGrid1.ExpanderColumnWidth = 288D;
this.sfDataGrid1.Location = new System.Drawing.Point(0, 0);
this.sfDataGrid1.Name = "sfDataGrid1";
this.sfDataGrid1.RowHeight = 30;
@@ -480,6 +511,7 @@ namespace OnDoc.UICintrols
//
this.ribbon2.BackColor = System.Drawing.SystemColors.ActiveCaption;
this.ribbon2.CaptionBarVisible = false;
this.ribbon2.Cursor = System.Windows.Forms.Cursors.Default;
this.ribbon2.Font = new System.Drawing.Font("Segoe UI", 9F);
this.ribbon2.Location = new System.Drawing.Point(0, 0);
this.ribbon2.Minimized = false;
@@ -843,11 +875,14 @@ namespace OnDoc.UICintrols
//
// ribbonCBAnsicht
//
this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Compact;
this.ribbonCBAnsicht.AllowTextEdit = false;
this.ribbonCBAnsicht.DrawIconsBar = false;
this.ribbonCBAnsicht.MaxSizeMode = System.Windows.Forms.RibbonElementSizeMode.Medium;
this.ribbonCBAnsicht.Name = "ribbonCBAnsicht";
this.ribbonCBAnsicht.SelectedIndex = -1;
this.ribbonCBAnsicht.TextBoxText = "";
this.ribbonCBAnsicht.DropDownItemClicked += new System.Windows.Forms.RibbonComboBox.RibbonItemEventHandler(this.ribbonCBAnsicht_DropDownItemClicked);
//
// ribbonItemGroup3
//
@@ -1277,6 +1312,28 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// ctxMenuGroups
//
this.ctxMenuGroups.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.gruppenÖffnenToolStripMenuItem1,
this.gruppenSchliessenToolStripMenuItem1});
this.ctxMenuGroups.Name = "ctxMenuGroups";
this.ctxMenuGroups.Size = new System.Drawing.Size(206, 48);
//
// gruppenÖffnenToolStripMenuItem1
//
this.gruppenÖffnenToolStripMenuItem1.Name = "gruppenÖffnenToolStripMenuItem1";
this.gruppenÖffnenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
this.gruppenÖffnenToolStripMenuItem1.Text = "Alle Gruppen aufklappen";
this.gruppenÖffnenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenÖffnenToolStripMenuItem1_Click);
//
// gruppenSchliessenToolStripMenuItem1
//
this.gruppenSchliessenToolStripMenuItem1.Name = "gruppenSchliessenToolStripMenuItem1";
this.gruppenSchliessenToolStripMenuItem1.Size = new System.Drawing.Size(205, 22);
this.gruppenSchliessenToolStripMenuItem1.Text = "Alle Gruppen einklappen";
this.gruppenSchliessenToolStripMenuItem1.Click += new System.EventHandler(this.gruppenSchliessenToolStripMenuItem1_Click);
//
// dokwerte1
//
this.dokwerte1.Dock = System.Windows.Forms.DockStyle.Right;
@@ -1307,6 +1364,7 @@ namespace OnDoc.UICintrols
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).EndInit();
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.ctxMenuGroups.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -1436,5 +1494,11 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.ToolStripMenuItem dokumentFürPartnerErstellenToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripMenuItem zurUnterschriftenPrüfungToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3;
private System.Windows.Forms.ToolStripMenuItem gruppenÖffnenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem gruppenSchliessenToolStripMenuItem;
private System.Windows.Forms.ContextMenuStrip ctxMenuGroups;
private System.Windows.Forms.ToolStripMenuItem gruppenÖffnenToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem gruppenSchliessenToolStripMenuItem1;
}
}
Client/UIControls/DokList.cs
+60 -6
View File
@@ -205,7 +205,7 @@ namespace OnDoc.UICintrols
}
index = index + 1;
}
if (selindex>0) { ribbonCBAnsicht.SelectedIndex=selindex; }
if (selindex>0) { ribbonCBAnsicht.SelectedIndex=selindex-1; }
db = null;
// if (standardview != "") { refresh_view(standardview); }
if (standardview != null) { refresh_view(standardview); }
@@ -376,6 +376,7 @@ namespace OnDoc.UICintrols
private void sfDataGrid1_CellClick(object sender, Syncfusion.WinForms.DataGrid.Events.CellClickEventArgs e)
{
//var rowColumnIndex = sfDataGrid1.TableControl.PointToCellRowColumnIndex(e.MouseEventArgs.Location);
string documentid = "";
try
{
@@ -391,6 +392,7 @@ namespace OnDoc.UICintrols
selected_cellvalue = this.sfDataGrid1.View.GetPropertyAccessProvider().GetValue(e.DataRow.RowData, e.DataColumn.GridColumn.MappingName).ToString();
update_ansicht(dataRow["Bearbeitung_Zwingend"].ToString(), dataRow["toapprove"].ToString(), dataRow["approved"].ToString(), dataRow["faksimile"].ToString());
sfDataGrid1.ContextMenuStrip = ctxMenuDokList;
return;
if (dokwerte1.Width > 0)
{
@@ -418,10 +420,9 @@ namespace OnDoc.UICintrols
}
catch
{
selected_dokumentid = "";
selected_partnernr = "";
sfDataGrid1.ContextMenuStrip = ctxMenuGroups;
return;
}
if (vorschauposition == "Keine Vorschau") { return; }
@@ -481,10 +482,11 @@ namespace OnDoc.UICintrols
db.Get_Tabledata("Select * from dokument where dokumentid='" + selected_dokumentid + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["verantwortlich"]) != AppParams.CurrentMitarbeiter)
{
if (MessageBox.Show("Durch die Bearbeitung wird die Dokument-Verantwortung übernommen.", "Dokumentbearbieutng", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK)
if (MessageBox.Show("Durch die Bearbeitung wird die Dokument-Verantwortung übernommen.", "Dokumentbearbeiutng", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK)
{
db.Exec_SQL("Update dokument set verantwortlich=" + AppParams.CurrentMitarbeiter.ToString() + " where dokumentid='" + selected_dokumentid + "'");
Logging.DocLog.Info("Verantwortung für Bearbeitung übernommen", "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung übernommen");
return;
}
}
Logging.Logging.Debug("Vor Dok In Bearbeitung", "ondoc client", "");
@@ -1723,7 +1725,10 @@ return;
}
}
}
catch { }
catch (Exception ex)
{
//MessageBox.Show(ex.Message);
}
}
private void RibbonButtonViewStandard_Click(object sender, EventArgs e)
@@ -1807,6 +1812,7 @@ return;
}
}
db = null;
ribbonCBAnsicht.SelectedIndex = 1;
refresh_ansichten();
}
}
@@ -1885,7 +1891,7 @@ return;
RibbonButtonAttributeEinAusblenden.Checked = true;
}
show_hide_attribute();
update_currentview();
update_currentview();
}
//if (dokwerte1.Width == 0)
//{
@@ -2212,6 +2218,54 @@ return;
{
this.profilnr = Convert.ToInt32(RibbonCBProfil.SelectedItem.Tag);
}
private void ctxMenuDokList_Opening(object sender, CancelEventArgs e)
{
if (this.sfDataGrid1.GroupColumnDescriptions.Count > 0)
{
gruppenÖffnenToolStripMenuItem.Visible = true;
gruppenSchliessenToolStripMenuItem.Visible = true;
toolStripMenuItem3.Visible = true;
}
else
{
gruppenÖffnenToolStripMenuItem.Visible = false;
gruppenSchliessenToolStripMenuItem.Visible = false;
toolStripMenuItem3.Visible = false;
}
//var location = this.PointToClient(Cursor.Position);
////System.Drawing.Point location = new System.Drawing.Point();
// //location.X = Cursor.Position.X;
// //location.Y = Cursor.Position.Y;
//MessageBox.Show(location.X.ToString() + " / " + location.Y.ToString());
}
private void gruppenÖffnenToolStripMenuItem_Click(object sender, EventArgs e)
{
this.sfDataGrid1.ExpandAllGroup();
}
private void gruppenSchliessenToolStripMenuItem_Click(object sender, EventArgs e)
{
this.sfDataGrid1.CollapseAllGroup();
}
private void gruppenÖffnenToolStripMenuItem1_Click(object sender, EventArgs e)
{
gruppenÖffnenToolStripMenuItem_Click(sender, e);
}
private void gruppenSchliessenToolStripMenuItem1_Click(object sender, EventArgs e)
{
gruppenSchliessenToolStripMenuItem_Click(sender, e);
}
}
Client/UIControls/DokList.resx
+3
View File
@@ -566,4 +566,7 @@
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<metadata name="ctxMenuGroups.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>578, 17</value>
</metadata>
</root>
Client/bin/Debug/DOCGEN.dll
BIN
View File
Binary file not shown.
Client/bin/Debug/DOCGEN.pdb
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDoc.exe
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDoc.pdb
BIN
View File
Binary file not shown.
Client/bin/Debug/OnDocClient.zip
BIN
View File
Binary file not shown.
Client/bin/Debug/de-DE/OnDoc.resources.dll
BIN
View File
Binary file not shown.
Client/obj/Debug/Client.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/Client.csproj.GenerateResource.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.exe
BIN
View File
Binary file not shown.
Client/obj/Debug/OnDoc.pdb
BIN
View File
Binary file not shown.
Client/obj/Debug/de-DE/OnDoc.resources.dll
BIN
View File
Binary file not shown.