Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator
This commit is contained in:
commit
4cd39c6c5c
@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
|
|||||||
<Assembly: AssemblyCompany("Digital Data")>
|
<Assembly: AssemblyCompany("Digital Data")>
|
||||||
<Assembly: AssemblyProduct("Envelope Generator")>
|
<Assembly: AssemblyProduct("Envelope Generator")>
|
||||||
<Assembly: AssemblyCopyright("Copyright © 2024")>
|
<Assembly: AssemblyCopyright("Copyright © 2024")>
|
||||||
<Assembly: AssemblyTrademark("2.4.4.2")>
|
<Assembly: AssemblyTrademark("2.4.5.0")>
|
||||||
<Assembly: AssemblyCulture("")>
|
<Assembly: AssemblyCulture("")>
|
||||||
|
|
||||||
' Setting ComVisible to false makes the types in this assembly not visible
|
' Setting ComVisible to false makes the types in this assembly not visible
|
||||||
@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' You can specify all the values or you can default the Build and Revision Numbers
|
' You can specify all the values or you can default the Build and Revision Numbers
|
||||||
' by using the '*' as shown below:
|
' by using the '*' as shown below:
|
||||||
' [assembly: AssemblyVersion("1.0.*")]
|
' [assembly: AssemblyVersion("1.0.*")]
|
||||||
<Assembly: AssemblyVersion("2.4.4.2")>
|
<Assembly: AssemblyVersion("2.4.5.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||||
|
|||||||
@ -90,7 +90,9 @@ Public Class frmSplashScreen
|
|||||||
Thread.Sleep(300)
|
Thread.Sleep(300)
|
||||||
|
|
||||||
' This checks for module access and admin rights
|
' This checks for module access and admin rights
|
||||||
oUserModel.CheckUserLogin(oUser)
|
If oUser IsNot Nothing Then
|
||||||
|
oUserModel.CheckUserLogin(oUser)
|
||||||
|
End If
|
||||||
|
|
||||||
Worker.ReportProgress(100, "Starting Application")
|
Worker.ReportProgress(100, "Starting Application")
|
||||||
Thread.Sleep(300)
|
Thread.Sleep(300)
|
||||||
@ -113,6 +115,10 @@ Public Class frmSplashScreen
|
|||||||
|
|
||||||
Dim oState As State = DirectCast(e.Result, State)
|
Dim oState As State = DirectCast(e.Result, State)
|
||||||
|
|
||||||
|
If oState.User Is Nothing Or oState.UserId = 0 Then
|
||||||
|
Throw New ApplicationException($"User {Environment.UserName} is unknown. Please contact your administrator. Application will close!")
|
||||||
|
End If
|
||||||
|
|
||||||
Dim oCultureInfo As CultureInfo
|
Dim oCultureInfo As CultureInfo
|
||||||
oCultureInfo = New CultureInfo(oState.User.Language)
|
oCultureInfo = New CultureInfo(oState.User.Language)
|
||||||
Thread.CurrentThread.CurrentCulture = oCultureInfo
|
Thread.CurrentThread.CurrentCulture = oCultureInfo
|
||||||
@ -143,7 +149,4 @@ Public Class frmSplashScreen
|
|||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
End Class
|
End Class
|
||||||
Loading…
x
Reference in New Issue
Block a user