Änderungen AMBAR

UID/frmLogin.vb

@@ -1,4 +1,9 @@
-Public Class frmLogin
+Imports System.IO
+Imports SDL
+Imports System.Net.Sockets
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmLogin
     Public ConnStrInfo As String
     Public ConnStr As String
     '  Public USRNAME As String
@@ -6,42 +11,109 @@
 
     Private UID As New cOptionenDAL
     Private SDL As New SDL.cOptionenDAL
+    Private ADMIN As New cADMIN
 
 
-    Private Version As String = My.Resources.Version
+    Private Version As String = Application.ProductVersion
     Public sAppPath As String = Application.StartupPath
+    Public firma As String = "VERAG"
 
     Public TESTSYSTEM As Boolean = False
 
 
     Private Sub btnLogin_Click(sender As Object, e As EventArgs) Handles btnLogin.Click
-        If SDL.checkLogin(txtUser.Text, txtPwd.Text, "DISPO") Then
-            VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "DISPO"
-            VERAG_PROG_ALLGEMEIN.cAllgemein.PROGVERSION = My.Resources.Version
-            VERAG_PROG_ALLGEMEIN.cAllgemein.SESSION.LOGIN()
-
-
-            AddHandler frmMain.FormClosed, Sub()
-                                               VERAG_PROG_ALLGEMEIN.cAllgemein.SESSION.LOGOUT()
-                                               Me.Close()
-                                           End Sub
-            'frmMain.Show()
-            frmMainV2.Show()
-            Me.Hide()
+        If CBool(ADMIN.checkLogin(txtUser.Text, txtPwd.Text, firma,,, "DISPO")) Then
+            loginOK()
         Else
+            '  MsgBox("Benutzername oder Kennwort ist falsch!", MsgBoxStyle.Exclamation, "Fehler bei Anmeldung")
             lblAlertTxt.Visible = True
         End If
+
+        'If SDL.checkLogin(txtUser.Text, txtPwd.Text, "DISPO") Then
+        '    VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "DISPO"
+        '    VERAG_PROG_ALLGEMEIN.cAllgemein.PROGVERSION = My.Resources.Version
+        '    VERAG_PROG_ALLGEMEIN.cAllgemein.SESSION.LOGIN()
+
+
+        '    AddHandler frmMain.FormClosed, Sub()
+        '                                       VERAG_PROG_ALLGEMEIN.cAllgemein.SESSION.LOGOUT()
+        '                                       Me.Close()
+        '                                   End Sub
+        '    'frmMain.Show()
+        '    frmMainV2.Show()
+        '    Me.Hide()
+        'Else
+        '    lblAlertTxt.Visible = True
+        'End If
     End Sub
 
+    Private Sub loginOK()
+
+        'Prüfen, ob sich eein WO Nutzer in den Firmen-Login schmuggeln möchte:
+        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then
+            If Not VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
+                MsgBox("Keine Berechtigung!")
+                Exit Sub
+            End If
+        End If
+        '      MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+
+        'Prüfen, ob Passwort erneuert werden muss
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_PasswortChanged Is Nothing Then
+            Dim f As New frmChangePWD(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER)
+            f.txtPwdOld.Text = txtpwd.Text
+            f.txtPwdNew1.Focus()
+            If f.ShowDialog() <> DialogResult.OK Then
+                Exit Sub
+            End If
+        End If
+        VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "DISPO"
+        VERAG_PROG_ALLGEMEIN.cAllgemein.PROGVERSION = Application.ProductVersion
+
+        VERAG_PROG_ALLGEMEIN.cAllgemein.SESSION.LOGIN()
+
+
+        'AddHandler frmMain.FormClosed, Sub()
+        '                                   VERAG_PROG_ALLGEMEIN.cAllgemein.SESSION.LOGOUT()
+        '                                   Me.Close()
+        '                               End Sub
+        'frmMain.Show()
+        frmMainV2.Show()
+
+
+        Me.Hide()
+        cGlobal.AngemeldeterUser = cGlobal.AktiverMitarbeiter.Mitarbeiter
+
+
+
+    End Sub
     Private Sub frmLogin_Load(sender As Object, e As EventArgs) Handles Me.Load
         'If sAppPath Like "*\bin\Debug" Then
         '    txtUser.Text = "sebastian"
         '    txtPwd.Text = "verag#3"
         'End If
+
+        Dim pfadDatei As String = Application.StartupPath & "\Standort.txt"
+        firma = "VERAG"
+        If File.Exists(pfadDatei) Then
+            Dim fs As New FileStream(pfadDatei, FileMode.Open, FileAccess.Read)
+            Dim strmReader As New StreamReader(fs)
+            firma = strmReader.ReadLine
+            If firma = "AMBAR" Then firma = "AMBAR"
+            If firma = "NEU" Then firma = "VERAG"
+            strmReader.Close()
+        End If
+
+
+
+        initstart()
+
+
         If TESTSYSTEM Then lblTestsystem.Visible = True
         VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = TESTSYSTEM
         'Dim tmp As String
-        lblVersion.Text = lblVersion.Text & " " & My.Resources.Version
+        lblVersion.Text = lblVersion.Text & " " & Application.ProductVersion
+
         Me.Show()
         txtUser.Focus()
         lblAlertTxt.Visible = False
@@ -102,7 +174,27 @@
                 txtPwd.Text = "verag#3"
             End If
         End If
+        If e.Modifiers = Keys.Control And e.KeyCode = Keys.A Then
+            Panel2.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor
+            lblVersion.ForeColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor
+            Label3.ForeColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor
+
+
+            Select Case firma
+                Case "VERAG" : firma = "AMBAR"
+                Case "AMBAR" : firma = "VERAG"
+
+            End Select
+
+            VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firma
+
+            ' firma = If(firma = "VERAG", "ATILLA", If(firma = "ATILLA", "IMEX", "VERAG"))
+            initstart()
+
+            e.Handled = True
+        End If
     End Sub
+
     Sub initstart()
 
 
@@ -117,6 +209,17 @@
         VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = TESTSYSTEM
 
 
+
+        Select Case firma
+            Case "VERAG"
+                PictureBox1.Image = My.Resources.Verag_AG_Logo
+
+            Case "AMBAR"
+                PictureBox1.Image = My.Resources.ambar_simple
+
+        End Select
+
+        VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firma
         ' txtSachbear.Text = ""
         'txtKennwort.Text = ""