Version 1.0.2.0

This commit is contained in:
Jonathan Jenne 2020-07-02 11:36:39 +02:00
parent 36bbac5e5d
commit 30c3c907fd
3 changed files with 41 additions and 35 deletions

View File

@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("UserManager")>
<Assembly: AssemblyCopyright("Copyright © 2019")>
<Assembly: AssemblyTrademark("")>
<Assembly: AssemblyCopyright("Copyright © 2020")>
<Assembly: AssemblyTrademark("1020")>
<Assembly: ComVisible(False)>
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.1.0")>
<Assembly: AssemblyVersion("1.0.2.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -911,7 +911,7 @@ Partial Class frmMain
Me.SplitContainer2.Panel2.Controls.Add(Me.listClients)
Me.SplitContainer2.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No
Me.SplitContainer2.Size = New System.Drawing.Size(797, 374)
Me.SplitContainer2.SplitterDistance = 180
Me.SplitContainer2.SplitterDistance = 179
Me.SplitContainer2.TabIndex = 63
'
'Label8
@ -1506,7 +1506,7 @@ Partial Class frmMain
Me.tabClientAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabClientAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.tabClientAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20)
Me.tabClientAssign.Name = "tabClientAssign"
Me.tabClientAssign.Size = New System.Drawing.Size(1191, 352)
Me.tabClientAssign.Size = New System.Drawing.Size(1195, 348)
Me.tabClientAssign.Text = "Mandanten Zuordnung"
'
'SplitContainer4
@ -1527,8 +1527,8 @@ Partial Class frmMain
Me.SplitContainer4.Panel2.Controls.Add(Me.Panel4)
Me.SplitContainer4.Panel2.Controls.Add(Me.Panel5)
Me.SplitContainer4.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No
Me.SplitContainer4.Size = New System.Drawing.Size(1191, 352)
Me.SplitContainer4.SplitterDistance = 435
Me.SplitContainer4.Size = New System.Drawing.Size(1195, 348)
Me.SplitContainer4.SplitterDistance = 436
Me.SplitContainer4.TabIndex = 0
'
'Panel6
@ -1540,7 +1540,7 @@ Partial Class frmMain
Me.Panel6.Controls.Add(Me.Label7)
Me.Panel6.Location = New System.Drawing.Point(0, 0)
Me.Panel6.Name = "Panel6"
Me.Panel6.Size = New System.Drawing.Size(321, 352)
Me.Panel6.Size = New System.Drawing.Size(322, 348)
Me.Panel6.TabIndex = 12
'
'gridClients_AvailableUsers
@ -1550,7 +1550,7 @@ Partial Class frmMain
Me.gridClients_AvailableUsers.Location = New System.Drawing.Point(0, 30)
Me.gridClients_AvailableUsers.MainView = Me.viewClients_AvailableUsers
Me.gridClients_AvailableUsers.Name = "gridClients_AvailableUsers"
Me.gridClients_AvailableUsers.Size = New System.Drawing.Size(321, 322)
Me.gridClients_AvailableUsers.Size = New System.Drawing.Size(322, 318)
Me.gridClients_AvailableUsers.TabIndex = 0
Me.gridClients_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AvailableUsers})
'
@ -1606,7 +1606,7 @@ Partial Class frmMain
Me.Label7.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label7.Location = New System.Drawing.Point(0, 0)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(321, 30)
Me.Label7.Size = New System.Drawing.Size(322, 30)
Me.Label7.TabIndex = 2
Me.Label7.Text = "Nicht zugeordnete Benutzer:"
Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@ -1616,7 +1616,7 @@ Partial Class frmMain
Me.btnClients_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnClients_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right
Me.btnClients_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnClients_AddUsers.Location = New System.Drawing.Point(329, 108)
Me.btnClients_AddUsers.Location = New System.Drawing.Point(330, 108)
Me.btnClients_AddUsers.Name = "btnClients_AddUsers"
Me.btnClients_AddUsers.Size = New System.Drawing.Size(103, 50)
Me.btnClients_AddUsers.TabIndex = 11
@ -1628,7 +1628,7 @@ Partial Class frmMain
Me.btnClients_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnClients_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red
Me.btnClients_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnClients_RemoveUsers.Location = New System.Drawing.Point(330, 164)
Me.btnClients_RemoveUsers.Location = New System.Drawing.Point(331, 164)
Me.btnClients_RemoveUsers.Name = "btnClients_RemoveUsers"
Me.btnClients_RemoveUsers.Size = New System.Drawing.Size(103, 50)
Me.btnClients_RemoveUsers.TabIndex = 10
@ -1642,7 +1642,7 @@ Partial Class frmMain
Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel4.Location = New System.Drawing.Point(326, 0)
Me.Panel4.Name = "Panel4"
Me.Panel4.Size = New System.Drawing.Size(426, 352)
Me.Panel4.Size = New System.Drawing.Size(429, 348)
Me.Panel4.TabIndex = 0
'
'gridClients_AssignedUsers
@ -1652,7 +1652,7 @@ Partial Class frmMain
Me.gridClients_AssignedUsers.Location = New System.Drawing.Point(0, 30)
Me.gridClients_AssignedUsers.MainView = Me.viewClients_AssignedUsers
Me.gridClients_AssignedUsers.Name = "gridClients_AssignedUsers"
Me.gridClients_AssignedUsers.Size = New System.Drawing.Size(426, 322)
Me.gridClients_AssignedUsers.Size = New System.Drawing.Size(429, 318)
Me.gridClients_AssignedUsers.TabIndex = 0
Me.gridClients_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AssignedUsers})
'
@ -1709,7 +1709,7 @@ Partial Class frmMain
Me.labelClients_AssignedUsers.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.labelClients_AssignedUsers.Location = New System.Drawing.Point(0, 0)
Me.labelClients_AssignedUsers.Name = "labelClients_AssignedUsers"
Me.labelClients_AssignedUsers.Size = New System.Drawing.Size(426, 30)
Me.labelClients_AssignedUsers.Size = New System.Drawing.Size(429, 30)
Me.labelClients_AssignedUsers.TabIndex = 2
Me.labelClients_AssignedUsers.Text = "Zugeordnete Benutzer zu Mandant {0}:"
Me.labelClients_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@ -1721,7 +1721,7 @@ Partial Class frmMain
Me.Panel5.Dock = System.Windows.Forms.DockStyle.Left
Me.Panel5.Location = New System.Drawing.Point(0, 0)
Me.Panel5.Name = "Panel5"
Me.Panel5.Size = New System.Drawing.Size(326, 352)
Me.Panel5.Size = New System.Drawing.Size(326, 348)
Me.Panel5.TabIndex = 1
'
'gridClients_AllClients
@ -1731,7 +1731,7 @@ Partial Class frmMain
Me.gridClients_AllClients.Location = New System.Drawing.Point(0, 30)
Me.gridClients_AllClients.MainView = Me.viewClients_AllClients
Me.gridClients_AllClients.Name = "gridClients_AllClients"
Me.gridClients_AllClients.Size = New System.Drawing.Size(326, 322)
Me.gridClients_AllClients.Size = New System.Drawing.Size(326, 318)
Me.gridClients_AllClients.TabIndex = 0
Me.gridClients_AllClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewClients_AllClients})
'
@ -1789,7 +1789,7 @@ Partial Class frmMain
Me.tabModuleAssign.ImageOptions.SvgImage = CType(resources.GetObject("tabModuleAssign.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.tabModuleAssign.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20)
Me.tabModuleAssign.Name = "tabModuleAssign"
Me.tabModuleAssign.Size = New System.Drawing.Size(1191, 352)
Me.tabModuleAssign.Size = New System.Drawing.Size(1195, 348)
Me.tabModuleAssign.Text = "Modul Zuordnung"
'
'SplitContainer6
@ -1810,8 +1810,8 @@ Partial Class frmMain
Me.SplitContainer6.Panel2.Controls.Add(Me.Panel8)
Me.SplitContainer6.Panel2.Controls.Add(Me.Panel7)
Me.SplitContainer6.Panel2.RightToLeft = System.Windows.Forms.RightToLeft.No
Me.SplitContainer6.Size = New System.Drawing.Size(1191, 352)
Me.SplitContainer6.SplitterDistance = 435
Me.SplitContainer6.Size = New System.Drawing.Size(1195, 348)
Me.SplitContainer6.SplitterDistance = 436
Me.SplitContainer6.TabIndex = 0
'
'btnModules_AddUsers
@ -1819,7 +1819,7 @@ Partial Class frmMain
Me.btnModules_AddUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnModules_AddUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_right
Me.btnModules_AddUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnModules_AddUsers.Location = New System.Drawing.Point(329, 108)
Me.btnModules_AddUsers.Location = New System.Drawing.Point(330, 108)
Me.btnModules_AddUsers.Name = "btnModules_AddUsers"
Me.btnModules_AddUsers.Size = New System.Drawing.Size(103, 50)
Me.btnModules_AddUsers.TabIndex = 13
@ -1831,7 +1831,7 @@ Partial Class frmMain
Me.btnModules_RemoveUsers.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnModules_RemoveUsers.Image = Global.DDUserManager.My.Resources.Resources.arrow_left_red
Me.btnModules_RemoveUsers.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnModules_RemoveUsers.Location = New System.Drawing.Point(330, 164)
Me.btnModules_RemoveUsers.Location = New System.Drawing.Point(331, 164)
Me.btnModules_RemoveUsers.Name = "btnModules_RemoveUsers"
Me.btnModules_RemoveUsers.Size = New System.Drawing.Size(103, 50)
Me.btnModules_RemoveUsers.TabIndex = 12
@ -1847,7 +1847,7 @@ Partial Class frmMain
Me.Panel9.Controls.Add(Me.Label10)
Me.Panel9.Location = New System.Drawing.Point(0, 0)
Me.Panel9.Name = "Panel9"
Me.Panel9.Size = New System.Drawing.Size(321, 352)
Me.Panel9.Size = New System.Drawing.Size(322, 348)
Me.Panel9.TabIndex = 9
'
'gridModules_AvailableUsers
@ -1857,7 +1857,7 @@ Partial Class frmMain
Me.gridModules_AvailableUsers.Location = New System.Drawing.Point(0, 30)
Me.gridModules_AvailableUsers.MainView = Me.viewModules_AvailableUsers
Me.gridModules_AvailableUsers.Name = "gridModules_AvailableUsers"
Me.gridModules_AvailableUsers.Size = New System.Drawing.Size(321, 322)
Me.gridModules_AvailableUsers.Size = New System.Drawing.Size(322, 318)
Me.gridModules_AvailableUsers.TabIndex = 6
Me.gridModules_AvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AvailableUsers, Me.GridView8})
'
@ -1919,7 +1919,7 @@ Partial Class frmMain
Me.Label10.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label10.Location = New System.Drawing.Point(0, 0)
Me.Label10.Name = "Label10"
Me.Label10.Size = New System.Drawing.Size(321, 30)
Me.Label10.Size = New System.Drawing.Size(322, 30)
Me.Label10.TabIndex = 8
Me.Label10.Text = "Nicht zugeordnete Benutzer:"
Me.Label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@ -1931,7 +1931,7 @@ Partial Class frmMain
Me.Panel8.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel8.Location = New System.Drawing.Point(326, 0)
Me.Panel8.Name = "Panel8"
Me.Panel8.Size = New System.Drawing.Size(426, 352)
Me.Panel8.Size = New System.Drawing.Size(429, 348)
Me.Panel8.TabIndex = 10
'
'gridModules_AssignedUsers
@ -1941,7 +1941,7 @@ Partial Class frmMain
Me.gridModules_AssignedUsers.Location = New System.Drawing.Point(0, 30)
Me.gridModules_AssignedUsers.MainView = Me.viewModules_AssignedUsers
Me.gridModules_AssignedUsers.Name = "gridModules_AssignedUsers"
Me.gridModules_AssignedUsers.Size = New System.Drawing.Size(426, 322)
Me.gridModules_AssignedUsers.Size = New System.Drawing.Size(429, 318)
Me.gridModules_AssignedUsers.TabIndex = 6
Me.gridModules_AssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AssignedUsers, Me.GridView10})
'
@ -2003,7 +2003,7 @@ Partial Class frmMain
Me.labelModules_AssignedUsers.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.labelModules_AssignedUsers.Location = New System.Drawing.Point(0, 0)
Me.labelModules_AssignedUsers.Name = "labelModules_AssignedUsers"
Me.labelModules_AssignedUsers.Size = New System.Drawing.Size(426, 30)
Me.labelModules_AssignedUsers.Size = New System.Drawing.Size(429, 30)
Me.labelModules_AssignedUsers.TabIndex = 8
Me.labelModules_AssignedUsers.Text = "Zugeordnete Benutzer zu Modul {0}:"
Me.labelModules_AssignedUsers.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@ -2015,7 +2015,7 @@ Partial Class frmMain
Me.Panel7.Dock = System.Windows.Forms.DockStyle.Left
Me.Panel7.Location = New System.Drawing.Point(0, 0)
Me.Panel7.Name = "Panel7"
Me.Panel7.Size = New System.Drawing.Size(326, 352)
Me.Panel7.Size = New System.Drawing.Size(326, 348)
Me.Panel7.TabIndex = 9
'
'gridModules_AllModules
@ -2025,7 +2025,7 @@ Partial Class frmMain
Me.gridModules_AllModules.Location = New System.Drawing.Point(0, 30)
Me.gridModules_AllModules.MainView = Me.viewModules_AllModules
Me.gridModules_AllModules.Name = "gridModules_AllModules"
Me.gridModules_AllModules.Size = New System.Drawing.Size(326, 322)
Me.gridModules_AllModules.Size = New System.Drawing.Size(326, 318)
Me.gridModules_AllModules.TabIndex = 7
Me.gridModules_AllModules.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewModules_AllModules})
'
@ -2207,7 +2207,7 @@ Partial Class frmMain
Me.tabPageGroups.ImageOptions.SvgImage = CType(resources.GetObject("tabPageGroups.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.tabPageGroups.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20)
Me.tabPageGroups.Name = "tabPageGroups"
Me.tabPageGroups.Size = New System.Drawing.Size(1197, 787)
Me.tabPageGroups.Size = New System.Drawing.Size(1197, 783)
Me.tabPageGroups.Text = "Gruppen"
'
'SplitContainer3
@ -3028,7 +3028,7 @@ Partial Class frmMain
Me.tabPageClients.ImageOptions.SvgImage = CType(resources.GetObject("tabPageClients.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.tabPageClients.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20)
Me.tabPageClients.Name = "tabPageClients"
Me.tabPageClients.Size = New System.Drawing.Size(1197, 787)
Me.tabPageClients.Size = New System.Drawing.Size(1197, 783)
Me.tabPageClients.Text = "Mandanten"
'
'Panel17
@ -3054,7 +3054,7 @@ Partial Class frmMain
Me.Panel17.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel17.Location = New System.Drawing.Point(400, 25)
Me.Panel17.Name = "Panel17"
Me.Panel17.Size = New System.Drawing.Size(797, 762)
Me.Panel17.Size = New System.Drawing.Size(797, 758)
Me.Panel17.TabIndex = 20
'
'Label18
@ -3153,7 +3153,7 @@ Partial Class frmMain
Me.gridClients.Location = New System.Drawing.Point(0, 25)
Me.gridClients.MainView = Me.GridView4
Me.gridClients.Name = "gridClients"
Me.gridClients.Size = New System.Drawing.Size(400, 762)
Me.gridClients.Size = New System.Drawing.Size(400, 758)
Me.gridClients.TabIndex = 19
Me.gridClients.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4})
'
@ -3536,7 +3536,7 @@ Partial Class frmMain
Me.tabPageSettings.ImageOptions.SvgImage = CType(resources.GetObject("tabPageSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.tabPageSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(20, 20)
Me.tabPageSettings.Name = "tabPageSettings"
Me.tabPageSettings.Size = New System.Drawing.Size(1197, 787)
Me.tabPageSettings.Size = New System.Drawing.Size(1197, 783)
Me.tabPageSettings.Text = "Einstellungen"
'
'Button2

View File

@ -26,7 +26,12 @@ Public Class frmMain
MyLogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName)
MyLogger = MyLogConfig.GetLogger()
MyConfig = New ConfigManager(Of UserConfig)(MyLogConfig, Application.CommonAppDataPath, Application.CommonAppDataPath)
Catch ex As Exception
MsgBox($"Unexpected error while setting up logging! Exiting.{vbNewLine}{vbNewLine}Message:{ex.Message}{vbNewLine}Stacktrace:{vbNewLine}{ex.StackTrace}", MsgBoxStyle.Critical, Text)
Application.Exit()
End Try
Try
LoadConfig(MyConfig)
CurrentVersion = Assembly.GetEntryAssembly().GetName().Version.ToString()
@ -126,6 +131,7 @@ Public Class frmMain
Catch ex As Exception
MsgBox("Unexpected Error while loading. Please check the log.", MsgBoxStyle.Critical, "User Manager")
MyLogger.Error(ex, "Unexpected Error while loading.")
Application.ExitThread()
End Try
End Sub