Merge branch 'newMaster2024' of https://git.it.verag.ag/edv/SDL into newMaster2024

SDL/SMS/frmSendSMS.Designer.vb

@@ -73,6 +73,11 @@ Partial Class frmSendSMS
         Me.Button30 = New System.Windows.Forms.Button()
         Me.Button31 = New System.Windows.Forms.Button()
         Me.pnl = New System.Windows.Forms.Panel()
+        Me.Button32 = New System.Windows.Forms.Button()
+        Me.Button33 = New System.Windows.Forms.Button()
+        Me.Button34 = New System.Windows.Forms.Button()
+        Me.Button35 = New System.Windows.Forms.Button()
+        Me.Button36 = New System.Windows.Forms.Button()
         Me.pnl.SuspendLayout()
         Me.SuspendLayout()
         '
@@ -116,7 +121,7 @@ Partial Class frmSendSMS
         Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.Label1.Location = New System.Drawing.Point(12, 37)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(381, 25)
+        Me.Label1.Size = New System.Drawing.Size(275, 17)
         Me.Label1.TabIndex = 1
         Me.Label1.Text = "Handynummer (immer mit Ländervorwahl):"
         '
@@ -130,7 +135,7 @@ Partial Class frmSendSMS
         Me.cboLandVorwahl.FormattingEnabled = True
         Me.cboLandVorwahl.Location = New System.Drawing.Point(370, 232)
         Me.cboLandVorwahl.Name = "cboLandVorwahl"
-        Me.cboLandVorwahl.Size = New System.Drawing.Size(64, 37)
+        Me.cboLandVorwahl.Size = New System.Drawing.Size(64, 28)
         Me.cboLandVorwahl.TabIndex = 7
         Me.cboLandVorwahl.Visible = False
         '
@@ -168,7 +173,7 @@ Partial Class frmSendSMS
         Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.Label2.Location = New System.Drawing.Point(12, 209)
         Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(100, 25)
+        Me.Label2.Size = New System.Drawing.Size(72, 17)
         Me.Label2.TabIndex = 3
         Me.Label2.Text = "Nachricht:"
         '
@@ -311,7 +316,7 @@ Partial Class frmSendSMS
         Me.cbxLKWOK.CheckState = System.Windows.Forms.CheckState.Checked
         Me.cbxLKWOK.Location = New System.Drawing.Point(329, 122)
         Me.cbxLKWOK.Name = "cbxLKWOK"
-        Me.cbxLKWOK.Size = New System.Drawing.Size(127, 21)
+        Me.cbxLKWOK.Size = New System.Drawing.Size(120, 17)
         Me.cbxLKWOK.TabIndex = 18
         Me.cbxLKWOK.Text = "LKW auf OK setzen"
         Me.cbxLKWOK.UseVisualStyleBackColor = True
@@ -326,7 +331,7 @@ Partial Class frmSendSMS
         Me.cboFirma.FormattingEnabled = True
         Me.cboFirma.Location = New System.Drawing.Point(329, 57)
         Me.cboFirma.Name = "cboFirma"
-        Me.cboFirma.Size = New System.Drawing.Size(128, 37)
+        Me.cboFirma.Size = New System.Drawing.Size(128, 28)
         Me.cboFirma.TabIndex = 5
         '
         'Label3
@@ -335,7 +340,7 @@ Partial Class frmSendSMS
         Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.Label3.Location = New System.Drawing.Point(326, 37)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(67, 25)
+        Me.Label3.Size = New System.Drawing.Size(47, 17)
         Me.Label3.TabIndex = 4
         Me.Label3.Text = "Firma:"
         '
@@ -541,7 +546,7 @@ Partial Class frmSendSMS
         Me.lblInfoWhatsApp.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
         Me.lblInfoWhatsApp.Location = New System.Drawing.Point(197, 209)
         Me.lblInfoWhatsApp.Name = "lblInfoWhatsApp"
-        Me.lblInfoWhatsApp.Size = New System.Drawing.Size(381, 20)
+        Me.lblInfoWhatsApp.Size = New System.Drawing.Size(260, 13)
         Me.lblInfoWhatsApp.TabIndex = 40
         Me.lblInfoWhatsApp.Text = "Der Text kann bei WhatsApp nicht verändert werden!"
         '
@@ -551,7 +556,7 @@ Partial Class frmSendSMS
         Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.Label4.Location = New System.Drawing.Point(52, 102)
         Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(111, 25)
+        Me.Label4.Size = New System.Drawing.Size(77, 17)
         Me.Label4.TabIndex = 42
         Me.Label4.Text = "WhatsApp:"
         '
@@ -561,7 +566,7 @@ Partial Class frmSendSMS
         Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.Label5.Location = New System.Drawing.Point(223, 102)
         Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(63, 25)
+        Me.Label5.Size = New System.Drawing.Size(41, 17)
         Me.Label5.TabIndex = 44
         Me.Label5.Text = "SMS:"
         '
@@ -584,7 +589,7 @@ Partial Class frmSendSMS
         Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
         Me.Label6.Location = New System.Drawing.Point(12, 12)
         Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(285, 20)
+        Me.Label6.Size = New System.Drawing.Size(190, 13)
         Me.Label6.TabIndex = 48
         Me.Label6.Text = "WhatsApp: Bitte zu VERAG kommen..."
         '
@@ -653,17 +658,77 @@ Partial Class frmSendSMS
         Me.pnl.Controls.Add(Me.Button28)
         Me.pnl.Controls.Add(Me.Button29)
         Me.pnl.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnl.Location = New System.Drawing.Point(0, 458)
+        Me.pnl.Location = New System.Drawing.Point(0, 492)
         Me.pnl.Name = "pnl"
         Me.pnl.Size = New System.Drawing.Size(469, 108)
         Me.pnl.TabIndex = 54
         '
+        'Button32
+        '
+        Me.Button32.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button32.Location = New System.Drawing.Point(422, 451)
+        Me.Button32.Name = "Button32"
+        Me.Button32.Size = New System.Drawing.Size(35, 25)
+        Me.Button32.TabIndex = 59
+        Me.Button32.Text = "BG"
+        Me.Button32.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button32.UseVisualStyleBackColor = True
+        '
+        'Button33
+        '
+        Me.Button33.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button33.Location = New System.Drawing.Point(389, 451)
+        Me.Button33.Name = "Button33"
+        Me.Button33.Size = New System.Drawing.Size(35, 25)
+        Me.Button33.TabIndex = 58
+        Me.Button33.Text = "RO"
+        Me.Button33.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button33.UseVisualStyleBackColor = True
+        '
+        'Button34
+        '
+        Me.Button34.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button34.Location = New System.Drawing.Point(355, 451)
+        Me.Button34.Name = "Button34"
+        Me.Button34.Size = New System.Drawing.Size(35, 25)
+        Me.Button34.TabIndex = 57
+        Me.Button34.Text = "YU"
+        Me.Button34.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button34.UseVisualStyleBackColor = True
+        '
+        'Button35
+        '
+        Me.Button35.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button35.Location = New System.Drawing.Point(321, 451)
+        Me.Button35.Name = "Button35"
+        Me.Button35.Size = New System.Drawing.Size(35, 25)
+        Me.Button35.TabIndex = 56
+        Me.Button35.Text = "TR"
+        Me.Button35.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button35.UseVisualStyleBackColor = True
+        '
+        'Button36
+        '
+        Me.Button36.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button36.Location = New System.Drawing.Point(15, 451)
+        Me.Button36.Name = "Button36"
+        Me.Button36.Size = New System.Drawing.Size(307, 25)
+        Me.Button36.TabIndex = 55
+        Me.Button36.Text = "Bitte entfernen Sie das Siegel und bringen Sie es zu VERAG!"
+        Me.Button36.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button36.UseVisualStyleBackColor = True
+        '
         'frmSendSMS
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(469, 566)
+        Me.ClientSize = New System.Drawing.Size(469, 600)
+        Me.Controls.Add(Me.Button32)
+        Me.Controls.Add(Me.Button33)
+        Me.Controls.Add(Me.Button34)
+        Me.Controls.Add(Me.Button35)
+        Me.Controls.Add(Me.Button36)
         Me.Controls.Add(Me.pnl)
         Me.Controls.Add(Me.Label5)
         Me.Controls.Add(Me.Label4)
@@ -767,4 +832,9 @@ Partial Class frmSendSMS
     Friend WithEvents Button30 As Button
     Friend WithEvents Button31 As Button
     Friend WithEvents pnl As Panel
+    Friend WithEvents Button32 As Button
+    Friend WithEvents Button33 As Button
+    Friend WithEvents Button34 As Button
+    Friend WithEvents Button35 As Button
+    Friend WithEvents Button36 As Button
 End Class

SDL/SMS/frmSendSMS.vb

@@ -429,6 +429,27 @@ Public Class frmSendSMS
     Private Sub Button27_Click(sender As Object, e As EventArgs) Handles Button27.Click
         If MyRichTextBox1.Text <> "" Then fillTXT("Моля, елате във VERAG " & MyRichTextBox1.Text, "", template_BG, MyRichTextBox1.Text)
     End Sub
+
+    Private Sub Button35_Click(sender As Object, e As EventArgs) Handles Button35.Click
+        fillTXT("Lütfen Mühür/Mühürleri söküp VERAG ofise getiriniz!", "TIR: ", template_TR, "Lütfen Mühür/Mühürleri söküp VERAG ofise getiriniz!")
+    End Sub
+
+    Private Sub Button36_Click(sender As Object, e As EventArgs) Handles Button36.Click
+        fillTXT("Bitte entfernen Sie das Siegel bzw. die Siegel und bringen Sie sie zum VERAG-Büro!", "LKW: ", template_DE, "Bitte entfernen Sie das Siegel bzw. die Siegel und bringen Sie sie zum VERAG-Büro!")
+
+    End Sub
+
+    Private Sub Button34_Click(sender As Object, e As EventArgs) Handles Button34.Click
+        fillTXT("Molimo uklonite pečat i odnesite ga u VERAG!", "TIR: ", template_YU, "Molimo uklonite pečat i odnesite ga u VERAG!")
+    End Sub
+
+    Private Sub Button33_Click(sender As Object, e As EventArgs) Handles Button33.Click
+        fillTXT("Vă rugăm să îndepărtați sigiliul și să îl duceți la VERAG!", "TIR: ", template_RO, "Vă rugăm să îndepărtați sigiliul și să îl duceți la VERAG!")
+    End Sub
+
+    Private Sub Button32_Click(sender As Object, e As EventArgs) Handles Button32.Click
+        fillTXT("Моля, махнете печата и го занесете в VERAG!", "TIR: ", template_BG, "Моля, махнете печата и го занесете в VERAG!")
+    End Sub
 End Class
 
 Public Class cSMSOptions

VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/Read_T1/cATEZ_Read_T1.vb

@@ -41,7 +41,7 @@ Public Class cATEZ_Read_T1
 
     ' lt. API-Dokumentation
     Private Const Username As String = "verag"
-    Private Const Password As String = "verag_password123"
+    Private Const Password As String = "$2a$11$ia/nymf749eoBktjhWyp2.1TP3VkmdWsX62bgBH1TGQbwFWQg4rc2" '"verag_password123"
     Private Const ClientId As String = "client3"
     Private Const GrantType As String = "password"
 
@@ -213,7 +213,7 @@ Public Class cATEZ_Read_T1
     ' ==========================
     ' TEST-Methode – ruft ProcessPdfAsync auf und gibt ALLES aus
     ' ==========================
-    Private Async Sub TEST(pdfPath As String)
+    Public Async Sub TEST(pdfPath As String)
         Try
             ' dieselbe Instanz verwenden
             Dim result As T1ProcessResult = Await Me.ProcessPdfAsync(pdfPath)