diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb index fbc92f5..e6c25d5 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb @@ -28,6 +28,7 @@ Partial Class usrCntlBenachrichtigungen Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel4 = New System.Windows.Forms.Panel() + Me.cbxTaskForce = New System.Windows.Forms.CheckBox() Me.cbxVerwarung = New System.Windows.Forms.CheckBox() Me.txtVermerk = New System.Windows.Forms.TextBox() Me.cbxNeukunden = New System.Windows.Forms.CheckBox() @@ -37,7 +38,6 @@ Partial Class usrCntlBenachrichtigungen Me.cbxTeams = New System.Windows.Forms.CheckBox() Me.Label22 = New System.Windows.Forms.Label() Me.Label25 = New System.Windows.Forms.Label() - Me.cbxTaskForce = New System.Windows.Forms.CheckBox() Me.Panel2.SuspendLayout() CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() @@ -106,6 +106,18 @@ Partial Class usrCntlBenachrichtigungen Me.Panel4.Size = New System.Drawing.Size(284, 38) Me.Panel4.TabIndex = 5 ' + 'cbxTaskForce + ' + Me.cbxTaskForce.AutoSize = True + Me.cbxTaskForce.ForeColor = System.Drawing.Color.Black + Me.cbxTaskForce.Location = New System.Drawing.Point(174, 19) + Me.cbxTaskForce.Name = "cbxTaskForce" + Me.cbxTaskForce.Size = New System.Drawing.Size(77, 17) + Me.cbxTaskForce.TabIndex = 33 + Me.cbxTaskForce.Text = "TaskForce" + Me.cbxTaskForce.UseVisualStyleBackColor = True + Me.cbxTaskForce.Visible = False + ' 'cbxVerwarung ' Me.cbxVerwarung.AutoSize = True @@ -215,18 +227,6 @@ Partial Class usrCntlBenachrichtigungen Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen" Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'cbxTaskForce - ' - Me.cbxTaskForce.AutoSize = True - Me.cbxTaskForce.ForeColor = System.Drawing.Color.Black - Me.cbxTaskForce.Location = New System.Drawing.Point(174, 19) - Me.cbxTaskForce.Name = "cbxTaskForce" - Me.cbxTaskForce.Size = New System.Drawing.Size(77, 17) - Me.cbxTaskForce.TabIndex = 33 - Me.cbxTaskForce.Text = "TaskForce" - Me.cbxTaskForce.UseVisualStyleBackColor = True - Me.cbxTaskForce.Visible = False - ' 'usrCntlBenachrichtigungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index c8faf50..69a1179 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 8763393..f10db12 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -1491,7 +1491,7 @@ Public Class frmHauptfenster sqlStr &= " ORDER BY case " & " when [Status] =3 then 0 " & " when [Status] =1 then 5 " & " else 1 " & " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID") End If - ' MsgBox(sqlStr) + ' MsgBox(sqlStr) 'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " & ' " FROM Aviso " & ' " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " & @@ -4951,8 +4951,12 @@ Public Class frmHauptfenster End Sub Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click - Dim resp = GetDataFromSharePoint("https://dpdhl.sharepoint.com/sites/FRTTR-Verag", "TruckList", "al@verag.ag", "Muellerskuh1!") - MsgBox(resp) + + ' MsgBox(VERAG_PROG_ALLGEMEIN.cATEZ_Tariff.GetTariffInfo_SingleOrEmpty("6207220000")) + + ' + 'Dim resp = GetDataFromSharePoint("https://dpdhl.sharepoint.com/sites/FRTTR-Verag", "TruckList", "al@verag.ag", "Muellerskuh1!") + 'MsgBox(resp) 'saveLukowaPDFsFromTherefore() End Sub diff --git a/Diverses/Thumbs.db b/Diverses/Thumbs.db new file mode 100644 index 0000000..64ccb17 Binary files /dev/null and b/Diverses/Thumbs.db differ