Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2023-10-27 15:21:40 +02:00
parent c08aa3750b 7f93965282
commit c0b63deeeb
17 changed files with 322 additions and 46 deletions
--- a/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb
@@ -23,6 +23,7 @@ Public Class cEssensbestellung
    Property eb_anmerkung As Object = Nothing
    Property eb_gesendet_am As Object = Nothing
    Property eb_gesendet As Boolean
+    Property eb_firma As Object = Nothing


    Public hasEntry = False
@@ -72,6 +73,7 @@ Public Class cEssensbestellung
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_anmerkung", eb_anmerkung))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_gesendet", eb_gesendet))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_gesendet_am", eb_gesendet_am))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_firma", eb_firma))


        Return list
--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
@@ -12,7 +12,7 @@ Imports Spire.Pdf.HtmlConverter
 Imports System.Threading
 Imports System.Net
 Imports Spire.Pdf.Tables
-
+Imports System.Windows.Forms.VisualStyles

 Public Class cDATENSERVER

@@ -1374,9 +1374,16 @@ Public Class cFormularManager



-    Public Shared Function getPDFViaSpirePDF_FromURLStream(URL As String, Optional targetPath As String = "", Optional openFileAfterDownload As Boolean = True) As String
+    Public Shared Function getPDFViaSpirePDF_FromURLStream(URL As String, Optional filename As String = "", Optional targetPath As String = "", Optional openFileAfterDownload As Boolean = True) As String
        Try
-            If targetPath = "" Then targetPath = getTMPPath_PDF()
+            If targetPath = "" Then
+                If filename <> "" Then
+                    targetPath = System.IO.Path.GetTempPath() & filename & ".pdf"
+                Else
+                    targetPath = getTMPPath_PDF()
+                End If
+            End If
+

            VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()

--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.Designer.vb
@@ -73,6 +73,7 @@ Partial Class frmMitarbeitersuche
        Me.lblFirma = New System.Windows.Forms.Label()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Label3 = New System.Windows.Forms.Label()
+        Me.cbxHomeoffice = New System.Windows.Forms.CheckBox()
        Me.pnlSrch.SuspendLayout()
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlMain.SuspendLayout()
@@ -217,6 +218,7 @@ Partial Class frmMitarbeitersuche
        '
        'pnlZeiten
        '
+        Me.pnlZeiten.Controls.Add(Me.cbxHomeoffice)
        Me.pnlZeiten.Controls.Add(Me.btnZEGehen)
        Me.pnlZeiten.Controls.Add(Me.btnZEKommen)
        Me.pnlZeiten.Controls.Add(Me.lblTimasSaldo)
@@ -658,6 +660,17 @@ Partial Class frmMitarbeitersuche
        Me.Label3.Text = "Niederlassung:"
        Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        '
+        'cbxHomeoffice
+        '
+        Me.cbxHomeoffice.AutoSize = True
+        Me.cbxHomeoffice.ForeColor = System.Drawing.Color.Black
+        Me.cbxHomeoffice.Location = New System.Drawing.Point(262, 7)
+        Me.cbxHomeoffice.Name = "cbxHomeoffice"
+        Me.cbxHomeoffice.Size = New System.Drawing.Size(80, 17)
+        Me.cbxHomeoffice.TabIndex = 125
+        Me.cbxHomeoffice.Text = "Homeoffice"
+        Me.cbxHomeoffice.UseVisualStyleBackColor = True
+        '
        'frmMitarbeitersuche
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -679,6 +692,7 @@ Partial Class frmMitarbeitersuche
        Me.pnl.ResumeLayout(False)
        Me.pnl.PerformLayout()
        Me.pnlZeiten.ResumeLayout(False)
+        Me.pnlZeiten.PerformLayout()
        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlWohnadresse.ResumeLayout(False)
        CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -742,4 +756,5 @@ Partial Class frmMitarbeitersuche
    Friend WithEvents pnlZeiten As Windows.Forms.Panel
    Friend WithEvents btnZEGehen As Windows.Forms.Button
    Friend WithEvents btnZEKommen As Windows.Forms.Button
+    Friend WithEvents cbxHomeoffice As Windows.Forms.CheckBox
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -305,10 +305,10 @@ Public Class frmMitarbeitersuche

        If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
            Dim timas As New cTimasAPI
-            Dim a As MsgBoxResult = MsgBox(sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo)
+            Dim a As MsgBoxResult = MsgBox(IIf(cbxHomeoffice.Checked, "Homeoffice", "Büro") & vbNewLine & sender.text & " für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & vbNewLine & Now.ToString(), vbYesNo)
            If a = vbYes Then
                Dim info
-                timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, art)
+                timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, art, IIf(cbxHomeoffice.Checked, 3, 0))
                MsgBox(info)
                Thread.Sleep(2000) 'warten bis Eintrag in Timas-DB
                requestDone = False
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb
@@ -651,6 +651,7 @@ Public Class cDigicustAPI
        'afterNormalization(overwrite -> werden mit mitgeschickten Infos überschrieben).
        json.UpdateString("priority", "afterNormalization")
        json.UpdateString("documentStatus", "finished")
+        json.UpdateString("documentType", "UserInput")

        If sendung.consignee_name <> "" Then json.UpdateString("annotatedAggregated.consignee.name.input", sendung.consignee_name)

@@ -659,7 +660,7 @@ Public Class cDigicustAPI
        If sendung.consignee_eori <> "" Then json.UpdateString("annotatedAggregated.consignee.EORI.input", sendung.consignee_eori)

        If sendung.licencePlate <> "" AndAlso sendung.lkwCountryId <> "" Then
-            json.UpdateString("annotatedAggregated.meansOfTransportation[0].type", "Inland")
+            json.UpdateString("annotatedAggregated.meansOfTransportation[0].type", "Border")
            json.UpdateString("annotatedAggregated.meansOfTransportation[0].value", "Road")
            json.UpdateString("annotatedAggregated.meansOfTransportation[0].licensePlate", sendung.licencePlate)
            json.UpdateString("annotatedAggregated.meansOfTransportation[0].countryCode", sendung.lkwCountryId)
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
@@ -774,7 +774,7 @@ Public Class cTimasAPI



-    Public Function setTimeEntry(ByVal mitarbeiter As cMitarbeiter, ByVal timeEntry As DateTime, ByRef info As String, ByRef inout As String)
+    Public Function setTimeEntry(ByVal mitarbeiter As cMitarbeiter, ByVal timeEntry As DateTime, ByRef info As String, ByRef inout As String, Optional ByRef art As Integer = 0)
        Dim failureText As String = ""
        Dim timeEntryCreated As Boolean = False

@@ -805,7 +805,7 @@ Public Class cTimasAPI

        Dim json As New Chilkat.JsonObject
        json.UpdateString("stamp", timeEntry.ToString("yyyy-MM-ddTHH:mm:ss"))
-        json.UpdateInt("statusnumber", 0) '
+        json.UpdateInt("statusnumber", art) '0 Standardanwesenheit, 3 Homeoffice
        json.UpdateString("type", inout)
        json.UpdateString("employeeid", mitarbeiter.mit_timasId)

--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -59,7 +59,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
    <DocumentationFile>VERAG_PROG_ALLGEMEIN.xml</DocumentationFile>
    <Optimize>true</Optimize>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>