update 20241120

This commit is contained in:
Stefan Hutter
2024-11-20 17:25:15 +01:00
parent 194a97416c
commit d3bf9458eb
356 changed files with 30432 additions and 500 deletions

View File

@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="OnDoc.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="OnDoc.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<userSettings>
<OnDoc.Properties.Settings>
@@ -39,36 +39,36 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Syncfusion.Pdf.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0" />
<assemblyIdentity name="Syncfusion.Pdf.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.Compression.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0" />
<assemblyIdentity name="Syncfusion.Compression.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.DocIO.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.5.0" newVersion="25.2462.5.0" />
<assemblyIdentity name="Syncfusion.DocIO.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.5.0" newVersion="25.2462.5.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.OfficeChart.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.5.0" newVersion="25.2462.5.0" />
<assemblyIdentity name="Syncfusion.OfficeChart.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.5.0" newVersion="25.2462.5.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.Licensing" publicKeyToken="632609b4d040f6b4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0" />
<assemblyIdentity name="Syncfusion.Licensing" publicKeyToken="632609b4d040f6b4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.XlsIO.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0" />
<assemblyIdentity name="Syncfusion.XlsIO.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2"/>
</dependentAssembly>
</assemblyBinding>
</runtime>

View File

@@ -7,8 +7,8 @@
<ProjectGuid>{1CBBE5F6-4562-4EEF-BC9B-177F30901E23}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>OnDoc</RootNamespace>
<AssemblyName>update</AssemblyName>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<AssemblyName>OnDoc</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
@@ -225,6 +225,7 @@
<Compile Include="Helper\Security.cs" />
<Compile Include="Helper\Strings.cs" />
<Compile Include="Helper\TableHelper.cs" />
<Compile Include="Helper\xmlhelper.cs" />
<Compile Include="Interfaces\IListener.cs" />
<Compile Include="Klassen\Broadcaster.cs" />
<Compile Include="Klassen\clsAppParams.cs" />

View File

@@ -17,6 +17,7 @@ using Syncfusion.WinForms.DataGrid.Interactivity;
using Database;
using OnDoc.Diverses;
using System.Xml.Linq;
using System.Web.UI.WebControls;
namespace OnDoc.DocMgmt
{
@@ -57,7 +58,7 @@ namespace OnDoc.DocMgmt
{
treeViewAdv1.Visible = false;
}
this.treeViewDragHighlightTracker1 = new TreeViewAdvDragHighlightTracker(this.treeViewAdv2);
this.treeViewDragHighlightTracker1.QueryAllowedPositionsForNode +=
new QueryAllowedPositionsEventHandler(this.TreeDragDrop_QueryAllowedPositionsForNode1);
@@ -71,13 +72,13 @@ namespace OnDoc.DocMgmt
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
if (this.favoriten) { Load_Favoriten(""); }
else { load_standard(""); }
}
public void load_standard(string filter)
{
Cursor = Cursors.WaitCursor;
if (AppParams.connectionstring == "")
{
@@ -85,7 +86,10 @@ namespace OnDoc.DocMgmt
}
treeViewAdv1.Enabled = false;
treeViewAdv1.Visible = false;
treeViewAdv1.BeginEdit();
treeViewAdv1.BeginUpdate();
treeViewAdv1.EnableVirtualization=true;
treeViewAdv1.SuspendExpandRecalculate=true;
treeViewAdv1.RecalculateExpansion = false;
treeViewAdv1.Nodes.Clear();
treeViewAdv1.LeftImageList = imageList1;
@@ -97,40 +101,89 @@ namespace OnDoc.DocMgmt
if (vorlagentype == 1)
{
this.Text = "Vorlage auswählen";
//Standard Vorlagen
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select dokumenttypnr as id, bezeichnung, node, OnBase_Dokumenttyp from View_Dokumenttypen_Relaunch where aktiv=1 " + where + " order by bezeichnung", false, true);
//DB db1 = new DB(AppParams.connectionstring);
//DataTable vorlagen1 = new DataTable();
//DataTable Struktur1 = new DataTable();
//DataSet ds = new DataSet();
//db1.Get_Tabledata("Select dokumenttypnr as id, bezeichnung, node, OnBase_Dokumenttyp from View_Dokumenttypen_Relaunch where aktiv=1 " + where + " order by bezeichnung", false, true);
//vorlagen1 = db1.dsdaten.Tables[0].Copy();
//db1.Get_Tabledata("Select * from Dokumentart_Relaunch order by id", false, true);
DataTable vorlagen = new DataTable();
DataTable Struktur = new DataTable();
DataSet ds = new DataSet();
vorlagen = db.dsdaten.Tables[0].Copy();
db.Get_Tabledata("Select * from Dokumentart_Relaunch order by id", false, true);
db.dsdaten.Tables[0].AcceptChanges();
Struktur = db.dsdaten.Tables[0].Copy();
//db1.dsdaten.Tables[0].AcceptChanges();
//Struktur1 = db1.dsdaten.Tables[0].Copy();
//Syncfusion.Windows.Forms.Tools.DataRelation childRelation1;
//Syncfusion.Windows.Forms.Tools.DataRelation childRelation2;
//Syncfusion.Windows.Forms.Tools.DataRelation childRelation3;
ds.Tables.Add(Struktur.Copy());
ds.Tables[0].TableName = "Struktur";
ds.Tables.Add(vorlagen.Copy());
ds.Relations.Add("TreeParentChild", ds.Tables[0].Columns["ID"], ds.Tables[0].Columns["ParentID"], false);
ds.Relations.Add("VorlagenParent", ds.Tables[0].Columns["ID"], ds.Tables[1].Columns["node"], false);
//childRelation1 = new Syncfusion.Windows.Forms.Tools.DataRelation(Struktur1, "struktur1", "bezeichnung", "ChildFolder", "SubFolderChild1", "SubFolderName1", "Checked");
foreach (System.Data.DataRow dr in ds.Tables[0].Rows)
{
if (dr["Parentid"].ToString() == "0")
//if (where == "" && StaticValues.vorlagen.Nodes.Count>1)
//{
// treeViewAdv1.Nodes.Clear();
// TreeNodeAdv copynodes = StaticValues.vorlagen.Nodes[0].Clone();
// treeViewAdv1.Nodes.Add(copynodes);
// copynodes = StaticValues.vorlagen.Nodes[1].Clone();
// treeViewAdv1.Nodes.Add(copynodes);
//}
//else
//{
this.Text = "Vorlage auswählen";
//Standard Vorlagen
DB db = new DB(AppParams.connectionstring);
DataTable vorlagen = new DataTable();
DataTable Struktur = new DataTable();
DataSet ds = new DataSet();
db.Get_Tabledata("Select dokumenttypnr as id, bezeichnung, node, OnBase_Dokumenttyp from View_Dokumenttypen_Relaunch where aktiv=1 " + where + " order by bezeichnung", false, true);
vorlagen = db.dsdaten.Tables[0].Copy();
db.Get_Tabledata("Select * from Dokumentart_Relaunch order by id", false, true);
db.dsdaten.Tables[0].AcceptChanges();
Struktur = db.dsdaten.Tables[0].Copy();
ds.Tables.Add(Struktur.Copy());
ds.Tables[0].TableName = "Struktur";
ds.Tables.Add(vorlagen.Copy());
ds.Relations.Add("TreeParentChild", ds.Tables[0].Columns["ID"], ds.Tables[0].Columns["ParentID"], false);
ds.Relations.Add("VorlagenParent", ds.Tables[0].Columns["ID"], ds.Tables[1].Columns["node"], false);
foreach (System.Data.DataRow dr in ds.Tables[0].Rows)
{
//Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString() );
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
treeViewAdv1.Nodes.Add(root);
//Recursively builds the tree
PopulateTree(dr, root);
if (dr["Parentid"].ToString() == "0")
{
//Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
treeViewAdv1.Nodes.Add(root);
//Recursively builds the tree
PopulateTree(dr, root);
}
}
}
// if (StaticValues.vorlagen.Nodes.Count==0)
//{
// Logging.Logging.Debug("Save Static Value Start", "OnDoc", "");
// //StaticValues.vorlagen = treeViewAdv1;
// TreeNodeAdv copynodes = this.treeViewAdv1.Nodes[0].Clone();
// StaticValues.vorlagen.Nodes.Add(copynodes);
// copynodes = this.treeViewAdv1.Nodes[1].Clone();
// StaticValues.vorlagen.Nodes.Add(copynodes);
// Logging.Logging.Debug("Save Static Value Ende", "OnDoc", "");
// }
//}
}
else
{
@@ -162,7 +215,7 @@ namespace OnDoc.DocMgmt
if (dr["bezeichnung"].ToString() == "Dokumentpakete")
{
//Creates a TreeNode if the parent equals 0
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString() );
TreeNodeAdv root = new TreeNodeAdv(dr["bezeichnung"].ToString());
root.Tag = Convert.ToInt32(dr["id"]) * -1;
root.TagObject = dr;
root.LeftImageIndices = new int[] { 0 };
@@ -171,14 +224,18 @@ namespace OnDoc.DocMgmt
PopulateTree(dr, root);
}
}
treeViewAdv1.ExpandAll();
}
//Expands all the tree nodes
treeViewAdv1.ExpandAll();
treeViewAdv1.SelectedNode = treeViewAdv1.Nodes[0];
treeViewAdv1.EndEdit();
treeViewAdv1.EndUpdate();
treeViewAdv1.Enabled = true;
treeViewAdv1.Visible = true;
Logging.Logging.Debug("Tree Expand all Ende", "OnDoc", "");
if (ExternalCall.struktur != "")
{
treeViewAdv1.CollapseAll();
@@ -214,7 +271,7 @@ namespace OnDoc.DocMgmt
foreach (System.Data.DataRow row in dr.GetChildRows("TreeParentChild"))
{
//Creating a TreeNode for each row
TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString() );
TreeNodeAdv cChild = new TreeNodeAdv(row["bezeichnung"].ToString());
cChild.Tag = Convert.ToInt32(row["id"]) * -1;
cChild.LeftImageIndices = new int[] { 0 };
cChild.TagObject = row;
@@ -242,7 +299,7 @@ namespace OnDoc.DocMgmt
DataTable Struktur = new DataTable();
DataSet ds = new DataSet();
string sql = "Select * from view_favoriten_vorlagen where typ="+vorlagentype.ToString()+" and aktiv=1 and mitarbeiternr=" + AppParams.CurrentMitarbieter.ToString();
string sql = "Select * from view_favoriten_vorlagen where typ=" + vorlagentype.ToString() + " and aktiv=1 and mitarbeiternr=" + AppParams.CurrentMitarbieter.ToString();
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata(sql, false, true);
ds.Tables.Add(db.dsdaten.Tables[0].Copy());
@@ -550,7 +607,7 @@ namespace OnDoc.DocMgmt
private void save_new_entry(TreeNodeAdv node, int parent, int doktypnr = 0)
{
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select top 1 id from Relaunch_Favoriten where typ="+vorlagentype.ToString()+" order by id desc", false, true);
db.Get_Tabledata("Select top 1 id from Relaunch_Favoriten where typ=" + vorlagentype.ToString() + " order by id desc", false, true);
int newkey = 0;
try { newkey = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]); } catch { }
newkey = newkey + 1;

View File

@@ -297,7 +297,7 @@ namespace OnDoc.UIControls
Base64Helper bh = new Base64Helper();
bh.Base64 = db.dsdaten.Tables[0].Rows[0][0].ToString();
string xml = bh.DecodeBase64();
string filename = AppParams.tempdir + @"\tmpsb.xml";
string filename = AppParams.tempdir + @"\"+sb.serienbriefnr.ToString()+".xml";
System.IO.File.WriteAllText(filename, xml);
//dsempfaenger.Tables.Clear();
//dsempfaenger.ReadXml(filename);
@@ -309,7 +309,7 @@ namespace OnDoc.UIControls
sb.dsempfaenger.AcceptChanges();
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
System.IO.File.Delete(filename);
//System.IO.File.Delete(filename);
}
private void RibbonButtonNew_Click(object sender, EventArgs e)
@@ -320,23 +320,31 @@ namespace OnDoc.UIControls
DokTypSelect.ShowDialog(this);
if (DokTypSelect.DialogResult == DialogResult.OK)
{
this.sb = null;
this.sb = new serienbrief();
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
try
{
this.sb = null;
this.sb = new serienbrief();
sb.dokumenttypnr = DokTypSelect.dokumenttypnr;
update_serienbrief_details(true, sb.dokumenttypnr, 0);
init_empfaenger(0);
vorlagenfelder(sb.dokumenttypnr);
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
update_screen();
update_serienbriefdaten(true);
update_serienbrief_details(true, sb.dokumenttypnr, 0);
init_empfaenger(0);
vorlagenfelder(sb.dokumenttypnr);
refresh_empfaenger(sb.dsempfaenger.Tables[0]);
update_screen();
update_serienbriefdaten(true);
vorlage_auslesen_und_speichern();
vorlage_auslesen_und_speichern();
SerienbriefBearbeitung sbe = new SerienbriefBearbeitung(sb);
sb.dsempfaenger.Tables.Add(sbe.init_used_felder(false).Copy());
sb.dsempfaenger.Tables[sb.dsempfaenger.Tables.Count - 1].TableName = "UsedFelder";
update_serienbriefdaten(false);
treeViewAdv1.Enabled = true;
SerienbriefBearbeitung sbe = new SerienbriefBearbeitung(sb);
sb.dsempfaenger.Tables.Add(sbe.init_used_felder(false).Copy());
sb.dsempfaenger.Tables[sb.dsempfaenger.Tables.Count - 1].TableName = "UsedFelder";
Logging.Logging.Debug("Update Serienbriefdaten", "OnDoc", "");
update_serienbriefdaten(false);
treeViewAdv1.Enabled = true;
}
catch (Exception ex)
{
Logging.Logging.Debug(ex.Message, "OnDoc", "SB Error");
}
}
else

View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnDoc.Helper
{
internal class xmlhelper
{
}
}

View File

@@ -56,12 +56,13 @@ namespace OnDoc.Klassen
{
public static void ShowToast(string title, string message)
{
new ToastContentBuilder()
return;
// new ToastContentBuilder()
.AddArgument("Datensicherung", "Datensicherung")
.AddText(title)
.AddText(message)
.Show();
//.AddArgument("Datensicherung", "Datensicherung")
//.AddText(title)
//.AddText(message)
//.Show();
}
}

View File

@@ -1,13 +1,17 @@
using System;
using Syncfusion.Windows.Forms.Tools;
using Syncfusion.Windows.Forms.Tools.MultiColumnTreeView;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnDoc.Klassen
{
internal class StaticValues
public static class StaticValues
{
public static string UserID { get; set; } = "";
public static TreeViewAdv vorlagen { get; set; } = new TreeViewAdv();
}
}

View File

@@ -26,14 +26,16 @@ namespace OnDoc
/// Der Haupteinstiegspunkt für die Anwendung.
/// </summary>
private static Mutex mutex = null;
const string AppId = "OnDoc5094533C-A613-4889-A0E3-8C28C130C6AA)"; // Unique par application
const string AppId = "OnDoc5094533C-A613-4889-A0E3-8C28C130C6AA)";
//static Start MyForm = new Start();
///
[STAThread]
static void Main(string[] args)
{
ExternalCall.sourceparam = "";
if (args.Length > 0)
{
@@ -74,7 +76,6 @@ namespace OnDoc
if (!createdNew)
{
//MyForm.runparams();
return;
}

View File

@@ -46,6 +46,8 @@
this.nativVorlagenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.dokList1 = new OnDoc.UICintrols.DokList();
this.label1 = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
@@ -99,6 +101,7 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.panel1.Controls.Add(this.label1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel1.Location = new System.Drawing.Point(2, 798);
this.panel1.Name = "panel1";
@@ -178,12 +181,24 @@
this.dokList1.partnernr = 0;
this.dokList1.profilnr = 0;
this.dokList1.runmacros = false;
this.dokList1.Search_Docid = "";
this.dokList1.selected_cellvalue = null;
this.dokList1.selected_dokumentid = null;
this.dokList1.selected_partnernr = null;
this.dokList1.Size = new System.Drawing.Size(1584, 772);
this.dokList1.TabIndex = 4;
this.dokList1.Load += new System.EventHandler(this.dokList1_Load);
//
// label1
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.IndianRed;
this.label1.Location = new System.Drawing.Point(3, 3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(35, 13);
this.label1.TabIndex = 0;
this.label1.Text = "label1";
//
// Start
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -200,6 +215,8 @@
this.Style.MdiChild.IconVerticalAlignment = System.Windows.Forms.VisualStyles.VerticalAlignment.Center;
this.Text = "OnDoc";
this.Load += new System.EventHandler(this.Start_Load);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.ResumeLayout(false);
@@ -224,5 +241,6 @@
private System.Windows.Forms.ToolStripMenuItem beendenToolStripMenuItem;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem nativVorlagenToolStripMenuItem;
private System.Windows.Forms.Label label1;
}
}

View File

@@ -38,13 +38,26 @@ namespace OnDoc
this.Style.TitleBar.ForeColor = Theaming.TitelFontColor();
InitLogging();
Logging.Logging.Debug("Start", "start.cs", "");
mitarbeiter = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
mitarbeiter = mitarbeiter.Substring(mitarbeiter.IndexOf("\\") + 1);
Logging.Logging.Debug("Start", "start.cs", mitarbeiter);
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select mitarbeiternr from mitarbeiter where tgnummer='" + mitarbeiter + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count == 0)
{
mitarbeiter = mitarbeiter.Replace("i", "");
mitarbeiter = mitarbeiter.Replace("I", "");
db.Get_Tabledata("Select mitarbeiternr from mitarbeiter where tgnummer='" + mitarbeiter + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count == 0)
{
MessageBox.Show("Berechtigung zur Verwendung von OnDoc fehlen", "Anmeldung OnDoc", MessageBoxButtons.OK);
Logging.Logging.Error("Login fehlgeschlagen", "OnDoc Client", mitarbeiter);
System.Environment.Exit(0);
}
}
AppParams.CurrentMitarbieter = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["mitarbeiternr"].ToString());
db.dsdaten.Tables.Clear();
db.Get_Tabledata("Select * from [applikation] where applikationsnr = 1", false, true);

View File

@@ -155,11 +155,11 @@ namespace OnDoc.UIControls
db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
this.vorlagenr = Convert.ToInt32(dr["office_vorlagenr"]);
this.kopfzeile_generieren = false;
this.barcode_left = Convert.ToInt32(dr["bcpl"]);
this.barcode_top = Convert.ToInt32(dr["bcpt"]);
this.barcode_width = Convert.ToInt32(dr["bcw"]);
this.barcode_height = Convert.ToInt32(dr["bch"]);
this.barcode_horizontal = Convert.ToInt32(dr["bchorizontal"]);
this.barcode_left = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpl"]);
this.barcode_top = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpt"]);
this.barcode_width = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcw"]);
this.barcode_height = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bch"]);
this.barcode_horizontal = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bchorizontal"]);
try
{
if (Convert.ToBoolean(db.dsdaten.Tables[0].Rows[0][1]) == true) { this.kopfzeile_generieren = true; }

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Syncfusion.DocIO.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0" />
<assemblyIdentity name="Syncfusion.DocIO.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.Compression.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0" />
<assemblyIdentity name="Syncfusion.Compression.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.OfficeChart.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0" />
<assemblyIdentity name="Syncfusion.OfficeChart.Base" publicKeyToken="3d67ed1f87d44c89" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-25.2462.6.0" newVersion="25.2462.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Syncfusion.Licensing" publicKeyToken="632609b4d040f6b4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-26.2462.8.0" newVersion="26.2462.8.0" />
<assemblyIdentity name="Syncfusion.Licensing" publicKeyToken="632609b4d040f6b4" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-26.2462.8.0" newVersion="26.2462.8.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -6,7 +6,7 @@
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<userSettings>
<OnDoc.Properties.Settings>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -8,18 +8,18 @@ VBFileManagement
<members>
<member name="T:VBFileManagement.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
</summary>
</member>
<member name="P:VBFileManagement.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
</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.
Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
</summary>
</member>
</members>

View File

@@ -0,0 +1,4 @@
delete EDKB02DMS.zip
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDoc.pdb
copy OnDocClient.zip H:\NextCloud\ZZDownload
pause

View File

@@ -27,7 +27,7 @@
"C:\\Program Files (x86)\\NuGet\\Config\\Syncfusion Toolbox for WPF.config"
],
"originalTargetFrameworks": [
"net481"
"net48"
],
"sources": {
"C:\\Program Files (x86)\\FastReports\\FastReport.Net\\Nugets": {},
@@ -39,7 +39,7 @@
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net481": {
"net48": {
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj"
@@ -72,7 +72,7 @@
}
},
"frameworks": {
"net481": {
"net48": {
"dependencies": {
"Microsoft.Office.Interop.Excel": {
"target": "Package",
@@ -126,7 +126,7 @@
"projectName": "Database",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj",
"frameworks": {
"net481": {
"net48": {
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj"
@@ -139,7 +139,7 @@
}
},
"frameworks": {
"net481": {}
"net48": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\DOCGEN\\DocGen.csproj": {
@@ -148,7 +148,7 @@
"projectName": "DocGen",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\DOCGEN\\DocGen.csproj",
"frameworks": {
"net481": {
"net48": {
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj"
@@ -167,7 +167,7 @@
}
},
"frameworks": {
"net481": {}
"net48": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
@@ -176,13 +176,13 @@
"projectName": "Helper",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj",
"frameworks": {
"net481": {
"net48": {
"projectReferences": {}
}
}
},
"frameworks": {
"net481": {}
"net48": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Logging\\Logging.csproj": {
@@ -191,13 +191,13 @@
"projectName": "Logging",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Logging\\Logging.csproj",
"frameworks": {
"net481": {
"net48": {
"projectReferences": {}
}
}
},
"frameworks": {
"net481": {}
"net48": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj": {
@@ -206,13 +206,13 @@
"projectName": "Model",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj",
"frameworks": {
"net481": {
"net48": {
"projectReferences": {}
}
}
},
"frameworks": {
"net481": {}
"net48": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj": {
@@ -221,13 +221,13 @@
"projectName": "OfficePrinter",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OfficePrinter\\OfficePrinter.csproj",
"frameworks": {
"net481": {
"net48": {
"projectReferences": {}
}
}
},
"frameworks": {
"net481": {}
"net48": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocOffice\\OnDocOffice.csproj": {
@@ -236,7 +236,7 @@
"projectName": "OnDocOffice",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\OnDocOffice\\OnDocOffice.csproj",
"frameworks": {
"net481": {
"net48": {
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj"
@@ -249,7 +249,7 @@
}
},
"frameworks": {
"net481": {}
"net48": {}
}
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj": {
@@ -258,13 +258,13 @@
"projectName": "VBFileManagement",
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\VBFileManagement\\VBFileManagement.vbproj",
"frameworks": {
"net481": {
"net48": {
"projectReferences": {}
}
}
},
"frameworks": {
"net481": {}
"net48": {}
}
}
}

View File

@@ -1 +1 @@
85ea68152cc1c77a0170cd69ab5d88399f0136f58ca7881894498165fde58e13
b85197c4cb2d8acde4f36cac6dd54c4797f46e1d9966a337f99196a91d00f019

View File

@@ -111,7 +111,6 @@ E:\Software-Projekte\OnDoc\OnDoc\EDOKA_2024\obj\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\EDOKA_2024\obj\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.AssemblyReference.cache
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\Client.csproj.SuggestedBindingRedirects.cache
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe.config
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.frmCalendar.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.frmLogin.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.Diverses.InputDialog.resources
@@ -155,10 +154,6 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\libSkiaSharp.dylib
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\x86\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\x64\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\arm64\libSkiaSharp.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.exe.config
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Office.Interop.Excel.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Office.Interop.Word.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Microsoft.Toolkit.Uwp.Notifications.dll
@@ -243,11 +238,16 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Presentation.Base.x
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\FastReport.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.OfficeChart.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\Syncfusion.Grid.Windows.XmlSerializers.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\de-DE\OnDoc.resources.dll
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
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe.config
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.exe.config
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\OnDoc.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\de-DE\OnDoc.resources.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.exe
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.pdb

Binary file not shown.

View File

@@ -6,7 +6,7 @@
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<userSettings>
<OnDoc.Properties.Settings>

Binary file not shown.

View File

@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

View File

@@ -1,7 +1,7 @@
{
"version": 3,
"targets": {
".NETFramework,Version=v4.8.1": {
".NETFramework,Version=v4.8": {
"Microsoft.NETFramework.ReferenceAssemblies/1.0.0": {
"type": "package",
"dependencies": {
@@ -380,7 +380,7 @@
}
}
},
".NETFramework,Version=v4.8.1/win": {
".NETFramework,Version=v4.8/win": {
"Microsoft.NETFramework.ReferenceAssemblies/1.0.0": {
"type": "package",
"dependencies": {
@@ -759,7 +759,7 @@
}
}
},
".NETFramework,Version=v4.8.1/win-arm64": {
".NETFramework,Version=v4.8/win-arm64": {
"Microsoft.NETFramework.ReferenceAssemblies/1.0.0": {
"type": "package",
"dependencies": {
@@ -1138,7 +1138,7 @@
}
}
},
".NETFramework,Version=v4.8.1/win-x64": {
".NETFramework,Version=v4.8/win-x64": {
"Microsoft.NETFramework.ReferenceAssemblies/1.0.0": {
"type": "package",
"dependencies": {
@@ -1517,7 +1517,7 @@
}
}
},
".NETFramework,Version=v4.8.1/win-x86": {
".NETFramework,Version=v4.8/win-x86": {
"Microsoft.NETFramework.ReferenceAssemblies/1.0.0": {
"type": "package",
"dependencies": {
@@ -2930,7 +2930,7 @@
}
},
"projectFileDependencyGroups": {
".NETFramework,Version=v4.8.1": [
".NETFramework,Version=v4.8": [
"Database >= 1.0.0",
"DocGen >= 1.0.0",
"Helper >= 1.0.0",
@@ -2976,7 +2976,7 @@
"C:\\Program Files (x86)\\NuGet\\Config\\Syncfusion Toolbox for WPF.config"
],
"originalTargetFrameworks": [
"net481"
"net48"
],
"sources": {
"C:\\Program Files (x86)\\FastReports\\FastReport.Net\\Nugets": {},
@@ -2988,7 +2988,7 @@
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net481": {
"net48": {
"projectReferences": {
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Database\\Database.csproj"
@@ -3021,7 +3021,7 @@
}
},
"frameworks": {
"net481": {
"net48": {
"dependencies": {
"Microsoft.Office.Interop.Excel": {
"target": "Package",

View File

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