diff --git a/MultiTool.Shared/BaseClass.vb b/MultiTool.Common/BaseClass.vb similarity index 100% rename from MultiTool.Shared/BaseClass.vb rename to MultiTool.Common/BaseClass.vb diff --git a/MultiTool.Shared/Config.vb b/MultiTool.Common/Config.vb similarity index 100% rename from MultiTool.Shared/Config.vb rename to MultiTool.Common/Config.vb diff --git a/MultiTool.Shared/Constants.vb b/MultiTool.Common/Constants.vb similarity index 100% rename from MultiTool.Shared/Constants.vb rename to MultiTool.Common/Constants.vb diff --git a/MultiTool.Shared/Documents/Document.vb b/MultiTool.Common/Documents/Document.vb similarity index 95% rename from MultiTool.Shared/Documents/Document.vb rename to MultiTool.Common/Documents/Document.vb index b8fcda2..1d8999e 100644 --- a/MultiTool.Shared/Documents/Document.vb +++ b/MultiTool.Common/Documents/Document.vb @@ -1,6 +1,6 @@ Imports System.IO -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Winline.Entities +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Winline.Entities Namespace Documents Public Class Document diff --git a/MultiTool.Shared/Documents/DocumentCleaner.vb b/MultiTool.Common/Documents/DocumentCleaner.vb similarity index 96% rename from MultiTool.Shared/Documents/DocumentCleaner.vb rename to MultiTool.Common/Documents/DocumentCleaner.vb index e87f2e4..cba43b0 100644 --- a/MultiTool.Shared/Documents/DocumentCleaner.vb +++ b/MultiTool.Common/Documents/DocumentCleaner.vb @@ -1,6 +1,6 @@ Imports System.IO Imports DigitalData.Modules.Logging -Imports MultiTool.Shared.Templates +Imports MultiTool.Common.Templates Namespace Documents Public Class DocumentCleaner diff --git a/MultiTool.Shared/Documents/DocumentLoader.vb b/MultiTool.Common/Documents/DocumentLoader.vb similarity index 99% rename from MultiTool.Shared/Documents/DocumentLoader.vb rename to MultiTool.Common/Documents/DocumentLoader.vb index e8bc105..6687534 100644 --- a/MultiTool.Shared/Documents/DocumentLoader.vb +++ b/MultiTool.Common/Documents/DocumentLoader.vb @@ -2,10 +2,10 @@ Imports System.Text.RegularExpressions Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Language -Imports MultiTool.Shared.Exceptions -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Winline -Imports MultiTool.Shared.Winline.Entities +Imports MultiTool.Common.Exceptions +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Winline +Imports MultiTool.Common.Winline.Entities Namespace Documents Public Class DocumentLoader diff --git a/MultiTool.Shared/Documents/DocumentRow.vb b/MultiTool.Common/Documents/DocumentRow.vb similarity index 100% rename from MultiTool.Shared/Documents/DocumentRow.vb rename to MultiTool.Common/Documents/DocumentRow.vb diff --git a/MultiTool.Shared/Documents/DocumentType.vb b/MultiTool.Common/Documents/DocumentType.vb similarity index 100% rename from MultiTool.Shared/Documents/DocumentType.vb rename to MultiTool.Common/Documents/DocumentType.vb diff --git a/MultiTool.Shared/Exceptions.vb b/MultiTool.Common/Exceptions.vb similarity index 100% rename from MultiTool.Shared/Exceptions.vb rename to MultiTool.Common/Exceptions.vb diff --git a/MultiTool.Shared/IDictionaryEx.vb b/MultiTool.Common/IDictionaryEx.vb similarity index 100% rename from MultiTool.Shared/IDictionaryEx.vb rename to MultiTool.Common/IDictionaryEx.vb diff --git a/MultiTool.Shared/IEnumerableEx.vb b/MultiTool.Common/IEnumerableEx.vb similarity index 100% rename from MultiTool.Shared/IEnumerableEx.vb rename to MultiTool.Common/IEnumerableEx.vb diff --git a/MultiTool.Shared/ImporterShared.vbproj.bak b/MultiTool.Common/ImporterShared.vbproj.bak similarity index 100% rename from MultiTool.Shared/ImporterShared.vbproj.bak rename to MultiTool.Common/ImporterShared.vbproj.bak diff --git a/MultiTool.Shared/Mapper.vb b/MultiTool.Common/Mapper.vb similarity index 99% rename from MultiTool.Shared/Mapper.vb rename to MultiTool.Common/Mapper.vb index c971527..e1d65d7 100644 --- a/MultiTool.Shared/Mapper.vb +++ b/MultiTool.Common/Mapper.vb @@ -3,7 +3,7 @@ Imports System.Text.RegularExpressions Imports AutoMapper Imports AutoMapper.Configuration Imports DigitalData.Modules.Logging -Imports MultiTool.Shared.Documents.DocumentRow +Imports MultiTool.Common.Documents.DocumentRow Public Class Mapper Private MapperConfig As MapperConfiguration diff --git a/MultiTool.Shared/MultiTool.Shared.vbproj b/MultiTool.Common/MultiTool.Common.vbproj similarity index 94% rename from MultiTool.Shared/MultiTool.Shared.vbproj rename to MultiTool.Common/MultiTool.Common.vbproj index d448f4e..740841d 100644 --- a/MultiTool.Shared/MultiTool.Shared.vbproj +++ b/MultiTool.Common/MultiTool.Common.vbproj @@ -6,8 +6,8 @@ AnyCPU {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0} Library - MultiTool.Shared - MultiTool.Shared + MultiTool.Common + MultiTool.Common 512 Windows v4.6.1 @@ -19,7 +19,7 @@ true true bin\Debug\ - MultiTool.Shared.xml + MultiTool.Common.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -28,7 +28,7 @@ true true bin\Release\ - MultiTool.Shared.xml + MultiTool.Common.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -65,8 +65,9 @@ ..\..\DDMonorepo\Modules.Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll - - ..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll + + False + ..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll ..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll @@ -103,7 +104,6 @@ - diff --git a/MultiTool.Shared/MultiTool.Shared.vbproj.bak b/MultiTool.Common/MultiTool.Shared.vbproj.bak similarity index 100% rename from MultiTool.Shared/MultiTool.Shared.vbproj.bak rename to MultiTool.Common/MultiTool.Shared.vbproj.bak diff --git a/MultiTool.Shared/My Project/Application.Designer.vb b/MultiTool.Common/My Project/Application.Designer.vb similarity index 100% rename from MultiTool.Shared/My Project/Application.Designer.vb rename to MultiTool.Common/My Project/Application.Designer.vb diff --git a/MultiTool.Shared/My Project/Application.myapp b/MultiTool.Common/My Project/Application.myapp similarity index 100% rename from MultiTool.Shared/My Project/Application.myapp rename to MultiTool.Common/My Project/Application.myapp diff --git a/MultiTool.Shared/My Project/AssemblyInfo.vb b/MultiTool.Common/My Project/AssemblyInfo.vb similarity index 92% rename from MultiTool.Shared/My Project/AssemblyInfo.vb rename to MultiTool.Common/My Project/AssemblyInfo.vb index 2879e5c..decd321 100644 --- a/MultiTool.Shared/My Project/AssemblyInfo.vb +++ b/MultiTool.Common/My Project/AssemblyInfo.vb @@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - + - + diff --git a/MultiTool.Shared/My Project/Resources.Designer.vb b/MultiTool.Common/My Project/Resources.Designer.vb similarity index 98% rename from MultiTool.Shared/My Project/Resources.Designer.vb rename to MultiTool.Common/My Project/Resources.Designer.vb index 2a57fc0..51883d8 100644 --- a/MultiTool.Shared/My Project/Resources.Designer.vb +++ b/MultiTool.Common/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Shared.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MultiTool.Common.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan diff --git a/MultiTool.Shared/My Project/Resources.resx b/MultiTool.Common/My Project/Resources.resx similarity index 100% rename from MultiTool.Shared/My Project/Resources.resx rename to MultiTool.Common/My Project/Resources.resx diff --git a/MultiTool.Shared/My Project/Settings.Designer.vb b/MultiTool.Common/My Project/Settings.Designer.vb similarity index 96% rename from MultiTool.Shared/My Project/Settings.Designer.vb rename to MultiTool.Common/My Project/Settings.Designer.vb index fc42fb7..27e2706 100644 --- a/MultiTool.Shared/My Project/Settings.Designer.vb +++ b/MultiTool.Common/My Project/Settings.Designer.vb @@ -64,9 +64,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.MultiTool.[Shared].My.MySettings + Friend ReadOnly Property Settings() As Global.MultiTool.Common.My.MySettings Get - Return Global.MultiTool.[Shared].My.MySettings.Default + Return Global.MultiTool.Common.My.MySettings.Default End Get End Property End Module diff --git a/MultiTool.Shared/My Project/Settings.settings b/MultiTool.Common/My Project/Settings.settings similarity index 100% rename from MultiTool.Shared/My Project/Settings.settings rename to MultiTool.Common/My Project/Settings.settings diff --git a/MultiTool.Shared/Patterns.vb b/MultiTool.Common/Patterns.vb similarity index 97% rename from MultiTool.Shared/Patterns.vb rename to MultiTool.Common/Patterns.vb index 7bd4c13..472c87a 100644 --- a/MultiTool.Shared/Patterns.vb +++ b/MultiTool.Common/Patterns.vb @@ -1,8 +1,8 @@ Imports System.Text.RegularExpressions Imports DigitalData.Modules.Logging -Imports MultiTool.Shared.Documents -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Winline.Entities +Imports MultiTool.Common.Documents +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Winline.Entities Public Class Patterns Inherits BaseClass diff --git a/MultiTool.Shared/Report/ReportGenerator.vb b/MultiTool.Common/Report/ReportGenerator.vb similarity index 96% rename from MultiTool.Shared/Report/ReportGenerator.vb rename to MultiTool.Common/Report/ReportGenerator.vb index 36a7807..d0d81ff 100644 --- a/MultiTool.Shared/Report/ReportGenerator.vb +++ b/MultiTool.Common/Report/ReportGenerator.vb @@ -2,11 +2,11 @@ Imports DevExpress.XtraReports Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports MultiTool.Shared.Documents -Imports MultiTool.Shared.Documents.DocumentRow -Imports MultiTool.Shared.Report -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Winline.Entities +Imports MultiTool.Common.Documents +Imports MultiTool.Common.Documents.DocumentRow +Imports MultiTool.Common.Report +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Winline.Entities Public Class ReportGenerator(Of TReport As IReport) Inherits BaseClass diff --git a/MultiTool.Shared/Report/ReportHead.vb b/MultiTool.Common/Report/ReportHead.vb similarity index 100% rename from MultiTool.Shared/Report/ReportHead.vb rename to MultiTool.Common/Report/ReportHead.vb diff --git a/MultiTool.Shared/Report/ReportPosition.vb b/MultiTool.Common/Report/ReportPosition.vb similarity index 100% rename from MultiTool.Shared/Report/ReportPosition.vb rename to MultiTool.Common/Report/ReportPosition.vb diff --git a/MultiTool.Shared/Report/ReportSource.vb b/MultiTool.Common/Report/ReportSource.vb similarity index 100% rename from MultiTool.Shared/Report/ReportSource.vb rename to MultiTool.Common/Report/ReportSource.vb diff --git a/MultiTool.Shared/Serializer.vb b/MultiTool.Common/Serializer.vb similarity index 100% rename from MultiTool.Shared/Serializer.vb rename to MultiTool.Common/Serializer.vb diff --git a/MultiTool.Shared/Templates/GeneralConfig.vb b/MultiTool.Common/Templates/GeneralConfig.vb similarity index 100% rename from MultiTool.Shared/Templates/GeneralConfig.vb rename to MultiTool.Common/Templates/GeneralConfig.vb diff --git a/MultiTool.Shared/Templates/MandatorConfig.vb b/MultiTool.Common/Templates/MandatorConfig.vb similarity index 100% rename from MultiTool.Shared/Templates/MandatorConfig.vb rename to MultiTool.Common/Templates/MandatorConfig.vb diff --git a/MultiTool.Shared/Templates/MandatorConfigItem.vb b/MultiTool.Common/Templates/MandatorConfigItem.vb similarity index 100% rename from MultiTool.Shared/Templates/MandatorConfigItem.vb rename to MultiTool.Common/Templates/MandatorConfigItem.vb diff --git a/MultiTool.Shared/Templates/MappingConfig.vb b/MultiTool.Common/Templates/MappingConfig.vb similarity index 100% rename from MultiTool.Shared/Templates/MappingConfig.vb rename to MultiTool.Common/Templates/MappingConfig.vb diff --git a/MultiTool.Shared/Templates/MappingConfigItem.vb b/MultiTool.Common/Templates/MappingConfigItem.vb similarity index 100% rename from MultiTool.Shared/Templates/MappingConfigItem.vb rename to MultiTool.Common/Templates/MappingConfigItem.vb diff --git a/MultiTool.Shared/Templates/Template.vb b/MultiTool.Common/Templates/Template.vb similarity index 100% rename from MultiTool.Shared/Templates/Template.vb rename to MultiTool.Common/Templates/Template.vb diff --git a/MultiTool.Shared/Templates/TemplateConfig.vb b/MultiTool.Common/Templates/TemplateConfig.vb similarity index 93% rename from MultiTool.Shared/Templates/TemplateConfig.vb rename to MultiTool.Common/Templates/TemplateConfig.vb index 3014a9a..49ff74a 100644 --- a/MultiTool.Shared/Templates/TemplateConfig.vb +++ b/MultiTool.Common/Templates/TemplateConfig.vb @@ -1,5 +1,5 @@  -Imports MultiTool.Shared.Winline +Imports MultiTool.Common.Winline Namespace Templates ''' diff --git a/MultiTool.Shared/Templates/TemplateConfigItem.vb b/MultiTool.Common/Templates/TemplateConfigItem.vb similarity index 97% rename from MultiTool.Shared/Templates/TemplateConfigItem.vb rename to MultiTool.Common/Templates/TemplateConfigItem.vb index a23a6e8..973b559 100644 --- a/MultiTool.Shared/Templates/TemplateConfigItem.vb +++ b/MultiTool.Common/Templates/TemplateConfigItem.vb @@ -1,4 +1,4 @@ -Imports MultiTool.Shared.Constants +Imports MultiTool.Common.Constants Imports DigitalData.Modules.Language Namespace Templates diff --git a/MultiTool.Shared/Templates/TemplateLoader.vb b/MultiTool.Common/Templates/TemplateLoader.vb similarity index 99% rename from MultiTool.Shared/Templates/TemplateLoader.vb rename to MultiTool.Common/Templates/TemplateLoader.vb index 2d8129c..f2f7f18 100644 --- a/MultiTool.Shared/Templates/TemplateLoader.vb +++ b/MultiTool.Common/Templates/TemplateLoader.vb @@ -1,6 +1,7 @@ Imports System.IO Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Language Namespace Templates Public Class TemplateLoader @@ -14,17 +15,14 @@ Namespace Templates Public Property MandatorConfiguration As New MandatorConfig Public Property GeneralConfiguration As New GeneralConfig - Private ReadOnly Database As MSSQLServer - Private Const SQL_VWMT_ITEMS = "SELECT * FROM [DD_ECM].[dbo].[VWMT_ITEMS]" Private Const SQL_VWMT_MAPPING = "SELECT * FROM [DD_ECM].[dbo].[VWMT_MAPPING]" Private Const SQL_TBMT_MANDATORS = "SELECT * FROM [DD_ECM].[dbo].[TBMT_MANDATORS] ORDER BY ORDER_KEY" Private Const SQL_TBMT_CONFIG = "SELECT * FROM [DD_ECM].[dbo].[TBMT_CONFIG]" - Private Const SQL_TBMT_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBMT_TEMPLATES]" + Private Const SQL_TBMT_TEMPLATES = "SELECT * FROM [DD_ECM].[dbo].[TBMT_TEMPLATES] WHERE ACTIVE = 1" Public Sub New(pLogConfig As LogConfig, pMSSQL As MSSQLServer) - MyBase.New(pLogConfig) - Database = pMSSQL + MyBase.New(pLogConfig, pMSSQL) End Sub Public Async Function LoadTemplates() As Task(Of Boolean) diff --git a/MultiTool.Shared/Winline/Entities/Account.vb b/MultiTool.Common/Winline/Entities/Account.vb similarity index 100% rename from MultiTool.Shared/Winline/Entities/Account.vb rename to MultiTool.Common/Winline/Entities/Account.vb diff --git a/MultiTool.Shared/Winline/Entities/Article.vb b/MultiTool.Common/Winline/Entities/Article.vb similarity index 100% rename from MultiTool.Shared/Winline/Entities/Article.vb rename to MultiTool.Common/Winline/Entities/Article.vb diff --git a/MultiTool.Shared/Winline/Entities/Contact.vb b/MultiTool.Common/Winline/Entities/Contact.vb similarity index 100% rename from MultiTool.Shared/Winline/Entities/Contact.vb rename to MultiTool.Common/Winline/Entities/Contact.vb diff --git a/MultiTool.Shared/Winline/Entities/DocumentKind.vb b/MultiTool.Common/Winline/Entities/DocumentKind.vb similarity index 100% rename from MultiTool.Shared/Winline/Entities/DocumentKind.vb rename to MultiTool.Common/Winline/Entities/DocumentKind.vb diff --git a/MultiTool.Shared/Winline/Entities/ExportDocument.vb b/MultiTool.Common/Winline/Entities/ExportDocument.vb similarity index 100% rename from MultiTool.Shared/Winline/Entities/ExportDocument.vb rename to MultiTool.Common/Winline/Entities/ExportDocument.vb diff --git a/MultiTool.Shared/Winline/Entities/Mandator.vb b/MultiTool.Common/Winline/Entities/Mandator.vb similarity index 100% rename from MultiTool.Shared/Winline/Entities/Mandator.vb rename to MultiTool.Common/Winline/Entities/Mandator.vb diff --git a/MultiTool.Shared/Winline/Entities/Response.vb b/MultiTool.Common/Winline/Entities/Response.vb similarity index 100% rename from MultiTool.Shared/Winline/Entities/Response.vb rename to MultiTool.Common/Winline/Entities/Response.vb diff --git a/MultiTool.Shared/Winline/WebServiceData.vb b/MultiTool.Common/Winline/WebServiceData.vb similarity index 98% rename from MultiTool.Shared/Winline/WebServiceData.vb rename to MultiTool.Common/Winline/WebServiceData.vb index 4c9fb41..8aacb3e 100644 --- a/MultiTool.Shared/Winline/WebServiceData.vb +++ b/MultiTool.Common/Winline/WebServiceData.vb @@ -4,11 +4,11 @@ Imports System.Xml Imports DigitalData.Modules.Database Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Logging -Imports MultiTool.Shared.Documents -Imports MultiTool.Shared.Exceptions -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Templates.GeneralConfig -Imports MultiTool.Shared.Winline.Entities +Imports MultiTool.Common.Documents +Imports MultiTool.Common.Exceptions +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Templates.GeneralConfig +Imports MultiTool.Common.Winline.Entities Namespace Winline Public Class WebServiceData diff --git a/MultiTool.Shared/Winline/WinlineData.vb b/MultiTool.Common/Winline/WinlineData.vb similarity index 99% rename from MultiTool.Shared/Winline/WinlineData.vb rename to MultiTool.Common/Winline/WinlineData.vb index 847f680..7ff8692 100644 --- a/MultiTool.Shared/Winline/WinlineData.vb +++ b/MultiTool.Common/Winline/WinlineData.vb @@ -1,9 +1,9 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Database -Imports MultiTool.Shared.Winline.Entities +Imports MultiTool.Common.Winline.Entities Imports System.Text.RegularExpressions -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Constants +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Constants Imports DigitalData.Modules.Language Namespace Winline diff --git a/MultiTool.Shared/XmlData.vb b/MultiTool.Common/XmlData.vb similarity index 100% rename from MultiTool.Shared/XmlData.vb rename to MultiTool.Common/XmlData.vb diff --git a/MultiTool.Shared/packages.config b/MultiTool.Common/packages.config similarity index 100% rename from MultiTool.Shared/packages.config rename to MultiTool.Common/packages.config diff --git a/MultiTool.Form/FormHelpers.vb b/MultiTool.Form/FormHelpers.vb index 78a55d8..831267b 100644 --- a/MultiTool.Form/FormHelpers.vb +++ b/MultiTool.Form/FormHelpers.vb @@ -1,5 +1,5 @@ Imports DigitalData.Modules.Logging -Imports MultiTool.Shared.Exceptions +Imports MultiTool.Common.Exceptions Public Class FormHelper Private ReadOnly Logger As Logger diff --git a/MultiTool.Form/GridLoader.vb b/MultiTool.Form/GridLoader.vb index 96d97d0..ba2ea47 100644 --- a/MultiTool.Form/GridLoader.vb +++ b/MultiTool.Form/GridLoader.vb @@ -2,8 +2,8 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Logging -Imports MultiTool.Shared -Imports MultiTool.Shared.Constants +Imports MultiTool.Common +Imports MultiTool.Common.Constants Public Class GridLoader Inherits BaseClass diff --git a/MultiTool.Form/MultiTool.Form.vbproj b/MultiTool.Form/MultiTool.Form.vbproj index 095b6a0..e5e9d83 100644 --- a/MultiTool.Form/MultiTool.Form.vbproj +++ b/MultiTool.Form/MultiTool.Form.vbproj @@ -115,9 +115,9 @@ False ..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll - + False - ..\..\DDMonorepo\Modules.Language\bin\Release\DigitalData.Modules.Language.dll + ..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll ..\..\DDMonorepo\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll @@ -338,6 +338,9 @@ + + + @@ -412,11 +415,10 @@ - + {dd1ac3b9-7595-4d3c-b9bb-97c46a480fa0} - MultiTool.Shared + MultiTool.Common - \ No newline at end of file diff --git a/MultiTool.Form/My Project/Resources.Designer.vb b/MultiTool.Form/My Project/Resources.Designer.vb index 0178da4..0e11d24 100644 --- a/MultiTool.Form/My Project/Resources.Designer.vb +++ b/MultiTool.Form/My Project/Resources.Designer.vb @@ -160,6 +160,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_reload1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_reload1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -610,6 +620,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property refreshpivottable() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("refreshpivottable", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -740,6 +760,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property update() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("update", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/MultiTool.Form/My Project/Resources.resx b/MultiTool.Form/My Project/Resources.resx index c7ecce3..b95784e 100644 --- a/MultiTool.Form/My Project/Resources.resx +++ b/MultiTool.Form/My Project/Resources.resx @@ -124,14 +124,17 @@ ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\parameters.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -157,6 +160,9 @@ ..\Resources\resetview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\update.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\open26.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -187,12 +193,12 @@ ..\Resources\bo_unknown2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\deletetablerows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\open3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -202,9 +208,6 @@ ..\Resources\wraptext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\logical2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\tableproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -217,9 +220,6 @@ ..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -235,8 +235,11 @@ ..\Resources\open23.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_reload1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -244,8 +247,8 @@ ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open24.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\logical3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -265,6 +268,9 @@ ..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\support.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -280,8 +286,8 @@ ..\Resources\preview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_sale.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\exporttopdf.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -307,22 +313,25 @@ ..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\squarified.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_send4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\logical2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\export.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open27.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_checkcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\logical3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\refreshpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/MultiTool.Form/MyApplication.vb b/MultiTool.Form/MyApplication.vb index c98120b..c3a4c70 100644 --- a/MultiTool.Form/MyApplication.vb +++ b/MultiTool.Form/MyApplication.vb @@ -1,6 +1,6 @@ -Imports MultiTool.Shared -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Winline +Imports MultiTool.Common +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Winline Namespace My diff --git a/MultiTool.Form/Reports/OrderReport.Designer.vb b/MultiTool.Form/Reports/OrderReport.Designer.vb index 8e75cb3..223a971 100644 --- a/MultiTool.Form/Reports/OrderReport.Designer.vb +++ b/MultiTool.Form/Reports/OrderReport.Designer.vb @@ -690,7 +690,7 @@ Partial Public Class OrderReport ' 'ObjectDataSource1 ' - Me.ObjectDataSource1.DataSource = GetType(MultiTool.[Shared].Report.ReportSource) + Me.ObjectDataSource1.DataSource = GetType(MultiTool.Common.Report.ReportSource) Me.ObjectDataSource1.Name = "ObjectDataSource1" ' 'GroupFooter1 diff --git a/MultiTool.Form/Resources/actions_reload1.svg b/MultiTool.Form/Resources/actions_reload1.svg new file mode 100644 index 0000000..b6b1422 --- /dev/null +++ b/MultiTool.Form/Resources/actions_reload1.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/refreshpivottable.svg b/MultiTool.Form/Resources/refreshpivottable.svg new file mode 100644 index 0000000..9c1f495 --- /dev/null +++ b/MultiTool.Form/Resources/refreshpivottable.svg @@ -0,0 +1,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/Resources/update.svg b/MultiTool.Form/Resources/update.svg new file mode 100644 index 0000000..f528169 --- /dev/null +++ b/MultiTool.Form/Resources/update.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/MultiTool.Form/frmConfig.vb b/MultiTool.Form/frmConfig.vb index 0f1d26f..88dd627 100644 --- a/MultiTool.Form/frmConfig.vb +++ b/MultiTool.Form/frmConfig.vb @@ -4,25 +4,24 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports MultiTool.Shared -Imports MultiTool.Shared.Constants +Imports DigitalData.Modules.Language Public Class frmConfig - Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Shared.Config) + Private ReadOnly TBMT_CONFIG_GENERAL As New DS_DD_ECM.TBMT_CONFIGDataTable + Private ReadOnly ConfigManager As ConfigManager(Of MultiTool.Common.Config) Private ReadOnly FormHelper As FormHelper Private BindingSource As BindingSource = TBEDIXMLITEMSBindingSource Private View As GridView = GridViewSchema - Private TBMT_CONFIG_GENERAL As New DS_DD_ECM.TBMT_CONFIGDataTable - Private ReadOnly Property Config As MultiTool.Shared.Config + Private ReadOnly Property Config As MultiTool.Common.Config Get Return ConfigManager?.Config End Get End Property - Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Shared.Config)) + Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of MultiTool.Common.Config)) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() diff --git a/MultiTool.Form/frmExportMain.vb b/MultiTool.Form/frmExportMain.vb index 461e31e..9fd5267 100644 --- a/MultiTool.Form/frmExportMain.vb +++ b/MultiTool.Form/frmExportMain.vb @@ -5,15 +5,14 @@ Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Language -Imports MultiTool.Shared -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Exceptions -Imports MultiTool.Shared.Winline -Imports MultiTool.Shared.Winline.Entities +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Exceptions +Imports MultiTool.Common.Winline +Imports MultiTool.Common.Winline.Entities Public Class frmExportMain Private ReadOnly LogConfig As LogConfig - Private ReadOnly ConfigManager As ConfigManager(Of Config) + Private ReadOnly ConfigManager As ConfigManager(Of Common.Config) Private ReadOnly CurrentTemplate As Template = Nothing Private Logger As Logger @@ -24,7 +23,7 @@ Public Class frmExportMain Private GridBuilder As GridBuilder Private FileEx As DigitalData.Modules.Filesystem.File - Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pTemplate As Template) + Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Common.Config), pTemplate As Template) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb index 8d73791..1ed1d5e 100644 --- a/MultiTool.Form/frmImportMain.vb +++ b/MultiTool.Form/frmImportMain.vb @@ -7,14 +7,14 @@ Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports MultiTool.Shared -Imports MultiTool.Shared.Documents -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Winline -Imports MultiTool.Shared.Winline.Entities -Imports MultiTool.Shared.Constants -Imports MultiTool.Shared.Exceptions -Imports MultiTool.Shared.Documents.Document +Imports MultiTool.Common +Imports MultiTool.Common.Documents +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Winline +Imports MultiTool.Common.Winline.Entities +Imports MultiTool.Common.Constants +Imports MultiTool.Common.Exceptions +Imports MultiTool.Common.Documents.Document Public Class frmImportMain Public LogConfig As LogConfig diff --git a/MultiTool.Form/frmMain.Designer.vb b/MultiTool.Form/frmMain.Designer.vb index 54ace01..4e9016f 100644 --- a/MultiTool.Form/frmMain.Designer.vb +++ b/MultiTool.Form/frmMain.Designer.vb @@ -23,13 +23,14 @@ Partial Class frmMain Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.btnOpenImportExportForm = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.btnReloadTemplates = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.txtVersion = New DevExpress.XtraBars.BarStaticItem() Me.txtCulture = New DevExpress.XtraBars.BarStaticItem() Me.btnOpenSchemaDirectory = New DevExpress.XtraBars.BarButtonItem() + Me.btnReloadWinlineData = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -54,9 +55,9 @@ Partial Class frmMain 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.BarButtonItem1, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3, Me.txtVersion, Me.txtCulture, Me.btnOpenSchemaDirectory}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnOpenImportExportForm, Me.btnReloadTemplates, Me.BarButtonItem4, Me.BarButtonItem2, Me.BarButtonItem3, Me.txtVersion, Me.txtCulture, Me.btnOpenSchemaDirectory, Me.btnReloadWinlineData}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 13 + Me.RibbonControl1.MaxItemId = 14 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -72,12 +73,12 @@ Partial Class frmMain Me.btnOpenImportExportForm.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_checkcircled1 Me.btnOpenImportExportForm.Name = "btnOpenImportExportForm" ' - 'BarButtonItem1 + 'btnReloadTemplates ' - Me.BarButtonItem1.Caption = "Daten neuladen" - Me.BarButtonItem1.Id = 2 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.actions_reload - Me.BarButtonItem1.Name = "BarButtonItem1" + Me.btnReloadTemplates.Caption = "Vorlagen neuladen" + Me.btnReloadTemplates.Id = 2 + Me.btnReloadTemplates.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.refreshpivottable + Me.btnReloadTemplates.Name = "btnReloadTemplates" ' 'BarButtonItem4 ' @@ -123,6 +124,13 @@ Partial Class frmMain Me.btnOpenSchemaDirectory.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.open26 Me.btnOpenSchemaDirectory.Name = "btnOpenSchemaDirectory" ' + 'btnReloadWinlineData + ' + Me.btnReloadWinlineData.Caption = "WinLine Daten neuladen" + Me.btnReloadWinlineData.Id = 13 + Me.btnReloadWinlineData.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.update + Me.btnReloadWinlineData.Name = "btnReloadWinlineData" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3}) @@ -138,7 +146,8 @@ Partial Class frmMain 'RibbonPageGroup3 ' Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnReloadTemplates) + Me.RibbonPageGroup3.ItemLinks.Add(Me.btnReloadWinlineData) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Text = "Daten" ' @@ -263,7 +272,7 @@ Partial Class frmMain Friend WithEvents colFileName As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnReloadTemplates As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem @@ -273,4 +282,5 @@ Partial Class frmMain Friend WithEvents txtCulture As DevExpress.XtraBars.BarStaticItem Friend WithEvents btnOpenSchemaDirectory As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents btnReloadWinlineData As DevExpress.XtraBars.BarButtonItem End Class diff --git a/MultiTool.Form/frmMain.vb b/MultiTool.Form/frmMain.vb index 389151a..62698e8 100644 --- a/MultiTool.Form/frmMain.vb +++ b/MultiTool.Form/frmMain.vb @@ -6,14 +6,14 @@ Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Winline -Imports MultiTool.Shared.Winline.Entities +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Winline +Imports MultiTool.Common.Winline.Entities Public Class frmMain Private LogConfig As LogConfig Private Logger As Logger - Private ConfigManager As ConfigManager(Of [Shared].Config) + Private ConfigManager As ConfigManager(Of Common.Config) Private Database As MSSQLServer Private TemplateLoader As TemplateLoader Private GridBuilder As GridBuilder @@ -40,7 +40,7 @@ Public Class frmMain SplashScreenManager.SetWaitFormDescription("Initialisierung der Grundfunktionen") FormHelper = New FormHelper(LogConfig, Me) - ConfigManager = New ConfigManager(Of [Shared].Config)(LogConfig, + ConfigManager = New ConfigManager(Of Common.Config)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath @@ -70,13 +70,10 @@ Public Class frmMain Database = New MSSQLServer(LogConfig, oConnectionString) SplashScreenManager.SetWaitFormDescription("Lade Vorlagen") - Await LoadTemplateData() + GridControl1.DataSource = Await LoadTemplateData() SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten") My.Winline = New WinlineData(LogConfig, Database, My.GeneralConfiguration, My.MappingConfiguration, My.MandatorConfiguration) - Dim oBindingSource As BindingList(Of Template) = Await LoadWinlineData(My.Winline) - GridControl1.DataSource = oBindingSource - txtVersion.Caption = String.Format(My.Resources.frmMainExtra.Version___0_, My.Application.Info.Version.ToString) txtCulture.Caption = String.Format(My.Resources.frmMainExtra.Sprache___0_, My.Application.UICulture.ToString) @@ -89,7 +86,7 @@ Public Class frmMain End Try End Sub - Private Async Function LoadWinlineData(Winline As WinlineData) As Task(Of BindingList(Of Template)) + Private Async Function LoadWinlineData(Winline As WinlineData) As Task Winline.Mandators.Clear() Winline.LoadEconomicYears() Await Winline.LoadMandators() @@ -104,15 +101,9 @@ Public Class frmMain Next My.Winline = Winline - - Dim oBindingSource = New BindingList(Of Template) - For Each oTemplate As Template In TemplateLoader.TemplateList - oBindingSource.Add(oTemplate) - Next - Return oBindingSource End Function - Private Async Function LoadTemplateData() As Task + Private Async Function LoadTemplateData() As Task(Of BindingList(Of Template)) ' Initialize Schemas TemplateLoader = New TemplateLoader(LogConfig, Database) Await TemplateLoader.LoadTemplates() @@ -126,6 +117,12 @@ Public Class frmMain My.TemplateConfiguration = TemplateLoader.TemplateConfiguration My.MandatorConfiguration = TemplateLoader.MandatorConfiguration My.GeneralConfiguration = TemplateLoader.GeneralConfiguration + + Dim oBindingSource = New BindingList(Of Template) + For Each oTemplate As Template In TemplateLoader.TemplateList + oBindingSource.Add(oTemplate) + Next + Return oBindingSource End Function Private Sub btnOpenImportExportForm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenImportExportForm.ItemClick @@ -233,7 +230,7 @@ Public Class frmMain End Try End Sub - Private Async Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Private Async Sub btnReloadTemplates_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadTemplates.ItemClick If SplashScreenManager.IsSplashFormVisible Then Exit Sub End If @@ -242,11 +239,27 @@ Public Class frmMain Try SplashScreenManager.SetWaitFormDescription("Lade Vorlagen") - Await LoadTemplateData() + GridControl1.DataSource = Await LoadTemplateData() + Catch ex As Exception + FormHelper.ShowError(ex, "Laden der Vorlagen") + + Finally + SplashScreenManager.CloseWaitForm() + + End Try + End Sub + + Private Async Sub btnReloadWinlineData_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnReloadWinlineData.ItemClick + If SplashScreenManager.IsSplashFormVisible Then + Exit Sub + End If + + SplashScreenManager.ShowWaitForm() + + Try SplashScreenManager.SetWaitFormDescription("Lade Winline Stammdaten") - Dim oBindingSource As BindingList(Of Template) = Await LoadWinlineData(My.Winline) - GridControl1.DataSource = oBindingSource + Await LoadWinlineData(My.Winline) Catch ex As Exception FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Laden_der_Winline_Daten) diff --git a/MultiTool.Form/frmRowEditor.vb b/MultiTool.Form/frmRowEditor.vb index 85fe9ee..6460e81 100644 --- a/MultiTool.Form/frmRowEditor.vb +++ b/MultiTool.Form/frmRowEditor.vb @@ -1,10 +1,10 @@ Imports System.Globalization -Imports MultiTool.Shared.Documents -Imports MultiTool.Shared.Documents.DocumentRow -Imports MultiTool.Shared.Winline -Imports MultiTool.Shared.Winline.Entities -Imports MultiTool.Shared.Templates -Imports MultiTool.Shared.Constants +Imports MultiTool.Common.Documents +Imports MultiTool.Common.Documents.DocumentRow +Imports MultiTool.Common.Winline +Imports MultiTool.Common.Winline.Entities +Imports MultiTool.Common.Templates +Imports MultiTool.Common.Constants Imports DigitalData.Modules.Language Imports DigitalData.Modules.Logging Imports DevExpress.XtraEditors diff --git a/MultiTool.Shared/DataRowEx.vb b/MultiTool.Shared/DataRowEx.vb deleted file mode 100644 index bebec62..0000000 --- a/MultiTool.Shared/DataRowEx.vb +++ /dev/null @@ -1,13 +0,0 @@ -Imports System.Runtime.CompilerServices -Imports DigitalData.Modules.Language - -Public Module DataRowEx - - Public Function ItemEx(Of T)(pRow As DataRow, pFieldName As String, Optional pDefaultValue As T = Nothing) As T - Try - Return Utils.NotNull(pRow.Item(pFieldName), pDefaultValue) - Catch ex As Exception - Return Nothing - End Try - End Function -End Module diff --git a/MultiTool.sln b/MultiTool.sln index a330c8a..803601c 100644 --- a/MultiTool.sln +++ b/MultiTool.sln @@ -5,22 +5,40 @@ VisualStudioVersion = 16.0.31005.135 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Form", "MultiTool.Form\MultiTool.Form.vbproj", "{7AAEC958-955D-4F77-964C-38658684E424}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Shared", "MultiTool.Shared\MultiTool.Shared.vbproj", "{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MultiTool.Common", "MultiTool.Common\MultiTool.Common.vbproj", "{DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Multitool.Form.Setup", "Multitool.Form.Setup\Multitool.Form.Setup.wixproj", "{A03D1911-C6D6-4AD0-9601-4D277B35E91D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7AAEC958-955D-4F77-964C-38658684E424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AAEC958-955D-4F77-964C-38658684E424}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7AAEC958-955D-4F77-964C-38658684E424}.Debug|x86.ActiveCfg = Debug|Any CPU + {7AAEC958-955D-4F77-964C-38658684E424}.Debug|x86.Build.0 = Debug|Any CPU {7AAEC958-955D-4F77-964C-38658684E424}.Release|Any CPU.ActiveCfg = Release|Any CPU {7AAEC958-955D-4F77-964C-38658684E424}.Release|Any CPU.Build.0 = Release|Any CPU + {7AAEC958-955D-4F77-964C-38658684E424}.Release|x86.ActiveCfg = Release|Any CPU + {7AAEC958-955D-4F77-964C-38658684E424}.Release|x86.Build.0 = Release|Any CPU {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|x86.ActiveCfg = Debug|Any CPU + {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Debug|x86.Build.0 = Debug|Any CPU {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|Any CPU.ActiveCfg = Release|Any CPU {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|Any CPU.Build.0 = Release|Any CPU + {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|x86.ActiveCfg = Release|Any CPU + {DD1AC3B9-7595-4D3C-B9BB-97C46A480FA0}.Release|x86.Build.0 = Release|Any CPU + {A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|Any CPU.ActiveCfg = Debug|x86 + {A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|x86.ActiveCfg = Debug|x86 + {A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Debug|x86.Build.0 = Debug|x86 + {A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|Any CPU.ActiveCfg = Release|x86 + {A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|x86.ActiveCfg = Release|x86 + {A03D1911-C6D6-4AD0-9601-4D277B35E91D}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE