Clean up

Improve validation
Generate script from MSSMS
2021-11-18 13:31:23 +01:00 · 2021-11-18 13:31:14 +01:00 · 2021-11-18 13:30:53 +01:00 · 2021-11-18 13:28:33 +01:00
12 changed files with 322 additions and 202 deletions
--- a/MultiTool.Form/CREATE_DATABASE.sql
+++ b/MultiTool.Form/CREATE_DATABASE.sql
@@ -1,191 +1,234 @@
 USE [DD_ECM]
 GO
-
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_TYPES]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [FK_TBEDI_XML_NODES]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TABLES] DROP CONSTRAINT [DF_TBEDI_XML_NODES_IS_HEAD]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VISIBLE]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] DROP CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_READ_ONLY]
+GO
+/****** Object:  View [dbo].[VWEDI_XML_ITEMS]    Script Date: 18.11.2021 13:29:24 ******/
+DROP VIEW [dbo].[VWEDI_XML_ITEMS]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_ITEMS]    Script Date: 18.11.2021 13:29:24 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_ITEMS]') AND type in (N'U'))
+DROP TABLE [dbo].[TBEDI_XML_ITEMS]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_TABLES]    Script Date: 18.11.2021 13:29:24 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TABLES]') AND type in (N'U'))
+DROP TABLE [dbo].[TBEDI_XML_TABLES]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_FUNCTIONS]    Script Date: 18.11.2021 13:29:24 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_FUNCTIONS]') AND type in (N'U'))
+DROP TABLE [dbo].[TBEDI_XML_FUNCTIONS]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_TYPES]    Script Date: 18.11.2021 13:29:24 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TYPES]') AND type in (N'U'))
+DROP TABLE [dbo].[TBEDI_XML_TYPES]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_TEMPLATES]    Script Date: 18.11.2021 13:29:24 ******/
+IF  EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[TBEDI_XML_TEMPLATES]') AND type in (N'U'))
+DROP TABLE [dbo].[TBEDI_XML_TEMPLATES]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_TEMPLATES]    Script Date: 18.11.2021 13:29:24 ******/
 SET ANSI_NULLS ON
 GO
-
 SET QUOTED_IDENTIFIER ON
 GO
-
-/* TBEDI_XML_TEMPLATES */
-
-DROP TABLE [dbo].[TBEDI_XML_TEMPLATES]
-
 CREATE TABLE [dbo].[TBEDI_XML_TEMPLATES](
-	[GUID] [int] IDENTITY(1,1) NOT NULL PRIMARY KEY,
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](20) NOT NULL,
-	[DESCRIPTION] [nvarchar](max) NULL
-) ON [PRIMARY]
+	[DESCRIPTION] [nvarchar](max) NULL,
+PRIMARY KEY CLUSTERED 
+(
+	[GUID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_TYPES]    Script Date: 18.11.2021 13:29:24 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
 GO
-
-INSERT INTO [dbo].[TBEDI_XML_TEMPLATES] (NAME, DESCRIPTION) VALUES ('EXIM-VRG_orders', 'Schaum EDI Aufträge') 
-
-/* TBEDI_XML_TYPES */
-
-DROP TABLE [dbo].[TBEDI_XML_TYPES]
-
 CREATE TABLE [dbo].[TBEDI_XML_TYPES](
-	[GUID] [int] IDENTITY(1,1) NOT NULL PRIMARY KEY,
-	[NAME] [nvarchar](20) NOT NULL
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
+	[NAME] [nvarchar](20) NOT NULL,
+PRIMARY KEY CLUSTERED 
+(
+	[GUID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
-
-INSERT INTO [dbo].[TBEDI_XML_TYPES] (NAME) VALUES ('STRING') 
-INSERT INTO [dbo].[TBEDI_XML_TYPES] (NAME) VALUES ('INTEGER') 
-INSERT INTO [dbo].[TBEDI_XML_TYPES] (NAME) VALUES ('DATE') 
-INSERT INTO [dbo].[TBEDI_XML_TYPES] (NAME) VALUES ('BOOLEAN') 
-INSERT INTO [dbo].[TBEDI_XML_TYPES] (NAME) VALUES ('DECIMAL')
-
-INSERT INTO [dbo].[TBEDI_XML_TYPES] (NAME) VALUES ('ACCOUNT')
-INSERT INTO [dbo].[TBEDI_XML_TYPES] (NAME) VALUES ('ARTICLE')
-
-/* TBEDI_XML_NODES */
-
-DROP TABLE [dbo].[TBEDI_XML_FUNCTIONS]
-
+/****** Object:  Table [dbo].[TBEDI_XML_FUNCTIONS]    Script Date: 18.11.2021 13:29:24 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
 CREATE TABLE [dbo].[TBEDI_XML_FUNCTIONS](
-	[GUID] [int] IDENTITY(1,1) NOT NULL PRIMARY KEY,
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](max) NOT NULL,
 	[DESCRIPTION] [nvarchar](max) NOT NULL,
 	[PARAMETERS] [nvarchar](max) NULL,
-) ON [PRIMARY]
-GO 
-
-INSERT INTO [dbo].[TBEDI_XML_FUNCTIONS] (NAME, DESCRIPTION) VALUES ('GLN', 'Finds an WinLine Account Number by GLN') 
-INSERT INTO [dbo].[TBEDI_XML_FUNCTIONS] (NAME, DESCRIPTION) VALUES ('EAN', 'Finds an WinLine Article Number by EAN') 
-
-/* TBEDI_XML_NODES */
-
-DROP TABLE [dbo].[TBEDI_XML_NODES]
-
-CREATE TABLE [dbo].[TBEDI_XML_NODES](
-	[GUID] [int] IDENTITY(1,1) NOT NULL PRIMARY KEY,
+PRIMARY KEY CLUSTERED 
+(
+	[GUID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_TABLES]    Script Date: 18.11.2021 13:29:24 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+CREATE TABLE [dbo].[TBEDI_XML_TABLES](
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[NAME] [nvarchar](max) NOT NULL,
 	[TEMPLATE_ID] [int] NOT NULL,
-	[IS_HEAD] [bit] NOT NULL
-) ON [PRIMARY]
-GO 
-
-ALTER TABLE [dbo].[TBEDI_XML_NODES]
-	ADD CONSTRAINT DF_TBEDI_XML_NODES_IS_HEAD
-		DEFAULT 0 FOR IS_HEAD
-
-INSERT INTO [dbo].[TBEDI_XML_NODES] (NAME, IS_HEAD, TEMPLATE_ID) VALUES ('EXIM-VRG_ordersT025', 1, 1) 
-INSERT INTO [dbo].[TBEDI_XML_NODES] (NAME, IS_HEAD, TEMPLATE_ID) VALUES ('EXIM-VRG_ordersT026', 0, 1)
-
-/* TBEDI_XML_ITEMS */
-
-DROP TABLE [dbo].[TBEDI_XML_ITEMS]
-
+	[IS_HEAD] [bit] NOT NULL,
+PRIMARY KEY CLUSTERED 
+(
+	[GUID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+GO
+/****** Object:  Table [dbo].[TBEDI_XML_ITEMS]    Script Date: 18.11.2021 13:29:24 ******/
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER ON
+GO
 CREATE TABLE [dbo].[TBEDI_XML_ITEMS](
-	[GUID] [int] IDENTITY(1,1) NOT NULL PRIMARY KEY,
+	[GUID] [int] IDENTITY(1,1) NOT NULL,
 	[XML_NAME] [nvarchar](50) NOT NULL,
-	[XML_NODE_ID] [int] NOT NULL,
+	[XML_TABLE_ID] [int] NOT NULL,
 	[XML_TYPE_ID] [int] NOT NULL,
 	[IS_READ_ONLY] [bit] NOT NULL,
 	[IS_VISIBLE] [bit] NOT NULL,
-	[ORDER] [int] NOT NULL,
-	[FUNCTION_ID] [int] NULL
+	[ORDER_KEY] [int] NOT NULL,
+	[FUNCTION_ID] [int] NULL,
+	[IS_REQUIRED] [bit] NOT NULL,
+PRIMARY KEY CLUSTERED 
+(
+	[GUID] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 ) ON [PRIMARY]
 GO
-		
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS]
-	ADD CONSTRAINT FK_TBEDI_XML_TYPES FOREIGN KEY (XML_TYPE_ID)
-		REFERENCES [dbo].[TBEDI_XML_ITEMS] (GUID)
-		
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS]
-	ADD CONSTRAINT FK_TBEDI_XML_NODES FOREIGN KEY (XML_NODE_ID)
-		REFERENCES [dbo].[TBEDI_XML_ITEMS] (GUID)
-
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS]
-	ADD CONSTRAINT DF_TBEDI_XML_ITEMS_IS_READ_ONLY
-		DEFAULT 0 FOR IS_READ_ONLY
-
-ALTER TABLE [dbo].[TBEDI_XML_ITEMS]
-	ADD CONSTRAINT DF_TBEDI_XML_ITEMS_ORDER
-		DEFAULT 0 FOR ORDER
-
-
-DROP VIEW [dbo].[VWEDI_XML_ITEMS]
+/****** Object:  View [dbo].[VWEDI_XML_ITEMS]    Script Date: 18.11.2021 13:29:24 ******/
+SET ANSI_NULLS ON
 GO
+SET QUOTED_IDENTIFIER ON
+GO
+

 CREATE VIEW [dbo].[VWEDI_XML_ITEMS]
 AS
 	SELECT DISTINCT
-		[TBITEMS].[XML_NAME]
-		,[TBNODES].[NAME] [XML_ROOT]
-		,[TBTEMPLATES].[NAME] [TEMPLATE_NAME]
-		,[TBTYPES].[NAME] [DATA_TYPE]
-		,[TBNODES].[IS_HEAD] [IS_HEAD]
-		,[TBFUNCTIONS].[GUID] [FUNCTION_ID]
-		,[TBFUNCTIONS].[NAME] [FUNCTION_NAME]
-		,[TBFUNCTIONS].[PARAMETERS] [FUNCTION_PARAMETERS]
+		[TBTEMPLATES].[NAME] [TEMPLATE_NAME]
+		,[TBTABLES].[NAME] AS [XML_TABLE]
+		,[TBITEMS].[XML_NAME] AS [XML_ITEM]		
+		,[TBTYPES].[NAME] AS [DATA_TYPE]
+		,[TBTABLES].[IS_HEAD] AS [IS_HEAD]
 		,[TBITEMS].[IS_READ_ONLY]
 		,[TBITEMS].[IS_VISIBLE]
+        ,[TBITEMS].[IS_REQUIRED]
+		,[TBITEMS].[ORDER_KEY]
+		,[TBFUNCTIONS].[GUID] AS [FUNCTION_ID]
+		,[TBFUNCTIONS].[NAME] AS [FUNCTION_NAME]
+		,[TBFUNCTIONS].[PARAMETERS] AS [FUNCTION_PARAMETERS]
 	FROM
 		[dbo].[TBEDI_XML_ITEMS] [TBITEMS]
-		INNER JOIN [dbo].[TBEDI_XML_NODES] [TBNODES] ON [TBITEMS].[XML_NODE_ID] = [TBNODES].[GUID]
+		INNER JOIN [dbo].[TBEDI_XML_TABLES] [TBTABLES] ON [TBITEMS].[XML_TABLE_ID] = [TBTABLES].[GUID]
 		INNER JOIN [dbo].[TBEDI_XML_TYPES] [TBTYPES] ON [TBITEMS].[XML_TYPE_ID] = [TBTYPES].[GUID]
-		INNER JOIN [dbo].[TBEDI_XML_TEMPLATES] [TBTEMPLATES] ON [TBNODES].[TEMPLATE_ID] = [TBTEMPLATES].[GUID]
+		INNER JOIN [dbo].[TBEDI_XML_TEMPLATES] [TBTEMPLATES] ON [TBTABLES].[TEMPLATE_ID] = [TBTEMPLATES].[GUID]
 		LEFT OUTER JOIN [dbo].[TBEDI_XML_FUNCTIONS] [TBFUNCTIONS] ON [TBITEMS].[FUNCTION_ID] = [TBFUNCTIONS].[GUID]
 		
 GO
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_FUNCTIONS] ON 

+INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS]) VALUES (1, N'GLN', N'Finds an WinLine Account Number by GLN', NULL)
+INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS]) VALUES (2, N'EAN', N'Finds an WinLine Article Number by EAN', NULL)
+INSERT [dbo].[TBEDI_XML_FUNCTIONS] ([GUID], [NAME], [DESCRIPTION], [PARAMETERS]) VALUES (3, N'SQL', N'Finds a Value by SQL Query', NULL)
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_FUNCTIONS] OFF
+GO
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_ITEMS] ON 

-/* Kopfdaten */	
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (1, N'BELEGKEY', 1, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (2, N'Fakt_Kontonummer', 1, 1, 0, 1, 0, 1, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (3, N'Laufnummer', 1, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (4, N'Bestellt_von', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (5, N'Lief_Kontonummer', 1, 1, 0, 1, 0, 1, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (6, N'Lief_Name', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (7, N'Lief_Strasse', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (8, N'Lief_PLZ', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (9, N'Lief_Ort', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (10, N'Belegart', 1, 2, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (11, N'Datum_Auftrag-Bestellung', 1, 3, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (12, N'Auftrags-Bestellnummer', 1, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (13, N'Leistungsdatum', 1, 3, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (14, N'Infotext', 1, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (15, N'BELEGKEY', 2, 1, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (16, N'Zeilennummer', 2, 1, 0, 1, 1, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (17, N'Datentyp', 2, 2, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (18, N'Artikelnummer', 2, 1, 0, 1, 2, 2, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (19, N'Bezeichnung', 2, 1, 0, 1, 3, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (20, N'Lieferantenartikelnummer', 2, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (21, N'Menge_bestellt', 2, 5, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (22, N'Menge_geliefert', 2, 5, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (23, N'Colli', 2, 1, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (24, N'Einzelpreis', 2, 5, 0, 1, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (25, N'Zeilenrabatt1', 2, 5, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (26, N'Zeilenrabatt2', 2, 5, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (27, N'Zeilenrabatt3', 2, 5, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (28, N'Zeilenrabatt4', 2, 5, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (29, N'Umsatzsteuerprozent_Zeile', 2, 2, 0, 0, 0, NULL, 0)
+INSERT [dbo].[TBEDI_XML_ITEMS] ([GUID], [XML_NAME], [XML_TABLE_ID], [XML_TYPE_ID], [IS_READ_ONLY], [IS_VISIBLE], [ORDER_KEY], [FUNCTION_ID], [IS_REQUIRED]) VALUES (30, N'EDI_Infotext', 2, 1, 0, 0, 0, NULL, 0)
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_ITEMS] OFF
+GO
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_TABLES] ON 

-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('BELEGKEY', 1, 1, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Fakt_Kontonummer', 1, 1, 1, 1, 1)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Laufnummer', 1, 1, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Bestellt_von', 1, 1, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Lief_Kontonummer', 1, 1, 1, 1, 1)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Belegart', 1, 2, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Datum_Auftrag-Bestellung', 1, 3, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Auftrags-Bestellnummer', 1, 1, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Leistungsdatum', 1, 3, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Infotext', 1, 1, 1, 0, NULL)
+INSERT [dbo].[TBEDI_XML_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD]) VALUES (1, N'EXIM-VRG_ordersT025', 1, 1)
+INSERT [dbo].[TBEDI_XML_TABLES] ([GUID], [NAME], [TEMPLATE_ID], [IS_HEAD]) VALUES (2, N'EXIM-VRG_ordersT026', 1, 0)
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_TABLES] OFF
+GO
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATES] ON 

-/* Positionsdaten */	
+INSERT [dbo].[TBEDI_XML_TEMPLATES] ([GUID], [NAME], [DESCRIPTION]) VALUES (1, N'EXIM-VRG_orders', N'Schaum EDI Aufträge')
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_TEMPLATES] OFF
+GO
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_TYPES] ON 

-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('BELEGKEY', 2, 1, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Zeilennummer', 2, 1, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Datentyp', 2, 2, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Artikelnummer', 2, 1, 1, 1, 2)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Bezeichnung', 2, 1, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Lieferantenartikelnummer', 2, 1, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Menge_bestellt', 2, 5, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Menge_geliefert', 2, 5, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Colli', 2, 1, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Einzelpreis', 2, 5, 1, 1, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Zeilenrabatt1', 2, 5, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Zeilenrabatt2', 2, 5, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Zeilenrabatt3', 2, 5, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Zeilenrabatt4', 2, 5, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('Umsatzsteuerprozent_Zeile', 2, 2, 1, 0, NULL)
-INSERT [dbo].[TBEDI_XML_ITEMS] (XML_NAME, XML_NODE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, FUNCTION_ID)
-VALUES ('EDI_Infotext', 2, 1, 1, 0, NULL)
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (1, N'STRING')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (2, N'INTEGER')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (3, N'DATE')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (4, N'BOOLEAN')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (5, N'DECIMAL')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (6, N'ACCOUNT')
+INSERT [dbo].[TBEDI_XML_TYPES] ([GUID], [NAME]) VALUES (7, N'ARTICLE')
+SET IDENTITY_INSERT [dbo].[TBEDI_XML_TYPES] OFF
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_READ_ONLY]  DEFAULT ((0)) FOR [IS_READ_ONLY]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_VISIBLE]  DEFAULT ((0)) FOR [IS_VISIBLE]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_ORDER_KEY]  DEFAULT ((0)) FOR [ORDER_KEY]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] ADD  CONSTRAINT [DF_TBEDI_XML_ITEMS_IS_REQUIRED]  DEFAULT ((0)) FOR [IS_REQUIRED]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_TABLES] ADD  CONSTRAINT [DF_TBEDI_XML_NODES_IS_HEAD]  DEFAULT ((0)) FOR [IS_HEAD]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS]  WITH CHECK ADD  CONSTRAINT [FK_TBEDI_XML_NODES] FOREIGN KEY([XML_TABLE_ID])
+REFERENCES [dbo].[TBEDI_XML_ITEMS] ([GUID])
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_NODES]
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS]  WITH CHECK ADD  CONSTRAINT [FK_TBEDI_XML_TYPES] FOREIGN KEY([XML_TYPE_ID])
+REFERENCES [dbo].[TBEDI_XML_ITEMS] ([GUID])
+GO
+ALTER TABLE [dbo].[TBEDI_XML_ITEMS] CHECK CONSTRAINT [FK_TBEDI_XML_TYPES]
+GO
--- a/MultiTool.Form/GridLoader.vb
+++ b/MultiTool.Form/GridLoader.vb
@@ -8,7 +8,7 @@ Imports MultiTool.Shared.Constants
 Public Class GridLoader
    Inherits BaseClass

-    Public Sub New(pLogConfig As LogConfig, pTemplateConfig As Winline.Configuration)
+    Public Sub New(pLogConfig As LogConfig)
        MyBase.New(pLogConfig, pLogConfig.GetLogger())
    End Sub

@@ -28,7 +28,13 @@ Public Class GridLoader
                If oCol.Config.IsVisible = False Then
                    oVisibleIndex = -1
                Else
-                    oVisibleIndex = oCol.Config.OrderKey
+                    ' If OrderKey is 0, set to a high number to 
+                    ' push this column to the end of the grid
+                    If oCol.Config.OrderKey = 0 Then
+                        oVisibleIndex = 99
+                    Else
+                        oVisibleIndex = oCol.Config.OrderKey
+                    End If
                End If
            Else
                oVisibleIndex = 0
--- a/MultiTool.Form/MultiTool.Form.vbproj
+++ b/MultiTool.Form/MultiTool.Form.vbproj
@@ -315,6 +315,7 @@
  <ItemGroup>
    <Content Include="CREATE_DATABASE.sql" />
    <Content Include="MultiTool.ico" />
+    <None Include="Resources\followupall.svg" />
    <None Include="Resources\actions_send2.svg" />
    <None Include="Resources\bo_product.svg" />
    <None Include="Resources\bo_country.svg" />
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -200,6 +200,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property followupall() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("followupall", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -121,9 +121,6 @@
  <data name="logical" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\redo.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -145,6 +142,9 @@
  <data name="mailmergepreview" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mailmergepreview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="tilelabels" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\tilelabels.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -163,6 +163,9 @@
  <data name="paymentrefund" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\paymentrefund.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="open1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -196,8 +199,8 @@
  <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="bo_country" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_country.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="actions_arrow4down" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_arrow4down.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -232,7 +235,7 @@
  <data name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="actions_send2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="followupall" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\followupall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/MultiTool.Form/Resources/followupall.svg
+++ b/MultiTool.Form/Resources/followupall.svg
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{display:none;}
+	.st2{display:inline;fill:#039C23;}
+	.st3{display:inline;fill:#D11C1C;}
+	.st4{display:inline;fill:#727272;}
+</style>
+  <g id="FollowUpAll">
+    <path d="M10,2v16l18-8L10,2z M12,5.1L23.1,10L12,14.9V5.1z M6,2h2v28H6V2z" class="Black" />
+  </g>
+</svg>
--- a/MultiTool.Form/frmImportMain.Designer.vb
+++ b/MultiTool.Form/frmImportMain.Designer.vb
@@ -341,9 +341,8 @@ Partial Class frmImportMain
        Me.txtCulture.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
        resources.ApplyResources(Me.txtCulture, "txtCulture")
        Me.txtCulture.Id = 26
-        Me.txtCulture.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.bo_country
+        Me.txtCulture.ImageOptions.SvgImage = Global.MultiTool.Form.My.Resources.Resources.followupall
        Me.txtCulture.Name = "txtCulture"
-        Me.txtCulture.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
        Me.txtCulture.Tag = "Culture: {0}"
        '
        'btnRemoveRow
--- a/MultiTool.Form/frmImportMain.vb
+++ b/MultiTool.Form/frmImportMain.vb
@@ -98,8 +98,10 @@ Public Class frmImportMain
            Winline = New WinlineData(LogConfig, Database, ConfigManager.Config)
            WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
            AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
+
        Catch ex As Exception
            FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Initialisieren_der_Anwendungs_Daten)
+
        End Try

        txtVersion.Caption = String.Format(My.Resources.frmImportMainExtra.Version__0_, My.Application.Info.Version.ToString)
@@ -141,7 +143,7 @@ Public Class frmImportMain

            DocumentLoader = New DocumentLoader(LogConfig, Winline)
            SchemaLoader = New SchemaLoader(LogConfig)
-            GridLoader = New GridLoader(LogConfig, Winline.TemplateConfiguration)
+            GridLoader = New GridLoader(LogConfig)

            SplashScreenManager.SetWaitFormDescription(My.Resources.frmImportMainExtra.Lade_Vorlagen)

@@ -151,6 +153,8 @@ Public Class frmImportMain
            CurrentSchema = SchemaLoader.GetSchemaFromFile(CurrentSchemaName)
            CurrentSchema = SchemaLoader.UpdateSchemaWithDatabaseConfiguration(CurrentSchema, Winline.TemplateConfiguration)

+
+
            Grids = CreateGridsAndColumns(CurrentSchema)

            For Each oGrid As GridControl In Grids
--- a/MultiTool.Shared/Documents/DocumentLoader.vb
+++ b/MultiTool.Shared/Documents/DocumentLoader.vb
@@ -153,46 +153,79 @@ Namespace Documents
                    Where(Function(t) t.Name = oTopLevelElement.Name).
                    FirstOrDefault()

-                For Each oSubElement As XElement In oSubElements
-                    Dim oSchemaField = oTable.Columns.
-                        Where(Function(c) c.Name = oSubElement.Name).
+                For Each oColumn In oTable.Columns
+                    Dim oSubElement = oSubElements.
+                        Where(Function(e) e.Name = oColumn.Name).
                        SingleOrDefault()

-                    Dim oRequired = oSchemaField.IsRequired
-                    Dim oValue = oSubElement.Value.Trim()
+                    If oSubElement IsNot Nothing Then
+                        Dim oRequired = oColumn.IsRequired
+                        Dim oValue = oSubElement.Value.Trim()

-                    ' TODO: Needed when we have time for date times
-                    'If oSchemaField.DataType = Constants.ColumnType.Date Then
-                    '    Dim oDate = Date.ParseExact(oValue, "yyyy-MM-dd", CultureInfo.InvariantCulture)
-                    '    oValue = oDate.ToString("d")
-                    'End If
+                        ' TODO: Needed when we have time for date times
+                        'If oSchemaField.DataType = Constants.ColumnType.Date Then
+                        '    Dim oDate = Date.ParseExact(oValue, "yyyy-MM-dd", CultureInfo.InvariantCulture)
+                        '    oValue = oDate.ToString("d")
+                        'End If

-                    oFields.Add(oSubElement.Name.ToString, New DocumentRow.FieldValue With {
-                        .Original = oValue,
-                        .Final = oValue,
-                        .DataType = oSchemaField.DataType,
-                        .Required = oRequired
-                    })
+                        oFields.Add(oSubElement.Name.ToString, New DocumentRow.FieldValue With {
+                            .Original = oValue,
+                            .Final = oValue,
+                            .DataType = oColumn.DataType,
+                            .Required = oRequired
+                        })
+                    Else
+                        Dim oColumnError = DocumentRow.FieldError.None
+                        If oColumn.Config?.IsRequired Then
+                            oColumnError = DocumentRow.FieldError.MissingValue
+                        End If

+                        oFields.Add(oColumn.Name, New DocumentRow.FieldValue With {
+                            .[Error] = oColumnError
+                        })
+                    End If
                Next

-                ' All fields in the schema are generated,
-                ' only creating the ones with values leads to wrong visual cues when asking for
-                ' docs/rows/fields with errors
-                For Each oColumn In oTable.Columns
-                    If oFields.ContainsKey(oColumn.Name) Then
-                        Continue For
-                    End If
+                'For Each oSubElement As XElement In oSubElements
+                '    Dim oSchemaField = oTable.Columns.
+                '        Where(Function(c) c.Name = oSubElement.Name).
+                '        SingleOrDefault()

-                    Dim oColumnError = DocumentRow.FieldError.None
-                    If oColumn.Config?.IsRequired Then
-                        oColumnError = DocumentRow.FieldError.MissingValue
-                    End If
+                '    Dim oRequired = oSchemaField.IsRequired
+                '    Dim oValue = oSubElement.Value.Trim()

-                    oFields.Add(oColumn.Name, New DocumentRow.FieldValue With {
-                        .[Error] = oColumnError
-                    })
-                Next
+                '    ' TODO: Needed when we have time for date times
+                '    'If oSchemaField.DataType = Constants.ColumnType.Date Then
+                '    '    Dim oDate = Date.ParseExact(oValue, "yyyy-MM-dd", CultureInfo.InvariantCulture)
+                '    '    oValue = oDate.ToString("d")
+                '    'End If
+
+                '    oFields.Add(oSubElement.Name.ToString, New DocumentRow.FieldValue With {
+                '        .Original = oValue,
+                '        .Final = oValue,
+                '        .DataType = oSchemaField.DataType,
+                '        .Required = oRequired
+                '    })
+
+                'Next
+
+                '' All fields in the schema are generated,
+                '' only creating the ones with values leads to wrong visual cues when asking for
+                '' docs/rows/fields with errors
+                'For Each oColumn In oTable.Columns
+                '    If oFields.ContainsKey(oColumn.Name) Then
+                '        Continue For
+                '    End If
+
+                '    Dim oColumnError = DocumentRow.FieldError.None
+                '    If oColumn.Config?.IsRequired Then
+                '        oColumnError = DocumentRow.FieldError.MissingValue
+                '    End If
+
+                '    oFields.Add(oColumn.Name, New DocumentRow.FieldValue With {
+                '        .[Error] = oColumnError
+                '    })
+                'Next

                ' Create a DocumentRow object for each Top Level Element
                Dim oRow = New DocumentRow With {
--- a/MultiTool.Shared/Documents/DocumentRow.vb
+++ b/MultiTool.Shared/Documents/DocumentRow.vb
@@ -60,7 +60,9 @@

            Public ReadOnly Property HasError As Boolean
                Get
-                    Return [Error] <> FieldError.None Or (Required = True And Final = String.Empty)
+                    Return Required = True And (
+                        [Error] <> FieldError.None Or Final = String.Empty
+                    )
                End Get
            End Property

--- a/MultiTool.Shared/Winline/Entities/ColumnConfig.vb
+++ b/MultiTool.Shared/Winline/Entities/ColumnConfig.vb
@@ -3,7 +3,7 @@
 Namespace Winline
    Public Class ColumnConfig
        Public Property Name As String
-        Public Property Root As String
+        Public Property Table As String
        Public Property Type As ColumnType
        Public Property Template As String
        Public Property OrderKey As Integer
--- a/MultiTool.Shared/Winline/WinlineData.vb
+++ b/MultiTool.Shared/Winline/WinlineData.vb
@@ -495,20 +495,20 @@ Namespace Winline

                For Each oRow As DataRow In oTable.Rows
                    Dim oColumn As New ColumnConfig() With {
-                        .Name = GetRowItem(oRow, "XML_NAME", String.Empty),
-                        .Root = GetRowItem(oRow, "XML_ROOT", String.Empty),
-                        .Type = ColumnConfig.ConvertType(GetRowItem(oRow, "DATA_TYPE", String.Empty)),
                        .Template = GetRowItem(oRow, "TEMPLATE_NAME", String.Empty),
-                        .[Function] = New ColumnConfig.ColumnFunction With {
-                            .Id = GetRowItem(oRow, "FUNCTION_ID", 0),
-                            .Name = GetRowItem(oRow, "FUNCTION_NAME", String.Empty),
-                            .Params = GetRowItem(oRow, "FUNCTION_PARAMETERS", String.Empty)
-                        },
+                        .Table = GetRowItem(oRow, "XML_TABLE", String.Empty),
+                        .Name = GetRowItem(oRow, "XML_ITEM", String.Empty),
+                        .Type = ColumnConfig.ConvertType(GetRowItem(oRow, "DATA_TYPE", String.Empty)),
                        .OrderKey = GetRowItem(oRow, "ORDER_KEY", 0),
                        .IsReadOnly = GetRowItem(oRow, "IS_READ_ONLY", False),
                        .IsVisible = GetRowItem(oRow, "IS_VISIBLE", True),
                        .IsRequired = GetRowItem(oRow, "IS_REQUIRED", False),
-                        .IsHead = GetRowItem(oRow, "IS_HEAD", True)
+                        .IsHead = GetRowItem(oRow, "IS_HEAD", True),
+                        .[Function] = New ColumnConfig.ColumnFunction With {
+                            .Id = GetRowItem(oRow, "FUNCTION_ID", 0),
+                            .Name = GetRowItem(oRow, "FUNCTION_NAME", String.Empty),
+                            .Params = GetRowItem(oRow, "FUNCTION_PARAMETERS", String.Empty)
+                        }
                    }

                    oItems.Add(oColumn)
Author	SHA1	Message	Date
Jonathan Jenne	15b553efc3	Clean up	2021-11-18 13:31:23 +01:00
Jonathan Jenne	3760453d82	Improve validation	2021-11-18 13:31:14 +01:00
Jonathan Jenne	3b07002c28	Generate script from MSSMS	2021-11-18 13:30:53 +01:00
Jonathan Jenne	6693ac770e	Easier column configuration	2021-11-18 13:28:33 +01:00