From 084b2186d026081c49b37ecdd78ee0a2ddd78531 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Tue, 7 Sep 2021 18:40:34 -0700 Subject: [PATCH 1/4] Re-created this new feature branch for Compliance input screens --- .../EHR_ComplianceDB-12.40-12.41.sql | 9 ++++++++ .../EHR_ComplianceDB-12.40-12.41.sql | 9 ++++++++ .../resources/schemas/ehr_compliancedb.xml | 22 +++++++++++++++++++ .../EHR_ComplianceDBModule.java | 2 +- 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql create mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql new file mode 100644 index 000000000..b2805edf8 --- /dev/null +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql @@ -0,0 +1,9 @@ +ALTER TABLE ehr_compliancedb.Employees add taskid entityid; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add taskid entityid; + +ALTER TABLE ehr_compliancedb.Employees add objectid entityid; + +ALTER TABLE ehr_complianEHR_ComplianceDB-12.42-12.43.sqledb.RequirementsPerCategory add objectid entityid; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag nvarchar(50); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql new file mode 100644 index 000000000..2442f3e06 --- /dev/null +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql @@ -0,0 +1,9 @@ +ALTER TABLE ehr_compliancedb.Employees add taskid entityid; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add taskid entityid; + +ALTER TABLE ehr_compliancedb.Employees add objectid entityid; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add objectid entityid; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag varchar(50); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml b/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml index a2f83fe82..ae493e7e5 100644 --- a/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml +++ b/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml @@ -273,6 +273,20 @@ true true + + false + true + true + + + false + true + true + + + true + + @@ -420,6 +434,14 @@ truetrue + + false + true + true + + + true +
diff --git a/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java b/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java index ed0734f0c..77df98be7 100644 --- a/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java +++ b/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java @@ -49,7 +49,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 12.40; + return 12.41; } @Override From 91f7f7e3bc9de85c0c9bcc646039eba2310d2b55 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Wed, 8 Sep 2021 22:04:34 -0700 Subject: [PATCH 2/4] Re-created this new feature branch for Compliance input screens --- .../dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql index b2805edf8..6c2e9e43c 100644 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql @@ -4,6 +4,6 @@ ALTER TABLE ehr_compliancedb.RequirementsPerCategory add taskid entityid; ALTER TABLE ehr_compliancedb.Employees add objectid entityid; -ALTER TABLE ehr_complianEHR_ComplianceDB-12.42-12.43.sqledb.RequirementsPerCategory add objectid entityid; +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add objectid entityid; ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag nvarchar(50); \ No newline at end of file From 01200b71e09ba7cef12469f39bde4438bb1bf89a Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Mon, 13 Sep 2021 15:23:32 -0700 Subject: [PATCH 3/4] Re-created this new feature branch for Compliance input screens. Added missing columns into xml file. --- .../resources/schemas/ehr_compliancedb.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml b/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml index ae493e7e5..e1a5621d8 100644 --- a/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml +++ b/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml @@ -283,9 +283,7 @@ truetrue - - true - +
@@ -439,9 +437,17 @@ true true - + + false + true true + + false + true + true + + From 9d85dc7f22acf9bcd55a14e98d5ce0ea143e4797 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Tue, 14 Sep 2021 14:39:12 -0700 Subject: [PATCH 4/4] Re-created this new feature branch for Compliance input screens. Added missing columns into xml file. --- EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml b/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml index e1a5621d8..359cb72bc 100644 --- a/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml +++ b/EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml @@ -443,9 +443,9 @@ true - false - true - true + true + false + false