From 9b659da6259de749ab9aacaa325dac86979cef20 Mon Sep 17 00:00:00 2001 From: Binal Patel Date: Tue, 16 Mar 2021 21:51:23 -0700 Subject: [PATCH 1/4] Allow null vals for assignedTo --- .../dbscripts/postgresql/ehr_purchasing-21.002-21.003.sql | 2 ++ .../src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 EHR_Purchasing/resources/schemas/dbscripts/postgresql/ehr_purchasing-21.002-21.003.sql diff --git a/EHR_Purchasing/resources/schemas/dbscripts/postgresql/ehr_purchasing-21.002-21.003.sql b/EHR_Purchasing/resources/schemas/dbscripts/postgresql/ehr_purchasing-21.002-21.003.sql new file mode 100644 index 000000000..aedc94156 --- /dev/null +++ b/EHR_Purchasing/resources/schemas/dbscripts/postgresql/ehr_purchasing-21.002-21.003.sql @@ -0,0 +1,2 @@ +ALTER TABLE ehr_purchasing.purchasingRequests DROP assignedTo; +ALTER TABLE ehr_purchasing.purchasingRequests ADD assignedTo USERID; \ No newline at end of file diff --git a/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java b/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java index 9a4c3af3e..37d297a02 100644 --- a/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java +++ b/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java @@ -46,7 +46,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 21.002; + return 21.003; } @Override From 28aebc96dd75662a3b72e717c312a0a4298b2408 Mon Sep 17 00:00:00 2001 From: Binal Patel Date: Wed, 17 Mar 2021 20:21:36 -0700 Subject: [PATCH 2/4] Add EHRPurchasingContainer module property. Separate out overview report links for requesters and admins. Add links to wnprcUnits. --- EHR_Purchasing/resources/module.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 EHR_Purchasing/resources/module.xml diff --git a/EHR_Purchasing/resources/module.xml b/EHR_Purchasing/resources/module.xml new file mode 100644 index 000000000..04096ce51 --- /dev/null +++ b/EHR_Purchasing/resources/module.xml @@ -0,0 +1,11 @@ + + + + true + The is the path to the container holding purchasing data. Use of slashes is very important - it should be in the format '/myProject/My Purchasing Admin Folder' + + ADMIN + + + + \ No newline at end of file From 9df3b91b0aed02729f83bace3ffd386965329b57 Mon Sep 17 00:00:00 2001 From: Binal Patel Date: Mon, 22 Mar 2021 23:13:36 -0700 Subject: [PATCH 3/4] Make lineItems.unitCost numeric instead of double precision. --- .../dbscripts/postgresql/ehr_purchasing-21.003-21.004.sql | 1 + .../src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 EHR_Purchasing/resources/schemas/dbscripts/postgresql/ehr_purchasing-21.003-21.004.sql diff --git a/EHR_Purchasing/resources/schemas/dbscripts/postgresql/ehr_purchasing-21.003-21.004.sql b/EHR_Purchasing/resources/schemas/dbscripts/postgresql/ehr_purchasing-21.003-21.004.sql new file mode 100644 index 000000000..85b306bf6 --- /dev/null +++ b/EHR_Purchasing/resources/schemas/dbscripts/postgresql/ehr_purchasing-21.003-21.004.sql @@ -0,0 +1 @@ +ALTER TABLE ehr_purchasing.lineItems ALTER COLUMN unitCost TYPE NUMERIC(10, 2); \ No newline at end of file diff --git a/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java b/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java index 37d297a02..bb5f96c98 100644 --- a/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java +++ b/EHR_Purchasing/src/org/labkey/ehr_purchasing/EHR_PurchasingModule.java @@ -46,7 +46,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 21.003; + return 21.004; } @Override From d646439e7aea953c97f6a6d615b60dd34bc6ea0b Mon Sep 17 00:00:00 2001 From: Binal Patel Date: Tue, 23 Mar 2021 19:08:43 -0700 Subject: [PATCH 4/4] Remove module prop. Update purchase links. --- EHR_Purchasing/resources/module.xml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 EHR_Purchasing/resources/module.xml diff --git a/EHR_Purchasing/resources/module.xml b/EHR_Purchasing/resources/module.xml deleted file mode 100644 index 04096ce51..000000000 --- a/EHR_Purchasing/resources/module.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - true - The is the path to the container holding purchasing data. Use of slashes is very important - it should be in the format '/myProject/My Purchasing Admin Folder' - - ADMIN - - - - \ No newline at end of file