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

Update 20241229

Browse Source
This commit is contained in:
Stefan Hutter
2024-12-29 23:03:57 +01:00
parent 4455cca85a
commit 2feaf6cc29
140 changed files with 12447 additions and 556552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Client/Client.csproj
View File

@@ -55,7 +55,7 @@
<StartupObject>OnDoc.Program</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>OnDoc6_Transparent.ico</ApplicationIcon>
<ApplicationIcon>OnDoc.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup>
@@ -941,7 +941,6 @@
<None Include="Resources\delete.png" />
</ItemGroup>
<ItemGroup>
<Content Include="OnDoc6_Transparent.ico" />
<None Include="Resources\Select_24x24-32.png" />
<None Include="Resources\Select_16x16-32.png" />
<None Include="Resources\Select_256x256-32.png" />
@@ -1288,5 +1287,8 @@
<Version>5.0.1.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Content Include="OnDoc.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

4
Client/Diverses/NativVorlagen.cs
View File

@@ -59,7 +59,7 @@ namespace OnDoc.Diverses
string line = "";
int i = 1;
StreamReader sr = new StreamReader(Properties.Settings.Default.NativVorlagen+@"\klassifizierung.txt");
StreamReader sr = new StreamReader(AppParams.pathNativVorlagen+@"\klassifizierung.txt");
line = sr.ReadLine();
while (line != null)
{
@@ -83,7 +83,7 @@ namespace OnDoc.Diverses
catch { }
string ext = "";
DirectoryInfo directoryInfo = new DirectoryInfo(Properties.Settings.Default.NativVorlagen);
DirectoryInfo directoryInfo = new DirectoryInfo(AppParams.pathNativVorlagen);
if (directoryInfo.Exists)
{
try

2
Client/Diverses/SplashScreen.Designer.cs generated
View File

@@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(203, 26);
this.label2.TabIndex = 2;
this.label2.Text = "23. Dezember 2024";
this.label2.Text = "29. Dezember 2024";
//
// SplashScreen
//

5
Client/DocMgmt/Dokumenterstellung.cs
View File

@@ -139,9 +139,12 @@ namespace OnDoc.DocMgmt
Logging.DocLog.Info("Dokumenterstellung", "frmDokumenterstellung", dokumentid, ucAllgemeineDokumentParam1.partnernr.ToString(), "Dokumenterstellung");
if (dokumentid != "")
{
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey,AppParams.Office_Fill_DocIO);
clsdok dok = new clsdok("", "", "");
Logging.Logging.Debug("Generate_Doc_EDOKA", "Dokumenterstellung", dokumentid);
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata, ucAllgemeineDokumentParam1.ErstellungInOffice,AppParams.OfficeSpleep1);
Logging.Logging.Debug("Generate_Doc_EDOKA - Ende", "Dokumenterstellung", dokumentid);
interop = ucAllgemeineDokumentParam1.interop;

44
Client/DocMgmt/Dokumentpaket.Designer.cs generated
View File

@@ -48,6 +48,9 @@
this.sfListView1 = new Syncfusion.WinForms.ListView.SfListView();
this.TabControlDokuments = new Syncfusion.Windows.Forms.Tools.TabControlAdv();
this.tabPageAdv1 = new Syncfusion.Windows.Forms.Tools.TabPageAdv();
this.panelword = new System.Windows.Forms.Panel();
this.lbldokumentname = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.pnlfooter = new System.Windows.Forms.Panel();
this.progressBarAdv1 = new Syncfusion.Windows.Forms.Tools.ProgressBarAdv();
this.pnlleft = new System.Windows.Forms.Panel();
@@ -59,6 +62,7 @@
this.dokList1 = new OnDoc.UICintrols.DokList();
((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).BeginInit();
this.TabControlDokuments.SuspendLayout();
this.panelword.SuspendLayout();
this.pnlfooter.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit();
this.pnlleft.SuspendLayout();
@@ -220,6 +224,7 @@
// sfListView1
//
this.sfListView1.AccessibleName = "ScrollControl";
this.sfListView1.AutoHideScrollBars = true;
this.sfListView1.BackColor = System.Drawing.SystemColors.Window;
this.sfListView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.sfListView1.Location = new System.Drawing.Point(0, 149);
@@ -232,7 +237,6 @@
//
// TabControlDokuments
//
this.TabControlDokuments.BeforeTouchSize = new System.Drawing.Size(1069, 660);
this.TabControlDokuments.BorderVisible = true;
this.TabControlDokuments.Controls.Add(this.tabPageAdv1);
this.TabControlDokuments.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -250,10 +254,40 @@
this.tabPageAdv1.Name = "tabPageAdv1";
this.tabPageAdv1.ShowCloseButton = true;
this.tabPageAdv1.Size = new System.Drawing.Size(1059, 630);
this.tabPageAdv1.TabIndex = 1;
this.tabPageAdv1.Text = "tabPageAdv1";
this.tabPageAdv1.ThemesEnabled = false;
//
// panelword
//
this.panelword.BackColor = System.Drawing.Color.PowderBlue;
this.panelword.Controls.Add(this.lbldokumentname);
this.panelword.Controls.Add(this.label1);
this.panelword.Location = new System.Drawing.Point(437, 75);
this.panelword.Name = "panelword";
this.panelword.Size = new System.Drawing.Size(715, 354);
this.panelword.TabIndex = 24;
this.panelword.Visible = false;
//
// lbldokumentname
//
this.lbldokumentname.AutoSize = true;
this.lbldokumentname.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbldokumentname.Location = new System.Drawing.Point(22, 81);
this.lbldokumentname.Name = "lbldokumentname";
this.lbldokumentname.Size = new System.Drawing.Size(167, 26);
this.lbldokumentname.TabIndex = 1;
this.lbldokumentname.Text = "Dokumentname";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(22, 25);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(443, 26);
this.label1.TabIndex = 0;
this.label1.Text = "Folgendes Dokument wird in Word generiert:";
//
// pnlfooter
//
this.pnlfooter.Controls.Add(this.progressBarAdv1);
@@ -379,6 +413,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(2124, 851);
this.Controls.Add(this.panelword);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
this.Controls.Add(this.pnlleft);
@@ -394,6 +429,8 @@
this.Load += new System.EventHandler(this.Dokumentpaket_Load);
((System.ComponentModel.ISupportInitialize)(this.TabControlDokuments)).EndInit();
this.TabControlDokuments.ResumeLayout(false);
this.panelword.ResumeLayout(false);
this.panelword.PerformLayout();
this.pnlfooter.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit();
this.pnlleft.ResumeLayout(false);
@@ -437,5 +474,8 @@
private Syncfusion.Windows.Forms.Tools.ProgressBarAdv progressBarAdv1;
private System.Windows.Forms.RibbonPanel ribbonPanel5;
private System.Windows.Forms.RibbonButton ribbonButtonNew;
private System.Windows.Forms.Panel panelword;
private System.Windows.Forms.Label lbldokumentname;
private System.Windows.Forms.Label label1;
}
}

34
Client/DocMgmt/Dokumentpaket.cs
View File

@@ -434,7 +434,7 @@ namespace OnDoc.DocMgmt
if (idokumentid == "" || uc.genertated_dokumentid == idokumentid)
{
uc.Set_Edit_later();
//uc.Set_Edit_later();
uc.Update_DocGenData();
clsDocData dokdata = new clsDocData();
uc.update_dokdata(ref dokdata);
@@ -446,13 +446,41 @@ namespace OnDoc.DocMgmt
uc.Show_Neugenerieren();
filter = filter + dokumentid + "','";
dokumentid = dokdata.Dokumentid;
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentPreview) { uc.docgendata.erstellungsart = Erstellungsart.DokumentSpäterBearbeiten; }
if (dokumentid != "")
{
Logging.DocLog.Info("Dokument erstellt", "Dokumentpaket", dokumentid, uc.partnernr.ToString(), "Dokument erstellt");
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI,AppParams.apikey);
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI,AppParams.apikey,AppParams.Office_Fill_DocIO);
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
panelword.Visible = true;
lbldokumentname.Text = tab.Text;
Application.DoEvents();
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata,true,AppParams.OfficeSpleep1);
panelword.Visible = false;
Application.DoEvents();
}
else
{
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
}
if (uc.docgendata.erstellungsart == Erstellungsart.ErstellungInOffice)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;
string filename_temp = filename + ".tmp";
System.IO.File.WriteAllBytes(filename_temp, Convert.FromBase64String(dok.dokument));
DB db = new DB(AppParams.connectionstring);
db.Save_To_DB(dokdata.Dokumentid, filename_temp);
db.Dok_in_Bearbeitung(1,dokdata.Dokumentid, AppParams.CurrentMitarbieter);
db = null;
System.IO.File.Delete(filename_temp);
clsProcessWatch.AddToList(dokdata.Dokumentid, filename, "Word");
}
if (uc.docgendata.erstellungsart == Erstellungsart.DokumentBearbeiten)
{
string filename = AppParams.tempdir + dokumentid + "." + dok.extension;

2
Client/DocMgmt/FrmDokumenterstellung.cs
View File

@@ -216,7 +216,7 @@ namespace OnDoc.DocMgmt
dokdata.barcode_content = dB.daten.Tables[0].Rows[0][1].ToString();
dB = null;
}
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey);
DOCGEN.Generator.DocGenerator_from_EDOKA Generator = new DOCGEN.Generator.DocGenerator_from_EDOKA(AppParams.connectionstring, AppParams.tempdir, AppParams.RESTURI, AppParams.apikey, AppParams.Office_Fill_DocIO);
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);

80
Client/Klassen/clsAppParams.cs
View File

@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@@ -43,6 +44,10 @@ namespace OnDoc.Klassen
public static int OfficeSpleep1 { get; set; } = 500;
public static int OfficeSpleep2 { get; set; } = 1000;
public static string pathNativVorlagen { get; set; } = "";
public static int Office_Fill_DocIO { get; set; } = 0;
static AppParams()
{
@@ -57,24 +62,69 @@ namespace OnDoc.Klassen
logconnectionstring = System.IO.File.ReadAllText(startuppath + @"\logconn.cfg");
logconnectionstring = StringCipher.Decrypt(logconnectionstring, "i%!k!7pab%bNLdA5hE4pkR4XaB%E^jB3d9tHuQ4pbF&BZjF7SB#WBWit5#HrbJiLrLVm");
DB db = new DB(connectionstring);
db.Get_Tabledata("Select * from applikation where applikationsnr = 1", false, true);
tempdir = db.dsdaten.Tables[0].Rows[0]["pfad_temporaer_dokumente"].ToString();
db = null;
StaticValues.UserID = "Stefan Hutter";
db.Get_Tabledata("Select * from ondoc_appParams where usedbparams=1", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
tempdir = db.dsdaten.Tables[0].Rows[0][0].ToString();
Version = db.dsdaten.Tables[0].Rows[0][1].ToString();
UseAPI = db.dsdaten.Tables[0].Rows[0][2].ToString();
RESTURI = db.dsdaten.Tables[0].Rows[0][3].ToString();
wordprintmacro = db.dsdaten.Tables[0].Rows[0][5].ToString();
vbvorlagenmanagement = db.dsdaten.Tables[0].Rows[0][6].ToString();
barcodefont = db.dsdaten.Tables[0].Rows[0][7].ToString();
barcodefontsize = db.dsdaten.Tables[0].Rows[0][8].ToString();
barcodetextposition = db.dsdaten.Tables[0].Rows[0][9].ToString();
ZusatzFont = db.dsdaten.Tables[0].Rows[0][10].ToString();
ZusatzFontSize = db.dsdaten.Tables[0].Rows[0][11].ToString();
EDOKAPath = db.dsdaten.Tables[0].Rows[0][12].ToString();
OfficeSpleep1 = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][13]);
OfficeSpleep2 = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][14]);
pathNativVorlagen = db.dsdaten.Tables[0].Rows[0][15].ToString();
Office_Fill_DocIO= Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][15]);
}
else
{
db.Get_Tabledata("Select * from applikation where applikationsnr = 1", false, true);
tempdir = db.dsdaten.Tables[0].Rows[0]["pfad_temporaer_dokumente"].ToString();
StaticValues.UserID = "Stefan Hutter";
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;
barcodefont = Properties.Settings.Default.BarcodeFont;
barcodefontsize = Properties.Settings.Default.BarcodeFontSize;
barcodetextposition = Properties.Settings.Default.BarodeTextPosition;
ZusatzFont = Properties.Settings.Default.ZusatzFont;
ZusatzFontSize = Properties.Settings.Default.ZusatzFontSize;
EDOKAPath = Properties.Settings.Default.edokapath;
pathNativVorlagen = Properties.Settings.Default.NativVorlagen;
}
apikey = System.IO.File.ReadAllText(startuppath + @"\apikey.cfg");
apikey = StringCipher.Decrypt(apikey, "PBod8b%s@c9ib7Lws#na5sGM2trugrx3h!oyB^y!Bc%fHEYUT3QvTVr6sAaAr9FoQWzb");
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;
barcodefont = Properties.Settings.Default.BarcodeFont;
barcodefontsize=Properties.Settings.Default.BarcodeFontSize;
barcodetextposition = Properties.Settings.Default.BarodeTextPosition;
ZusatzFont = Properties.Settings.Default.ZusatzFont;
ZusatzFontSize = Properties.Settings.Default.ZusatzFontSize;
EDOKAPath=Properties.Settings.Default.edokapath;
db = null;
EvaluatePath(AppParams.tempdir);
}
private static String EvaluatePath(String path)
{
try
{
String folder = Path.GetDirectoryName(path);
if (!Directory.Exists(folder))
{
// Try to create the directory.
DirectoryInfo di = Directory.CreateDirectory(folder);
}
}
catch (IOException ioex)
{
Console.WriteLine(ioex.Message);
return "";
}
return path;
}
}

2
Client/Klassen/clsProcessWatch.cs
View File

@@ -102,7 +102,7 @@ namespace OnDoc.Klassen
private static void Remove_Dok_in_Bearbeitung(string dokumentid)
{
DB db = new DB(AppParams.connectionstring);
db.Dok_in_Bearbeietung(2, dokumentid, AppParams.CurrentMitarbieter);
db.Dok_in_Bearbeitung(2, dokumentid, AppParams.CurrentMitarbieter);
db = null;
}
private static void Remove_Dokumentbearbeitung_Zwingend(string dokumentid)

0
Client/OnDoc6_Transparent.ico → Client/OnDoc.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

27
Client/UIControls/Administrator/Dokumenttyp.Designer.cs generated
View File

@@ -100,6 +100,7 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbtnsave = new System.Windows.Forms.ToolStripButton();
this.grpVorlagenfeld = new System.Windows.Forms.GroupBox();
this.btnSaveVorlagenfeld = new System.Windows.Forms.Button();
this.chkaktiv = new System.Windows.Forms.CheckBox();
this.label14 = new System.Windows.Forms.Label();
this.lblFeldregel = new System.Windows.Forms.TextBox();
@@ -144,7 +145,6 @@
this.label16 = new System.Windows.Forms.Label();
this.rbNr = new System.Windows.Forms.RadioButton();
this.label15 = new System.Windows.Forms.Label();
this.btnSaveVorlagenfeld = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.tabControlAdv1)).BeginInit();
this.tabControlAdv1.SuspendLayout();
this.tabPageAdv1.SuspendLayout();
@@ -178,7 +178,6 @@
//
// tabControlAdv1
//
this.tabControlAdv1.BeforeTouchSize = new System.Drawing.Size(1019, 760);
this.tabControlAdv1.Controls.Add(this.tabPageAdv1);
this.tabControlAdv1.Controls.Add(this.tabPageAdv2);
this.tabControlAdv1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -204,7 +203,6 @@
this.tabPageAdv1.Name = "tabPageAdv1";
this.tabPageAdv1.ShowCloseButton = true;
this.tabPageAdv1.Size = new System.Drawing.Size(1016, 733);
this.tabPageAdv1.TabIndex = 1;
this.tabPageAdv1.Text = "Allgemein";
this.tabPageAdv1.ThemesEnabled = false;
//
@@ -325,7 +323,7 @@
//
this.cbUnterschriftrechts.Location = new System.Drawing.Point(130, 28);
this.cbUnterschriftrechts.Name = "cbUnterschriftrechts";
this.cbUnterschriftrechts.Size = new System.Drawing.Size(114, 24);
this.cbUnterschriftrechts.Size = new System.Drawing.Size(150, 24);
this.cbUnterschriftrechts.TabIndex = 6;
this.cbUnterschriftrechts.Text = "Unterschrift rechts";
//
@@ -846,7 +844,6 @@
this.tabPageAdv2.Name = "tabPageAdv2";
this.tabPageAdv2.ShowCloseButton = true;
this.tabPageAdv2.Size = new System.Drawing.Size(1016, 733);
this.tabPageAdv2.TabIndex = 2;
this.tabPageAdv2.Text = "Voralgenfelder";
this.tabPageAdv2.ThemesEnabled = false;
//
@@ -986,6 +983,16 @@
this.grpVorlagenfeld.TabStop = false;
this.grpVorlagenfeld.Text = "Vorlagenfeld";
//
// btnSaveVorlagenfeld
//
this.btnSaveVorlagenfeld.Location = new System.Drawing.Point(21, 622);
this.btnSaveVorlagenfeld.Name = "btnSaveVorlagenfeld";
this.btnSaveVorlagenfeld.Size = new System.Drawing.Size(248, 23);
this.btnSaveVorlagenfeld.TabIndex = 36;
this.btnSaveVorlagenfeld.Text = "Speichern";
this.btnSaveVorlagenfeld.UseVisualStyleBackColor = true;
this.btnSaveVorlagenfeld.Click += new System.EventHandler(this.btnSaveVorlagenfeld_Click);
//
// chkaktiv
//
this.chkaktiv.AutoSize = true;
@@ -1446,16 +1453,6 @@
this.label15.TabIndex = 7;
this.label15.Text = "Sort";
//
// btnSaveVorlagenfeld
//
this.btnSaveVorlagenfeld.Location = new System.Drawing.Point(21, 622);
this.btnSaveVorlagenfeld.Name = "btnSaveVorlagenfeld";
this.btnSaveVorlagenfeld.Size = new System.Drawing.Size(248, 23);
this.btnSaveVorlagenfeld.TabIndex = 36;
this.btnSaveVorlagenfeld.Text = "Speichern";
this.btnSaveVorlagenfeld.UseVisualStyleBackColor = true;
this.btnSaveVorlagenfeld.Click += new System.EventHandler(this.btnSaveVorlagenfeld_Click);
//
// Dokumenttyp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

6
Client/UIControls/DokList.cs
View File

@@ -405,7 +405,7 @@ namespace OnDoc.UICintrols
DB db = new DB(AppParams.connectionstring);
try
{
if (db.Dok_in_Bearbeietung(3, selected_dokumentid, AppParams.CurrentMitarbieter) == false)
if (db.Dok_in_Bearbeitung(3, selected_dokumentid, AppParams.CurrentMitarbieter) == false)
{
MessageBox.Show("Das Dokument wird aktuell bearbeitet.", "Dokumentbearbeitung", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
@@ -426,7 +426,7 @@ namespace OnDoc.UICintrols
Logging.DocLog.Info("Verantwortung für Bearbeitung übernommen", "Doklist", selected_dokumentid, selected_partnernr, "Verantwortung übernommen");
}
}
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
}
catch { }
@@ -783,7 +783,7 @@ namespace OnDoc.UICintrols
return;
}
db.Dok_in_Bearbeietung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db.Dok_in_Bearbeitung(1, selected_dokumentid, AppParams.CurrentMitarbieter);
db = null;
clsProcessWatch.AddToList(selected_dokumentid, filename, "Word");
break;

52
Client/UIControls/UCAllgemeineDokumentParam.Designer.cs generated
View File

@@ -28,8 +28,8 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.GrpPartner = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
this.btneditadresse = new System.Windows.Forms.Button();
this.btnweitereadressen = new System.Windows.Forms.Button();
this.txtanrede = new System.Windows.Forms.TextBox();
@@ -76,6 +76,9 @@
this.cbboxpostzustellung = new Syncfusion.WinForms.ListView.SfComboBox();
this.lblPostzustellung = new System.Windows.Forms.Label();
this.btnErneutGenerierung = new System.Windows.Forms.Button();
this.lblAnrede = new System.Windows.Forms.Label();
this.DateTerminText = new System.Windows.Forms.TextBox();
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.GrpPartner.SuspendLayout();
this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout();
@@ -99,7 +102,7 @@
//
// GrpPartner
//
this.GrpPartner.Controls.Add(this.button1);
this.GrpPartner.Controls.Add(this.lblAnrede);
this.GrpPartner.Controls.Add(this.btneditadresse);
this.GrpPartner.Controls.Add(this.btnweitereadressen);
this.GrpPartner.Controls.Add(this.txtanrede);
@@ -116,15 +119,6 @@
this.GrpPartner.TabStop = false;
this.GrpPartner.Text = "Partner";
//
// button1
//
this.button1.Location = new System.Drawing.Point(490, 226);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 8;
this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = true;
//
// btneditadresse
//
this.btneditadresse.Image = global::OnDoc.Properties.Resources.EditDoc_16x16_32;
@@ -149,11 +143,10 @@
//
// txtanrede
//
this.txtanrede.Location = new System.Drawing.Point(298, 156);
this.txtanrede.Location = new System.Drawing.Point(298, 169);
this.txtanrede.Name = "txtanrede";
this.txtanrede.Size = new System.Drawing.Size(200, 20);
this.txtanrede.TabIndex = 6;
this.txtanrede.Text = "txtanrede";
//
// groupBox5
//
@@ -547,6 +540,7 @@
//
// groupBox9
//
this.groupBox9.Controls.Add(this.DateTerminText);
this.groupBox9.Controls.Add(this.DateTermin);
this.groupBox9.Controls.Add(this.lblTermin);
this.groupBox9.Controls.Add(this.DateDokumentDatum);
@@ -563,11 +557,13 @@
//
// DateTermin
//
this.DateTermin.Location = new System.Drawing.Point(398, 42);
this.DateTermin.DateTimeIcon = null;
this.DateTermin.Location = new System.Drawing.Point(476, 42);
this.DateTermin.Name = "DateTermin";
this.DateTermin.Size = new System.Drawing.Size(107, 21);
this.DateTermin.Size = new System.Drawing.Size(29, 21);
this.DateTermin.TabIndex = 5;
this.DateTermin.ToolTipText = "";
this.DateTermin.ValueChanged += new Syncfusion.WinForms.Input.Events.DateTimeValueChangedEventHandler(this.DateTermin_ValueChanged);
//
// lblTermin
//
@@ -580,6 +576,7 @@
//
// DateDokumentDatum
//
this.DateDokumentDatum.DateTimeIcon = null;
this.DateDokumentDatum.Location = new System.Drawing.Point(151, 44);
this.DateDokumentDatum.Name = "DateDokumentDatum";
this.DateDokumentDatum.Size = new System.Drawing.Size(107, 21);
@@ -627,6 +624,27 @@
this.btnErneutGenerierung.Visible = false;
this.btnErneutGenerierung.Click += new System.EventHandler(this.btnErneutGenerierung_Click);
//
// lblAnrede
//
this.lblAnrede.AutoSize = true;
this.lblAnrede.Location = new System.Drawing.Point(298, 153);
this.lblAnrede.Name = "lblAnrede";
this.lblAnrede.Size = new System.Drawing.Size(151, 13);
this.lblAnrede.TabIndex = 8;
this.lblAnrede.Text = "Anrede (sofern nicht Standard)";
//
// DateTerminText
//
this.DateTerminText.Location = new System.Drawing.Point(406, 43);
this.DateTerminText.Name = "DateTerminText";
this.DateTerminText.Size = new System.Drawing.Size(69, 20);
this.DateTerminText.TabIndex = 6;
//
// contextMenuStrip1
//
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
//
// UCAllgemeineDokumentParam
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -723,7 +741,9 @@
private System.Windows.Forms.Button btnErneutGenerierung;
private System.Windows.Forms.Button btnweitereadressen;
private System.Windows.Forms.TextBox txtanrede;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btneditadresse;
private System.Windows.Forms.Label lblAnrede;
private System.Windows.Forms.TextBox DateTerminText;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
}
}

23
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -165,17 +165,22 @@ namespace OnDoc.UIControls
{
this.lblTermin.Visible = true;
this.DateTermin.Visible = true;
this.DateTerminText.Visible = true;
this.DateTerminText.Text = "";
}
else
{
this.lblTermin.Visible = false;
this.DateTermin.Visible = false;
this.DateTerminText.Visible = false;
this.DateTermin.Value = new DateTime(1900, 01, 01);
}
db.Get_Tabledata("Select beschreibung from physischesarchiv where physischesarchivnr = " + dr["physisches_archiv"].ToString(), false, true);
barcode_zusatz = db.dsdaten.Tables[0].Rows[0][0].ToString();
if (barcode_zusatz != "") { barcode_zusatz = " / " + barcode_zusatz; }
if (barcode_zusatz != "") { barcode_zusatz = " " + barcode_zusatz; }
db.Get_Tabledata("Select office_vorlagenr,kopfzeile_generieren, bcpt,bcpl, bcw, bch, bchorizontal, barcodetype, datamatrixcontent from office_vorlage where office_vorlagenr="+dr["office_vorlagenr"].ToString(),false,true);
this.vorlagenr = Convert.ToInt32(dr["office_vorlagenr"]);
@@ -567,7 +572,14 @@ namespace OnDoc.UIControls
dokdata.barcode_textposition = AppParams.barcodetextposition;
dokdata.barcode_type = barcode_type;
dokdata.barcode_content = barcode_content;
dokdata.Termin = DateTermin.Value.ToString();
if (DateTerminText.Text == "")
{
dokdata.Termin = "01.01.1900";
}
else
{
dokdata.Termin = DateTermin.Value.ToString();
}
dokdata.Bezeichnung = txtbezeichnung.ToString();
dokdata.zustelladresse = docgendata.zustelladresse;
dokdata.anrede = docgendata.anrede;
@@ -586,7 +598,7 @@ namespace OnDoc.UIControls
if (ps.DialogResult == DialogResult.OK)
{
this.partnernr = ps.partnernr;
if (ps.bpperson_changed) { lblPartner.ForeColor = System.Drawing.Color.Red; } else { lblPartner.ForeColor = System.Drawing.Color.Black; }
if (ps.bpperson_changed) { lblPartner.ForeColor = System.Drawing.Color.Blue; } else { lblPartner.ForeColor = System.Drawing.Color.Black; }
update_partner();
}
}
@@ -798,5 +810,10 @@ namespace OnDoc.UIControls
}
catch { }
}
private void DateTermin_ValueChanged(object sender, Syncfusion.WinForms.Input.Events.DateTimeValueChangedEventArgs e)
{
this.DateTerminText.Text = DateTermin.Value.ToString().Substring(0,10);
}
}
}

3
Client/UIControls/UCAllgemeineDokumentParam.resx
View File

@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

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

Binary file not shown.

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

Binary file not shown.

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/OnDoc.exe
View File

Binary file not shown.

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

Binary file not shown.

BIN
Client/bin/Debug/OnDocClient.zip
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

2
Client/bin/Debug/_Zipit.bat
View File

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

BIN
Client/bin/Debug/db.zip Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

@@ -237,6 +237,9 @@
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Helper\\Helper.csproj"
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Logging\\Logging.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Logging\\Logging.csproj"
},
"E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj": {
"projectPath": "E:\\Software-Projekte\\OnDoc\\OnDoc\\Model\\Model.csproj"
}

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

Binary file not shown.

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.exe
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

@@ -322,6 +322,7 @@
"type": "project",
"dependencies": {
"Helper": "1.0.0",
"Logging": "1.0.0",
"Model": "1.0.0"
},
"compile": {
@@ -662,6 +663,7 @@
"type": "project",
"dependencies": {
"Helper": "1.0.0",
"Logging": "1.0.0",
"Model": "1.0.0"
},
"compile": {
@@ -1002,6 +1004,7 @@
"type": "project",
"dependencies": {
"Helper": "1.0.0",
"Logging": "1.0.0",
"Model": "1.0.0"
},
"compile": {
@@ -1342,6 +1345,7 @@
"type": "project",
"dependencies": {
"Helper": "1.0.0",
"Logging": "1.0.0",
"Model": "1.0.0"
},
"compile": {
@@ -1682,6 +1686,7 @@
"type": "project",
"dependencies": {
"Helper": "1.0.0",
"Logging": "1.0.0",
"Model": "1.0.0"
},
"compile": {

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

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