From 9f2f8fe4863a1856feee052fda4eff5666622d44 Mon Sep 17 00:00:00 2001 From: Franzi Date: Thu, 21 Dec 2023 21:49:36 +0100 Subject: [PATCH 01/14] Update seed data #1487 --- .../DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs index 1b16a5a602..37749eb278 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Helpers/DCMSeedDataGenerator.cs @@ -316,6 +316,7 @@ public void GenerateSeedData() entityTemplate.MetadataFields = new List() { 4, 1 }; entityTemplate.HasDatastructure = true; entityTemplate.DatastructureList = new List(); + entityTemplate.AllowedFileTypes = new List { ".csv" }; // set entity entityTemplate.EntityType = entity; From faf699e499c5644c1b0e618b5f43e61eb2833392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 10:11:19 +0100 Subject: [PATCH 02/14] #1366 add missing operations and update meanngs tables and constraints --- .../Helpers/RPMSeedDataGenerator.cs | 21 +- .../Update_Script_2182to3.sql | 557 +++++++++++++++--- 2 files changed, 481 insertions(+), 97 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/RPMSeedDataGenerator.cs b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/RPMSeedDataGenerator.cs index 8efc2fc67c..f55e8a03bb 100644 --- a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/RPMSeedDataGenerator.cs +++ b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/RPMSeedDataGenerator.cs @@ -121,11 +121,11 @@ public void GenerateSeedData() f.Parent != null && f.Parent.Id.Equals(dataPlanning.Id)); - if (newDataTypeFeature == null) - newDataTypeFeature = featureManager.Create("New Data Type Management", "New Data Type Management", dataPlanning); + //if (newDataTypeFeature == null) + //newDataTypeFeature = featureManager.Create("New Data Type Management", "New Data Type Management", dataPlanning); if (!operationManager.Exists("RPM", "DataType", "*")) - operationManager.Create("RPM", "DataType", "*", newDataTypeFeature); + operationManager.Create("RPM", "DataType", "*", dataTypeFeature); @@ -147,22 +147,22 @@ public void GenerateSeedData() //meanings features and security levels Feature dataMeaning = features.FirstOrDefault(f => - f.Name.Equals("Data Meaning Manager") && + f.Name.Equals("Meaning Manager") && f.Parent != null && f.Parent.Id.Equals(dataPlanning.Id)); if (dataMeaning == null) - dataMeaning = featureManager.Create("Data Meaning", "Data Meaning Management", dataPlanning); + dataMeaning = featureManager.Create("Meaning", "Meaning Management", dataPlanning); if (!operationManager.Exists("API", "MeaningsAdmin", "*")) { operationManager.Create("API", "MeaningsAdmin", "*", dataMeaning); } Feature dataMeaning_pub = features.FirstOrDefault(f => - f.Name.Equals("Data Meaning (public)") && + f.Name.Equals("Meaning API") && f.Parent != null && f.Parent.Id.Equals(dataPlanning.Id)); if (dataMeaning_pub == null) - dataMeaning_pub = featureManager.Create("Data Meaning (public)", "Data Meaning Management", dataPlanning); + dataMeaning_pub = featureManager.Create("Meaning API", "Meaning Management", dataPlanning); if (!operationManager.Exists("API", "Meanings", "*")) { operationManager.Create("API", "Meanings", "*", dataMeaning_pub); @@ -171,9 +171,12 @@ public void GenerateSeedData() if (!operationManager.Exists("RPM", "Meaning", "*")) { - operationManager.Create("RPM", "Meaning", "*", dataMeaning_pub); - operationManager.Create("RPM", "ExternalLink", "*", dataMeaning_pub); + operationManager.Create("RPM", "Meaning", "*", dataMeaning); + } + if (!operationManager.Exists("RPM", "ExternalLink", "*")) + { + operationManager.Create("RPM", "ExternalLink", "*", dataMeaning); } if (!operationManager.Exists("RPM", "Help", "*"))operationManager.Create("RPM", "Help", "*"); diff --git a/database update scripts/Update_Script_2182to3.sql b/database update scripts/Update_Script_2182to3.sql index 3321af631b..25ea4fdb65 100644 --- a/database update scripts/Update_Script_2182to3.sql +++ b/database update scripts/Update_Script_2182to3.sql @@ -28,71 +28,13 @@ CREATE TABLE IF NOT EXISTS public.entitytemplates ( ALTER TABLE IF EXISTS public.entitytemplates OWNER to postgres; - -CREATE TABLE IF NOT EXISTS public.variable_constraints ( - constraintref bigint NOT NULL, - variableref bigint NOT NULL, - CONSTRAINT variable_constraints_pkey PRIMARY KEY (variableref, constraintref), - CONSTRAINT fk_17300cc1 FOREIGN KEY (variableref) REFERENCES public.variables (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION, - CONSTRAINT fk_8ba3b117 FOREIGN KEY (constraintref) REFERENCES public.constraints (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION -) TABLESPACE pg_default; - -ALTER TABLE - IF EXISTS public.variable_constraints OWNER to postgres; - -CREATE TABLE IF NOT EXISTS public.meanings ( - id bigint NOT NULL, - versionno integer NOT NULL, - name character varying(255) COLLATE pg_catalog."default", - shortname character varying(255) COLLATE pg_catalog."default", - description character varying(255) COLLATE pg_catalog."default", - approved integer, - selectable integer, - CONSTRAINT meanings_pkey PRIMARY KEY (id) -) TABLESPACE pg_default; - -ALTER TABLE - IF EXISTS public.meanings OWNER to postgres; - -CREATE TABLE IF NOT EXISTS public.externallink ( - id bigint NOT NULL, - versionno integer NOT NULL, - uri character varying(255) COLLATE pg_catalog."default", - name character varying(255) COLLATE pg_catalog."default", - type character varying(255) COLLATE pg_catalog."default", - externallinkref bigint, - CONSTRAINT externallink_pkey PRIMARY KEY (id), - CONSTRAINT fk_6978e301 FOREIGN KEY (externallinkref) REFERENCES public.meanings (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION -) TABLESPACE pg_default; - -ALTER TABLE - IF EXISTS public.externallink OWNER to postgres; +ALTER TABLE IF EXISTS public.entitytemplates + ALTER COLUMN id SET DEFAULT nextval('entitytemplates_id_seq'::regclass); -CREATE TABLE IF NOT EXISTS public.meaning_meaning ( - meaningsparentref bigint NOT NULL, - meaningschildrenref bigint NOT NULL, - CONSTRAINT meaning_meaning_pkey PRIMARY KEY (meaningsparentref, meaningschildrenref), - CONSTRAINT fk_516f2fd8 FOREIGN KEY (meaningschildrenref) REFERENCES public.meanings (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION, - CONSTRAINT fk_d0cc9d49 FOREIGN KEY (meaningsparentref) REFERENCES public.meanings (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION -) TABLESPACE pg_default; - -ALTER TABLE - IF EXISTS public.meaning_meaning OWNER to postgres; - -CREATE TABLE IF NOT EXISTS public.meanings_variables ( - variableref bigint NOT NULL, - meaningref bigint NOT NULL, - CONSTRAINT meanings_variables_pkey PRIMARY KEY (meaningref, variableref), - CONSTRAINT fk_a7c43e6c FOREIGN KEY (variableref) REFERENCES public.variables (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION, - CONSTRAINT fk_c5170336 FOREIGN KEY (meaningref) REFERENCES public.meanings (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION -) TABLESPACE pg_default; - -ALTER TABLE - IF EXISTS public.meanings_variables OWNER to postgres; - -CREATE TABLE IF NOT EXISTS public.accessrules ( +CREATE TABLE IF NOT EXISTS public.accessrules +( id bigint NOT NULL, versionno integer NOT NULL, securitykey character varying(255) COLLATE pg_catalog."default", @@ -101,12 +43,29 @@ CREATE TABLE IF NOT EXISTS public.accessrules ( displayname character varying(255) COLLATE pg_catalog."default", parentref bigint, CONSTRAINT accessrules_pkey PRIMARY KEY (id), - CONSTRAINT fk_accessruleentitys_parentaccessruleentity FOREIGN KEY (parentref) REFERENCES public.accessrules (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION + CONSTRAINT fk_accessruleentitys_parentaccessruleentity FOREIGN KEY (parentref) + REFERENCES public.accessrules (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.accessrules + OWNER to postgres; + +CREATE TABLE IF NOT EXISTS public.variable_constraints ( + constraintref bigint NOT NULL, + variableref bigint NOT NULL, + CONSTRAINT variable_constraints_pkey PRIMARY KEY (variableref, constraintref), + CONSTRAINT fk_17300cc1 FOREIGN KEY (variableref) REFERENCES public.variables (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION, + CONSTRAINT fk_8ba3b117 FOREIGN KEY (constraintref) REFERENCES public.constraints (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION ) TABLESPACE pg_default; ALTER TABLE - IF EXISTS public.accessrules OWNER to postgres; + IF EXISTS public.variable_constraints OWNER to postgres; +/* VARIABLES */ ALTER TABLE IF EXISTS public.variables @@ -116,7 +75,7 @@ ALTER COLUMN ALTER TABLE IF EXISTS public.variables ADD - COLUMN approved boolean; + COLUMN approved boolean DEFAULT true; ALTER TABLE IF EXISTS public.variables @@ -176,6 +135,282 @@ DROP INDEX IF EXISTS public.idx_dataattributeref_variables; DROP INDEX IF EXISTS public.idx_datastructureref_variables; +/**END VARIABLES */ + +/**meanings**/ + +CREATE TABLE IF NOT EXISTS public.rpm_prefixcategory +( + id bigint NOT NULL, + versionno integer NOT NULL, + name character varying(255) COLLATE pg_catalog."default", + description character varying(255) COLLATE pg_catalog."default", + CONSTRAINT rpm_prefixcategory_pkey PRIMARY KEY (id) +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_prefixcategory + OWNER to postgres; + +CREATE TABLE IF NOT EXISTS public.rpm_meaning_externallink +( + meaningsref bigint NOT NULL, + externallinkref bigint NOT NULL, + CONSTRAINT rpm_meaning_externallink_pkey PRIMARY KEY (meaningsref, externallinkref) +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meaning_externallink + OWNER to postgres; + +/* External LINKS */ + +CREATE TABLE IF NOT EXISTS public.rpm_externallink +( + id bigint NOT NULL, + versionno integer NOT NULL, + uri character varying(255) COLLATE pg_catalog."default", + name character varying(255) COLLATE pg_catalog."default", + type integer, + prefix bigint, + prefixcategory bigint +); + +CREATE SEQUENCE IF NOT EXISTS public.rpm_externallink_id_seq INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 OWNED BY rpm_externallink.id; + +ALTER SEQUENCE public.rpm_externallink_id_seq OWNER TO postgres; + +ALTER TABLE IF EXISTS public.rpm_externallink + OWNER to postgres; + + +ALTER TABLE IF EXISTS public.rpm_externallink + ALTER COLUMN id SET DEFAULT nextval('rpm_externallink_id_seq'::regclass); + + +ALTER TABLE IF EXISTS public.rpm_externallink + ADD CONSTRAINT rpm_externallink_pkey PRIMARY KEY (id); + +ALTER TABLE IF EXISTS public.rpm_externallink + ADD CONSTRAINT fk_a4adc10f FOREIGN KEY (prefix) + REFERENCES public.rpm_externallink (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION; + +ALTER TABLE IF EXISTS public.rpm_externallink + ADD CONSTRAINT fk_cc3bd9e2 FOREIGN KEY (prefixcategory) + REFERENCES public.rpm_prefixcategory (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION; + +/* end External LINKS */ + +/* MEANING ENTRY */ + +CREATE TABLE IF NOT EXISTS public.rpm_meaningentry +( + id bigint NOT NULL, + mappingrelation bigint, + CONSTRAINT rpm_meaningentry_pkey PRIMARY KEY (id), + CONSTRAINT fk_a9af26db FOREIGN KEY (mappingrelation) + REFERENCES public.rpm_externallink (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +); + +ALTER TABLE IF EXISTS public.rpm_meaningentry + OWNER to postgres; + +CREATE SEQUENCE IF NOT EXISTS public.rpm_meaningentry_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + CACHE 1 + OWNED BY rpm_meaningentry.id; + +ALTER TABLE IF EXISTS public.rpm_meaningentry + ALTER COLUMN id SET DEFAULT nextval('rpm_meaningentry_id_seq'::regclass); + + +ALTER SEQUENCE public.rpm_meaningentry_id_seq + OWNER TO postgres; + +/* end MEANING ENTRY */ + +CREATE SEQUENCE IF NOT EXISTS public.accessrules_id_seq INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 OWNED BY accessrules.id; + +ALTER SEQUENCE public.accessrules_id_seq OWNER TO postgres; + +CREATE TABLE IF NOT EXISTS public.rpm_meanings +( + id bigint NOT NULL, + versionno integer NOT NULL, + name character varying(255) COLLATE pg_catalog."default", + shortname character varying(255) COLLATE pg_catalog."default", + description character varying(255) COLLATE pg_catalog."default", + approved boolean, + selectable boolean, + CONSTRAINT rpm_meanings_pkey PRIMARY KEY (id) +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meanings + OWNER to postgres; + +CREATE TABLE IF NOT EXISTS public.rpm_meaning_constraints +( + meaningref bigint NOT NULL, + constraintref bigint NOT NULL, + CONSTRAINT rpm_meaning_constraints_pkey PRIMARY KEY (meaningref, constraintref), + CONSTRAINT fk_2c15262f FOREIGN KEY (constraintref) + REFERENCES public.constraints (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION, + CONSTRAINT fk_82e106c9 FOREIGN KEY (meaningref) + REFERENCES public.rpm_meanings (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meaning_constraints + OWNER to postgres; + + +CREATE TABLE IF NOT EXISTS public.rpm_meaning_meaning +( + meaningsparentref bigint NOT NULL, + meaningschildrenref bigint NOT NULL, + CONSTRAINT rpm_meaning_meaning_pkey PRIMARY KEY (meaningsparentref, meaningschildrenref) +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meaning_meaning + OWNER to postgres; + +CREATE TABLE IF NOT EXISTS public.rpm_meaning_related_meaning +( + meaningref bigint NOT NULL, + parentmeaningref bigint NOT NULL, + CONSTRAINT fk_a3ef456 FOREIGN KEY (meaningref) + REFERENCES public.rpm_meanings (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION, + CONSTRAINT fk_d0f1340d FOREIGN KEY (parentmeaningref) + REFERENCES public.rpm_meanings (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meaning_related_meaning + OWNER to postgres; + +CREATE TABLE IF NOT EXISTS public.rpm_meaningentry +( + id bigint NOT NULL, + mappingrelation bigint, + CONSTRAINT rpm_meaningentry_pkey PRIMARY KEY (id), + CONSTRAINT fk_a9af26db FOREIGN KEY (mappingrelation) + REFERENCES public.rpm_externallink (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meaningentry + OWNER to postgres; + +CREATE TABLE IF NOT EXISTS public.rpm_meaningentry_mappedlinks +( + meaningentryref bigint NOT NULL, + externallink_mapped_linkref bigint NOT NULL, + CONSTRAINT fk_45a06b73 FOREIGN KEY (externallink_mapped_linkref) + REFERENCES public.rpm_externallink (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION, + CONSTRAINT fk_75241888 FOREIGN KEY (meaningentryref) + REFERENCES public.rpm_meaningentry (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meaningentry_mappedlinks + OWNER to postgres; + +CREATE TABLE IF NOT EXISTS public.rpm_meanings_meaningentry +( + meaningref bigint NOT NULL, + meaningentryref bigint NOT NULL, + CONSTRAINT fk_5b58106d FOREIGN KEY (meaningref) + REFERENCES public.rpm_meanings (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION, + CONSTRAINT fk_ce0176f7 FOREIGN KEY (meaningentryref) + REFERENCES public.rpm_meaningentry (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meanings_meaningentry + OWNER to postgres; + +CREATE TABLE IF NOT EXISTS public.rpm_meanings_variables +( + variableref bigint NOT NULL, + meaningref bigint NOT NULL, + CONSTRAINT rpm_meanings_variables_pkey PRIMARY KEY (variableref, meaningref), + CONSTRAINT fk_5428fd5b FOREIGN KEY (meaningref) + REFERENCES public.rpm_meanings (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION, + CONSTRAINT fk_98f6228e FOREIGN KEY (variableref) + REFERENCES public.variables (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.rpm_meanings_variables + OWNER to postgres; + +/* -- */ + +/*end Meanings */ + +CREATE TABLE IF NOT EXISTS public.variable_constraints +( + constraintref bigint NOT NULL, + variableref bigint NOT NULL, + CONSTRAINT variable_constraints_pkey PRIMARY KEY (variableref, constraintref), + CONSTRAINT fk_17300cc1 FOREIGN KEY (variableref) + REFERENCES public.variables (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION, + CONSTRAINT fk_8ba3b117 FOREIGN KEY (constraintref) + REFERENCES public.constraints (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +) + +TABLESPACE pg_default; + +ALTER TABLE IF EXISTS public.variable_constraints + OWNER to postgres; + ALTER TABLE IF EXISTS public.datasets ALTER COLUMN @@ -221,22 +456,107 @@ ALTER TABLE ADD CONSTRAINT fk_f9a7e19e FOREIGN KEY (unitref) REFERENCES public.units (id) MATCH SIMPLE ON UPDATE NO ACTION ON DELETE NO ACTION; -CREATE SEQUENCE IF NOT EXISTS public.meanings_id_seq INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 OWNED BY meanings.id; +/* Constraints */ -ALTER SEQUENCE public.meanings_id_seq OWNER TO postgres; +ALTER TABLE IF EXISTS public.constraints + ALTER COLUMN datacontainerref DROP NOT NULL; -CREATE SEQUENCE IF NOT EXISTS public.externallink_id_seq INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 OWNED BY externallink.id; +ALTER TABLE IF EXISTS public.constraints + ADD COLUMN creationdate timestamp without time zone; -ALTER SEQUENCE public.externallink_id_seq OWNER TO postgres; +ALTER TABLE IF EXISTS public.constraints + ADD COLUMN lastmodified timestamp without time zone; -CREATE SEQUENCE IF NOT EXISTS public.accessrules_id_seq INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 OWNED BY accessrules.id; +ALTER TABLE IF EXISTS public.constraints + ADD COLUMN lastmodifieduserref bigint; + +ALTER TABLE IF EXISTS public.constraints + ADD COLUMN name character varying(255) COLLATE pg_catalog."default"; +ALTER TABLE IF EXISTS public.constraints DROP CONSTRAINT IF EXISTS fkb6093b2ee5c7912c; + +ALTER TABLE IF EXISTS public.constraints + ADD CONSTRAINT fk_fd8e6a17 FOREIGN KEY (datacontainerref) + REFERENCES public.datacontainers (id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION; -ALTER SEQUENCE public.accessrules_id_seq OWNER TO postgres; + +/* TABLE DROPS*/ +DROP TABLE IF EXISTS public.parameters CASCADE; + +/* SEQUENCE */ CREATE SEQUENCE IF NOT EXISTS public.entitytemplates_id_seq INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 OWNED BY entitytemplates.id; ALTER SEQUENCE public.entitytemplates_id_seq OWNER TO postgres; +CREATE SEQUENCE IF NOT EXISTS public.rpm_prefixcategory_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + CACHE 1 + OWNED BY rpm_prefixcategory.id; + +ALTER SEQUENCE public.rpm_prefixcategory_id_seq + OWNER TO postgres; + +CREATE SEQUENCE IF NOT EXISTS public.rpm_meanings_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + CACHE 1 + OWNED BY rpm_meanings.id; + +ALTER SEQUENCE public.rpm_meanings_id_seq + OWNER TO postgres; + + + + +DROP SEQUENCE IF EXISTS public.parameters_id_seq; + +CREATE SEQUENCE IF NOT EXISTS public.entitytemplates_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + CACHE 1 + OWNED BY entitytemplates.id; + +ALTER SEQUENCE public.entitytemplates_id_seq + OWNER TO postgres; + +CREATE SEQUENCE IF NOT EXISTS public.accessrules_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + CACHE 1 + OWNED BY accessrules.id; + +ALTER SEQUENCE public.accessrules_id_seq + OWNER TO postgres; + + +ALTER TABLE IF EXISTS public.rpm_meanings + ALTER COLUMN id SET DEFAULT nextval('rpm_meanings_id_seq'::regclass); + + +ALTER TABLE IF EXISTS public.rpm_prefixcategory + ALTER COLUMN id SET DEFAULT nextval('rpm_prefixcategory_id_seq'::regclass); + +/* UNITS */ + +ALTER TABLE IF EXISTS public.units + ADD COLUMN externallinkref bigint; + +/** DROP COLUMNS */ +ALTER TABLE IF EXISTS public.datacontainers DROP COLUMN IF EXISTS classifierref; + + + /**********************************************************************************************/ /********************** DATA CHANGES *********************************************************/ @@ -264,23 +584,42 @@ SELECT 1, null, '', 'Dimension Management', Select id from features where name = 'Data Planing' ) WHERE NOT EXISTS (SELECT * FROM public.features WHERE name='Dimension Management'); + +/*Constraint Management*/ +INSERT INTO public.features( +versionno, extra, description, name, parentref) +SELECT 1, null, '', 'Constraint Management', +( + Select id from features where name = 'Data Planing' +) +WHERE NOT EXISTS (SELECT * FROM public.features WHERE name='Constraint Management'); + +/*Data Type Management*/ +INSERT INTO public.features( +versionno, extra, description, name, parentref) +SELECT 1, null, '', 'Data Type Management', +( + Select id from features where name = 'Data Planing' +) +WHERE NOT EXISTS (SELECT * FROM public.features WHERE name='Data Type Management'); + /*Data Meaning*/ INSERT INTO public.features( versionno, extra, description, name, parentref) -SELECT 1, null, '', 'Data Meaning', +SELECT 1, null, '', 'Meaning', ( Select id from features where name = 'Data Planing' ) -WHERE NOT EXISTS (SELECT * FROM public.features WHERE name='Data Meaning'); -/*Data Meaning (public)*/ +WHERE NOT EXISTS (SELECT * FROM public.features WHERE name='Meaning'); +/*Meaning API*/ INSERT INTO public.features( versionno, extra, description, name, parentref) -SELECT 1, null, '', 'Data Meaning (public)', +SELECT 1, null, '', 'Meaning API', ( Select id from features where name = 'Data Planing' ) -WHERE NOT EXISTS (SELECT * FROM public.features WHERE name='Data Meaning (public)'); +WHERE NOT EXISTS (SELECT * FROM public.features WHERE name='Meaning API'); /* Update Operations */ /* ADD **/ @@ -292,6 +631,18 @@ WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='Shell' AND contr INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) SELECT 1, NULL, 'Shell', 'Menu', '*', null WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='Shell' AND controller='Menu'); +/* Shell Header **/ +INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) +SELECT 1, NULL, 'Shell', 'Header', '*', null +WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='Shell' AND controller='Header'); +/* Shell Tokens **/ +INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) +SELECT 1, NULL, 'Shell', 'Tokens', '*', null +WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='Shell' AND controller='Tokens'); +/* API Tokens **/ +INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) +SELECT 1, NULL, 'Api', 'Tokens', '*', null +WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='Api' AND controller='Tokens'); /* Shell Settings **/ INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) SELECT 1, NULL, 'Shell', 'Settings', '*', (Select id from features where name = 'Settings' AND parentref = ( @@ -365,24 +716,39 @@ INSERT INTO public.operations (versionno, extra, module, controller, action, fea SELECT 1, NULL, 'RPM', 'Dimension', '*', (Select id from features where name = 'Unit Management' AND parentref = ( Select id from features where name = 'Data Planning')) WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='RPM' AND controller='Dimension'); +/* RPM Constraints **/ +INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) +SELECT 1, NULL, 'RPM', 'Constraints', '*', (Select id from features where name = 'Constraints Management' AND parentref = ( +Select id from features where name = 'Data Planning')) +WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='RPM' AND controller='Constraints'); +/* RPM Constraints **/ +INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) +SELECT 1, NULL, 'RPM', 'Constraints', '*', (Select id from features where name = 'Constraints Management' AND parentref = ( +Select id from features where name = 'Data Planning')) +WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='RPM' AND controller='Constraints'); +/* RPM Data Type **/ +INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) +SELECT 1, NULL, 'RPM', 'DataType', '*', (Select id from features where name = 'Data Type Management' AND parentref = ( +Select id from features where name = 'Data Planning')) +WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='RPM' AND controller='DataType'); /* API MeaningsAdmin **/ INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) -SELECT 1, NULL, 'API', 'MeaningsAdmin', '*', (Select id from features where name = 'Data Meaning' AND parentref = ( +SELECT 1, NULL, 'API', 'MeaningsAdmin', '*', (Select id from features where name = 'Meaning' AND parentref = ( Select id from features where name = 'Data Planning')) WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='API' AND controller='MeaningsAdmin'); /* API Meanings **/ INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) -SELECT 1, NULL, 'API', 'Meanings', '*', (Select id from features where name = 'Data Meaning (public)' AND parentref = ( +SELECT 1, NULL, 'API', 'Meanings', '*', (Select id from features where name = 'Meaning API' AND parentref = ( Select id from features where name = 'Data Planning')) WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='API' AND controller='Meanings'); /* RPM Meaning **/ INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) -SELECT 1, NULL, 'RPM', 'Meaning', '*', (Select id from features where name = 'Data Meaning (public)' AND parentref = ( +SELECT 1, NULL, 'RPM', 'Meaning', '*', (Select id from features where name = 'Meaning' AND parentref = ( Select id from features where name = 'Data Planning')) WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='RPM' AND controller='Meaning'); /* RPM ExternalLink **/ INSERT INTO public.operations (versionno, extra, module, controller, action, featureref) -SELECT 1, NULL, 'RPM', 'ExternalLink', '*', (Select id from features where name = 'Data Meaning (public)' AND parentref = ( +SELECT 1, NULL, 'RPM', 'ExternalLink', '*', (Select id from features where name = 'Meaning' AND parentref = ( Select id from features where name = 'Data Planning')) WHERE NOT EXISTS (SELECT * FROM public.operations WHERE module='RPM' AND controller='ExternalLink'); /* DIM Publish **/ @@ -419,7 +785,8 @@ DELETE FROM public.operations Where module = 'DCM' and controller = 'EasyUploadS DELETE FROM public.operations Where module = 'DCM' and controller = 'EasyUploadSummary'; /** DCM EasyUploadVerification **/ DELETE FROM public.operations Where module = 'DCM' and controller = 'EasyUploadVerification'; - +/** API TOKEN **/ +DELETE FROM public.operations Where module = 'Api' and controller = 'Token'; @@ -432,7 +799,7 @@ INSERT INTO public.entitytemplates( /* add template for structured */ INSERT INTO public.entitytemplates( id, versionno, extra, name, description, metadatainvalidsavemode, hasdatastructure, entityref, metadatastructureref) - VALUES (2, 1, null, 'Data', 'Use this template if you want to upload data', true, true,1,1); + VALUES (2, 1, null, 'Data', 'Use this template if you want to upload data', true, true,1,2); /* update datasets */ Update Datasets SET entitytemplateref=1 where datastructureref in (select id from datastructures where datastructuretype like 'UnS'); @@ -452,6 +819,11 @@ INSERT INTO public.variables( Select versionno, extra, name, description, id, unitref, datatyperef, 'VAR_TEMPL', true From public.datacontainers Where discriminator like 'DA'; +/* set VAR_INST Datatype based on VAR_TEMPL*/ +update variables as x +SET datatyperef = b.datatyperef +from variables as b +where x.vartemplateref = b.id ; /* set all templates to variables */ update variables as x @@ -463,9 +835,19 @@ where x.dataattributeref = b.dataattributeref and b.variablestype = 'VAR_TEMPL'; /** update Constraints **/ /***Link constraints to varaibles*/ +/* fill coupling table variables_constraint*/ +INSERT INTO variable_constraints(constraintref,variableref) +Select c.id, v.id +From constraints as c, variables as v +WHERE c.datacontainerref = v.dataattributeref; +/* set name and remove datacontainer*/ +UPDATE constraints as c +SET name = c.id, datacontainerref = null +where datacontainerref in (Select id from public.datacontainers Where discriminator like 'DA'); -/* Seed data dwc terms as meanings */ +/* delete all data container with discimrinator */ +DELETE from public.datacontainers Where discriminator like 'DA' /**********************************************************************************************/ @@ -477,24 +859,23 @@ where x.dataattributeref = b.dataattributeref and b.variablestype = 'VAR_TEMPL'; ALTER TABLE IF EXISTS public.variables ALTER COLUMN - datatyperef bigint NOT NULL; + datatyperef SET NOT NULL; /** set type in variable to not null**/ ALTER TABLE IF EXISTS public.variables ALTER - COLUMN variablestype character varying(255) COLLATE pg_catalog."default" NOT NULL; + COLUMN variablestype SET NOT NULL; /** set entitytemplateref in datasets to not null**/ ALTER TABLE IF EXISTS public.datasets -ADD - COLUMN entitytemplateref bigint NOT NULL; +ALTER + COLUMN entitytemplateref SET NOT NULL; /* drop all varaible links to dataattributeref*/ ALTER TABLE IF EXISTS public.variables DROP COLUMN IF EXISTS dataattributeref; - END; \ No newline at end of file From 1d3808ac498ee222967d39a281c19fa46f261f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 10:15:28 +0100 Subject: [PATCH 03/14] #1370 set meaning and template is required as default false --- .../Areas/RPM/BExIS.Modules.Rpm.UI/Rpm.Settings.json | 4 ++-- Console/Workspace | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Rpm.Settings.json b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Rpm.Settings.json index 4f3bf0791e..6dbaaa8f8b 100644 --- a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Rpm.Settings.json +++ b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Rpm.Settings.json @@ -27,14 +27,14 @@ { "key": "isTemplateRequired", "title": "Link variables to templates", - "value": true, + "value": false, "type": "Boolean", "description": "During data structure creation, variables are created. Is it mandatory to link these variables to templates." }, { "key": "isMeaningRequired", "title": "Link variables to meanings", - "value": true, + "value": false, "type": "Boolean", "description": "During data structure creation, variables are created. Is it mandatory to link these variables to meanings." }, diff --git a/Console/Workspace b/Console/Workspace index 43b4884133..5a38a7b665 160000 --- a/Console/Workspace +++ b/Console/Workspace @@ -1 +1 @@ -Subproject commit 43b48841337e110b4a17fdb262af94f264993d3d +Subproject commit 5a38a7b6653bd5e09b61409155b1e0bfbcc9d965 From 2580a6903d9c482247529b268efc32c1e84b64b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 10:21:02 +0100 Subject: [PATCH 04/14] #1370 remove som views that are not needed anymore --- .../Views/CreateDataset/Index.cshtml | 376 ------------ .../Views/EasyUpload/UploadWizard.cshtml | 69 --- .../Views/EasyUpload/_taskListView.cshtml | 76 --- .../Views/EasyUpload/_uploadWizardNav.cshtml | 170 ------ .../EasyUploadSelectAFile/SelectAFile.cshtml | 181 ------ .../EasyUploadSelectAreas/SelectAreas.cshtml | 545 ------------------ .../SheetDataStructure.cshtml | 117 ---- .../SheetSelectMetaData.cshtml | 88 --- .../EasyUploadSummary.cshtml | 72 --- .../Views/EasyUploadVerification/Row.cshtml | 139 ----- .../Verification.cshtml | 241 -------- .../ChooseUpdateMethod.cshtml | 177 ------ .../GetFileInformation.cshtml | 64 -- .../_txtFormularView.cshtml | 125 ---- .../_xlsFormularView.cshtml | 516 ----------------- .../SubmitSelectAFile/SelectAFile.cshtml | 291 ---------- .../SpecifyDataset.cshtml | 103 ---- .../_selectADatasetId.cshtml | 40 -- .../Views/SubmitSummary/Summary.cshtml | 133 ----- .../UnstructuredData.cshtml | 151 ----- .../Views/SubmitValidation/Validation.cshtml | 141 ----- 21 files changed, 3815 deletions(-) delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/CreateDataset/Index.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/UploadWizard.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/_taskListView.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/_uploadWizardNav.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSelectAFile/SelectAFile.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSelectAreas/SelectAreas.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSheetDataStructure/SheetDataStructure.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSheetSelectMetaData/SheetSelectMetaData.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSummary/EasyUploadSummary.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadVerification/Row.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadVerification/Verification.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitChooseUpdateMethod/ChooseUpdateMethod.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/GetFileInformation.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/_txtFormularView.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/_xlsFormularView.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSelectAFile/SelectAFile.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSpecifyDataset/SpecifyDataset.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSpecifyDataset/_selectADatasetId.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSummary/Summary.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitUnstructuredData/UnstructuredData.cshtml delete mode 100644 Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitValidation/Validation.cshtml diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/CreateDataset/Index.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/CreateDataset/Index.cshtml deleted file mode 100644 index c30191fb06..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/CreateDataset/Index.cshtml +++ /dev/null @@ -1,376 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.CreateDataset.SetupModel -@using BExIS.Modules.Dcm.UI.Models.CreateDataset; - -@using BExIS.Modules.Dcm.UI.Models -@using Telerik.Web.Mvc.UI -@using BExIS.Utils.Extensions - -@{ - List DatasetsList = new List(); - DatasetsList.Insert(0, new ListViewItem(-1, "New Dataset")); - - foreach (ListViewItem item in Model.DatasetViewList) - { - DatasetsList.Add(item); - } -} - -
- @section Information - { - This wizard helps you to create a new dataset. There are two options: (1) create a new dataset or (2) create a dataset based on an existing dataset. -
- (1) Please select “New dataset”, choose the data type (tabular data or file) as new or based on an exiting, and the metadata structure (e.g. BE-MetadataSchema). -
- (2) Select a dataset as a template to reuse its metadata and data structure. -

- More -

-

- More -

- } - - @Html.ValidationSummary(true) - -

Please provide the following information.

- @using (Html.BeginForm("StoreSelectedDatasetSetup", "CreateDataset", FormMethod.Post)) - { - - - - - - - - - - - - - - - - - - - -
- @Html.LabelFor(m => m.SelectedDatasetId) - - - - @*@Html.Partial("_EnititySelectorView", BexisModelManager.LoadEntitySelectorModel(Model.DatasetViewList,"Id","myTest"))*@ - - @if (Model.BlockDatasetId) - { - string title = Model.DatasetViewList.Where(ms => ms.Id.Equals(Model.SelectedDatasetId)).FirstOrDefault().Title; - @Html.HiddenFor(m => m.SelectedDatasetId) - @Html.Label(title) - - } - else - { - @(Html.Telerik().DropDownList() - .Name("SelectedDatasetId") - .SelectedIndex(0) - .HtmlAttributes(new { title = "Select a Dataset as Template", @class = "bx-dropdown" }) - .BindTo(new SelectList(DatasetsList, "Id", "Title", Model.SelectedDatasetId)) - .ClientEvents(events => - { - events.OnChange("datasetChange"); - }) - ) - - - } - -
- @Ajax.ActionLink("Select from table", "ShowListOfDatasets", "CreateDataset", new { title = "Select a Dataset as Template" }, - new AjaxOptions - { - HttpMethod = "GET", - InsertionMode = InsertionMode.Replace, - UpdateTargetId = "datasetWindowContainer" - }, - new { @class = "bx-button function", @style = "float:right", title = "Select a Dataset as Template" }) -
-
- 		- @Html.ValidationMessageFor(m => m.SelectedDatasetId) -
- @Html.LabelFor(m => m.SelectedDataStructureId) - - @{ string show_div_structured = "style=display:none"; - string show_div_unstructured = "style=display:none"; - var option = DataStructureOptions.CreateNewStructure; - } - @foreach (var item in Model.DataStructureViewList_structured) - { - if (Model.SelectedDataStructureId == item.Id) - { - show_div_structured = "style=\"display: none\""; - option = DataStructureOptions.Existing_structured; - } - } - @foreach (var item in Model.DataStructureViewList_unstructured) - { - if (Model.SelectedDataStructureId == item.Id) - { - show_div_unstructured = "style=\"display: none\""; - option = DataStructureOptions.Existing_unstructured; - } - } - - - @foreach (DataStructureOptions dsoptions in Enum.GetValues(typeof(DataStructureOptions))) - { - var id = TagBuilder.CreateSanitizedId(string.Format("{0}_{1}_{2}", "rdbtn", typeof(DataStructureOptions), dsoptions)); -
- @Html.RadioButtonFor(s => s.DataStructureOptions, dsoptions, dsoptions == option ? new { @checked = "checked" } : null) - @Html.Label(dsoptions.GetDisplayName(), new { @for = id }) -
- } - - -
- - @if (Model.BlockDatastructureId) - { - string title = Model.DataStructureViewList_unstructured.Where(ms => ms.Id.Equals(Model.SelectedDataStructureId)).FirstOrDefault().Title; - @Html.HiddenFor(m => m.SelectedDataStructureId) - @Html.Label(title) - ; - } - else - { - - - - } -
- @Ajax.ActionLink("Select from table", "ShowListOfDataStructures", "CreateDataset", - new AjaxOptions - { - HttpMethod = "GET", - InsertionMode = InsertionMode.Replace, - UpdateTargetId = "datastructureWindowContainer" - }, - new { @class = "bx-button function", @style = "float:right", title = "Select a Data Structure" }) -
- -
-
- @if (Model.BlockDatastructureId) - { - string title = Model.DataStructureViewList_unstructured.Where(ms => ms.Id.Equals(Model.SelectedDataStructureId)).FirstOrDefault().Title; - @Html.HiddenFor(m => m.SelectedDataStructureId) - @Html.Label(title) - ; - } - else - { - - } - -
- @Ajax.ActionLink("Select from table", "ShowListOfDataStructures", "CreateDataset", - new AjaxOptions - { - HttpMethod = "GET", - InsertionMode = InsertionMode.Replace, - UpdateTargetId = "datastructureWindowContainer" - }, - new { @class = "bx-button function", @style = "float:right", title = "Select a Data Structure" }) -
-
-
- 		- -
- @Html.LabelFor(m => m.SelectedMetadataStructureId) - - @*
- @if (Model.BlockMetadataStructureId) - { - - } - else - { - @Ajax.ActionLink("Select", "ShowListOfMetadataStructures", "CreateDataset", - new AjaxOptions - { - HttpMethod = "GET", - InsertionMode = InsertionMode.Replace, - UpdateTargetId = "metadatadatastructureWindowContainer" - }, - new { @class = "bx-button function", @style = "float:right", title = "Select a Metadata Structure" }) - } -
*@ -
- 		- @if (Model.BlockMetadataStructureId) - { - string title = Model.MetadataStructureViewList.Where(ms => ms.Id.Equals(Model.SelectedMetadataStructureId)).FirstOrDefault().Title; - @Html.HiddenFor(m => m.SelectedMetadataStructureId) - @Html.Label(title) - - } - else - { - - @(Html.Telerik().DropDownList() - .Name("SelectedMetadataStructureId") - .Placeholder("Select") - .HtmlAttributes(new { title = "Select a Metadata Structure", @class = "bx-dropdown" }) - .SelectedIndex(0) - .BindTo(new SelectList(Model.MetadataStructureViewList, "Id", "Title", Model.SelectedMetadataStructureId)) - .ClientEvents(e => - { - e.OnChange("onChangeMetadataStructure"); - }) - ) - - } - - @Html.ValidationMessageFor(m => m.SelectedMetadataStructureId) -
- -
- -
- - } -
- - - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/UploadWizard.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/UploadWizard.cshtml deleted file mode 100644 index 0fdf0985f8..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/UploadWizard.cshtml +++ /dev/null @@ -1,69 +0,0 @@ -@model BExIS.Dcm.UploadWizard.EasyUploadTaskManager -@using Telerik.Web.Mvc.UI; -@using BExIS.Modules.Dcm.UI.Models; - - - -@section Information -{ - This wizard will assist you in uploading an excel file to the system, creating a metadata structure based on the data table - and add it to a dataset. -

- More -

-} - -@section LeftPane -{ @if (ViewData.ModelState.IsValid) - { - @Html.Partial("_taskListView", Model.GetStatusOfStepInfos()) - } - - -} -
- @Html.ValidationSummary(true) -
- - - -@if (ViewData.ModelState.IsValid) -{ - @Html.Partial("_uploadWizardNav", Model) - - - -} \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/_taskListView.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/_taskListView.cshtml deleted file mode 100644 index 61f4a3e1f1..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/_taskListView.cshtml +++ /dev/null @@ -1,76 +0,0 @@ -@model List> - -@using Telerik.Web.Mvc.UI; -@using BExIS.Modules.Dcm.UI.Models; -@using BExIS.Dcm.UploadWizard; -@using BExIS.Dcm.Wizard; - -
- - - @foreach (Tuple item in Model) - { - - - - - } -
- @item.Item1 - - - @switch (item.Item2) - { - case StepStatus.success: - { - @*
*@ - break; - } - case StepStatus.inProgress: - { -
- break; - } - case StepStatus.error: - { -
- break; - } - default: - { - - break; - } - } - -
-
- -@*JavaScript*@ - - -@*CSS*@ - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/_uploadWizardNav.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/_uploadWizardNav.cshtml deleted file mode 100644 index b7990fce8b..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUpload/_uploadWizardNav.cshtml +++ /dev/null @@ -1,170 +0,0 @@ - @{ - ViewBag.Title = "UploadWizardNav"; -} - -@model BExIS.Dcm.UploadWizard.EasyUploadTaskManager -@using BExIS.Modules.Dcm.UI.Models; - -@{ - - int currentPage = @Model.GetCurrentStepInfoIndex() + 1; - -} - - diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSelectAFile/SelectAFile.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSelectAFile/SelectAFile.cshtml deleted file mode 100644 index 08afd80209..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSelectAFile/SelectAFile.cshtml +++ /dev/null @@ -1,181 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.SelectFileViewModel -@using Telerik.Web.Mvc.UI; -@using System; -@using System.Web.Configuration; -@using BExIS.Modules.Dcm.UI.Models; - -@{ - - HttpRuntimeSection section = System.Configuration.ConfigurationManager.GetSection("system.web/httpRuntime") as HttpRuntimeSection; - int int_MaxRequestLength = section.MaxRequestLength; - int mbMax = int_MaxRequestLength / 1024; - - string fileExtListAsString = ""; - - foreach (string s in Model.SupportedFileExtentions) - { - if (fileExtListAsString != "") - { - fileExtListAsString += "," + s; - } - else - { - fileExtListAsString = s; - } - } -} - -
- -
-
- -

@Model.StepInfo.title

-
- -
-

Please select a data file to be uploaded to the system.

-

Note: Large data files may take several minutes or hours to transfer, depending on your network speed. The system is freezed until the file has been transfered completely. Please be patient!

-

For multiple large files you may use the "Push Big Data to Server" option before entering this Upload Wizard.

-

Supported file formats: @{foreach (string s in @Model.SupportedFileExtentions) - {(*@s) } }

-

Maximum file size: @mbMax MB

-
- -
- - - - - - - - - - - - - -
- @(Html.Telerik().Upload() - .Name("SelectFileUploader") - .Multiple(false) - .ShowFileList(false) - .HtmlAttributes(new { title = "Browse" }) - .ClientEvents(events => - events.OnSelect("SelectFileProcess_OnSelect") - .OnRemove("SelectFileProcess_OnRemove") - .OnSuccess("SelectFileProcess_OnSuccess") - - ) - .Async(async => async - .Save("SelectFileProcess", @Model.StepInfo.PostActionInfo.ControllerName, new { area = "DCM" }) - .AutoUpload(true)) - - ) - - Select a data file from your local computer. -
- @(Html.Telerik().DropDownList() - .Placeholder("Please select") - .Name("SelectedServerFileName") - .BindTo(new SelectList(Model.serverFileList)) - .ClientEvents(e => e.OnChange("SelectedServerFileName_onChange"))) - - @*@Html.DropDownListFor(m => m.SelectedServerFileName, new SelectList(Model.serverFileList), "Select")*@@*, new { disabled = "disabled" })*@ - - Select a data file previously uploaded to the server. -
-
-
- -
-
@if (Model.SelectedFileName != "") - {@Model.SelectedFileName}
-
- -
- @if (Model != null && Model.ErrorList != null && Model.ErrorList.Count != 0) - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- } -
- -
- - diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSelectAreas/SelectAreas.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSelectAreas/SelectAreas.cshtml deleted file mode 100644 index 2103d9fdd0..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSelectAreas/SelectAreas.cshtml +++ /dev/null @@ -1,545 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.SelectAreasModel -@using Telerik.Web.Mvc.UI; -@using Telerik.Web.Mvc.Resources; -@using BExIS.Modules.Dcm.UI.Models; - - - - - -} - - -
- -
-
-

@Model.StepInfo.title

-
- -
-

Please mark your header (the names of the variables) and data area.

-
- - - -
-
- - - - - - - - -
- @{ - SelectListItem tmp; - List listItems = new List(); - foreach (KeyValuePair worksheetIdentifier in Model.SheetUriDictionary) - { - tmp = new SelectListItem - { - Text = worksheetIdentifier.Value, - Value = worksheetIdentifier.Key.ToString(), - Selected = (worksheetIdentifier.Key.ToString() == Model.activeSheetUri) - }; - listItems.Add(tmp); - } - } - @Html.DropDownList("Sheet Select", listItems, "Select", new { @class = "buttonsRight bx-dropdown", @id = "sheetSelect" }) - -
-
- -
- Worksheet is loading -
-
-
- - -
- -
- @if (Model != null && Model.ErrorList != null && Model.ErrorList.Count != 0) - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- } -
-
-
- - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSheetDataStructure/SheetDataStructure.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSheetDataStructure/SheetDataStructure.cshtml deleted file mode 100644 index 0e6d3df6c0..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSheetDataStructure/SheetDataStructure.cshtml +++ /dev/null @@ -1,117 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.SelectSheetFormatModel -@using Telerik.Web.Mvc.UI; -@using Telerik.Web.Mvc.Resources; -@using BExIS.Modules.Dcm.UI.Models; - -@{ - string preselect = ""; - if (!String.IsNullOrEmpty(Model.SelectedSheetFormat)) - { - preselect = "[value=" + Model.SelectedSheetFormat + "]"; - } -} - - - - -
- -
-
-

@Model.StepInfo.title

-
- -
-

- Your uploaded file has a specific structure, please select which one (red = variable names, green = data). -

-
- -
-
- - -
-
-
- -
- @if (Model != null && Model.ErrorList != null && Model.ErrorList.Count != 0) - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- } -
-
- - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSheetSelectMetaData/SheetSelectMetaData.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSheetSelectMetaData/SheetSelectMetaData.cshtml deleted file mode 100644 index c0ecf4d342..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSheetSelectMetaData/SheetSelectMetaData.cshtml +++ /dev/null @@ -1,88 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.SelectMetaDataModel -@using Telerik.Web.Mvc.UI; -@using Telerik.Web.Mvc.Resources; -@using BExIS.Modules.Dcm.UI.Models; -@using BExIS.Dlm.Entities.DataStructure; - - -
- -
-
-

Select metadata schema

-
- -
-

Please select the schema for the meta data of your new dataset. After the dataset is created, you will be redirected and you can edit the metadata.

-
- -
- @using (Html.BeginForm("SheetSelectMetaData", "EasyUploadSheetSelectMetaData", new { area = "DCM" })) - { - - - - - - - - - -
Metadata Schema - -
Title@(Html.TextBoxFor(m => m.DescriptionTitle, new { @class = "t-input asciiFormularField bx-input" }))
- } -
-
- -
- @if (Model != null && Model.ErrorList != null && Model.ErrorList.Count != 0) - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- } -
-
- - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSummary/EasyUploadSummary.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSummary/EasyUploadSummary.cshtml deleted file mode 100644 index bf41a18c5c..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadSummary/EasyUploadSummary.cshtml +++ /dev/null @@ -1,72 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.EasyUploadSummaryModel - -
-
-
-

@Model.StepInfo.title

-
- -
-
- -
- - - - - - - - - - - - - - - - - -
- @Html.LabelFor(m => m.DatasetTitle) - - @Model.DatasetTitle -
- @Html.LabelFor(m => m.MetadataSchemaTitle) - - - @Model.MetadataSchemaTitle -
- @Html.LabelFor(m => m.NumberOfHeaders) - - - @Model.NumberOfHeaders -
- @Html.LabelFor(m => m.NumberOfData) - - - @Model.NumberOfData -
-
- The upload process might take a while, depending on the size of your dataset. Please be patient after you click the "Finish" button. -
-
-
- -
-
-
- -
- @if (Model != null && Model.ErrorList != null && Model.ErrorList.Count != 0) - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- } -
- -
\ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadVerification/Row.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadVerification/Row.cshtml deleted file mode 100644 index 9dbd1901f6..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadVerification/Row.cshtml +++ /dev/null @@ -1,139 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.RowModel - -@using BExIS.Modules.Dcm.UI.Helpers; -@using BExIS.Modules.Dcm.UI.Models; - - - - @Html.Name(Model.Name) - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadVerification/Verification.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadVerification/Verification.cshtml deleted file mode 100644 index 681a58eee9..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/EasyUploadVerification/Verification.cshtml +++ /dev/null @@ -1,241 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.SelectVerificationModel -@using Telerik.Web.Mvc.UI; -@using Telerik.Web.Mvc.Resources; -@using BExIS.Modules.Dcm.UI.Models; -@using BExIS.Dlm.Entities.DataStructure; - - -
- -
-
-

@Model.StepInfo.title

-
- -
- -
- -
- - - - - - - - - - - - - - - - - @foreach (var row in Model.Rows) - { - @Html.Partial("Row", row); - } - -
Variable nameDatatypeUnitMeans
The variable [Name]is of [Datatype]has [Unit]and means [Attribute]
-
- -
- -
- -
- -
- @if (Model != null && Model.ErrorList != null && Model.ErrorList.Count != 0) - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- } -
-
- - - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitChooseUpdateMethod/ChooseUpdateMethod.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitChooseUpdateMethod/ChooseUpdateMethod.cshtml deleted file mode 100644 index ea6f9e7389..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitChooseUpdateMethod/ChooseUpdateMethod.cshtml +++ /dev/null @@ -1,177 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.PrimaryKeyViewModel -@using BExIS.Modules.Dcm.UI.Models; - - -
-
-
-

@Model.StepInfo.title

-
- -
-

- -

-
- -
- -
-
Update @Html.RadioButton("UpdateMethod", "Update", new { @checked = "true" })
-
Append @Html.RadioButton("UpdateMethod", "Append")
-
-
-
-

Update the rows from the files to the dataset. Therefore define a unique primary key.

-
-
- @foreach (ListViewItem s in Model.VariableLableList) - { - - - if (Model.PK_Id_List != null) - { - if (Model.PK_Id_List.Contains(s.Id)) - { - @Html.CheckBox(@s.Title, true) @s.Title
- } - else - { - - @Html.CheckBox(@s.Title, false) @s.Title
- } - } - else - { - @Html.CheckBox(@s.Title, false) @s.Title
- } - - - } - -
- -
-

- - - -

- -
-
- -
-
-
- - @if (Model != null) - { - if (Model.ErrorList.Count == 0) - { - // if primary keys unique - if (Model.IsUnique) - { -
    -
  • Primarykeys :
    • - @foreach (ListViewItem s in Model.PrimaryKeysList) - { -
  • @s.Title.ToString()
    • - } - -
  • - Unique!!! -
    • - -
- } - } - } - -
- -
- @if (Model != null) - { - - if (Model.ErrorList != null) - { - if (Model.ErrorList.Count == 0) - { - - - } - else - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- - } - } - - } -
-
- - diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/GetFileInformation.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/GetFileInformation.cshtml deleted file mode 100644 index a85e355257..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/GetFileInformation.cshtml +++ /dev/null @@ -1,64 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.GetFileInformationModel -@using BExIS.Dcm.UploadWizard; -@using BExIS.IO; -@{ - IOUtility iOUtility = new IOUtility(); - -} - - - -
-
-
- -

@Model.StepInfo.title

-
- -
- -
- -
- - @if (iOUtility.IsSupportedAsciiFile(Model.Extention)) - { - @Html.Partial("_txtFormularView", @Model.FileInfoModel) - } - - @if (iOUtility.IsSupportedExcelFile(Model.Extention)) - { - @Html.Partial("_xlsFormularView", @Model.FileInfoModel) - } - -
-
- -
- -
- @if (Model != null) - { - if (Model.ErrorList != null) - { - if (Model.ErrorList.Count == 0) - { - - - } - else - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- - } - } - - } -
- -
\ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/_txtFormularView.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/_txtFormularView.cshtml deleted file mode 100644 index e2af96b0bc..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/_txtFormularView.cshtml +++ /dev/null @@ -1,125 +0,0 @@ -@{ - ViewBag.Title = "_txtFormularView"; -} -@model BExIS.Modules.Dcm.UI.Models.FileInfoModel - -@using Telerik.Web.Mvc.UI; -@using BExIS.IO; -@using BExIS.IO.Transform.Input; -@{ - - List TextSeperatorList = new List(); - foreach (TextSeperator ms in Enum.GetValues(typeof(TextSeperator))) - { - TextSeperatorList.Add(ms.ToString()); - } - - - List DecimalCharacterList = new List(); - foreach (DecimalCharacter ms in Enum.GetValues(typeof(DecimalCharacter))) - { - DecimalCharacterList.Add(ms.ToString()); - } - - List OrientationList = new List(); - foreach (Orientation ms in Enum.GetValues(typeof(Orientation))) - { - OrientationList.Add(ms.ToString()); - } - - List TextMarkerList = new List(); - foreach (TextMarker ms in Enum.GetValues(typeof(TextMarker))) - { - TextMarkerList.Add(ms.ToString()); - } - - -} - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- @(Html.LabelFor(m => m.Separator)) - - @Html.DropDownListFor(m => m.Separator, new SelectList(TextSeperatorList, Model.Separator), new { @class="asciiFormularField"}) -
- @(Html.LabelFor(m => m.Decimal)) - - @Html.DropDownListFor(m => m.Decimal, new SelectList(DecimalCharacterList ,Model.Decimal), new { @class="asciiFormularField"}) - -
- @(Html.LabelFor(m => m.TextMarker)) - - @Html.DropDownListFor(m => m.TextMarker, new SelectList(TextMarkerList ,Model.TextMarker), new { @class="asciiFormularField"}) - -
- @(Html.LabelFor(m => m.Orientation)) - - @Html.DropDownListFor(m => m.Orientation, new SelectList(OrientationList ,Model.Orientation), new { @class="asciiFormularField"}) - -
- @(Html.LabelFor(m => m.Offset)) - - @(Html.TextBoxFor(m => m.Offset , new {@class = "t-input asciiFormularField" })) - - - Number of empty columns (columnwise) or rows (rowwise) before the variables are specified. -
- @(Html.LabelFor(m => m.Variables)) - - @(Html.TextBoxFor(m => m.Variables , new {@class = "t-input asciiFormularField" })) - - - Row (columnwise) or column (rowwise) in which the variables are. -
- @(Html.LabelFor(m => m.Data)) - - @(Html.TextBoxFor(m => m.Data , new {@class = "t-input asciiFormularField"})) - - - Row (columnwise) or column (rowwise) in which the data starts. -
-
- - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/_xlsFormularView.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/_xlsFormularView.cshtml deleted file mode 100644 index 2019cf3030..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitGetFileInformation/_xlsFormularView.cshtml +++ /dev/null @@ -1,516 +0,0 @@ -@using Telerik.Web.Mvc.UI; -@using Telerik.Web.Mvc.Resources; -@using BExIS.Modules.Dcm.UI.Models; - - - - - - -
-
- - - - - - - - -
- @{ - SelectListItem tmp; - List listItems = new List(); - foreach (KeyValuePair worksheetIdentifier in Model.SheetUriDictionary) - { - tmp = new SelectListItem - { - Text = worksheetIdentifier.Value, - Value = worksheetIdentifier.Key.ToString(), - Selected = (worksheetIdentifier.Key.ToString() == Model.activeSheetUri) - }; - listItems.Add(tmp); - } - } - @Html.DropDownList("Sheet Select", listItems, "Select", new { @class = "buttonsRight", @id = "sheetSelect" }) - -
-
- -
- Worksheet is loading -
-
-
- - -
- - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSelectAFile/SelectAFile.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSelectAFile/SelectAFile.cshtml deleted file mode 100644 index a2e25515db..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSelectAFile/SelectAFile.cshtml +++ /dev/null @@ -1,291 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.SelectFileViewModel -@using Telerik.Web.Mvc.UI; -@using System; -@using System.Web.Configuration; -@using BExIS.Modules.Dcm.UI.Models; - -@using BExIS.Utils.Data.Upload - -@{ - - HttpRuntimeSection section = System.Configuration.ConfigurationManager.GetSection("system.web/httpRuntime") as HttpRuntimeSection; - int int_MaxRequestLength = section.MaxRequestLength; - int mbMax = int_MaxRequestLength / 1024; - - string fileExtListAsString = ""; - - foreach (string s in Model.SupportedFileExtentions) - { - if (fileExtListAsString != "") - { - fileExtListAsString += "," + s; - } - else - { - fileExtListAsString = s; - } - } - - string selectedFile = ""; - if (Model.SelectedFileName != "") - { - selectedFile = "Selected files"; - } - - -} - -
- -
-
- -

@Model.StepInfo.title

-
- -
-

Please select a data file to be uploaded to the system.

-

Note: Large data files may take several minutes or hours to transfer, depending on your network speed. The system is freezed until the file has been transfered completely. Please be patient!

-

For multiple large files you may use the "Push Big Data to Server" option before entering this Upload Wizard.

-

- Supported file formats: @{foreach (string s in @Model.SupportedFileExtentions) - {(*@s) } } -

-

Maximum file size: @mbMax MB

-

Maximum file name length: @Model.MaxFileLength

-
- -
- - - - - - - - - - - - - - - - - - - -
- @(Html.Telerik().Upload() - .Name("SelectFileUploader") - .Multiple(false) - .ShowFileList(false) - .HtmlAttributes(new { title = "Browse" }) - .ClientEvents(events => - events.OnSelect("SelectFileProcess_OnSelect") - .OnRemove("SelectFileProcess_OnRemove") - .OnSuccess("SelectFileProcess_OnSuccess") - - ) - .Async(async => async - .Save("SelectFileProcess", @Model.StepInfo.PostActionInfo.ControllerName) - .AutoUpload(true)) - - ) - - Select a data file from your local computer. -
- @(Html.Telerik().DropDownList() - .Placeholder("Please select") - .Name("SelectedServerFileName") - .BindTo(new SelectList(Model.serverFileList)) - .ClientEvents(e => e.OnChange("SelectedServerFileName_onChange"))) - - @*@Html.DropDownListFor(m => m.SelectedServerFileName, new SelectList(Model.serverFileList), "Select")*@@*, new { disabled = "disabled" })*@ - - Select a data file previously uploaded to the server. -
-
-
- @if (Model.SelectedFileName != "") - { - @Model.SelectedFileName - - if (Model.SelectedFileName.Contains("xls")) - { -

An Excel file was selected.
The formatted, displayed values are used for further processing.

- } - } -
-
- 		-
- @if (Model.SelectedFileName != "") - {Selected file.} -
-
-
- @if (Model != null) - { - if (Model.ErrorList != null) - { - if (Model.ErrorList.Count == 0) - { - } - else - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- } - } - } -
-
-
-
- -
- - - diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSpecifyDataset/SpecifyDataset.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSpecifyDataset/SpecifyDataset.cshtml deleted file mode 100644 index c5292e3a65..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSpecifyDataset/SpecifyDataset.cshtml +++ /dev/null @@ -1,103 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.ChooseDatasetViewModel -@using Telerik.Web.Mvc.UI; -@using Telerik.Web.Mvc.Resources; -@using BExIS.Modules.Dcm.UI.Models; - -@{ - if (this.ViewContext.FormContext == null) - { - this.ViewContext.FormContext = new FormContext(); - } - - ListViewItem selectedListeViewitem = new ListViewItem(); - if (@Model.SelectedDatasetId > 0) - { - selectedListeViewitem.Id = Model.SelectedDatasetId; - selectedListeViewitem.Title = Model.DatasetTitle; - } -} - - -
- -
-
-

@Model.StepInfo.title

-
- -
-

- Select the dataset to attach your data. It should have the same data structure, i.e. in structured datasets, the number, name, and order of variables and their properties must be identical. -

-
- -
- - - - - - - - - -
- @Html.DropDownListFor(m => m.SelectedDatasetId, new SelectList(Model.DatasetsViewList,"Id","DisplayName",selectedListeViewitem),"Select") -
-
-
- @if (Model.DatasetTitle != "") - {You have selected Dataset : @Model.DatasetTitle} -
-
- -
- @if (Model != null) - { - if (Model.ErrorList != null) - { - if (Model.ErrorList.Count == 0) - { - - - } - else - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- - } - } - - } -
-
-
-
-
- - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSpecifyDataset/_selectADatasetId.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSpecifyDataset/_selectADatasetId.cshtml deleted file mode 100644 index 74d5a1c584..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSpecifyDataset/_selectADatasetId.cshtml +++ /dev/null @@ -1,40 +0,0 @@ -@model List - -@using Telerik.Web.Mvc.UI; - -

Please Select a Dataset.

- -@(Html.Telerik().DropDownList() - .Name("DatasetIds_DropDownList") - .BindTo(new SelectList(Model, "Id", "DisplayName")) - .HtmlAttributes( new { style = "width:100%; white-space:nowrap;" }) - - ) - -@*@Html.DropDownList("DatasetIds_DropDownList", new SelectList(Model, "Id", "Title"));*@ - -
-
- - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSummary/Summary.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSummary/Summary.cshtml deleted file mode 100644 index 1920d22445..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitSummary/Summary.cshtml +++ /dev/null @@ -1,133 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.SummaryModel - - -
-
-
-

@Model.StepInfo.title

-
- -
-
- -
- -
- -
File
-
- @Html.LabelFor(m => m.Filename) : @Model.Filename
- - @Html.LabelFor(m => m.Extention) : @Model.Extention
-
-
- -
-
Dataset
-
- @Html.LabelFor(m => m.DatasetId) : @Model.DatasetId
- @Html.LabelFor(m => m.DatasetTitle) : @Model.DatasetTitle
- @Html.LabelFor(m => m.DatasetStatus) : @Model.DatasetStatus -
-
- -
-
Datastructure
-
- @Html.LabelFor(m => m.DataStructureId) : @Model.DataStructureId
- @Html.LabelFor(m => m.DataStructureTitle) : @Model.DataStructureTitle
- @Html.LabelFor(m => m.DataStructureType) : @Model.DataStructureType -
-
- - @if (Model.DataStructureType.ToLower().Equals("structured")) - { - -
- -
Upload
-
- @Html.LabelFor(m => m.UploadMethod) : @Model.UploadMethod
- @Html.LabelFor(m => m.NumberOfRows) : @Model.NumberOfRows
- @Html.LabelFor(m => m.NumberOfVariables) : @Model.NumberOfVariables
- @Html.LabelFor(m => m.PrimaryKeys) : @Model.PrimaryKeys
- @Html.LabelFor(m => m.AsyncUpload) : @Model.AsyncUpload -
-
- } -
-
-
-
- @if (Model.AsyncUpload) - { -

@Model.AsyncUploadMessage

- } - -
-
-
- @if (Model != null) - { - if (Model.ErrorList != null) - { - if (Model.ErrorList.Count == 0) - { - - - } - else - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- - } - } - - } -
-
- - - \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitUnstructuredData/UnstructuredData.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitUnstructuredData/UnstructuredData.cshtml deleted file mode 100644 index 49e11099fe..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitUnstructuredData/UnstructuredData.cshtml +++ /dev/null @@ -1,151 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.SelectFileViewModel -@using Telerik.Web.Mvc.UI; -@using System; -@using System.Web.Configuration; -@using BExIS.Modules.Dcm.UI.Models; - -@{ - - HttpRuntimeSection section = System.Configuration.ConfigurationManager.GetSection("system.web/httpRuntime") as HttpRuntimeSection; - int int_MaxRequestLength = section.MaxRequestLength; - int mbMax = int_MaxRequestLength / 1024; - -} -
- -
-
- -

@Model.StepInfo.title

-
- -
-

Please select a data file to be uploaded to the BEXIS repository.

-

Very large data files that may take several minutes or hours to transfer, should be uploaded to the server before entering the Upload Wizard.
- Please contact your systems administrator for assistance.

- -

Supported file formats: Microsoft Excel (*.xlsm), ASCII (*.txt, *.csv )

- -

Max file size: @mbMax MB

-
- -
- - - - - - - - - - - - - -
- @(Html.Telerik().Upload() - .Name("SelectFileUploader") - .Multiple(false) - .ShowFileList(false) - .HtmlAttributes(new {title="Browse"}) - .ClientEvents(events => - events.OnSelect("SelectFileProcess_OnSelect") - .OnRemove("SelectFileProcess_OnRemove") - .OnSuccess("SelectFileProcess_OnSuccess") - - ) - .Async(async => async - .Save("SelectFileProcess", @Model.StepInfo.PostActionInfo.ControllerName, new { area = "Dcm" }) - .AutoUpload(true)) - - ) - - Select a data file from your local computer. -
- @Html.DropDownListFor(m => m.SelectedServerFileName, new SelectList(Model.serverFileList), "Select")@*, new { disabled = "disabled" })*@ - - Select a data file previously uploaded to the server. -
-
-
- -
-
@if(Model.SelectedFileName!=""){@Model.SelectedFileName}
-
- -
- @if (Model != null) - { - if (Model.ErrorList != null) - { - if (Model.ErrorList.Count == 0) - { - - - } - else - { -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- - } - } - - } -
- -
- \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitValidation/Validation.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitValidation/Validation.cshtml deleted file mode 100644 index dec95877f4..0000000000 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/SubmitValidation/Validation.cshtml +++ /dev/null @@ -1,141 +0,0 @@ -@model BExIS.Modules.Dcm.UI.Models.ValidationModel - -@{ - List> SortedErrors = new List>(); - - if (ViewData["SortedValueErrors"] != null) - { - SortedErrors = (List>)ViewData["SortedValueErrors"]; - } - -} - - -
-
-
-

@Model.StepInfo.title

-
- -
-

- With this step the selected data file is validated against the selected data structure. - Both, the structure of the data (e.g. variable properties) and whether the data values - fit to the specified structure (e.g. data type, value range) is evaluated. - -

-
- -
- - - - - -
Validate selected data file against a given data structure.
-
-
- -
- @if (Model.Validated) - { - -

Successfully validated.

- - } -
- -
- @if (Model != null) - { - if (Model.ErrorList != null) - { - if (Model.ErrorList.Count == 0) - { - - - } - else - { - if (Model.ErrorList.Count >= 1000) - { -

The validation was canceled because up to 1000 errors were found.
Please check the file or the datastructure and try again.

- - } - - if (SortedErrors != null && SortedErrors.Count>0) - { - - - foreach (var e in SortedErrors) - { - string message = String.Format("In the column {0} there are {1} errors. the message is : {2}", e.Item1, e.Item2.ToString(), e.Item3); - string toggleId = e.Item1 + "Toggle"; - string toggleObj = e.Item1 + "Div"; - -
- @message - -
-
- } - } - else - { - -
    - @foreach (BExIS.IO.Transform.Validation.Exceptions.Error s in @Model.ErrorList) - { -
  • @s.ToString()
    • - } -
- - } - - } - } - - } -
-
- - - - From f508a7fe744c7e758c9eb609544fd6aa9564afba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 10:21:23 +0100 Subject: [PATCH 05/14] #1370 update dcm ui project because of removed views --- .../BExIS.Modules.Dcm.UI.csproj | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj index bbc15a0d64..e06fdb7644 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj @@ -442,7 +442,6 @@ - @@ -469,27 +468,8 @@ - - - - - - - - - - - - - - - - - - - @@ -497,7 +477,6 @@ - From dade5987ac64ae2a6e20b790d18b4c6f57b9ea59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 10:28:15 +0100 Subject: [PATCH 06/14] #1433 remove upload btn by show data, remove upload attachments --- .../Attachments/_datasetAttachements.cshtml | 41 ------------------- .../DDM/Views/Data/ShowPrimaryData.cshtml | 10 ----- 2 files changed, 51 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Attachments/_datasetAttachements.cshtml b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Attachments/_datasetAttachements.cshtml index 18fa92fcc5..b890fd3f2b 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Attachments/_datasetAttachements.cshtml +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Attachments/_datasetAttachements.cshtml @@ -23,48 +23,7 @@ } - @if (Model.UploadAccess) - { - - }
-
-

-
-

Attach files to this dataset

-
-
-

You can select one or multiple files. Please provide a short description for your selected file(s).

-

- Note: Depending on your network connection the upload may take some time. Please stay patient. -

-

Maximum file size: @mbMax MB

-

Maximum file name length: @maxFileNameLength

-
- - @using (Html.BeginForm("ProcessSubmit", "Attachments", new { area = "Dcm", datasetId = datasetId }, -FormMethod.Post, new { id = "uploadForm", enctype = "multipart/form-data" })) - { -
- Description:
- -
-
- Files:
- @(Html.Telerik().Upload() - .Name("attachments-upload") - .Multiple(true) - .ShowFileList(true) - .ClientEvents(events => events - .OnSelect("Push_OnSelect") - .OnRemove("Push_OnRemove") - )) -
- -
- } -
-
diff --git a/Console/BExIS.Web.Shell/Areas/DDM/Views/Data/ShowPrimaryData.cshtml b/Console/BExIS.Web.Shell/Areas/DDM/Views/Data/ShowPrimaryData.cshtml index b010cbe2ae..372d362e71 100644 --- a/Console/BExIS.Web.Shell/Areas/DDM/Views/Data/ShowPrimaryData.cshtml +++ b/Console/BExIS.Web.Shell/Areas/DDM/Views/Data/ShowPrimaryData.cshtml @@ -7,16 +7,6 @@ @{ - string lable_upload = "Upload"; - - if (Model !=null && Model.DataStructureType == DataStructureType.Structured && Model.Data != null) - { - if (Model.Data.Rows.Count > 0) - { - lable_upload = "Update or Append"; - } - } - }
From 0b8b0be880790b631c658bfa943a4a2590f1997d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 10:42:59 +0100 Subject: [PATCH 07/14] #1370 update bexis2-bexis2-core-ui version in ui projects --- Console/BExIS.Web.Shell.Svelte/package.json | 2 +- .../Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json | 2 +- .../Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Console/BExIS.Web.Shell.Svelte/package.json b/Console/BExIS.Web.Shell.Svelte/package.json index c68a726a3c..798d442378 100644 --- a/Console/BExIS.Web.Shell.Svelte/package.json +++ b/Console/BExIS.Web.Shell.Svelte/package.json @@ -51,7 +51,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "^0.3.8", + "@bexis2/bexis2-core-ui": "^0.3.9", "@sveltejs/adapter-static": "^2.0.1", "patch-package": "^6.5.1", "svelte-collapsible": "^0.2.2", diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json index a324e28cf8..42b76ac7d4 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/package.json @@ -48,7 +48,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "^0.3.8", + "@bexis2/bexis2-core-ui": "^0.3.9", "@bexis2/bexis2-rpm-ui": "^0.1.0", "@floating-ui/dom": "^1.4.1", "@fortawesome/free-solid-svg-icons": "^6.4.0", diff --git a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package.json b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package.json index 110724877c..c50c084768 100644 --- a/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package.json +++ b/Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/package.json @@ -49,7 +49,7 @@ }, "type": "module", "dependencies": { - "@bexis2/bexis2-core-ui": "^0.3.8", + "@bexis2/bexis2-core-ui": "^0.3.9", "@floating-ui/dom": "^1.2.8", "@sveltejs/adapter-static": "^2.0.1", "@sveltejs/package": "^2.2.2", From be8754c3bac3383e5c3518f233a2a157a0ecd15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 11:00:43 +0100 Subject: [PATCH 08/14] #1433 remove upload bt from multi media --- .../Views/ShowMultimediaData/_multimediaData.cshtml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/MMM/Views/ShowMultimediaData/_multimediaData.cshtml b/Console/BExIS.Web.Shell/Areas/MMM/Views/ShowMultimediaData/_multimediaData.cshtml index dd3e96bc96..60092f2db0 100644 --- a/Console/BExIS.Web.Shell/Areas/MMM/Views/ShowMultimediaData/_multimediaData.cshtml +++ b/Console/BExIS.Web.Shell/Areas/MMM/Views/ShowMultimediaData/_multimediaData.cshtml @@ -28,16 +28,6 @@ -
-
- @if (edit && id > 0) - { - @Html.ActionLink("Upload", "UploadWizard", "Submit", new { area = "DCM", type = DataStructureType.Unstructured, datasetid = @id }, new { @class = "bx-button function" }) - } -
-
- - @if (Model.Count > 0) { From df721b15dbe200be0aee509b75d23b82cfa4b27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 12:09:35 +0100 Subject: [PATCH 09/14] #1522 fix issue with landing page --- .../Controllers/HomeController.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Console/BExIS.Web.Shell/Controllers/HomeController.cs b/Console/BExIS.Web.Shell/Controllers/HomeController.cs index 275236a936..5b5dd6564d 100644 --- a/Console/BExIS.Web.Shell/Controllers/HomeController.cs +++ b/Console/BExIS.Web.Shell/Controllers/HomeController.cs @@ -59,7 +59,10 @@ public ActionResult Index() // this.IsAccessible not possible for shell if (checkPermission(landingPage) == false) { - landingPage = this.Session.GetTenant().LandingPageTuple; + landingPage = new Tuple( + GeneralSettings.LandingPage.Split(',')[0].Trim(), //module id + GeneralSettings.LandingPage.Split(',')[1].Trim(), //controller + GeneralSettings.LandingPage.Split(',')[2].Trim());//action } // Default forward, if no other path given for no permission page @@ -72,7 +75,16 @@ public ActionResult Index() // use defined landing page without login else { - landingPage = this.Session.GetTenant().LandingPageTuple; + landingPage = new Tuple( + GeneralSettings.LandingPage.Split(',')[0].Trim(), //module id + GeneralSettings.LandingPage.Split(',')[1].Trim(), //controller + GeneralSettings.LandingPage.Split(',')[2].Trim());//action + + // Default forward, if no other path given for no permission page + if (landingPage.Item1.ToLower() == "shell" && landingPage.Item2.ToLower() == "home") + { + return View(landingPage.Item3); + } } //if the landingPage is null and the action is not accessible forward to shell/home/index From bd7b72e56ffa41af3dc04054336af149269d4ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 12:20:15 +0100 Subject: [PATCH 10/14] #1370 update version --- .../BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs | 4 ++-- Console/BExIS.Web.Shell/General.Settings.xml | 2 +- Console/BExIS.Web.Shell/Web.config.sample | 2 +- database update scripts/Update_Script_2182to3.sql | 8 ++++++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs b/Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs index c06e3441fc..217b96bc2c 100644 --- a/Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs +++ b/Components/Utils/BExIS.Utils.Data/Helpers/ShellSeedDataGenerator.cs @@ -40,9 +40,9 @@ public void GenerateSeedData() var o12 = operationManager.Find("Shell", "Settings", "*") ?? operationManager.Create("Shell", "Settings", "*", settings); - if (!versionManager.Exists("Shell", "2.18.2")) + if (!versionManager.Exists("Shell", "3.0.0-beta")) { - versionManager.Create("Shell", "2.18.2"); + versionManager.Create("Shell", "3.0.0-beta"); } } } diff --git a/Console/BExIS.Web.Shell/General.Settings.xml b/Console/BExIS.Web.Shell/General.Settings.xml index 0ec58e1fa6..af227dc9bb 100644 --- a/Console/BExIS.Web.Shell/General.Settings.xml +++ b/Console/BExIS.Web.Shell/General.Settings.xml @@ -14,5 +14,5 @@ - + \ No newline at end of file diff --git a/Console/BExIS.Web.Shell/Web.config.sample b/Console/BExIS.Web.Shell/Web.config.sample index dcd36e31c3..475ed5a2a9 100644 --- a/Console/BExIS.Web.Shell/Web.config.sample +++ b/Console/BExIS.Web.Shell/Web.config.sample @@ -22,7 +22,7 @@ - + diff --git a/database update scripts/Update_Script_2182to3.sql b/database update scripts/Update_Script_2182to3.sql index 25ea4fdb65..55185b2a3c 100644 --- a/database update scripts/Update_Script_2182to3.sql +++ b/database update scripts/Update_Script_2182to3.sql @@ -878,4 +878,12 @@ ALTER ALTER TABLE IF EXISTS public.variables DROP COLUMN IF EXISTS dataattributeref; + + +-- Insert version +INSERT INTO public.versions( + versionno, extra, module, value, date) + VALUES (1, null, 'Shell', '3.0.0-beta',NOW()); + + END; \ No newline at end of file From bb4c94085c1337e21759a9709bf677c3b8bd3d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 16:44:58 +0100 Subject: [PATCH 11/14] #1370 add create dataset controller --- .../Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj index e06fdb7644..7135bb2f5a 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/BExIS.Modules.Dcm.UI.csproj @@ -68,6 +68,7 @@ + From ca27829046ebbb49f778faa3c561e39fa9a661c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 16:46:52 +0100 Subject: [PATCH 12/14] #1370 fix issues in update scripts --- .../Update_Script_2145to215.sql | 2 +- .../Update_Script_2182to3.sql | 26 ++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/database update scripts/Update_Script_2145to215.sql b/database update scripts/Update_Script_2145to215.sql index 88a94f847f..8d2d284a72 100644 --- a/database update scripts/Update_Script_2145to215.sql +++ b/database update scripts/Update_Script_2145to215.sql @@ -54,7 +54,7 @@ ALTER TABLE public.variable_constraints ALter table variables add column vartemplateref bigint; ALter table variables add column datepattern character varying(255); -ALter table variables add column datatyperef bigint NOT NULL; + ALter table variables ADD CONSTRAINT fk_2abad2e6 FOREIGN KEY (vartemplateref) REFERENCES public.variables (id) MATCH SIMPLE diff --git a/database update scripts/Update_Script_2182to3.sql b/database update scripts/Update_Script_2182to3.sql index 55185b2a3c..bba86ae20e 100644 --- a/database update scripts/Update_Script_2182to3.sql +++ b/database update scripts/Update_Script_2182to3.sql @@ -1,4 +1,4 @@ -BEGIN; +BEGIN TRANSACTION; /**********************************************************************************************/ /********************** SCHEMA CHANGES BEFORE DATA ********************************************/ @@ -28,6 +28,10 @@ CREATE TABLE IF NOT EXISTS public.entitytemplates ( ALTER TABLE IF EXISTS public.entitytemplates OWNER to postgres; +CREATE SEQUENCE IF NOT EXISTS public.entitytemplates_id_seq INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 OWNED BY entitytemplates.id; + +ALTER SEQUENCE public.entitytemplates_id_seq OWNER TO postgres; + ALTER TABLE IF EXISTS public.entitytemplates ALTER COLUMN id SET DEFAULT nextval('entitytemplates_id_seq'::regclass); @@ -486,9 +490,7 @@ DROP TABLE IF EXISTS public.parameters CASCADE; /* SEQUENCE */ -CREATE SEQUENCE IF NOT EXISTS public.entitytemplates_id_seq INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 OWNED BY entitytemplates.id; -ALTER SEQUENCE public.entitytemplates_id_seq OWNER TO postgres; CREATE SEQUENCE IF NOT EXISTS public.rpm_prefixcategory_id_seq INCREMENT 1 @@ -555,7 +557,9 @@ ALTER TABLE IF EXISTS public.units /** DROP COLUMNS */ ALTER TABLE IF EXISTS public.datacontainers DROP COLUMN IF EXISTS classifierref; +COMMIT; +BEGIN TRANSACTION; /**********************************************************************************************/ @@ -793,13 +797,13 @@ DELETE FROM public.operations Where module = 'Api' and controller = 'Token'; /** Entity Templates **/ /* add template for unstructured */ INSERT INTO public.entitytemplates( - id, versionno, extra, name, description, metadatainvalidsavemode, hasdatastructure, entityref, metadatastructureref) - VALUES (1, 1, null, 'File', 'Use this template if you want to upload files only', true, false,1,1); + id, versionno, extra, name, description, metadatainvalidsavemode, hasdatastructure, entityref, metadatastructureref,jsondatastructurelist, jsonallowedfiletypes, jsondisabledhooks, jsonnotificationgroups, jsonpermissiongroups, jsonmetadatafields) + VALUES (1, 1, null, 'File', 'Use this template if you want to upload files only', true, false,1,1,"","","","","",""); /* add template for structured */ INSERT INTO public.entitytemplates( - id, versionno, extra, name, description, metadatainvalidsavemode, hasdatastructure, entityref, metadatastructureref) - VALUES (2, 1, null, 'Data', 'Use this template if you want to upload data', true, true,1,2); + id, versionno, extra, name, description, metadatainvalidsavemode, hasdatastructure, entityref, metadatastructureref,jsondatastructurelist, jsonallowedfiletypes, jsondisabledhooks, jsonnotificationgroups, jsonpermissiongroups, jsonmetadatafields) + VALUES (2, 1, null, 'Data', 'Use this template if you want to upload data', true, true,1,2,"","","","","",""); /* update datasets */ Update Datasets SET entitytemplateref=1 where datastructureref in (select id from datastructures where datastructuretype like 'UnS'); @@ -847,8 +851,12 @@ SET name = c.id, datacontainerref = null where datacontainerref in (Select id from public.datacontainers Where discriminator like 'DA'); /* delete all data container with discimrinator */ -DELETE from public.datacontainers Where discriminator like 'DA' +DELETE from public.datacontainers Where discriminator like 'DA'; + + +COMMIT; +BEGIN TRANSACTION; /**********************************************************************************************/ /********************** SCHEMA CHANGES AFTER DATA ********************************************/ @@ -886,4 +894,4 @@ INSERT INTO public.versions( VALUES (1, null, 'Shell', '3.0.0-beta',NOW()); -END; \ No newline at end of file +commit; \ No newline at end of file From 489808fb58a738390e454a82f866dc19e2d54b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 16:49:44 +0100 Subject: [PATCH 13/14] #1370 update read me --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fb0b5ab524..4d8607bf7e 100644 --- a/README.md +++ b/README.md @@ -8,23 +8,23 @@ BEXIS 2 is published under a GNU LESSER GENERAL PUBLIC LICENSE Version 3 > In the release notes you can find a list of all the current versions. -[RELEASE NOTES](https://github.com/BEXIS2/Core/blob/2.18.1/Release%20Notes/Release_Notes.md) +[RELEASE NOTES](https://github.com/BEXIS2/Core/blob/3.0.0-beta/Release%20Notes/Release_Notes.md) > A more detailed list of the changes is available for the co-developers. It mentions the changed libraries and important feature changes. -[CHANGES](https://github.com/BEXIS2/Core/blob/2.18.1/Release%20Notes/changes.md) +[CHANGES](https://github.com/BEXIS2/Core/blob/3.0.0-beta/Release%20Notes/changes.md) >if a running instance is updated, an update to the database is required. - STEP BY STEP -[UPDATE SCRIPTS](https://github.com/BEXIS2/Core/blob/2.18.1/database%20update%20scripts) +[UPDATE SCRIPTS](https://github.com/BEXIS2/Core/blob/3.0.0-beta/database%20update%20scripts) # Installation For the preparation of Bexis 2 on a server a guide is available here. -[Installation Manual](https://github.com/BEXIS2/Documents/blob/2.18.1/Guides/Installation/installation.md) +[Installation Manual](https://github.com/BEXIS2/Documents/blob/3.0.0-beta/Guides/Installation/installation.md) # Help for Users/Admins/Developers @@ -46,9 +46,9 @@ The page is divided into: The initial version of the workspace can be found here: -- [Workspace 2.18.1 Repo](https://github.com/BEXIS2/Workspace/tree/2.18.1) -- [Workspace 2.18.1 Release](https://github.com/BEXIS2/Workspace/releases/tag/2.18.1) +- [Workspace 3.0.0-beta Repo](https://github.com/BEXIS2/Workspace/tree/3.0.0-beta) +- [Workspace 3.0.0-beta Release](https://github.com/BEXIS2/Workspace/releases/tag/3.0.0-beta) # List of new Modules -- [Modules Overview](https://github.com/BEXIS2/Core/blob/2.18.1/MODULES.md) +- [Modules Overview](https://github.com/BEXIS2/Core/blob/3.0.0-beta/MODULES.md) From 406ed333ad522b64cb5d0f02470c0a9d73946e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Sch=C3=B6ne?= Date: Fri, 22 Dec 2023 17:25:06 +0100 Subject: [PATCH 14/14] #1370 fix submit metadata --- .../Controllers/Legacy/CreateDatasetController.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/Legacy/CreateDatasetController.cs b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/Legacy/CreateDatasetController.cs index 821e8732af..b03267e565 100644 --- a/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/Legacy/CreateDatasetController.cs +++ b/Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/Legacy/CreateDatasetController.cs @@ -541,9 +541,7 @@ public long SubmitDataset(bool valid, string entityname) { TaskManager = (CreateTaskmanager)Session["CreateDatasetTaskmanager"]; - if (TaskManager.Bus.ContainsKey(CreateTaskmanager.DATASTRUCTURE_ID) - && TaskManager.Bus.ContainsKey(CreateTaskmanager.RESEARCHPLAN_ID) - && TaskManager.Bus.ContainsKey(CreateTaskmanager.METADATASTRUCTURE_ID)) + if (TaskManager.Bus.ContainsKey(CreateTaskmanager.METADATASTRUCTURE_ID)) { // for e new dataset if (!TaskManager.Bus.ContainsKey(CreateTaskmanager.ENTITY_ID))