GUI Verbesserungen

SDL/kassenbuch/frmPOSTerminal.Designer.vb

@@ -23,6 +23,7 @@ Partial Class frmPOSTerminal
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmPOSTerminal))
         Me.dgvTerminals = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.cbx_Dummy = New System.Windows.Forms.CheckBox()
         Me.cbx_Autodruck = New System.Windows.Forms.CheckBox()
@@ -116,7 +117,7 @@ Partial Class frmPOSTerminal
         'cbx_Dummy
         '
         Me.cbx_Dummy.AutoSize = True
-        Me.cbx_Dummy.Location = New System.Drawing.Point(104, 48)
+        Me.cbx_Dummy.Location = New System.Drawing.Point(16, 72)
         Me.cbx_Dummy.Name = "cbx_Dummy"
         Me.cbx_Dummy.Size = New System.Drawing.Size(128, 17)
         Me.cbx_Dummy.TabIndex = 137
@@ -136,7 +137,7 @@ Partial Class frmPOSTerminal
         'Label15
         '
         Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(14, 191)
+        Me.Label15.Location = New System.Drawing.Point(15, 116)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(45, 13)
         Me.Label15.TabIndex = 135
@@ -145,9 +146,9 @@ Partial Class frmPOSTerminal
         'comboInstalledPrinters
         '
         Me.comboInstalledPrinters.FormattingEnabled = True
-        Me.comboInstalledPrinters.Location = New System.Drawing.Point(109, 186)
+        Me.comboInstalledPrinters.Location = New System.Drawing.Point(93, 113)
         Me.comboInstalledPrinters.Name = "comboInstalledPrinters"
-        Me.comboInstalledPrinters.Size = New System.Drawing.Size(101, 21)
+        Me.comboInstalledPrinters.Size = New System.Drawing.Size(147, 21)
         Me.comboInstalledPrinters.TabIndex = 134
         '
         'Label14
@@ -235,7 +236,7 @@ Partial Class frmPOSTerminal
         '
         'btn_Tagesabschluss
         '
-        Me.btn_Tagesabschluss.Location = New System.Drawing.Point(305, 45)
+        Me.btn_Tagesabschluss.Location = New System.Drawing.Point(265, 251)
         Me.btn_Tagesabschluss.Name = "btn_Tagesabschluss"
         Me.btn_Tagesabschluss.Size = New System.Drawing.Size(129, 34)
         Me.btn_Tagesabschluss.TabIndex = 121
@@ -658,9 +659,9 @@ Partial Class frmPOSTerminal
         '
         'btn_Druckwiederh
         '
-        Me.btn_Druckwiederh.Location = New System.Drawing.Point(440, 44)
+        Me.btn_Druckwiederh.Location = New System.Drawing.Point(413, 251)
         Me.btn_Druckwiederh.Name = "btn_Druckwiederh"
-        Me.btn_Druckwiederh.Size = New System.Drawing.Size(114, 34)
+        Me.btn_Druckwiederh.Size = New System.Drawing.Size(129, 34)
         Me.btn_Druckwiederh.TabIndex = 135
         Me.btn_Druckwiederh.Text = "Druckwiederholung"
         Me.btn_Druckwiederh.UseVisualStyleBackColor = True
@@ -791,7 +792,9 @@ Partial Class frmPOSTerminal
         Me.Controls.Add(Me.btn)
         Me.Controls.Add(Me.btnNew)
         Me.Controls.Add(Me.dgvTerminals)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmPOSTerminal"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "POS Terminal einstellen"
         CType(Me.dgvTerminals, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TabControl1.ResumeLayout(False)

SDL/kassenbuch/frmPOSTerminal.vb

@@ -50,6 +50,11 @@ Public Class frmPOSTerminal
 		Dim TypSelected As String
 		Dim Typ As Long
 
+		If ZVTKey Is Nothing Then
+			MsgBox("EasyZVT ist nicht installiert." & vbNewLine & "In der Master-Kasse unter POS-Terminal als Systemadministrator installieren!")
+			Exit Sub
+		End If
+
 		Try
 
 			ZVTKey.SetValue("Funktion", Funktion, RegistryValueKind.DWord)
@@ -115,6 +120,8 @@ Public Class frmPOSTerminal
 		End Try
 		ZVTKey.Close()
 
+		EasyZVT_Worker.RunWorkerAsync()
+
 	End Sub
 
 	Private Sub Autorisierung()
@@ -124,7 +131,7 @@ Public Class frmPOSTerminal
 		End If
 		Funktion = 0
 		SetRegistryParameter()
-		EasyZVT_Worker.RunWorkerAsync()
+
 
 	End Sub
 	Private Sub Button_Autorisierung_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_Autorisierung.Click
@@ -206,14 +213,14 @@ Public Class frmPOSTerminal
 	Private Sub Button_Diagnose_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_Diagnose.Click
 		Funktion = 1
 		SetRegistryParameter()
-		EasyZVT_Worker.RunWorkerAsync()
+
 
 	End Sub
 
 	Private Sub Button_Tagesabschluss_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_Tagesabschluss.Click
 		Funktion = 2
 		SetRegistryParameter()
-		EasyZVT_Worker.RunWorkerAsync()
+
 
 	End Sub
 
@@ -230,7 +237,7 @@ Public Class frmPOSTerminal
 
 		Funktion = 3
 		SetRegistryParameter()
-		EasyZVT_Worker.RunWorkerAsync()
+
 
 	End Sub
 
@@ -241,26 +248,26 @@ Public Class frmPOSTerminal
 		End If
 		Funktion = 4
 		SetRegistryParameter()
-		EasyZVT_Worker.RunWorkerAsync()
+
 
 	End Sub
 
 	Private Sub btn_Druckwiederh_Click(sender As Object, e As EventArgs) Handles btn_Druckwiederh.Click
 		Funktion = 5
 		SetRegistryParameter()
-		EasyZVT_Worker.RunWorkerAsync()
+
 	End Sub
 
 	Private Sub btn_Kontostand_Click(sender As Object, e As EventArgs) Handles btn_Kontostand.Click
 		Funktion = 7
 		SetRegistryParameter()
-		EasyZVT_Worker.RunWorkerAsync()
+
 	End Sub
 
 	Private Sub btn_Sprache_Click(sender As Object, e As EventArgs) Handles btn_Sprache.Click
 		Funktion = 13
 		SetRegistryParameter()
-		EasyZVT_Worker.RunWorkerAsync()
+
 
 	End Sub
 
@@ -525,6 +532,9 @@ Public Class frmPOSTerminal
 
 	Private Sub btnNew_Click(sender As Object, e As EventArgs) Handles btnNew.Click
 		savePOS()
+		dgvTerminals.GetOrder()
+		initDgv()
+		dgvTerminals.SetOrder()
 	End Sub
 
 	Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
@@ -661,7 +671,7 @@ Public Class frmPOSTerminal
 				Return valuesOK
 			Else
 
-				If CInt(SQL.getValueTxtBySql("SELECT count(*) FROM tblRKSV_POS WHERE pos_ip='" & txt_IP.Text & "' ", "FMZOLL")) > 0 Then
+				If CInt(SQL.getValueTxtBySql("SELECT count(*) FROM tblRKSV_POS WHERE pos_ip='" & txt_IP.Text & "' AND [pos_aktiv] = 1", "FMZOLL")) > 1 Then
 					lblWarning.Text = " IP Adresse ist bereits vergeben! "
 					Return valuesOK
 				End If