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

6
Client/App.config
View File

@@ -28,6 +28,12 @@
<setting name="apikey" serializeAs="String">
<value>5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6</value>
</setting>
<setting name="StandardWordDruckMakro" serializeAs="String">
<value>FilePrintDefault</value>
</setting>
<setting name="VBVorlagenmanagement" serializeAs="String">
<value>Yes</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>
<runtime>

8
Client/Client.csproj
View File

@@ -515,6 +515,14 @@
<Project>{a1fd0973-89a7-4588-877d-373835d6e00c}</Project>
<Name>Model</Name>
</ProjectReference>
<ProjectReference Include="..\OfficePrinter\OfficePrinter.csproj">
<Project>{e43884f0-a46f-4676-ade8-10b196faae3b}</Project>
<Name>OfficePrinter</Name>
</ProjectReference>
<ProjectReference Include="..\VBFileManagement\VBFileManagement.vbproj">
<Project>{dec8740a-0a3a-445b-a155-90ba612d6833}</Project>
<Name>VBFileManagement</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Resources\new-file_169262.png" />

35
Client/DocMgmt/Dokumenterstellung.Designer.cs generated
View File

@@ -33,7 +33,6 @@
this.sfButton3 = new Syncfusion.WinForms.Controls.SfButton();
this.btnDokumenterstellen = new Syncfusion.WinForms.Controls.SfButton();
this.PnlPreview = new System.Windows.Forms.Panel();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.GrpFnkt = new System.Windows.Forms.GroupBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -47,6 +46,8 @@
this.lbledit = new System.Windows.Forms.Label();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.btnOfficePrint = new System.Windows.Forms.Button();
this.docPreview1 = new OnDoc.UIControls.DocPreview();
this.ucAllgemeineDokumentParam1 = new OnDoc.UIControls.UCAllgemeineDokumentParam();
this.PnlPreview.SuspendLayout();
this.GrpFnkt.SuspendLayout();
@@ -82,17 +83,10 @@
this.PnlPreview.TabIndex = 19;
this.PnlPreview.Visible = false;
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
//
// GrpFnkt
//
this.GrpFnkt.BackColor = System.Drawing.Color.SeaShell;
this.GrpFnkt.Controls.Add(this.btnOfficePrint);
this.GrpFnkt.Controls.Add(this.label6);
this.GrpFnkt.Controls.Add(this.label5);
this.GrpFnkt.Controls.Add(this.ribbonButtonVersandstrasse);
@@ -122,6 +116,7 @@
this.label6.Size = new System.Drawing.Size(79, 13);
this.label6.TabIndex = 11;
this.label6.Text = "Versandstrasse";
this.label6.Visible = false;
//
// label5
//
@@ -141,6 +136,7 @@
this.ribbonButtonVersandstrasse.TabIndex = 9;
this.ribbonButtonVersandstrasse.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.ribbonButtonVersandstrasse.UseVisualStyleBackColor = true;
this.ribbonButtonVersandstrasse.Visible = false;
this.ribbonButtonVersandstrasse.Click += new System.EventHandler(this.button5_Click);
//
// label4
@@ -232,6 +228,26 @@
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// btnOfficePrint
//
this.btnOfficePrint.Image = ((System.Drawing.Image)(resources.GetObject("btnOfficePrint.Image")));
this.btnOfficePrint.Location = new System.Drawing.Point(419, 19);
this.btnOfficePrint.Name = "btnOfficePrint";
this.btnOfficePrint.Size = new System.Drawing.Size(74, 79);
this.btnOfficePrint.TabIndex = 12;
this.btnOfficePrint.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.btnOfficePrint.UseVisualStyleBackColor = true;
this.btnOfficePrint.Click += new System.EventHandler(this.btnOfficePrint_Click);
//
// docPreview1
//
this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill;
this.docPreview1.Location = new System.Drawing.Point(0, 123);
this.docPreview1.Name = "docPreview1";
this.docPreview1.Size = new System.Drawing.Size(668, 292);
this.docPreview1.TabIndex = 1;
this.docPreview1.ZoomPercentage = 0;
//
// ucAllgemeineDokumentParam1
//
this.ucAllgemeineDokumentParam1.ausDokumentpaket = false;
@@ -317,5 +333,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label lbledit;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnOfficePrint;
}
}

16
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -19,6 +19,8 @@ using BroadcastListener.Classes;
using BroadcastListener.Interfaces;
using static BroadcastListener.Classes.Factory;
using OnDoc.Helper;
using DOCGEN;
using System.Globalization;
namespace OnDoc.DocMgmt
{
@@ -234,5 +236,19 @@ namespace OnDoc.DocMgmt
{
}
private void btnOfficePrint_Click(object sender, EventArgs e)
{
clsdok dok = new clsdok("", "", "");
OfficePrinter.OnDocOffice op = new OfficePrinter.OnDocOffice();
DocGet gd = new DocGet(AppParams.connectionstring);
{
dok = gd.GetDoc(dokumentid);
}
Helper.FileHelper fh = new Helper.FileHelper();
string Filename = AppParams.tempdir + dokumentid + "." + dok.extension;
fh.SaveBase64ToFile(dok.dokument, Filename );
op.PrintInWord(Filename, AppParams.wordprintmacro);
}
}
}

18
Client/DocMgmt/Dokumenterstellung.resx
View File

@@ -118,6 +118,24 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnOfficePrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAuRJREFUaEPt
2cvLDXEcx/EjkZJYSESytsGC5JJLCv8AWYjcV7JRyjWl/AFPIUvJQor8ATZkoSgUOym55p6Q6/uT89XX
75n5nTkz85uZhU+96jlzTqff58x3fnOe5+n1MwWf8atmH7AEyZOqgLzDUiRNygKiEknPhC/wFhNQJScR
lkg6Tk0UkGTjlLLARbxxj5OMU8oCB7AQr92x2scpdQFFJcIzUds4NVFAWYQk45SywBmsdPbjB+z5WsYp
ZYEidCbmoHTaLiCLUTp1F9iFawW8RycLFM1N/C+gdK3AZMz482OxdKmAFn8dDzFTB4qkKwUm4YY79gCF
SsQKzIW/EVWxDD6+wFr4xRudiVmIJlbgAsI3LUvv7eMLPHE//4S/Ww8cpy4UMFr8IWyFLxEdp1iBI8i6
CZVxFT5hAS3+ICxb8A32fO44tXERa7d5BFucXEEYnYmwxKgz0XSBcLcxGpmdCHMM/nW3MBZ/02QBffJ+
8Rqb5+6xSuyGZQFewZ7/iBX4J7ECa7CnJlqYblK2GLtgp+Ne/5h8h16rxb/sHxP97rAKoxIrUOcu5Nni
x0BRifuw53UmtBZ7rE8+c/FK0wXC3cYyDb6EyRwbn1iB7ThVgT4Av5/bJ5+XdbDXSu7Y+KS6iMPdJhyb
MPMQXrADF6+kKJC122SNjaXQbpOXugvYV2K/+NjYFN5t8hIrsBea42HcRbj42sfGJ1ZAC7I3H1bSsfFJ
USD52PjECqzHvgEO4wvCxRcdG9mA0qlyEU9Eld3GtPZXiY2wRQw7Nl5rBc7BFqE77zBj47VSYByewhax
HFnJGxuvtgJfcRanCzgPW8ALjEeY2Nh4tRUoS9ttmEFj47VeYDM0/7OxA5fxCVmvzVKpgGZeu8fRIYzA
L0AjdRv+q7PRTeoEst7HDPzjVd3ZhnChWR6j9B02ZS4ha8G6I+ubqP65Nx+djEbO/7fxGXQ/2ISp6HxW
4w6OQxdf1vbZQHq931ZtB5WroluuAAAAAElFTkSuQmCC
</value>
</data>
<data name="ribbonButtonArchiv.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAADSdJREFUaEPV

34
Client/DocMgmt/frmBewilligung.Designer.cs generated
View File

@@ -30,34 +30,64 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmBewilligung));
this.approval1 = new OnDoc.UIControls.Approval();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// approval1
//
this.approval1.Dock = System.Windows.Forms.DockStyle.Fill;
this.approval1.Location = new System.Drawing.Point(2, 2);
this.approval1.Location = new System.Drawing.Point(2, 33);
this.approval1.Name = "approval1";
this.approval1.Size = new System.Drawing.Size(1608, 948);
this.approval1.Size = new System.Drawing.Size(1608, 917);
this.approval1.TabIndex = 0;
//
// toolStrip1
//
this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1});
this.toolStrip1.Location = new System.Drawing.Point(2, 2);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1608, 31);
this.toolStrip1.TabIndex = 1;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripButton1
//
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = global::OnDoc.Properties.Resources.CloseApplication_24x24_32;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(28, 28);
this.toolStripButton1.Text = "toolStripButton1";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// frmBewilligung
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1612, 952);
this.Controls.Add(this.approval1);
this.Controls.Add(this.toolStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "frmBewilligung";
this.Style.MdiChild.IconHorizontalAlignment = System.Windows.Forms.HorizontalAlignment.Center;
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "Unterschriftenprüfung";
this.Load += new System.EventHandler(this.frmBewilligung_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private UIControls.Approval approval1;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton toolStripButton1;
}
}

5
Client/DocMgmt/frmBewilligung.cs
View File

@@ -26,5 +26,10 @@ namespace OnDoc.DocMgmt
{
this.approval1.Update_Docs(AppParams.CurrentMitarbieter);
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
this.Close();
}
}
}

3
Client/DocMgmt/frmBewilligung.resx
View File

@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

3
Client/DocMgmt/frmToApproval.cs
View File

@@ -88,6 +88,7 @@ namespace OnDoc.DocMgmt
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
Logging.DocLog.Info("Dokument zur Prüfung", "Dokument zur Prüfung", dokumentid, "", cbboxunterschriftlinks.Text.ToString());
}
if (pxapproval2.Visible == false)
{
@@ -104,6 +105,7 @@ namespace OnDoc.DocMgmt
dr["notiz"] = txtnachricht.Text;
dB.daten.Tables[0].Rows.Add(dr);
dB.Update_Data();
Logging.DocLog.Info("Dokument zur Prüfung", "Dokument zur Prüfung", dokumentid, "", cbboxunterschriftrechts.Text.ToString());
}
if (pxapproval1.Visible && pxapproval2.Visible)
{
@@ -114,6 +116,7 @@ namespace OnDoc.DocMgmt
{
dB.insert_note(AppParams.CurrentMitarbieter, "Hinweis zur Unterschriftenprüfung", txtnachricht.Text, dokumentid);
}
this.Close();
}

5
Client/Klassen/clsAppParams.cs
View File

@@ -24,6 +24,9 @@ namespace OnDoc.Klassen
public static int CurrentMitarbieter { get; set; }
public static string RESTURI { get; set; } = "";//"http://localhost:2032/";
public static string apikey { get; set; } = "";
public static string wordprintmacro { get; set; } = "";
public static string vbvorlagenmanagement { get; set; } = "No";
static AppParams()
{
@@ -43,6 +46,8 @@ namespace OnDoc.Klassen
UseAPI = Properties.Settings.Default.UseAPI;
RESTURI = Properties.Settings.Default.RESTURI;
apikey = Properties.Settings.Default.apikey;
wordprintmacro = Properties.Settings.Default.StandardWordDruckMakro;
vbvorlagenmanagement = Properties.Settings.Default.VBVorlagenmanagement;
}
}

24
Client/Properties/Settings.Designer.cs generated
View File

@@ -97,5 +97,29 @@ namespace OnDoc.Properties {
this["apikey"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("FilePrintDefault")]
public string StandardWordDruckMakro {
get {
return ((string)(this["StandardWordDruckMakro"]));
}
set {
this["StandardWordDruckMakro"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Yes")]
public string VBVorlagenmanagement {
get {
return ((string)(this["VBVorlagenmanagement"]));
}
set {
this["VBVorlagenmanagement"] = value;
}
}
}
}

6
Client/Properties/Settings.settings
View File

@@ -20,5 +20,11 @@
<Setting Name="apikey" Type="System.String" Scope="User">
<Value Profile="(Default)">5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6</Value>
</Setting>
<Setting Name="StandardWordDruckMakro" Type="System.String" Scope="User">
<Value Profile="(Default)">FilePrintDefault</Value>
</Setting>
<Setting Name="VBVorlagenmanagement" Type="System.String" Scope="User">
<Value Profile="(Default)">Yes</Value>
</Setting>
</Settings>
</SettingsFile>

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">

BIN
Client/bin/Debug/Database.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/Database.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OfficePrinter.dll
View File

Binary file not shown.

BIN
Client/bin/Debug/OfficePrinter.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/OnDoc.exe
View File

Binary file not shown.

6
Client/bin/Debug/OnDoc.exe.config
View File

@@ -28,6 +28,12 @@
<setting name="apikey" serializeAs="String">
<value>5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6</value>
</setting>
<setting name="StandardWordDruckMakro" serializeAs="String">
<value>FilePrintDefault</value>
</setting>
<setting name="VBVorlagenmanagement" serializeAs="String">
<value>Yes</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>
<runtime>

BIN
Client/bin/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/bin/Debug/VBFileManagement.dll Normal file
View File

Binary file not shown.

BIN
Client/bin/Debug/VBFileManagement.pdb Normal file
View File

Binary file not shown.

26
Client/bin/Debug/VBFileManagement.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
VBFileManagement
</name>
</assembly>
<members>
<member name="T:VBFileManagement.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:VBFileManagement.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:VBFileManagement.My.Resources.Resources.Culture">
<summary>
Overrides the current thread's CurrentUICulture property for all
resource lookups using this strongly typed resource class.
</summary>
</member>
</members>
</doc>

BIN
Client/bin/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

36
Client/obj/Client.csproj.nuget.dgspec.json
View File

@@ -55,6 +55,12 @@
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj"
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj"
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj"
}
}
}
@@ -205,6 +211,36 @@
"frameworks": {
"net481": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj": {
"restore": {
"projectUniqueName": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj",
"projectName": "OfficePrinter",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj",
"frameworks": {
"net481": {
"projectReferences": {}
}
}
},
"frameworks": {
"net481": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj": {
"restore": {
"projectUniqueName": "E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj",
"projectName": "VBFileManagement",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj",
"frameworks": {
"net481": {
"projectReferences": {}
}
}
},
"frameworks": {
"net481": {}
}
}
}
}

BIN
Client/obj/Debug/Client.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Client/obj/Debug/Client.csproj.CoreCompileInputs.cache
View File

@@ -1 +1 @@
8da378f2397f300b8808b6f801306aaa269d19cd08b0d41d8535b9125dcef444
85ea68152cc1c77a0170cd69ab5d88399f0136f58ca7881894498165fde58e13

3
Client/obj/Debug/Client.csproj.FileListAbsolute.txt
View File

@@ -248,3 +248,6 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.SerienbriefBearbeitung.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBFileManagement.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBFileManagement.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBFileManagement.xml

BIN
Client/obj/Debug/Client.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.DocMgmt.Dokumenterstellung.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.UICintrols.DokList.resources
View File

Binary file not shown.

BIN
Client/obj/Debug/OnDoc.exe
View File

Binary file not shown.

6
Client/obj/Debug/OnDoc.exe.config
View File

@@ -28,6 +28,12 @@
<setting name="apikey" serializeAs="String">
<value>5sPQAPCxiSj+JWf+sWKTYgdTRSXeZJX/Ft2wE5B/SaSPoxPNMvkTgNjbmiK18SNmJ66OPzOM1fEw70R+VZeRWU+5fowTIXAGYLDneikxmK4HnIJku8732xxJ/9EomCZ6</value>
</setting>
<setting name="StandardWordDruckMakro" serializeAs="String">
<value>FilePrintDefault</value>
</setting>
<setting name="VBVorlagenmanagement" serializeAs="String">
<value>Yes</value>
</setting>
</OnDoc.Properties.Settings>
</userSettings>
<runtime>

BIN
Client/obj/Debug/OnDoc.pdb
View File

Binary file not shown.

BIN
Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
View File

Binary file not shown.

BIN
Client/obj/Debug/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

110
Client/obj/project.assets.json
View File

@@ -346,6 +346,24 @@
"runtime": {
"bin/placeholder/Model.dll": {}
}
},
"OfficePrinter/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/OfficePrinter.dll": {}
},
"runtime": {
"bin/placeholder/OfficePrinter.dll": {}
}
},
"VBFileManagement/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/VBFileManagement.dll": {}
},
"runtime": {
"bin/placeholder/VBFileManagement.dll": {}
}
}
},
".NETFramework,Version=v4.8.1/win": {
@@ -693,6 +711,24 @@
"runtime": {
"bin/placeholder/Model.dll": {}
}
},
"OfficePrinter/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/OfficePrinter.dll": {}
},
"runtime": {
"bin/placeholder/OfficePrinter.dll": {}
}
},
"VBFileManagement/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/VBFileManagement.dll": {}
},
"runtime": {
"bin/placeholder/VBFileManagement.dll": {}
}
}
},
".NETFramework,Version=v4.8.1/win-arm64": {
@@ -1040,6 +1076,24 @@
"runtime": {
"bin/placeholder/Model.dll": {}
}
},
"OfficePrinter/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/OfficePrinter.dll": {}
},
"runtime": {
"bin/placeholder/OfficePrinter.dll": {}
}
},
"VBFileManagement/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/VBFileManagement.dll": {}
},
"runtime": {
"bin/placeholder/VBFileManagement.dll": {}
}
}
},
".NETFramework,Version=v4.8.1/win-x64": {
@@ -1387,6 +1441,24 @@
"runtime": {
"bin/placeholder/Model.dll": {}
}
},
"OfficePrinter/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/OfficePrinter.dll": {}
},
"runtime": {
"bin/placeholder/OfficePrinter.dll": {}
}
},
"VBFileManagement/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/VBFileManagement.dll": {}
},
"runtime": {
"bin/placeholder/VBFileManagement.dll": {}
}
}
},
".NETFramework,Version=v4.8.1/win-x86": {
@@ -1734,6 +1806,24 @@
"runtime": {
"bin/placeholder/Model.dll": {}
}
},
"OfficePrinter/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/OfficePrinter.dll": {}
},
"runtime": {
"bin/placeholder/OfficePrinter.dll": {}
}
},
"VBFileManagement/1.0.0": {
"type": "project",
"compile": {
"bin/placeholder/VBFileManagement.dll": {}
},
"runtime": {
"bin/placeholder/VBFileManagement.dll": {}
}
}
}
},
@@ -2752,6 +2842,16 @@
"type": "project",
"path": "../Model/Model.csproj",
"msbuildProject": "../Model/Model.csproj"
},
"OfficePrinter/1.0.0": {
"type": "project",
"path": "../OfficePrinter/OfficePrinter.csproj",
"msbuildProject": "../OfficePrinter/OfficePrinter.csproj"
},
"VBFileManagement/1.0.0": {
"type": "project",
"path": "../VBFileManagement/VBFileManagement.vbproj",
"msbuildProject": "../VBFileManagement/VBFileManagement.vbproj"
}
},
"projectFileDependencyGroups": {
@@ -2766,8 +2866,10 @@
"Model >= 1.0.0",
"NLog.Database >= 5.3.2",
"Newtonsoft.Json >= 13.0.3",
"OfficePrinter >= 1.0.0",
"RibbonWinForms >= 5.0.1.1",
"Syncfusion.Pdf.WinForms >= 26.2.8"
"Syncfusion.Pdf.WinForms >= 26.2.8",
"VBFileManagement >= 1.0.0"
]
},
"packageFolders": {
@@ -2827,6 +2929,12 @@
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj"
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj"
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj"
}
}
}

2
Client/obj/project.nuget.cache
View File

@@ -1,6 +1,6 @@
{
"version": 2,
"dgSpecHash": "GuVitxgHv0E=",
"dgSpecHash": "LwjOZBX8J9I=",
"success": true,
"projectFilePath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Client\\Client.csproj",
"expectedPackageFiles": [