AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Jonathan Jenne 2019-02-27 11:52:44 +01:00
parent 3d64eb6eef
commit 667b8f1b2f
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DDMonorepo.sln
View File

@ -63,8 +63,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMService", "SERVICES\DD
EndProject EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIFileOps", "EDMI_FILE_OPs\EDMIFileOps.vbproj", "{5B1171DC-FFFE-4813-A20D-786AAE47B320}" Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIFileOps", "EDMI_FILE_OPs\EDMIFileOps.vbproj", "{5B1171DC-FFFE-4813-A20D-786AAE47B320}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientSuiteTest", "DXApplication1\ClientSuiteTest\ClientSuiteTest.csproj", "{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "DDLicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}" Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "DDLicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}"
EndProject EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "License", "Modules.License\License.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}" Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "License", "Modules.License\License.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}"
@ -159,10 +157,6 @@ Global
{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.Build.0 = Debug|Any CPU {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.ActiveCfg = Release|Any CPU {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.Build.0 = Release|Any CPU {5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.Build.0 = Release|Any CPU
{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}.Release|Any CPU.Build.0 = Release|Any CPU
{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.Build.0 = Debug|Any CPU {CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.ActiveCfg = Release|Any CPU {CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -197,7 +191,6 @@ Global
{406C95F4-9FEA-45B6-8385-1768CDBBF1A7} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {406C95F4-9FEA-45B6-8385-1768CDBBF1A7} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
{A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
{5B1171DC-FFFE-4813-A20D-786AAE47B320} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {5B1171DC-FFFE-4813-A20D-786AAE47B320} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
{221FDADA-D849-4036-A7CE-D1FC1D67E1FA} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
{5EBACBFA-F11A-4BBF-8D02-91461F2293ED} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {5EBACBFA-F11A-4BBF-8D02-91461F2293ED} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
EndGlobalSection EndGlobalSection

4
EDMI_ClientSuite/ClassErrorHandler.vb
View File

@ -15,13 +15,13 @@ Public Class ClassErrorHandler
oMessage &= $"Form: {oFormName}{vbNewLine}" oMessage &= $"Form: {oFormName}{vbNewLine}"
oMessage &= $"Method: {oMethodName}{vbNewLine}" oMessage &= $"Method: {oMethodName}{vbNewLine}"
oMessage &= $"{Exception.Message}{vbNewLine}{Exception.StackTrace}{vbNewLine}{vbNewLine}" oMessage &= $"{Exception.Message}{vbNewLine}"
oMessage &= $"{Exception.StackTrace}{vbNewLine}{vbNewLine}"
oMessage &= $"Please report this error to error@digitaldata.works" oMessage &= $"Please report this error to error@digitaldata.works"
Return oMessage Return oMessage
End Function End Function
Public Sub ShowErrorMessage(Exception As Exception) Public Sub ShowErrorMessage(Exception As Exception)
_Logger.Error(Exception) _Logger.Error(Exception)
MsgBox(GetMessage(Exception), MsgBoxStyle.Critical, "Unexpected Error") MsgBox(GetMessage(Exception), MsgBoxStyle.Critical, "Unexpected Error")

1
EDMI_ClientSuite/ClassUIConfig.vb
View File

@ -3,7 +3,6 @@
Public Class ClassUIConfig Public Class ClassUIConfig
Public Property SkinName As String = "Office 2016 Colorful" Public Property SkinName As String = "Office 2016 Colorful"
'Public Property EditFormConfigs As New List(Of KeyValuePair(Of String, EditFormConfig))
Public Property EditFormConfigs As New List(Of EditFormConfig) Public Property EditFormConfigs As New List(Of EditFormConfig)
Public Class EditFormConfig Public Class EditFormConfig

11
EDMI_ClientSuite/FormDefaults/BaseForm.vb
View File

@ -18,11 +18,16 @@ Public Class BaseForm
Protected ReadOnly _ErrorHandler As ClassErrorHandler Protected ReadOnly _ErrorHandler As ClassErrorHandler
Public Sub New() Public Sub New()
Dim oClassName = [GetType]().Name ' Get the full name of the inheriting form
' so the log messages have the right classname
Dim oClassName = [GetType]().FullName
' My.LogConfig is undefined in the designer ' My.LogConfig is undefined in the designer
' so we need to check with ?
_Logger = My.LogConfig?.GetLogger(oClassName) _Logger = My.LogConfig?.GetLogger(oClassName)
_ErrorHandler = New ClassErrorHandler(_Logger) _ErrorHandler = New ClassErrorHandler(_Logger)
' When you add something, be careful if it
' depends on a global var like My.LogConfig
' you might need to check for its existence with ?
End Sub End Sub
End Class End Class

11
EDMI_ClientSuite/FormDefaults/BaseRibbonForm.vb
View File

@ -18,12 +18,17 @@ Public Class BaseRibbonForm
Protected ReadOnly _ErrorHandler As ClassErrorHandler Protected ReadOnly _ErrorHandler As ClassErrorHandler
Public Sub New() Public Sub New()
Dim oClassName = [GetType]().Name ' Get the full name of the inheriting form
' so the log messages have the right classname
Dim oClassName = [GetType]().FullName
' My.LogConfig is undefined in the designer ' My.LogConfig is undefined in the designer
' so we need to check with ?
_Logger = My.LogConfig?.GetLogger(oClassName) _Logger = My.LogConfig?.GetLogger(oClassName)
_ErrorHandler = New ClassErrorHandler(_Logger) _ErrorHandler = New ClassErrorHandler(_Logger)
' When you add something, be careful if it
' depends on a global var like My.LogConfig
' you might need to check for its existence with ?
End Sub End Sub
End Class End Class