ADMIN UsrParam, DHF Import

2025-08-20 21:32:46 +02:00
parent c0984d7145
commit 01a8f1f7ad
13 changed files with 455 additions and 328 deletions
--- a/UID/Programme/frmProgDetails.Designer.vb
+++ b/UID/Programme/frmProgDetails.Designer.vb
@@ -283,6 +283,7 @@ Partial Class frmProgDetails
        '
        'btnSourceAkt
        '
+        Me.btnSourceAkt.Enabled = False
        Me.btnSourceAkt.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnSourceAkt.Location = New System.Drawing.Point(427, 125)
        Me.btnSourceAkt.Name = "btnSourceAkt"
@@ -296,9 +297,9 @@ Partial Class frmProgDetails
        Me.Label5.AutoSize = True
        Me.Label5.Location = New System.Drawing.Point(20, 130)
        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(69, 13)
+        Me.Label5.Size = New System.Drawing.Size(81, 26)
        Me.Label5.TabIndex = 52
-        Me.Label5.Text = "Source-Pfad:"
+        Me.Label5.Text = "Source-Pfad:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Usrespezifisch)"
        '
        'txtSourcePfad
        '
@@ -329,6 +330,7 @@ Partial Class frmProgDetails
        '
        'btnInstallSourceAkt
        '
+        Me.btnInstallSourceAkt.Enabled = False
        Me.btnInstallSourceAkt.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnInstallSourceAkt.Location = New System.Drawing.Point(427, 449)
        Me.btnInstallSourceAkt.Name = "btnInstallSourceAkt"
@@ -342,9 +344,9 @@ Partial Class frmProgDetails
        Me.Label8.AutoSize = True
        Me.Label8.Location = New System.Drawing.Point(20, 454)
        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(69, 13)
+        Me.Label8.Size = New System.Drawing.Size(81, 26)
        Me.Label8.TabIndex = 65
-        Me.Label8.Text = "Source-Pfad:"
+        Me.Label8.Text = "Source-Pfad:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Usrespezifisch)"
        '
        'txtInstallSourcePfad
        '
@@ -1049,8 +1051,6 @@ Partial Class frmProgDetails
        'cbxStandorttxtErstellenAMB
        '
        Me.cbxStandorttxtErstellenAMB.AutoSize = True
-        Me.cbxStandorttxtErstellenAMB.Checked = True
-        Me.cbxStandorttxtErstellenAMB.CheckState = System.Windows.Forms.CheckState.Checked
        Me.cbxStandorttxtErstellenAMB.Location = New System.Drawing.Point(615, 401)
        Me.cbxStandorttxtErstellenAMB.Name = "cbxStandorttxtErstellenAMB"
        Me.cbxStandorttxtErstellenAMB.Size = New System.Drawing.Size(126, 17)
@@ -1073,9 +1073,9 @@ Partial Class frmProgDetails
        Me.Label26.AutoSize = True
        Me.Label26.Location = New System.Drawing.Point(20, 401)
        Me.Label26.Name = "Label26"
-        Me.Label26.Size = New System.Drawing.Size(96, 13)
+        Me.Label26.Size = New System.Drawing.Size(99, 13)
        Me.Label26.TabIndex = 139
-        Me.Label26.Text = "Produktiv-AMBAR:"
+        Me.Label26.Text = "Produktiv Erweitert:"
        '
        'txtProdPfadAMB
        '
--- a/UID/Programme/frmProgDetails.vb
+++ b/UID/Programme/frmProgDetails.vb
@@ -35,10 +35,15 @@ Public Class frmProgDetails
        Dim daten As cProgramm = Nothing
        ' daten = New cProgramm
        daten = PROG.getProgrammByCodeName(codename)
-        txtSourcePfad.Text = daten.prog_source_path
+        txtSourcePfad.Text = getSourcePath()
+
+
+
+
+
        txtDevPfad.Text = daten.prog_dev_path
        txtProdPfad.Text = daten.prog_prod_path
-        txtInstallSourcePfad.Text = daten.prog_installer_source_path
+        txtInstallSourcePfad.Text = getSourceInstallPath() ' daten.prog_installer_source_path
        txtInstallDevPfad.Text = daten.prog_installer_dev_path
        txtInstallProdPfad.Text = daten.prog_installer_prod_path
        txtVersion.Text = daten.prog_aktuelleVersion
@@ -70,6 +75,14 @@ Public Class frmProgDetails

    End Sub

+    Function getSourcePath() As String
+        'PROG_initPath_AVISO 
+        Return VERAG_PROG_ALLGEMEIN.cMitarbeiter.GetUserParam("PROG_initPath_" & codename.Replace("AVISO_NEW", "AVISO"),, "")
+    End Function
+    Function getSourceInstallPath() As String
+        'PROG_initInstallPath_AVISO 
+        Return VERAG_PROG_ALLGEMEIN.cMitarbeiter.GetUserParam("PROG_initInstallPath_" & codename.Replace("AVISO_NEW", "AVISO"),, "")
+    End Function
    Private Sub btnVersionAkt_Click(sender As Object, e As EventArgs) Handles btnVersionAkt.Click
        PROG.setProgrammVersion(codename, txtVersion.Text)
        init()
@@ -135,10 +148,10 @@ Public Class frmProgDetails
        daten.prog_name = txtProgramName.Text
        daten.prog_aktuelleVersion = txtVersion.Text
        daten.prog_info = txtInfo.Text
-        daten.prog_source_path = txtSourcePfad.Text
+        '   daten.prog_source_path = txtSourcePfad.Text
        daten.prog_dev_path = txtDevPfad.Text
        daten.prog_prod_path = txtProdPfad.Text
-        daten.prog_installer_source_path = txtInstallSourcePfad.Text
+        '  daten.prog_installer_source_path = txtInstallSourcePfad.Text
        daten.prog_installer_dev_path = txtInstallDevPfad.Text
        daten.prog_installer_prod_path = txtInstallProdPfad.Text

--- a/UID/Programme/usrCntlProgramme.Designer.vb
+++ b/UID/Programme/usrCntlProgramme.Designer.vb
@@ -150,17 +150,18 @@ Partial Class usrCntlProgramme
        '
        Me.Label3.AutoSize = True
        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(226, 77)
+        Me.Label3.Location = New System.Drawing.Point(753, 77)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(120, 13)
        Me.Label3.TabIndex = 4
        Me.Label3.Text = "UID-VERWALTUNG"
+        Me.Label3.Visible = False
        '
        'Label4
        '
        Me.Label4.AutoSize = True
        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(374, 77)
+        Me.Label4.Location = New System.Drawing.Point(206, 77)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(139, 13)
        Me.Label4.TabIndex = 6
@@ -170,11 +171,12 @@ Partial Class usrCntlProgramme
        '
        Me.Label5.AutoSize = True
        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(531, 77)
+        Me.Label5.Location = New System.Drawing.Point(748, 292)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(142, 13)
        Me.Label5.TabIndex = 8
        Me.Label5.Text = "WABERER's Parkzeiten"
+        Me.Label5.Visible = False
        '
        'btnAdminAkt
        '
@@ -212,41 +214,45 @@ Partial Class usrCntlProgramme
        '
        'btnUidDetails
        '
-        Me.btnUidDetails.Location = New System.Drawing.Point(229, 173)
+        Me.btnUidDetails.Location = New System.Drawing.Point(756, 173)
        Me.btnUidDetails.Name = "btnUidDetails"
        Me.btnUidDetails.Size = New System.Drawing.Size(100, 39)
        Me.btnUidDetails.TabIndex = 18
        Me.btnUidDetails.Text = "Details"
        Me.btnUidDetails.UseVisualStyleBackColor = True
+        Me.btnUidDetails.Visible = False
        '
        'Label7
        '
        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(226, 107)
+        Me.Label7.Location = New System.Drawing.Point(753, 107)
        Me.Label7.Name = "Label7"
        Me.Label7.Size = New System.Drawing.Size(86, 13)
        Me.Label7.TabIndex = 17
        Me.Label7.Text = "Aktuelle Version:"
+        Me.Label7.Visible = False
        '
        'txtUidVersionAkt
        '
-        Me.txtUidVersionAkt.Location = New System.Drawing.Point(229, 123)
+        Me.txtUidVersionAkt.Location = New System.Drawing.Point(756, 123)
        Me.txtUidVersionAkt.Name = "txtUidVersionAkt"
        Me.txtUidVersionAkt.Size = New System.Drawing.Size(100, 20)
        Me.txtUidVersionAkt.TabIndex = 16
+        Me.txtUidVersionAkt.Visible = False
        '
        'btnUidAkt
        '
-        Me.btnUidAkt.Location = New System.Drawing.Point(229, 144)
+        Me.btnUidAkt.Location = New System.Drawing.Point(756, 144)
        Me.btnUidAkt.Name = "btnUidAkt"
        Me.btnUidAkt.Size = New System.Drawing.Size(100, 23)
        Me.btnUidAkt.TabIndex = 15
        Me.btnUidAkt.Text = "Aktualisieren"
        Me.btnUidAkt.UseVisualStyleBackColor = True
+        Me.btnUidAkt.Visible = False
        '
        'btnDispoDetails
        '
-        Me.btnDispoDetails.Location = New System.Drawing.Point(395, 173)
+        Me.btnDispoDetails.Location = New System.Drawing.Point(227, 173)
        Me.btnDispoDetails.Name = "btnDispoDetails"
        Me.btnDispoDetails.Size = New System.Drawing.Size(100, 39)
        Me.btnDispoDetails.TabIndex = 24
@@ -256,7 +262,7 @@ Partial Class usrCntlProgramme
        'Label8
        '
        Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(392, 107)
+        Me.Label8.Location = New System.Drawing.Point(224, 107)
        Me.Label8.Name = "Label8"
        Me.Label8.Size = New System.Drawing.Size(86, 13)
        Me.Label8.TabIndex = 23
@@ -264,14 +270,14 @@ Partial Class usrCntlProgramme
        '
        'txtDispoVersionAkt
        '
-        Me.txtDispoVersionAkt.Location = New System.Drawing.Point(395, 123)
+        Me.txtDispoVersionAkt.Location = New System.Drawing.Point(227, 123)
        Me.txtDispoVersionAkt.Name = "txtDispoVersionAkt"
        Me.txtDispoVersionAkt.Size = New System.Drawing.Size(100, 20)
        Me.txtDispoVersionAkt.TabIndex = 22
        '
        'btnDispoAkt
        '
-        Me.btnDispoAkt.Location = New System.Drawing.Point(395, 144)
+        Me.btnDispoAkt.Location = New System.Drawing.Point(227, 144)
        Me.btnDispoAkt.Name = "btnDispoAkt"
        Me.btnDispoAkt.Size = New System.Drawing.Size(100, 23)
        Me.btnDispoAkt.TabIndex = 21
@@ -280,37 +286,41 @@ Partial Class usrCntlProgramme
        '
        'btnParkzeitDetails
        '
-        Me.btnParkzeitDetails.Location = New System.Drawing.Point(539, 173)
+        Me.btnParkzeitDetails.Location = New System.Drawing.Point(756, 388)
        Me.btnParkzeitDetails.Name = "btnParkzeitDetails"
        Me.btnParkzeitDetails.Size = New System.Drawing.Size(100, 39)
        Me.btnParkzeitDetails.TabIndex = 30
        Me.btnParkzeitDetails.Text = "Details"
        Me.btnParkzeitDetails.UseVisualStyleBackColor = True
+        Me.btnParkzeitDetails.Visible = False
        '
        'Label9
        '
        Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(536, 107)
+        Me.Label9.Location = New System.Drawing.Point(753, 322)
        Me.Label9.Name = "Label9"
        Me.Label9.Size = New System.Drawing.Size(86, 13)
        Me.Label9.TabIndex = 29
        Me.Label9.Text = "Aktuelle Version:"
+        Me.Label9.Visible = False
        '
        'txtParkzeitVersionAkt
        '
-        Me.txtParkzeitVersionAkt.Location = New System.Drawing.Point(539, 123)
+        Me.txtParkzeitVersionAkt.Location = New System.Drawing.Point(756, 338)
        Me.txtParkzeitVersionAkt.Name = "txtParkzeitVersionAkt"
        Me.txtParkzeitVersionAkt.Size = New System.Drawing.Size(100, 20)
        Me.txtParkzeitVersionAkt.TabIndex = 28
+        Me.txtParkzeitVersionAkt.Visible = False
        '
        'btnParkzeitAkt
        '
-        Me.btnParkzeitAkt.Location = New System.Drawing.Point(539, 144)
+        Me.btnParkzeitAkt.Location = New System.Drawing.Point(756, 359)
        Me.btnParkzeitAkt.Name = "btnParkzeitAkt"
        Me.btnParkzeitAkt.Size = New System.Drawing.Size(100, 23)
        Me.btnParkzeitAkt.TabIndex = 27
        Me.btnParkzeitAkt.Text = "Aktualisieren"
        Me.btnParkzeitAkt.UseVisualStyleBackColor = True
+        Me.btnParkzeitAkt.Visible = False
        '
        'btnAdminBerechtigungen
        '
@@ -323,16 +333,17 @@ Partial Class usrCntlProgramme
        '
        'btnUidBerechtigungen
        '
-        Me.btnUidBerechtigungen.Location = New System.Drawing.Point(229, 218)
+        Me.btnUidBerechtigungen.Location = New System.Drawing.Point(756, 218)
        Me.btnUidBerechtigungen.Name = "btnUidBerechtigungen"
        Me.btnUidBerechtigungen.Size = New System.Drawing.Size(100, 23)
        Me.btnUidBerechtigungen.TabIndex = 39
        Me.btnUidBerechtigungen.Text = "Berechtigungen"
        Me.btnUidBerechtigungen.UseVisualStyleBackColor = True
+        Me.btnUidBerechtigungen.Visible = False
        '
        'btnDispoBerechtigungen
        '
-        Me.btnDispoBerechtigungen.Location = New System.Drawing.Point(395, 218)
+        Me.btnDispoBerechtigungen.Location = New System.Drawing.Point(227, 218)
        Me.btnDispoBerechtigungen.Name = "btnDispoBerechtigungen"
        Me.btnDispoBerechtigungen.Size = New System.Drawing.Size(100, 23)
        Me.btnDispoBerechtigungen.TabIndex = 40
@@ -341,12 +352,13 @@ Partial Class usrCntlProgramme
        '
        'btnParkzeitBerechtigungen
        '
-        Me.btnParkzeitBerechtigungen.Location = New System.Drawing.Point(539, 218)
+        Me.btnParkzeitBerechtigungen.Location = New System.Drawing.Point(756, 433)
        Me.btnParkzeitBerechtigungen.Name = "btnParkzeitBerechtigungen"
        Me.btnParkzeitBerechtigungen.Size = New System.Drawing.Size(100, 23)
        Me.btnParkzeitBerechtigungen.TabIndex = 41
        Me.btnParkzeitBerechtigungen.Text = "Berechtigungen"
        Me.btnParkzeitBerechtigungen.UseVisualStyleBackColor = True
+        Me.btnParkzeitBerechtigungen.Visible = False
        '
        'btnAdd
        '
@@ -360,16 +372,17 @@ Partial Class usrCntlProgramme
        'PictureBox4
        '
        Me.PictureBox4.Image = Global.ADMIN.My.Resources.Resources.parkzeit
-        Me.PictureBox4.Location = New System.Drawing.Point(572, 41)
+        Me.PictureBox4.Location = New System.Drawing.Point(789, 256)
        Me.PictureBox4.Name = "PictureBox4"
        Me.PictureBox4.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox4.TabIndex = 7
        Me.PictureBox4.TabStop = False
+        Me.PictureBox4.Visible = False
        '
        'PictureBox3
        '
        Me.PictureBox3.Image = Global.ADMIN.My.Resources.Resources.dispo_ico
-        Me.PictureBox3.Location = New System.Drawing.Point(424, 41)
+        Me.PictureBox3.Location = New System.Drawing.Point(256, 41)
        Me.PictureBox3.Name = "PictureBox3"
        Me.PictureBox3.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox3.TabIndex = 5
@@ -378,11 +391,12 @@ Partial Class usrCntlProgramme
        'PictureBox2
        '
        Me.PictureBox2.Image = Global.ADMIN.My.Resources.Resources.uid_ico
-        Me.PictureBox2.Location = New System.Drawing.Point(262, 41)
+        Me.PictureBox2.Location = New System.Drawing.Point(789, 41)
        Me.PictureBox2.Name = "PictureBox2"
        Me.PictureBox2.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox2.TabIndex = 3
        Me.PictureBox2.TabStop = False
+        Me.PictureBox2.Visible = False
        '
        'PictureBox1
        '
@@ -448,6 +462,8 @@ Partial Class usrCntlProgramme
        '
        'PictureBox6
        '
+        Me.PictureBox6.BackgroundImage = Global.ADMIN.My.Resources.Resources.sdl_ico
+        Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.PictureBox6.Location = New System.Drawing.Point(256, 256)
        Me.PictureBox6.Name = "PictureBox6"
        Me.PictureBox6.Size = New System.Drawing.Size(34, 33)
@@ -520,7 +536,7 @@ Partial Class usrCntlProgramme
        'PictureBox8
        '
        Me.PictureBox8.Image = CType(resources.GetObject("PictureBox8.Image"), System.Drawing.Image)
-        Me.PictureBox8.Location = New System.Drawing.Point(417, 256)
+        Me.PictureBox8.Location = New System.Drawing.Point(574, 256)
        Me.PictureBox8.Name = "PictureBox8"
        Me.PictureBox8.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox8.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -531,7 +547,7 @@ Partial Class usrCntlProgramme
        '
        Me.Label23.AutoSize = True
        Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label23.Location = New System.Drawing.Point(377, 292)
+        Me.Label23.Location = New System.Drawing.Point(534, 292)
        Me.Label23.Name = "Label23"
        Me.Label23.Size = New System.Drawing.Size(112, 13)
        Me.Label23.TabIndex = 53
@@ -540,7 +556,7 @@ Partial Class usrCntlProgramme
        'Label24
        '
        Me.Label24.AutoSize = True
-        Me.Label24.Location = New System.Drawing.Point(368, 322)
+        Me.Label24.Location = New System.Drawing.Point(536, 322)
        Me.Label24.Name = "Label24"
        Me.Label24.Size = New System.Drawing.Size(86, 13)
        Me.Label24.TabIndex = 56
@@ -548,7 +564,7 @@ Partial Class usrCntlProgramme
        '
        'btnMonitoringDetails
        '
-        Me.btnMonitoringDetails.Location = New System.Drawing.Point(371, 388)
+        Me.btnMonitoringDetails.Location = New System.Drawing.Point(539, 388)
        Me.btnMonitoringDetails.Name = "btnMonitoringDetails"
        Me.btnMonitoringDetails.Size = New System.Drawing.Size(100, 39)
        Me.btnMonitoringDetails.TabIndex = 72
@@ -557,14 +573,14 @@ Partial Class usrCntlProgramme
        '
        'txtMonitoringVersionAkt
        '
-        Me.txtMonitoringVersionAkt.Location = New System.Drawing.Point(371, 338)
+        Me.txtMonitoringVersionAkt.Location = New System.Drawing.Point(539, 338)
        Me.txtMonitoringVersionAkt.Name = "txtMonitoringVersionAkt"
        Me.txtMonitoringVersionAkt.Size = New System.Drawing.Size(100, 20)
        Me.txtMonitoringVersionAkt.TabIndex = 73
        '
        'btnMonitoringAkt
        '
-        Me.btnMonitoringAkt.Location = New System.Drawing.Point(371, 359)
+        Me.btnMonitoringAkt.Location = New System.Drawing.Point(539, 359)
        Me.btnMonitoringAkt.Name = "btnMonitoringAkt"
        Me.btnMonitoringAkt.Size = New System.Drawing.Size(100, 23)
        Me.btnMonitoringAkt.TabIndex = 72
@@ -573,7 +589,7 @@ Partial Class usrCntlProgramme
        '
        'Button1
        '
-        Me.Button1.Location = New System.Drawing.Point(76, 604)
+        Me.Button1.Location = New System.Drawing.Point(76, 620)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(100, 39)
        Me.Button1.TabIndex = 76
@@ -584,7 +600,7 @@ Partial Class usrCntlProgramme
        '
        Me.Label10.AutoSize = True
        Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label10.Location = New System.Drawing.Point(93, 587)
+        Me.Label10.Location = New System.Drawing.Point(93, 603)
        Me.Label10.Name = "Label10"
        Me.Label10.Size = New System.Drawing.Size(72, 13)
        Me.Label10.TabIndex = 75
@@ -593,7 +609,7 @@ Partial Class usrCntlProgramme
        'PictureBox9
        '
        Me.PictureBox9.Image = Global.ADMIN.My.Resources.Resources.aviso_tv
-        Me.PictureBox9.Location = New System.Drawing.Point(111, 551)
+        Me.PictureBox9.Location = New System.Drawing.Point(111, 567)
        Me.PictureBox9.Name = "PictureBox9"
        Me.PictureBox9.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -602,7 +618,7 @@ Partial Class usrCntlProgramme
        '
        'Button2
        '
-        Me.Button2.Location = New System.Drawing.Point(229, 604)
+        Me.Button2.Location = New System.Drawing.Point(229, 620)
        Me.Button2.Name = "Button2"
        Me.Button2.Size = New System.Drawing.Size(100, 39)
        Me.Button2.TabIndex = 79
@@ -613,7 +629,7 @@ Partial Class usrCntlProgramme
        '
        Me.Label11.AutoSize = True
        Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label11.Location = New System.Drawing.Point(232, 587)
+        Me.Label11.Location = New System.Drawing.Point(232, 603)
        Me.Label11.Name = "Label11"
        Me.Label11.Size = New System.Drawing.Size(95, 13)
        Me.Label11.TabIndex = 78
@@ -622,7 +638,7 @@ Partial Class usrCntlProgramme
        'PictureBox10
        '
        Me.PictureBox10.Image = Global.ADMIN.My.Resources.Resources.dp_tv
-        Me.PictureBox10.Location = New System.Drawing.Point(262, 551)
+        Me.PictureBox10.Location = New System.Drawing.Point(262, 567)
        Me.PictureBox10.Name = "PictureBox10"
        Me.PictureBox10.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox10.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -631,32 +647,35 @@ Partial Class usrCntlProgramme
        '
        'Button3
        '
-        Me.Button3.Location = New System.Drawing.Point(391, 604)
+        Me.Button3.Location = New System.Drawing.Point(391, 620)
        Me.Button3.Name = "Button3"
        Me.Button3.Size = New System.Drawing.Size(100, 39)
        Me.Button3.TabIndex = 82
        Me.Button3.Text = "Details"
        Me.Button3.UseVisualStyleBackColor = True
+        Me.Button3.Visible = False
        '
        'Label12
        '
        Me.Label12.AutoSize = True
        Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label12.Location = New System.Drawing.Point(403, 587)
+        Me.Label12.Location = New System.Drawing.Point(403, 603)
        Me.Label12.Name = "Label12"
        Me.Label12.Size = New System.Drawing.Size(75, 13)
        Me.Label12.TabIndex = 81
        Me.Label12.Text = "Fahrerdaten"
+        Me.Label12.Visible = False
        '
        'PictureBox11
        '
        Me.PictureBox11.Image = Global.ADMIN.My.Resources.Resources.fd1
-        Me.PictureBox11.Location = New System.Drawing.Point(424, 551)
+        Me.PictureBox11.Location = New System.Drawing.Point(424, 567)
        Me.PictureBox11.Name = "PictureBox11"
        Me.PictureBox11.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox11.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
        Me.PictureBox11.TabIndex = 80
        Me.PictureBox11.TabStop = False
+        Me.PictureBox11.Visible = False
        '
        'Button7
        '
@@ -687,7 +706,7 @@ Partial Class usrCntlProgramme
        '
        'Button4
        '
-        Me.Button4.Location = New System.Drawing.Point(522, 604)
+        Me.Button4.Location = New System.Drawing.Point(522, 620)
        Me.Button4.Name = "Button4"
        Me.Button4.Size = New System.Drawing.Size(100, 39)
        Me.Button4.TabIndex = 96
@@ -698,7 +717,7 @@ Partial Class usrCntlProgramme
        '
        Me.Label13.AutoSize = True
        Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label13.Location = New System.Drawing.Point(519, 587)
+        Me.Label13.Location = New System.Drawing.Point(519, 603)
        Me.Label13.Name = "Label13"
        Me.Label13.Size = New System.Drawing.Size(104, 13)
        Me.Label13.TabIndex = 95
@@ -707,7 +726,7 @@ Partial Class usrCntlProgramme
        'PictureBox5
        '
        Me.PictureBox5.Image = Global.ADMIN.My.Resources.Resources.admin_monitoring
-        Me.PictureBox5.Location = New System.Drawing.Point(557, 551)
+        Me.PictureBox5.Location = New System.Drawing.Point(557, 567)
        Me.PictureBox5.Name = "PictureBox5"
        Me.PictureBox5.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -716,7 +735,7 @@ Partial Class usrCntlProgramme
        '
        'Button5
        '
-        Me.Button5.Location = New System.Drawing.Point(638, 604)
+        Me.Button5.Location = New System.Drawing.Point(638, 620)
        Me.Button5.Name = "Button5"
        Me.Button5.Size = New System.Drawing.Size(100, 39)
        Me.Button5.TabIndex = 99
@@ -727,7 +746,7 @@ Partial Class usrCntlProgramme
        '
        Me.Label14.AutoSize = True
        Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label14.Location = New System.Drawing.Point(653, 587)
+        Me.Label14.Location = New System.Drawing.Point(653, 603)
        Me.Label14.Name = "Label14"
        Me.Label14.Size = New System.Drawing.Size(74, 13)
        Me.Label14.TabIndex = 98
@@ -736,7 +755,7 @@ Partial Class usrCntlProgramme
        'PictureBox12
        '
        Me.PictureBox12.Image = Global.ADMIN.My.Resources.Resources.admin_monitoring
-        Me.PictureBox12.Location = New System.Drawing.Point(673, 551)
+        Me.PictureBox12.Location = New System.Drawing.Point(673, 567)
        Me.PictureBox12.Name = "PictureBox12"
        Me.PictureBox12.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox12.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -745,14 +764,14 @@ Partial Class usrCntlProgramme
        '
        'txtDokuVersionAkt
        '
-        Me.txtDokuVersionAkt.Location = New System.Drawing.Point(539, 338)
+        Me.txtDokuVersionAkt.Location = New System.Drawing.Point(373, 123)
        Me.txtDokuVersionAkt.Name = "txtDokuVersionAkt"
        Me.txtDokuVersionAkt.Size = New System.Drawing.Size(100, 20)
        Me.txtDokuVersionAkt.TabIndex = 105
        '
        'Button6
        '
-        Me.Button6.Location = New System.Drawing.Point(539, 359)
+        Me.Button6.Location = New System.Drawing.Point(373, 144)
        Me.Button6.Name = "Button6"
        Me.Button6.Size = New System.Drawing.Size(100, 23)
        Me.Button6.TabIndex = 103
@@ -761,7 +780,7 @@ Partial Class usrCntlProgramme
        '
        'Button10
        '
-        Me.Button10.Location = New System.Drawing.Point(539, 388)
+        Me.Button10.Location = New System.Drawing.Point(373, 173)
        Me.Button10.Name = "Button10"
        Me.Button10.Size = New System.Drawing.Size(100, 39)
        Me.Button10.TabIndex = 104
@@ -771,7 +790,7 @@ Partial Class usrCntlProgramme
        'Label15
        '
        Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(536, 322)
+        Me.Label15.Location = New System.Drawing.Point(370, 107)
        Me.Label15.Name = "Label15"
        Me.Label15.Size = New System.Drawing.Size(86, 13)
        Me.Label15.TabIndex = 102
@@ -781,7 +800,7 @@ Partial Class usrCntlProgramme
        '
        Me.Label16.AutoSize = True
        Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label16.Location = New System.Drawing.Point(545, 292)
+        Me.Label16.Location = New System.Drawing.Point(379, 77)
        Me.Label16.Name = "Label16"
        Me.Label16.Size = New System.Drawing.Size(88, 13)
        Me.Label16.TabIndex = 101
@@ -790,7 +809,7 @@ Partial Class usrCntlProgramme
        'PictureBox13
        '
        Me.PictureBox13.Image = Global.ADMIN.My.Resources.Resources.doku_sym
-        Me.PictureBox13.Location = New System.Drawing.Point(572, 256)
+        Me.PictureBox13.Location = New System.Drawing.Point(406, 41)
        Me.PictureBox13.Name = "PictureBox13"
        Me.PictureBox13.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox13.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -799,32 +818,35 @@ Partial Class usrCntlProgramme
        '
        'Button11
        '
-        Me.Button11.Location = New System.Drawing.Point(754, 604)
+        Me.Button11.Location = New System.Drawing.Point(754, 620)
        Me.Button11.Name = "Button11"
        Me.Button11.Size = New System.Drawing.Size(100, 39)
        Me.Button11.TabIndex = 108
        Me.Button11.Text = "Details"
        Me.Button11.UseVisualStyleBackColor = True
+        Me.Button11.UseWaitCursor = True
        '
        'Label17
        '
        Me.Label17.AutoSize = True
        Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label17.Location = New System.Drawing.Point(775, 587)
+        Me.Label17.Location = New System.Drawing.Point(775, 603)
        Me.Label17.Name = "Label17"
        Me.Label17.Size = New System.Drawing.Size(61, 13)
        Me.Label17.TabIndex = 107
        Me.Label17.Text = "RKSV DE"
+        Me.Label17.UseWaitCursor = True
        '
        'PictureBox14
        '
        Me.PictureBox14.Image = Global.ADMIN.My.Resources.Resources.admin_monitoring
-        Me.PictureBox14.Location = New System.Drawing.Point(789, 551)
+        Me.PictureBox14.Location = New System.Drawing.Point(789, 567)
        Me.PictureBox14.Name = "PictureBox14"
        Me.PictureBox14.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox14.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
        Me.PictureBox14.TabIndex = 106
        Me.PictureBox14.TabStop = False
+        Me.PictureBox14.UseWaitCursor = True
        '
        'Button12
        '
@@ -856,7 +878,7 @@ Partial Class usrCntlProgramme
        '
        'Button13
        '
-        Me.Button13.Location = New System.Drawing.Point(754, 309)
+        Me.Button13.Location = New System.Drawing.Point(539, 83)
        Me.Button13.Name = "Button13"
        Me.Button13.Size = New System.Drawing.Size(100, 39)
        Me.Button13.TabIndex = 114
@@ -867,7 +889,7 @@ Partial Class usrCntlProgramme
        '
        Me.Label20.AutoSize = True
        Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label20.Location = New System.Drawing.Point(766, 292)
+        Me.Label20.Location = New System.Drawing.Point(551, 66)
        Me.Label20.Name = "Label20"
        Me.Label20.Size = New System.Drawing.Size(79, 13)
        Me.Label20.TabIndex = 113
@@ -876,7 +898,7 @@ Partial Class usrCntlProgramme
        'PictureBox15
        '
        Me.PictureBox15.Image = Global.ADMIN.My.Resources.Resources.admin_monitoring
-        Me.PictureBox15.Location = New System.Drawing.Point(789, 256)
+        Me.PictureBox15.Location = New System.Drawing.Point(574, 30)
        Me.PictureBox15.Name = "PictureBox15"
        Me.PictureBox15.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox15.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -885,7 +907,7 @@ Partial Class usrCntlProgramme
        '
        'Button14
        '
-        Me.Button14.Location = New System.Drawing.Point(754, 417)
+        Me.Button14.Location = New System.Drawing.Point(539, 191)
        Me.Button14.Name = "Button14"
        Me.Button14.Size = New System.Drawing.Size(100, 39)
        Me.Button14.TabIndex = 117
@@ -896,7 +918,7 @@ Partial Class usrCntlProgramme
        '
        Me.Label25.AutoSize = True
        Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label25.Location = New System.Drawing.Point(766, 400)
+        Me.Label25.Location = New System.Drawing.Point(551, 174)
        Me.Label25.Name = "Label25"
        Me.Label25.Size = New System.Drawing.Size(107, 13)
        Me.Label25.TabIndex = 116
@@ -905,7 +927,7 @@ Partial Class usrCntlProgramme
        'PictureBox16
        '
        Me.PictureBox16.Image = Global.ADMIN.My.Resources.Resources.admin_monitoring
-        Me.PictureBox16.Location = New System.Drawing.Point(789, 364)
+        Me.PictureBox16.Location = New System.Drawing.Point(574, 138)
        Me.PictureBox16.Name = "PictureBox16"
        Me.PictureBox16.Size = New System.Drawing.Size(34, 33)
        Me.PictureBox16.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
--- a/UID/Programme/usrCntlProgramme.resx
+++ b/UID/Programme/usrCntlProgramme.resx
@@ -121,89 +121,87 @@
  <data name="PictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC
-        RRoDQbBYEItAFLQwksJi9Qy5j8ljG5vdZgdmd959M3fuzEaspAVbKaAUUApYE/CzWJjH9h/cn+M46y4I
-        eBuN0ptq1XzcaKzQ1GLhD/V6OhsODectnFoI72u1UM85jpWrWvAgYNrphCSIMBXS+LnXMxwHT/r9kP86
-        GKyd4dJAPtaZXA1pApbzuV1Crolp8pUkFj+2WpaMCM4QkocwzhKnM4LwOOZePRCCmQCp50ICPieTsCru
-        MW0JAdoKZ23GC4xjeOOtYSZAyr1TqALeFKiRPo3/HZAj8Ww0jhGhjeIMaAJEwpoh9lODqQCnOSSI4ww5
-        GAMoxrE41sTipBdWoRBC3hgXOqOSWK4i5WDkqBZMk8WxasUrC38FRVkpoBRQvIDKZjMt1DPBPD0TzNN5
-        JC8zc+Kt3UP7Njv73fT0/NpibxvbB5brbXg7DoSqx+AQPhpPV+jfP7+/enjsjgcEi++lAZOnJBBSJNw7
-        mHJ4YyKkRgLb3TPDLq7u7IygvfaxxQxnfDw06dHJpb2ZApxG3sAh8UaOyESuHBqDz98/TJjfKL2CABV6
-        MibCRCKXSJr4zeHxp6GpcJwavw2r46FmkGmVrC82hIqAPOUgStNpe/7zUUeMSaQ1x0NQlGeCeXommJs3
-        01+wb33MpfBz/gAAAABJRU5ErkJggg==
+        vQAADr0BR/uQrQAAAf9JREFUWEftlLFKQ2EMhQt9F6GzbyAuvoEdXF0sTq4tPkDtLGInB8Hi5GAXEYXi
+        0MVCERwuiEOhCjpY6eBw5QucEP9OLvd2aCC9+c9NTk7yt63kJVslBYq2lYCVgOUS8DObmaf2Hzye0zg9
+        Yy7gbTDIb6pV82G97onEwh82N/NJv284T+HUQnhfq3k95zRWrmrBXcC41fIkiDAV0vi50zEcB8+6Xc9/
+        7fX+nOHSQDHWmVwNaQLm06k31sQ0+coyix8bDUtGhKYgD2GcJU5nBOFpzHv1QIgLkHpeSMDnaOSr4n3c
+        EgK0FQnHo8A0hjfdmguQ8ugUqoAnBfEKwOP3QGslZqNpjAhtFGdAEyAS1gxxnBosiqI5JLpTyLV6xfr+
+        pLEmFqf/CiiEkCfGC51RSSxXkXIwclQLpsnSWLXilS3XH1EZthKwElCprO/mpfoCULQvAEU7H9nLxJx4
+        Y+fQ7mZ7v52fnl+nV5avbR1YbrT+7dAJVY/BIXwwHDtOPTwuAILZ99yA0VPmhBQJjw6mHJ6YCKmRwGb7
+        zLCLqzsXtNc8tpjhXIAmPTq5tCdTqFE0cEiikSMykSuHxuDT9w8TFjdKLxegwkjGRJFELpE0iZvD06uh
+        qXCcmrgNF6BmkGmVrC81hIqAPOUgStNpe/H6qNM2JdKHitOV4gtA0b4AFOy/sG99zEhMXo4AAAAASUVO
+        RK5CYII=
 </value>
  </data>
  <data name="PictureBox8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        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
-        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
-        XzDi29KunwAAAABJRU5ErkJggg==
+        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
 </value>
  </data>
 </root>