20200108

2020-01-08 15:01:48 +01:00
parent c860c222c7
commit e879fb6881
89 changed files with 8692 additions and 3571 deletions
--- a/AvisoTV/App.config
+++ b/AvisoTV/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
    </startup>
 </configuration>
--- a/AvisoTV/AvisoTV.vbproj
+++ b/AvisoTV/AvisoTV.vbproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -13,7 +13,7 @@
    <AssemblyName>AvisoTV</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
    <TargetFrameworkProfile>
    </TargetFrameworkProfile>
    <PublishUrl>publish\</PublishUrl>
@@ -126,9 +126,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
@@ -166,6 +166,8 @@
    <None Include="Resources\urgent_qu.png" />
    <None Include="Resources\urgent.png" />
    <None Include="Resources\IMEX-LOGO_simple.png" />
+    <None Include="Resources\Unisped_logo.jpg" />
+    <None Include="Resources\FrontOfficeSUB.jpg" />
    <Content Include="tv.ico" />
  </ItemGroup>
  <ItemGroup>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -14,8 +14,8 @@ Option Explicit On

 Namespace My
    
-    'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern
-    ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer.
+    'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden.  Wenn Sie Änderungen vornehmen möchten
+    ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer.
    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im
    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
    '
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -107,6 +107,25 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property FrontOfficeSUB() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("FrontOfficeSUB", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die  ähnelt.
+        '''</summary>
+        Friend ReadOnly Property ggg5ggggggg() As String
+            Get
+                Return ResourceManager.GetString("ggg5ggggggg", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -136,6 +155,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Unisped_logo() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Unisped_logo", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -154,4 +154,13 @@
  <data name="IMEX_LOGO_simple" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="Unisped_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="FrontOfficeSUB" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FrontOfficeSUB.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ggg5ggggggg" xml:space="preserve">
+    <value />
+  </data>
 </root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,21 +15,21 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
        
        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
        
-#Region "Funktion zum automatischen Speichern von My.Settings"
+#Region "Automatische My.Settings-Speicherfunktion"
 #If _MyType = "WindowsForms" Then
    Private Shared addedHandler As Boolean

    Private Shared addedHandlerLockObject As New Object

    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+    Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs)
        If My.Application.SaveMySettingsOnExit Then
            My.Settings.Save()
        End If
--- a/AvisoTV/Resources/FrontOfficeSUB.jpg
+++ b/AvisoTV/Resources/FrontOfficeSUB.jpg
--- a/AvisoTV/Resources/Unisped_logo.jpg
+++ b/AvisoTV/Resources/Unisped_logo.jpg
--- a/AvisoTV/frmAnzeige.Designer.vb
+++ b/AvisoTV/frmAnzeige.Designer.vb
@@ -60,7 +60,7 @@ Partial Class frmAnzeige
        Me.txtSchrift6 = New System.Windows.Forms.TextBox()
        Me.Label13 = New System.Windows.Forms.Label()
        Me.Label12 = New System.Windows.Forms.Label()
-        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
+        Me.cboFirma = New System.Windows.Forms.ComboBox()
        Me.Label10 = New System.Windows.Forms.Label()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.btnTestAnzeige = New System.Windows.Forms.Button()
@@ -90,6 +90,7 @@ Partial Class frmAnzeige
        Me.picVERAG = New System.Windows.Forms.PictureBox()
        Me.btnClose = New System.Windows.Forms.Button()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button4 = New System.Windows.Forms.Button()
        Me.Button3 = New System.Windows.Forms.Button()
        Me.Label11 = New System.Windows.Forms.Label()
        Me.Panel2 = New System.Windows.Forms.Panel()
@@ -106,7 +107,6 @@ Partial Class frmAnzeige
        Me.Label17 = New System.Windows.Forms.Label()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.pnl = New System.Windows.Forms.Panel()
-        Me.Button4 = New System.Windows.Forms.Button()
        CType(Me.gridAnkunft, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picConnectionProblem, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -394,16 +394,16 @@ Partial Class frmAnzeige
        Me.Label12.TabIndex = 29
        Me.Label12.Text = "Standort wechseln"
        '
-        'ComboBox1
+        'cboFirma
        '
-        Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.ComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Items.AddRange(New Object() {"VERAG_ALLE", "SUB", "SBG", "WAI", "NKD", "ATILLA", "IMEX"})
-        Me.ComboBox1.Location = New System.Drawing.Point(316, 91)
-        Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(150, 21)
-        Me.ComboBox1.TabIndex = 30
+        Me.cboFirma.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboFirma.FormattingEnabled = True
+        Me.cboFirma.Items.AddRange(New Object() {"VERAG_ALLE", "SUB", "SBG", "WAI", "NKD", "ATILLA", "IMEX", "UNISPED", "AMBAR", "FRONTOFFICE"})
+        Me.cboFirma.Location = New System.Drawing.Point(316, 91)
+        Me.cboFirma.Name = "cboFirma"
+        Me.cboFirma.Size = New System.Drawing.Size(150, 21)
+        Me.cboFirma.TabIndex = 30
        '
        'Label10
        '
@@ -706,6 +706,23 @@ Partial Class frmAnzeige
        Me.Panel1.Size = New System.Drawing.Size(1250, 21)
        Me.Panel1.TabIndex = 0
        '
+        'Button4
+        '
+        Me.Button4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button4.BackColor = System.Drawing.Color.Gray
+        Me.Button4.FlatAppearance.BorderColor = System.Drawing.Color.White
+        Me.Button4.FlatAppearance.BorderSize = 0
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button4.ForeColor = System.Drawing.Color.White
+        Me.Button4.Location = New System.Drawing.Point(1077, 0)
+        Me.Button4.Name = "Button4"
+        Me.Button4.RightToLeft = System.Windows.Forms.RightToLeft.Yes
+        Me.Button4.Size = New System.Drawing.Size(45, 23)
+        Me.Button4.TabIndex = 86
+        Me.Button4.Text = "< >"
+        Me.Button4.UseVisualStyleBackColor = False
+        '
        'Button3
        '
        Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -849,7 +866,7 @@ Partial Class frmAnzeige
        Me.grpTestAnzeige.Controls.Add(Me.Label7)
        Me.grpTestAnzeige.Controls.Add(Me.Label12)
        Me.grpTestAnzeige.Controls.Add(Me.txtSchrift1)
-        Me.grpTestAnzeige.Controls.Add(Me.ComboBox1)
+        Me.grpTestAnzeige.Controls.Add(Me.cboFirma)
        Me.grpTestAnzeige.Controls.Add(Me.Label9)
        Me.grpTestAnzeige.Controls.Add(Me.Label10)
        Me.grpTestAnzeige.Controls.Add(Me.txtSchrift2)
@@ -931,23 +948,6 @@ Partial Class frmAnzeige
        Me.pnl.Size = New System.Drawing.Size(487, 20)
        Me.pnl.TabIndex = 87
        '
-        'Button4
-        '
-        Me.Button4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Button4.BackColor = System.Drawing.Color.Gray
-        Me.Button4.FlatAppearance.BorderColor = System.Drawing.Color.White
-        Me.Button4.FlatAppearance.BorderSize = 0
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Button4.ForeColor = System.Drawing.Color.White
-        Me.Button4.Location = New System.Drawing.Point(1077, 0)
-        Me.Button4.Name = "Button4"
-        Me.Button4.RightToLeft = System.Windows.Forms.RightToLeft.Yes
-        Me.Button4.Size = New System.Drawing.Size(45, 23)
-        Me.Button4.TabIndex = 86
-        Me.Button4.Text = "< >"
-        Me.Button4.UseVisualStyleBackColor = False
-        '
        'frmAnzeige
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1018,7 +1018,7 @@ Partial Class frmAnzeige
    Friend WithEvents Panel1 As System.Windows.Forms.Panel
    Friend WithEvents Panel2 As System.Windows.Forms.Panel
    Friend WithEvents Label11 As System.Windows.Forms.Label
-    Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox
+    Friend WithEvents cboFirma As System.Windows.Forms.ComboBox
    Friend WithEvents Label12 As System.Windows.Forms.Label
    Friend WithEvents Button3 As System.Windows.Forms.Button
    Friend WithEvents txtBreite6 As System.Windows.Forms.TextBox
--- a/AvisoTV/frmAnzeige.vb
+++ b/AvisoTV/frmAnzeige.vb
@@ -30,7 +30,7 @@ Public Class frmAnzeige
    Private StandortATILLA As Boolean = False
    Private StandortSUB12 As Boolean = False
    Private ZeilenATILLA As Integer = 16
-
+    Dim CLUSTER As String = ""
    Private Font1 As New Font(FontFamily.GenericSansSerif, 70, FontStyle.Bold)
    Private Font1_MESS As New Font(FontFamily.GenericSansSerif, 40, FontStyle.Bold)

@@ -101,10 +101,11 @@ Public Class frmAnzeige
        Panel1.ForeColor = Color.White
        lblAnzahl.ForeColor = Color.White
        lblSeite.ForeColor = Color.White
-
+        CLUSTER = ""
        VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG"
        'Standort Atilla bekommt Sonderanzeige
        If Standort = "ATILLA" Then
+
            VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA"
            StandortATILLA = True
            ZeilenStandard = ZeilenATILLA
@@ -112,6 +113,7 @@ Public Class frmAnzeige
            Standort = ""
        ElseIf Standort = "IMEX" Then
            VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX"
+            '  VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER = "FRONTOFFICE"
            Panel1.BackColor = Color.Gold
            Panel1.BackColor = Color.Gold
            lblZeit.BackColor = Color.Gold
@@ -127,7 +129,25 @@ Public Class frmAnzeige
            'gridAnkunft.BackgroundColor = Color.FromArgb(255, 255, 240)
            GridBackgroundColor = Color.FromArgb(255, 255, 240)

+        ElseIf Standort = "UNISPED" Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
+            ' VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER = "FRONTOFFICE"
+            Panel1.BackColor = Color.Red
+            Panel1.BackColor = Color.Red
+            lblZeit.BackColor = Color.Red
+            lblAnzahl.BackColor = Color.Red
+            lblSeite.BackColor = Color.Red

+            'gridAnkunft.BackgroundColor = Color.FromArgb(255, 255, 240)
+            GridBackgroundColor = Color.FromArgb(255, 255, 240)
+        ElseIf Standort = "AMBAR" Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR"
+        ElseIf Standort = "FRONTOFFICE" Then
+            VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE"
+            CLUSTER = "FRONTOFFICE"
+
+        ElseIf Standort = "VERAG" Then
+            ' VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER = "FRONTOFFICE"
        End If

        gridAnkunft.AlternatingRowsDefaultCellStyle.BackColor = GridBackgroundColor
@@ -220,8 +240,15 @@ Public Class frmAnzeige

            Dim where As String = " WHERE "
            Dim hSQL As String = "SELECT AvisoID, Status, UPPER(LKW_Nr) as LKW_Nr, Ankunft, Dauer, letzterMitarbeiter, LKW_fertig " & buero & " , AvisoTVHinweis, ImEx  FROM Aviso "
-            where &= " Status IN( " & stat_tmp & ") AND Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' "
-            If Standort <> "" Then where &= "  AND Grenzstelle = '" & Standort.Replace("IMEX", "SUB") & "'" 'nur die IMEX-LKW in SUB anzeigen
+            where &= " Status IN( " & stat_tmp & ") "
+            If CLUSTER <> "" Then
+                where &= " AND (Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR Cluster= '" & CLUSTER & "') "
+            ElseIf Standort <> "WAI" And Standort <> "ABG" And Standort <> "NKD" Then
+                where &= " AND Firma= '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' "
+            End If
+
+            If Standort <> "" Then where &= "  AND Grenzstelle = '" & Standort.Replace("IMEX", "SUB").Replace("UNISPED", "SUB").Replace("FRONTOFFICE", "SUB") & "'" 'nur die IMEX-LKW in SUB anzeigen
+            If Standort = "FRONTOFFICE" Then where &= "  AND isnull(ImEx,'IMPORT') IN ('IMPORT','') "
            hSQL &= where
            hSQL += ank_tmp & " ORDER BY CASE " &
                                        " when [Status] =3 then 1 " &
@@ -480,6 +507,9 @@ Public Class frmAnzeige
        Select Case Standort
            Case "ATILLA" : picVERAG.Image = My.Resources.Atilla 'Atilla such su
            Case "IMEX" : picVERAG.Image = My.Resources.IMEX_LOGO_simple
+            Case "UNISPED" : picVERAG.Image = My.Resources.Unisped_logo
+            Case "AMBAR" : picVERAG.Image = Nothing
+            Case "FRONTOFFICE" : picVERAG.Image = My.Resources.FrontOfficeSUB
            Case Else : picVERAG.Image = My.Resources.Verag_AG_Logopng
        End Select
        If StandortATILLA Then picVERAG.Image = My.Resources.Atilla
@@ -677,12 +707,12 @@ Public Class frmAnzeige
        Me.Close()
    End Sub

-    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
-        Standort = ComboBox1.Text
+    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedIndexChanged
+        Standort = cboFirma.Text
        cDatenbankAVISO.GlobalConnection = Nothing
        '   Dim fs As New FileStream(StandortDatei, FileMode.Open, FileAccess.Write)
        Dim strmWriter As New StreamWriter(StandortDatei, False)
-        strmWriter.WriteLine(ComboBox1.Text)
+        strmWriter.WriteLine(cboFirma.Text)
        strmWriter.Close() ' fs.Close()
        frmAnzeige_Load(Me, New EventArgs)
        grpTestAnzeige.Visible = False