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

Update 20241215

Browse Source
This commit is contained in:
Stefan Hutter
2024-11-15 14:52:05 +01:00
parent 3c5380f422
commit 69de21ca51
1081 changed files with 28807 additions and 3739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Client/UIControls/Administrator/Dokumenttyp.cs
View File

@@ -52,20 +52,23 @@ namespace OnDoc.UIControls.Administrator
_sqlOrder = "id ";
}
else _sqlOrder = "Bezeichnung";
System.Data.DataTable _newDataTable = treedata.Select(_sqlWhere, _sqlOrder).CopyToDataTable();
foreach (DataRow r in _newDataTable.Rows)
try
{
TreeNodeAdv nodeAdv = new TreeNodeAdv();
nodeAdv.Text = r["id"].ToString() + " " + r["Bezeichnung"].ToString();
nodeAdv.Tag = r["id"].ToString();
if (Convert.ToBoolean(r["aktiv"]) == false)
System.Data.DataTable _newDataTable = treedata.Select(_sqlWhere, _sqlOrder).CopyToDataTable();
foreach (DataRow r in _newDataTable.Rows)
{
nodeAdv.Font = new System.Drawing.Font(nodeAdv.Font, FontStyle.Strikeout);
TreeNodeAdv nodeAdv = new TreeNodeAdv();
nodeAdv.Text = r["id"].ToString() + " " + r["Bezeichnung"].ToString();
nodeAdv.Tag = r["id"].ToString();
if (Convert.ToBoolean(r["aktiv"]) == false)
{
nodeAdv.Font = new System.Drawing.Font(nodeAdv.Font, FontStyle.Strikeout);
}
TreeDokumenttyp.Nodes.Add(nodeAdv);
}
TreeDokumenttyp.Nodes.Add(nodeAdv);
}
catch { }
}
private void Dokumenttyp_Load(object sender, EventArgs e)

40
Client/UIControls/Administrator/OfficeVorlage.cs
View File

@@ -19,6 +19,7 @@ using OnDoc.Klassen;
using Syncfusion.Windows.Forms;
using Syncfusion.Windows.Forms.Tools;
using Syncfusion.WinForms.Controls;
using VBFileManagement;
using Windows.Devices.Sensors;
using Windows.Media.Audio;
@@ -224,12 +225,25 @@ namespace OnDoc.UIControls.Administrator
{
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{
Database.DB db = new Database.DB(AppParams.connectionstring);
db.save_vorlage_to_db(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString());
db = null;
TreeOfficeVorlagen_AfterSelect(sender, e);
if (AppParams.vbvorlagenmanagement == "Yes")
{
VBFileManagement.VBFileManagement vbf = new VBFileManagement.VBFileManagement();
vbf.Update_Vorlage(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString(), AppParams.connectionstring, AppParams.CurrentMitarbieter);
TreeOfficeVorlagen_AfterSelect(sender, e);
vbf = null;
}
else
{
Database.DB db = new Database.DB(AppParams.connectionstring);
db.save_vorlage_to_db(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString());
db = null;
TreeOfficeVorlagen_AfterSelect(sender, e);
}
}
}
private void panel1_DragEnter(object sender, DragEventArgs e)
@@ -241,11 +255,21 @@ namespace OnDoc.UIControls.Administrator
{
string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
if (files.Length > 1) { MessageBox.Show("Nur eine Datei möglich!","Vorlage speichern",MessageBoxButtons.OK,MessageBoxIcon.Error); return; }
Database.DB db = new Database.DB(AppParams.connectionstring);
db.save_vorlage_to_db(files[0], TreeOfficeVorlagen.SelectedNode.Tag.ToString());
db = null;
TreeOfficeVorlagen_AfterSelect(sender, e);
if (AppParams.vbvorlagenmanagement == "Yes")
{
VBFileManagement.VBFileManagement vbf = new VBFileManagement.VBFileManagement();
vbf.Update_Vorlage(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString(), AppParams.connectionstring, AppParams.CurrentMitarbieter);
TreeOfficeVorlagen_AfterSelect(sender, e);
vbf = null;
}
else
{
Database.DB db = new Database.DB(AppParams.connectionstring);
db.save_vorlage_to_db(openFileDialog1.FileName, TreeOfficeVorlagen.SelectedNode.Tag.ToString());
db = null;
TreeOfficeVorlagen_AfterSelect(sender, e);
}
}
private void toolStripButton1_Click(object sender, EventArgs e)

4
Client/UIControls/Approval.cs
View File

@@ -154,6 +154,8 @@ namespace OnDoc.UIControls
tp.Parent.Nodes.Remove(tp);
}
db = null;
Logging.DocLog.Info("Dokument geprüft - abgelehnt", "Dokumentprüfung", dr["dokumentid"].ToString(),"","");
}
}
@@ -168,7 +170,6 @@ namespace OnDoc.UIControls
TreeNodeAdv tp = treeViewAdv1.SelectedNode.Parent;
treeViewAdv1.SelectedNode.Parent.Nodes.Remove(treeViewAdv1.SelectedNode);
if (dr["Bewilligungstyp"].ToString() == "2")
{
db.Exec_SQL("Update dokument set approval2=1 where dokumentid='" + dr["dokumentid"].ToString() + "'");
@@ -178,6 +179,7 @@ namespace OnDoc.UIControls
db.Exec_SQL("Update dokument set approval1=1 where dokumentid='" + dr["dokumentid"].ToString()+"'");
}
db = null;
Logging.DocLog.Info("Dokument geprüft", "Dokumentprüfung", dr["dokumentid"].ToString(), "", "");
}
}
}

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

@@ -116,6 +116,8 @@ namespace OnDoc.UICintrols
this.lblToApprove = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.RibbonButtonCreateNewDoc = new System.Windows.Forms.RibbonButton();
this.ribbonPanel4 = new System.Windows.Forms.RibbonPanel();
this.ribbonbuttonlogin = new System.Windows.Forms.RibbonButton();
((System.ComponentModel.ISupportInitialize)(this.sfDataGrid1)).BeginInit();
this.ctxMenuDokList.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -337,6 +339,7 @@ namespace OnDoc.UICintrols
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(1709, 347);
this.docPreview1.TabIndex = 0;
this.docPreview1.ZoomPercentage = 0;
//
// panel2
//
@@ -815,6 +818,7 @@ namespace OnDoc.UICintrols
this.RibbonTabAdmin.Panels.Add(this.ribbonPanel1);
this.RibbonTabAdmin.Panels.Add(this.ribbonPanel3);
this.RibbonTabAdmin.Panels.Add(this.RibbonPanelDiverses);
this.RibbonTabAdmin.Panels.Add(this.ribbonPanel4);
this.RibbonTabAdmin.Text = "Administration";
//
// ribbonPanel1
@@ -910,6 +914,20 @@ namespace OnDoc.UICintrols
this.RibbonButtonCreateNewDoc.Text = "Dokument";
this.RibbonButtonCreateNewDoc.Click += new System.EventHandler(this.RibbonButtonCreateNewDoc_Click);
//
// ribbonPanel4
//
this.ribbonPanel4.Items.Add(this.ribbonbuttonlogin);
this.ribbonPanel4.Name = "ribbonPanel4";
this.ribbonPanel4.Text = "";
//
// ribbonbuttonlogin
//
this.ribbonbuttonlogin.Image = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.Image")));
this.ribbonbuttonlogin.LargeImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.LargeImage")));
this.ribbonbuttonlogin.Name = "ribbonbuttonlogin";
this.ribbonbuttonlogin.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonbuttonlogin.SmallImage")));
this.ribbonbuttonlogin.Click += new System.EventHandler(this.ribbonbuttonlogin_Click);
//
// DokList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1023,5 +1041,7 @@ namespace OnDoc.UICintrols
private System.Windows.Forms.RibbonLabel RibbonFilterLabel;
private System.Windows.Forms.RibbonButton RibbonFilterDelete;
private System.Windows.Forms.RibbonButton RibbonPartnerSaldiert;
private System.Windows.Forms.RibbonPanel ribbonPanel4;
private System.Windows.Forms.RibbonButton ribbonbuttonlogin;
}
}

72
Client/UIControls/DokList.cs
View File

@@ -201,6 +201,7 @@ namespace OnDoc.UICintrols
selected_dokumentid = documentid;
selected_partnernr = dataRow["Partner-Nr"].ToString();
selected_cellvalue = dataRow[e.DataColumn.ColumnIndex].ToString();
if (dataRow["Bearbeitung_Zwingend"].ToString() == "1")
{
@@ -868,33 +869,38 @@ namespace OnDoc.UICintrols
string documentid = datarow["dokumentid"].ToString();
archivedoc(documentid);
string URL = AppParams.RESTURI + "api/ArchiveDocFromDatabase?dokumentid=" + documentid;
HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
webRequest.Method = WebRequestMethods.Http.Get;
webRequest.Headers["Authorization"] = "Bearer " + AppParams.apikey;
try
{
using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse)
{
if (response.StatusCode == HttpStatusCode.OK)
{
StreamReader reader = new StreamReader(response.GetResponseStream());
string responseContent = reader.ReadToEnd();
}
else
{
MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde abgebrochen." + Environment.NewLine + "Fehler: " + response.StatusDescription);
Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", "");
}
}
} catch (Exception ex) {
MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " konnte nicht durchgeführt werden." + Environment.NewLine + "Fehler: " + ex.Message);
}
}
refresh_dokumente();
// return;
// string URL = AppParams.RESTURI + "api/ArchiveDocFromDatabase?dokumentid=" + documentid;
// HttpWebRequest webRequest = HttpWebRequest.Create(URL) as HttpWebRequest;
// webRequest.Method = WebRequestMethods.Http.Get;
// webRequest.Headers["Authorization"] = "Bearer " + AppParams.apikey;
// try
// {
// using (HttpWebResponse response = webRequest.GetResponse() as HttpWebResponse)
// {
// if (response.StatusCode == HttpStatusCode.OK)
// {
// StreamReader reader = new StreamReader(response.GetResponseStream());
// string responseContent = reader.ReadToEnd();
// }
// else
// {
// MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " wurde abgebrochen." + Environment.NewLine + "Fehler: " + response.StatusDescription);
// Logging.Logging.Error(URL + ": " + response.StatusCode.ToString() + " / " + response.StatusDescription, "Clinet - DokList GetDocument", "");
// }
// }
// } catch (Exception ex) {
// MessageBox.Show("Die Archivierung des Dokumentes " + documentid + " konnte nicht durchgeführt werden." + Environment.NewLine + "Fehler: " + ex.Message);
// }
//}
//refresh_dokumente();
}
private void ribbonButtonVersandstrasse_Click(object sender, EventArgs e)
{
@@ -1111,6 +1117,22 @@ namespace OnDoc.UICintrols
RibbonFilterDelete.Visible = false;
}
private void ribbonbuttonlogin_Click(object sender, EventArgs e)
{
frmLogin frmLogin = new frmLogin();
frmLogin.ShowDialog();
if (frmLogin.DialogResult == DialogResult.OK)
{
AppParams.CurrentMitarbieter = frmLogin.selectedmitarbeiternr;
this.mitarbeiternr = AppParams.CurrentMitarbieter;
//Helper.Security security = new Helper.Security();
//security.set_security(dokList1);
load_Profile();
refresh_dokumente();
set_functions();
}
}
}
}

21
Client/UIControls/DokList.resx
View File

@@ -465,6 +465,27 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
</value>
</data>
<data name="ribbonbuttonlogin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonbuttonlogin.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAaSURBVFhH7cEBAQAAAIIg/69uSEAAAADAuRoQIAABnXhJ
QwAAAABJRU5ErkJggg==
</value>
</data>
<data name="ribbonbuttonlogin.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAATSURBVDhPYxgFo2AUjAIwYGAAAAQQAAGnRHxjAAAAAElF
TkSuQmCC
</value>
</data>
<metadata name="pdfConfig1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">