update 20250129

master
Stefan Hutter 11 months ago
parent 3f765247ee
commit 6558c21a9d

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
VBOffice
</name>
</assembly>
<members>
<member name="T:VBOffice.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:VBOffice.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:VBOffice.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>

@ -3249,3 +3249,11 @@ Parametername: encoder
2025-01-26 11:04:42.7351|DEBUG|OnDoc|
2025-01-26 11:04:42.7621|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG4116
2025-01-26 11:04:42.7621|INFO|OnDoc|Unterschrift-Bezug: TG4116
2025-01-27 11:01:55.4901|DEBUG|OnDoc|
2025-01-27 11:01:55.5177|DEBUG|OnDoc|
2025-01-27 11:01:55.5424|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: 1234
2025-01-27 11:01:55.5424|INFO|OnDoc|Unterschrift-Bezug: 1234
2025-01-27 11:01:55.6505|DEBUG|OnDoc|
2025-01-27 11:01:55.6505|DEBUG|OnDoc|
2025-01-27 11:01:55.6771|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665
2025-01-27 11:01:55.6771|INFO|OnDoc|Unterschrift-Bezug: TG9665

@ -310,3 +310,6 @@ E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.XlsIO.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Pdf.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.Compression.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\Syncfusion.OfficeChart.Base.xml
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBOffice.pdb
E:\Software-Projekte\OnDoc\OnDoc\API_NetFramework\bin\VBOffice.xml

@ -74,19 +74,27 @@ namespace BarcodeLib
}
public Image DrawText1(Color foreColor, Color backColor, string fontName, int fontSize, string txt, int width, int height, string zusatz,string zusatzfontname, int zusatzfontsize , int rotation)
{
//width = 320;
//height = 50;
string barcodetext = txt;
barcodetext = Bar25I(txt);
Bitmap img = new Bitmap(width, height);
Graphics Gimg = Graphics.FromImage(img);
Font imgFont = new Font(fontName, fontSize);
PointF imgPoint = new PointF(5, 5);
PointF imgPoint = new PointF(0, 0);
SolidBrush bForeColor = new SolidBrush(foreColor);
SolidBrush bBackColor = new SolidBrush(backColor);
Gimg.FillRectangle(bBackColor, 0, 0, width, height);
Gimg.DrawString(txt, imgFont, bForeColor, imgPoint);
Gimg.DrawString(barcodetext, imgFont, bForeColor, imgPoint);
Font fzFont = new Font(zusatzfontname, zusatzfontsize);
SizeF textSize = Gimg.MeasureString(zusatz, fzFont, 50);
SizeF textSize = Gimg.MeasureString(zusatz, fzFont,30);
PointF imgPointZusatz = new PointF(width - textSize.Width - 15, 30);
PointF imgPointZusatz = new PointF(width - textSize.Width , 25);
Gimg.DrawString(zusatz, fzFont, bForeColor, imgPointZusatz);
return RotateImage(img, rotation, true, true, Color.White);

@ -64,7 +64,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(168, 26);
this.label2.TabIndex = 2;
this.label2.Text = "21. Januar 2025";
this.label2.Text = "27. Januar 2025";
//
// SplashScreen
//

@ -13,6 +13,7 @@ using System.IO;
using Syncfusion.Windows.Forms.Spreadsheet.Commands;
using OnDoc.UICintrols;
using OnDoc.UIControls;
using System.Linq.Expressions;
namespace OnDoc
@ -36,7 +37,11 @@ namespace OnDoc
{
ExternalCall.sourceparam = "";
try
{
MessageBox.Show(args[0]);
}
catch { }
if (args.Length > 0)
{
@ -51,6 +56,7 @@ namespace OnDoc
mitarbeiter = mitarbeiter.Replace("i", "");
mitarbeiter = mitarbeiter.Replace("I", "");
mitarbeiter = mitarbeiter.Substring(mitarbeiter.IndexOf("\\") + 1);
Logging.Logging.Debug("EDK-Umleitung", args[0], "");
AppParams.currenttgnummer = mitarbeiter;
db.Get_Tabledata("Select count(*) from ondoc_edk_routing where aktiv=1 and tgnummer='" + AppParams.currenttgnummer + "'", false, true);
if (Convert.ToInt32(db.dsdaten.Tables[0].Rows[0][0]) > 0)

@ -112,7 +112,7 @@ namespace OnDoc
Logging.Logging.Debug("Start - Ende", "start.cs", "");
AppParams.StartApp = false;
dokList1.refresh_dokumente();
//dokList1.refresh_dokumente();
}

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.

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
VBOffice
</name>
</assembly>
<members>
<member name="T:VBOffice.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:VBOffice.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:VBOffice.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>

@ -1,5 +1,5 @@
delete EDKB02DMS.zip
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll BarcodeLibVBDatamatrix.dll
"C:\Program Files\7-Zip\7z.exe" -pshu*tkb98125 a OnDocClient.zip OnDoc.exe OnDocOffice.dll Docgen.dll database.dll barcodelib.dll Helper.dll Logging.dll Model.dll OfficePrinter.dll VBFileManagement.dll vbbarcodes.dll BarcodeLibVBDatamatrix.dll, vboffice.dll
copy OnDocClient.zip H:\NextCloud\ZZDownload
pause

Binary file not shown.

Binary file not shown.

@ -368,3 +368,6 @@ E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.UIControls.Administrator
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.SerienbriefTemplateLoad.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmDokumentpaketNeugenerierung.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\obj\Debug\OnDoc.DocMgmt.frmSerienbrief.resources
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBOffice.pdb
E:\Software-Projekte\OnDoc\OnDoc\Client\bin\Debug\VBOffice.xml

Binary file not shown.

Binary file not shown.

@ -861,7 +861,26 @@ namespace DOCGEN.Klassen
//int rotation = 0;
//if (docData.barcode_horizontal == 0) { rotation = 270; }
barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16) + docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize), 0);
//barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height,false);
BarcodeLib.clsBarI25 barbarcode = new BarcodeLib.clsBarI25();
//barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 36, 350, 50, " "+docData.barcode_zusatz, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize), 0);
//barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height, false);
//barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), docData.barcode_font, docData.barcode_fontsize, docData.barcode_width*2, docData.barcode_height+10, " " + docData.barcode_zusatz, docData.Zusatz_Font, docData.Zusatz_FontSize, 0);
//barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width*3, docData.barcode_height*3,false);
if (docData.barcode_horizontal == 0)
{
barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, " U", "Futur Book", 8,270);
}
else
{
barcodeimage = barbarcode.GetBarI25(Color.Black, Color.White, docData.Dokumentid.Substring(6, 16), "Bar 25i c HR", 33, 300, 50, " U", "Futur Book", 8, 0);
}
//barcodeimage = ScaleImage(barcodeimage, docData.barcode_width, docData.barcode_height);
//barcodeimage = resizeImage(barcodeimage, new Size(docData.barcode_width,docData.barcode_height));
@ -906,9 +925,9 @@ namespace DOCGEN.Klassen
//picture.Height = barcodeimage.Height;
if (docData.barcode_horizontal == 0)
{
picture.Rotation = 270;
// picture.Height = docData.barcode_height;
// picture.Width = docData.barcode_width;
picture.Rotation = 0;
picture.Height = docData.barcode_width;
picture.Width = docData.barcode_height;
picture.VerticalPosition = docData.barcode_top; ;
picture.HorizontalPosition = docData.barcode_left;
@ -917,8 +936,8 @@ namespace DOCGEN.Klassen
else
{
picture.Rotation = 0;
//picture.Height = docData.barcode_height;
//picture.Width = docData.barcode_width;
picture.Height = docData.barcode_height;
picture.Width = docData.barcode_width;
picture.VerticalPosition = docData.barcode_top; ;
picture.HorizontalPosition = docData.barcode_left;
@ -929,8 +948,8 @@ namespace DOCGEN.Klassen
}
if (docData.barcode_type == "0")
{
picture.Width = docData.barcode_width;
picture.Height = docData.barcode_height;
// picture.Width = docData.barcode_width;
// picture.Height = docData.barcode_height;
}
WPicture picture2 = new WPicture(document);

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.

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
VBOffice
</name>
</assembly>
<members>
<member name="T:VBOffice.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:VBOffice.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:VBOffice.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>

Binary file not shown.

Binary file not shown.

@ -148,3 +148,6 @@ E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\MW6.SDK.dll
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BarcodeLibVBDatamatrix.dll
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BarcodeLibVBDatamatrix.pdb
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\BarcodeLibVBDatamatrix.xml
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\VBOffice.dll
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\VBOffice.pdb
E:\Software-Projekte\OnDoc\OnDoc\DOCGEN\bin\Debug\VBOffice.xml

Binary file not shown.

Binary file not shown.

@ -42,7 +42,13 @@ namespace OfficePrinter
wordDocument = appWord.Documents.Open(Filename);
Thread.Sleep(OfficeSleep);
appWord.Visible = true;
appWord.Activate();
wordDocument.Activate();
Microsoft.Office.Interop.Word.Window window = appWord.ActiveWindow;
window.SetFocus();
window.Activate();
appWord.WindowState = WdWindowState.wdWindowStateMinimize;
appWord.WindowState = WdWindowState.wdWindowStateMaximize;
if (printmacro == "") return "";
try
{
@ -50,6 +56,7 @@ namespace OfficePrinter
}
catch (Exception e) {
error = e.Message.ToString()+" / "+printmacro;
}
Thread.Sleep(OfficeSleep);
wordDocument.Close();

@ -32,6 +32,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Logging">
<HintPath>..\Client\bin\Debug\Logging.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>

Binary file not shown.

@ -1 +1 @@
e00516c95ac2185abce4d5a9b57f77ce0dde43a3c9cef3b199e9ef42746933f1
aa46558934c57c1dee0d62ddc8c2c4c41e93018c41a69ed585458eb2e1549ea2

@ -14,3 +14,7 @@ E:\Software-Projekte\OnDoc\OnDoc\OfficePrinter\obj\Debug\OfficePrinter.csproj.Co
E:\Software-Projekte\OnDoc\OnDoc\OfficePrinter\obj\Debug\OfficePr.6C7E73FF.Up2Date
E:\Software-Projekte\OnDoc\OnDoc\OfficePrinter\obj\Debug\OfficePrinter.dll
E:\Software-Projekte\OnDoc\OnDoc\OfficePrinter\obj\Debug\OfficePrinter.pdb
E:\Software-Projekte\OnDoc\OnDoc\OfficePrinter\bin\Debug\Logging.dll
E:\Software-Projekte\OnDoc\OnDoc\OfficePrinter\bin\Debug\NLog.dll
E:\Software-Projekte\OnDoc\OnDoc\OfficePrinter\bin\Debug\NLog.Database.dll
E:\Software-Projekte\OnDoc\OnDoc\OfficePrinter\bin\Debug\Logging.pdb

@ -61,6 +61,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BarcodeLibVBDatamatrix", "B
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZZ_BarcpdeFromFont", "ZZ_BarcpdeFromFont\ZZ_BarcpdeFromFont.csproj", "{913D34B6-1F69-4232-8AE6-7790794F5871}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VBOffice", "VBOffice\VBOffice.vbproj", "{63578D09-CC5F-4224-A877-FC2FB12C0A20}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -171,6 +173,10 @@ Global
{913D34B6-1F69-4232-8AE6-7790794F5871}.Debug|Any CPU.Build.0 = Debug|Any CPU
{913D34B6-1F69-4232-8AE6-7790794F5871}.Release|Any CPU.ActiveCfg = Release|Any CPU
{913D34B6-1F69-4232-8AE6-7790794F5871}.Release|Any CPU.Build.0 = Release|Any CPU
{63578D09-CC5F-4224-A877-FC2FB12C0A20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{63578D09-CC5F-4224-A877-FC2FB12C0A20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{63578D09-CC5F-4224-A877-FC2FB12C0A20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{63578D09-CC5F-4224-A877-FC2FB12C0A20}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

@ -32,6 +32,7 @@
this.label1 = new System.Windows.Forms.Label();
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// label1
@ -45,9 +46,9 @@
//
// progressBar1
//
this.progressBar1.Location = new System.Drawing.Point(12, 76);
this.progressBar1.Location = new System.Drawing.Point(15, 97);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(390, 23);
this.progressBar1.Size = new System.Drawing.Size(419, 23);
this.progressBar1.TabIndex = 1;
//
// label2
@ -55,19 +56,31 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(12, 49);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(0, 13);
this.label2.Size = new System.Drawing.Size(28, 13);
this.label2.TabIndex = 2;
this.label2.Text = "Text";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(12, 67);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(34, 13);
this.label3.TabIndex = 3;
this.label3.Text = "Detail";
//
// DialogGenerate
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(440, 111);
this.ClientSize = new System.Drawing.Size(440, 132);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.progressBar1);
this.Controls.Add(this.label1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "DialogGenerate";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Dokumenterstellung mit Office";
this.Load += new System.EventHandler(this.DialogGenerate_Load);
this.ResumeLayout(false);
@ -80,5 +93,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ProgressBar progressBar1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
}
}

@ -21,6 +21,7 @@ namespace OnDocOffice
{
InitializeComponent();
this.label2.Text = bez;
this.label3.Text = "";
}
private void DialogGenerate_Load(object sender, EventArgs e)
{
@ -29,15 +30,25 @@ namespace OnDocOffice
progressBar1.Value = 0;
}
public void set_progress(int value)
public void set_progress(int value, string text)
{
progressBar1.Value = value;
this.label3.Text=text;
try
{
progressBar1.Value = value;
}
catch { }
Application.DoEvents();
}
public void add_progress(int value)
public void add_progress(int value, string text)
{
progressBar1.Value += value;
this.label3.Text = text;
try
{
progressBar1.Value += value;
}
catch { }
Application.DoEvents();
}
}

@ -83,6 +83,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\VBFileManagement\bin\Debug\VBFileManagement.dll</HintPath>
</Reference>
<Reference Include="VBOffice">
<HintPath>..\VBOffice\bin\Debug\VBOffice.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="clsoffice.cs" />

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>
VBOffice
</name>
</assembly>
<members>
<member name="T:VBOffice.My.Resources.Resources">
<summary>
A strongly-typed resource class, for looking up localized strings, etc.
</summary>
</member>
<member name="P:VBOffice.My.Resources.Resources.ResourceManager">
<summary>
Returns the cached ResourceManager instance used by this class.
</summary>
</member>
<member name="P:VBOffice.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>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save