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

update 20250212

Browse Source
This commit is contained in:
Stefan Hutter
2025-02-12 20:40:38 +01:00
parent f8f1404ef9
commit 0969e308a7
77 changed files with 591 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,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();
@@ -167,6 +166,7 @@ namespace OnDoc.UICintrols
this.gruppenSchliessenToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonButton5 = new System.Windows.Forms.RibbonButton();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.dokwerte1 = new OnDoc.UIControls.Dokwerte();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -484,16 +484,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;
@@ -1394,6 +1384,16 @@ namespace OnDoc.UICintrols
this.ribbonButton5.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton5.SmallImage")));
this.ribbonButton5.Text = "Load";
//
// 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;

51
Client/UIControls/DokList.cs
View File

@@ -212,7 +212,17 @@ namespace OnDoc.UICintrols
}
index = index + 1;
}
if (selindex > 0) { ribbonCBAnsicht.SelectedIndex = selindex ; }
if (selindex > 0)
{
try
{
ribbonCBAnsicht.SelectedIndex = selindex;
}
catch
{
ribbonCBAnsicht.SelectedIndex = selindex - 1;
}
}
db = null;
// if (standardview != "") { refresh_view(standardview); }
if (standardview != null) { refresh_view(standardview); }
@@ -453,20 +463,24 @@ namespace OnDoc.UICintrols
private void dokumentBearbeitenToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!row_selected()) return;
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count > 1)
try
{
if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?", "Dokument bearbeiten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
if (!row_selected()) return;
var records = sfDataGrid1.View.GetSelectedRecords();
if (records.Count > 1)
{
if (MessageBox.Show("Mehrere Dokumente zum Bearbeiten öffnen?", "Dokument bearbeiten", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) { return; }
}
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
dokument_bearbeiten(documentid, false);
}
foreach (var record in records)
{
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
dokument_bearbeiten(documentid, false);
}
}
catch { }
}
public void dokument_bearbeiten(string dokid, bool newdok = false)
{
@@ -1038,6 +1052,7 @@ namespace OnDoc.UICintrols
this.sfDataGrid1.ShowGroupDropArea = false;
this.lblTitel.Text = "";
this.RibbonButtonNewDoc.Visible = false;
this.ribbonPanelNeu.Visible = false;
//this.RibbonPanelDoklist.Visible = false;
this.RibbonBtnVorschauNo.Visible = false;
this.RibbonButtonVorschauRechts.Visible = false;
@@ -1151,7 +1166,7 @@ namespace OnDoc.UICintrols
}
if (dataRow[0].ToString().Substring(0, 1).ToUpper() == "X")
{
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false == false)
if (Convert.ToBoolean(dataRow["Bearbeitung_Zwingend"]) == false )
if (Convert.ToBoolean(dataRow["toapprove"]) == true)
{
if (Convert.ToBoolean(dataRow["approved"]) == true)
@@ -1519,13 +1534,14 @@ namespace OnDoc.UICintrols
try
{
ribbonLabelToApprove.Text = "";
ribbonLabelToApprove.Visible = false;
DB db1 = new DB(AppParams.connectionstring);
db1.Get_Tabledata("Select count(*) from view_relaunch_approval where bewilligt=0 and abgelehnt = 0 and mitarbeiter_bewilligung=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
if (Convert.ToInt32(db1.dsdaten.Tables[0].Rows[0][0]) == 0)
{
//ribbonLabelToApprove.Text = "";
ribbonLabelToApprove.Visible = false;
//ribbonLabelToApprove.Visible = false;
}
else
@@ -1538,7 +1554,7 @@ namespace OnDoc.UICintrols
{
//ribbonLabelToApprove.Text = "";
ribbonLabelToApprove.Visible = false;
//ribbonLabelToApprove.Visible = false;
}
else
@@ -1608,12 +1624,14 @@ namespace OnDoc.UICintrols
ribbonVorlagen.Visible = AppParams.isSysadmin;
ribbonBerechtigung.Visible = AppParams.isSysadmin;
ribbonpanelanalyse.Visible = AppParams.isSysadmin;
RibbonPanelDiverses.Visible = AppParams.isSysadmin;
RibbonPanelDiverses.Visible = true;
ribbonPanel3.Visible = AppParams.isSysadmin;
ribbonPanel4.Visible = AppParams.isSysadmin;
RibbonTabAdmin.Visible = false;
RibbonTabAdmin.Visible = true;
ribbonSaveGridView.Enabled = AppParams.isSysadmin;
ribbonSaveGridView.Visible = AppParams.isSysadmin;
ribbonAnmelden.Visible = AppParams.showlogin;
//pos_elements();
}
@@ -2478,6 +2496,7 @@ namespace OnDoc.UICintrols
var datarow = record as DataRowView;
string documentid = datarow["dokumentid"].ToString();
DOCGEN.DocGen dg = new DocGen(AppParams.connectionstring,AppParams.RESTURI,AppParams.apikey);
if (dg.signdoc(selected_dokumentid, AppParams.tempdir))
{
DB db = new DB(AppParams.connectionstring);

5
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -744,7 +744,6 @@ namespace OnDoc.UIControls
if (rbEditlater.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (rbasPDF.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDF; }
if (rbasPDFarchivieren.Checked) { docgendata.erstellungsart = Erstellungsart.DokumentAlsPDFArchivieren; }
docgendata.dokumentwerte = gridDokwertlist.DataSource as DataTable;
@@ -778,7 +777,7 @@ 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.Zustaendig_Kube = "0";
if (this.rbzustaendigkube.Checked)
{
@@ -825,7 +824,7 @@ namespace OnDoc.UIControls
{
dokdata.approval1 = 0;
dokdata.approval2 = 0;
dokdata.toapprove = 1;
try
{
if (cbboxunterschriftlinks.Text == "") { dokdata.approval1 = 1; }