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

Update 20250505

Browse Source
This commit is contained in:
Stefan Hutter
2025-05-05 17:50:51 +02:00
parent 5aa75038e7
commit 3e7d72e379
26 changed files with 78 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
API_NetFramework/Controllers/ArchivController.cs
View File

@@ -572,6 +572,7 @@ namespace API_NetFramework.Controllers
url = System.Configuration.ConfigurationManager.AppSettings["ILRevision"];
break;
}
APILogging.Log((HttpRequestMessage)Request, "Upload URL:" + url, LogLevelType.Debug);
var data = Encoding.UTF8.GetBytes(jsonstring);
request = WebRequest.Create(url);

18
API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user
View File

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc</_PublishTargetUrl>
<History>True|2025-05-04T11:37:01.8401491Z||;True|2025-04-14T15:32:13.3923265+02:00||;True|2025-03-27T09:55:34.9678501+01:00||;True|2025-03-27T07:47:45.1288274+01:00||;True|2025-03-26T19:03:04.7550972+01:00||;True|2025-02-27T19:20:43.3755758+01:00||;True|2025-02-27T18:15:21.2843332+01:00||;True|2025-02-25T19:05:51.2823294+01:00||;True|2025-02-25T19:04:29.0810473+01:00||;True|2025-02-21T10:28:09.2279895+01:00||;True|2025-02-21T09:59:33.3258979+01:00||;True|2025-02-12T12:49:01.5618262+01:00||;True|2025-02-09T14:47:25.8660147+01:00||;True|2025-02-09T12:40:23.8730229+01:00||;True|2025-02-05T14:41:27.6196364+01:00||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||;</History>
<History>True|2025-05-05T08:30:22.0524225Z||;True|2025-05-05T09:37:27.1162038+02:00||;True|2025-05-04T13:37:01.8401491+02:00||;True|2025-04-14T15:32:13.3923265+02:00||;True|2025-03-27T09:55:34.9678501+01:00||;True|2025-03-27T07:47:45.1288274+01:00||;True|2025-03-26T19:03:04.7550972+01:00||;True|2025-02-27T19:20:43.3755758+01:00||;True|2025-02-27T18:15:21.2843332+01:00||;True|2025-02-25T19:05:51.2823294+01:00||;True|2025-02-25T19:04:29.0810473+01:00||;True|2025-02-21T10:28:09.2279895+01:00||;True|2025-02-21T09:59:33.3258979+01:00||;True|2025-02-12T12:49:01.5618262+01:00||;True|2025-02-09T14:47:25.8660147+01:00||;True|2025-02-09T12:40:23.8730229+01:00||;True|2025-02-05T14:41:27.6196364+01:00||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@@ -82,10 +82,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>09/04/2024 19:25:14</publishTime>
</File>
<File Include="bin/BarcodeLib.dll">
<publishTime>05/03/2025 10:15:11</publishTime>
<publishTime>04/05/2025 13:55:10</publishTime>
</File>
<File Include="bin/BarcodeLib.pdb">
<publishTime>05/03/2025 10:15:11</publishTime>
<publishTime>04/05/2025 13:55:10</publishTime>
</File>
<File Include="bin/CSVNET.dll">
<publishTime>02/28/2025 10:40:17</publishTime>
@@ -130,13 +130,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/20/2023 22:35:04</publishTime>
</File>
<File Include="bin/DOCGEN.dll">
<publishTime>05/04/2025 13:36:59</publishTime>
<publishTime>05/05/2025 10:30:20</publishTime>
</File>
<File Include="bin/DOCGEN.dll.config">
<publishTime>12/23/2024 22:17:43</publishTime>
</File>
<File Include="bin/DOCGEN.pdb">
<publishTime>05/04/2025 13:36:59</publishTime>
<publishTime>05/05/2025 10:30:20</publishTime>
</File>
<File Include="bin/FastReport.Bars.dll">
<publishTime>11/27/2023 09:49:58</publishTime>
@@ -250,16 +250,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>02/28/2025 10:40:16</publishTime>
</File>
<File Include="bin/OnDocOffice.dll">
<publishTime>05/04/2025 13:36:59</publishTime>
<publishTime>05/05/2025 10:30:20</publishTime>
</File>
<File Include="bin/OnDocOffice.pdb">
<publishTime>05/04/2025 13:36:59</publishTime>
<publishTime>05/05/2025 10:30:20</publishTime>
</File>
<File Include="bin/OnDoc_NetFramework.dll">
<publishTime>01/01/0001 00:00:00</publishTime>
<publishTime>05/05/2025 10:30:21</publishTime>
</File>
<File Include="bin/OnDoc_NetFramework.pdb">
<publishTime>01/01/0001 00:00:00</publishTime>
<publishTime>05/05/2025 10:30:21</publishTime>
</File>
<File Include="bin/Owin.dll">
<publishTime>11/13/2012 13:19:34</publishTime>

BIN
API_NetFramework/bin/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/bin/OnDoc_NetFramework.pdb
View File

Binary file not shown.

33
API_NetFramework/log.txt
View File

@@ -12436,3 +12436,36 @@ done
2025-05-04 17:31:38.0403|DEBUG|OnDoc|Start Transfer to OnBase
2025-05-04 17:31:38.0563|DEBUG|OnDoc|Ende Transfer to OnBase
2025-05-04 17:31:38.0664|DEBUG|OnDoc|Opload Versandstrasse:X:\\jsontemp\VS_1032777_20250504053138.json.pdf
2025-05-05 09:21:11.2691|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002508829
2025-05-05 09:21:11.3174|DEBUG|OnDoc|
2025-05-05 09:21:11.3517|DEBUG|OnDoc|
2025-05-05 09:21:11.3517|DEBUG|OnDoc|
2025-05-05 09:21:11.3517|DEBUG|OnDoc|
2025-05-05 09:21:11.3517|DEBUG|OnDoc|
2025-05-05 09:21:11.3637|DEBUG|OnDoc|
2025-05-05 09:21:13.1955|DEBUG|OnDoc|
2025-05-05 09:21:13.2088|DEBUG|OnDoc|
2025-05-05 09:21:21.0183|DEBUG|OnDoc|Start Transfer to OnBase
2025-05-05 09:21:21.5063|DEBUG|OnDoc|Ende Transfer to OnBase
2025-05-05 09:21:21.5257|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002508829
2025-05-05 09:21:21.5257|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002508829
2025-05-05 09:21:21.5347|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002508829
2025-05-05 09:21:21.5347|DEBUG|OnDoc|
2025-05-05 09:21:21.5347|DEBUG|OnDoc|
2025-05-05 09:21:21.5347|DEBUG|OnDoc|
2025-05-05 09:21:21.5347|DEBUG|OnDoc|
2025-05-05 09:21:21.5347|DEBUG|OnDoc|
2025-05-05 09:21:21.5347|DEBUG|OnDoc|
2025-05-05 09:23:13.7456|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002508829
2025-05-05 09:23:17.5135|DEBUG|OnDoc|
2025-05-05 09:23:17.5858|DEBUG|OnDoc|
2025-05-05 09:23:20.6089|DEBUG|OnDoc|
2025-05-05 09:23:20.6181|DEBUG|OnDoc|
2025-05-05 09:23:23.4465|DEBUG|OnDoc|
2025-05-05 09:23:23.4592|DEBUG|OnDoc|
2025-05-05 09:23:50.0827|DEBUG|OnDoc|
2025-05-05 09:23:50.1201|DEBUG|OnDoc|
2025-05-05 09:24:20.7838|DEBUG|OnDoc|Start Transfer to OnBase
2025-05-05 09:24:31.7176|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002508829
2025-05-05 09:24:32.3699|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002508829
2025-05-05 09:24:32.3849|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002508829

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

Binary file not shown.

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll
View File

Binary file not shown.

BIN
API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb
View File

Binary file not shown.

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

@@ -40,9 +40,10 @@
this.pictureBox1.ErrorImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.ErrorImage")));
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.InitialImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.InitialImage")));
this.pictureBox1.Location = new System.Drawing.Point(104, 25);
this.pictureBox1.Location = new System.Drawing.Point(139, 31);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(261, 258);
this.pictureBox1.Size = new System.Drawing.Size(348, 318);
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
@@ -50,9 +51,10 @@
//
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(164, 304);
this.label1.Location = new System.Drawing.Point(219, 374);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(122, 26);
this.label1.Size = new System.Drawing.Size(151, 31);
this.label1.TabIndex = 1;
this.label1.Text = "Version 1.5";
//
@@ -60,23 +62,25 @@
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(161, 330);
this.label2.Location = new System.Drawing.Point(215, 406);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(125, 26);
this.label2.Size = new System.Drawing.Size(154, 31);
this.label2.TabIndex = 2;
this.label2.Text = "5. Mai 2025";
this.label2.Click += new System.EventHandler(this.label2_Click);
//
// SplashScreen
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(469, 396);
this.ClientSize = new System.Drawing.Size(625, 487);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "SplashScreen";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "SplashScreen";

23
Client/Start.cs
View File

@@ -233,11 +233,12 @@ namespace OnDoc
EDK_Data.Load_EDK_File(filename);
dB.save_edk(filename, AppParams.CurrentMitarbeiter);
System.IO.File.Delete(filename);
if (EDK_Data.toexecute == true)
{
exec_edk(filename);
}
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
}
private void URI_Call(string filename)
{
@@ -428,13 +429,13 @@ namespace OnDoc
{
if (edkb12_check(filename))
{
System.IO.File.Delete(filename);
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
MessageBox.Show("Das gewählte Dokument wird im Hintergrund erstellt.", "Dokumenterstellung", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
}
System.IO.File.Delete(filename);
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
int doktyp = Convert.ToInt32(dokumenttypnr);
doktyp = doktyp - 900000000;
EDK_Data.toexecute = true;
@@ -452,8 +453,8 @@ namespace OnDoc
{
string partnernr = EDK_Data.AnzeigePartnernr;
dokList1.refresh_edk_partner(Convert.ToInt32(partnernr));
System.IO.File.Delete(filename);
if (System.IO.File.Exists(filename)) { System.IO.File.Delete(filename); }
}
}
@@ -508,6 +509,18 @@ namespace OnDoc
e.Cancel = true;
}
}
DB db = new DB(AppParams.connectionstring);
db.Get_Tabledata("Select count(*) from OnDoc_Versandstrasse_Reserved_Documents where mitarbeiter=" + AppParams.CurrentMitarbeiter.ToString(), false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0)
{
if (MessageBox.Show("Vor dem Schliessen müssen im Fesnter 'Versandstrasse' die offenen Versand-Couvertes bereinigt werden."+Environment.NewLine+"Trotzdem schliessen?", "OnDoc schliessen", MessageBoxButtons.YesNo, MessageBoxIcon.Question)==DialogResult.No)
{
e.Cancel = true;
}
}
db = null;
}
}
}

1
Client/UIControls/DokList.cs
View File

@@ -2115,6 +2115,7 @@ namespace OnDoc.UICintrols
ribbonSaveGridView.Enabled = AppParams.isSysadmin;
ribbonSaveGridView.Visible = AppParams.isSysadmin;
ribbonAnmelden.Visible = AppParams.showlogin;
System.Windows.Forms.Application.DoEvents();
//pos_elements();
}

2
Client/UIControls/UCAllgemeineDokumentParam.cs
View File

@@ -736,6 +736,8 @@ namespace OnDoc.UIControls
if (cbboxunterschriftrechts.Text == "") { docgendata.unterschriftRehts = "-1"; }
}
catch { }
if (cbboxunterschriftlinks.Visible == false) { docgendata.unterschriftLinks = "-1"; }
if (cbboxunterschriftrechts.Visible ==false) { docgendata.unterschriftRehts = "-1"; }
if (cbfaksimile.Checked) { docgendata.digitaleunterschrift = true; } else { docgendata.digitaleunterschrift = false; }
if (cbformularohneunterschrfit.Checked) { docgendata.frormularOhneUnterschrift = true; } else { docgendata.frormularOhneUnterschrift = false; }
if (lblohneUnterschrift.Visible) { docgendata.frormularOhneUnterschrift = true; }

4
Client/Versandstrasse/Versandstrasse.cs
View File

@@ -390,8 +390,8 @@ namespace OnDoc.Versandstrasse
{
set_nodeimage(dokumentnode, 5);
}
db.Get_Tabledata("Select unterschriftlinks, unterschriftrechts, signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) != 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) != 0){
db.Get_Tabledata("Select isnull(unterschriftlinks,0), isnull(unterschriftrechts,0), signiert from dokument where dokumentid='" + dokumentnode.Tag + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0 || Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][1]) > 0){
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][2]) == 0)
{
set_nodeimage(dokumentnode, 4);

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/de-DE/OnDoc.resources.dll
View File

Binary file not shown.

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

Binary file not shown.

BIN
Client/obj/Debug/DesignTimeResolveAssemblyReferences.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.

BIN
DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache
View File

Binary file not shown.

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

Binary file not shown.