Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot] Fast-forward for 23.3.15 #896

Merged
merged 15 commits into from
Jan 13, 2024
+1,097 −372
Merged

[bot] Fast-forward for 23.3.15 #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
76b8cea
23.3 fb update do check (#832)
jonesgaohsu Nov 9, 2023
2c8178a
23.3 fb utilization summary panel (#838)
Ohsudev Nov 13, 2023
1fe24f4
23.3 fb cage layout updates (#846)
Ohsudev Nov 13, 2023
42d8703
MOdified Tissue Distribution reports to only include completed status…
Ohsudev Nov 13, 2023
87eb5a0
Backport changes to increase size of geneticscore column (#842)
bbimber Nov 20, 2023
837fd80
Meds validation (#856)
kollil Dec 11, 2023
d9242da
23.3 fb clinical report modifications (#869)
Ohsudev Dec 14, 2023
4e31714
23.3 fb path tissue createfrom previous (#850)
Ohsudev Dec 16, 2023
6e31825
Removing this validation check from the "Meds Given" data entry panel…
kollil Dec 18, 2023
b2461b8
BSU validation take#2 (#875)
kollil Dec 19, 2023
7e2e6e9
Clinical alerts modification (#873)
kollil Dec 19, 2023
8eb4d71
Added the newly created onprc version of the behaviordefaults.js file…
kollil Dec 19, 2023
b363bf4
Put the validation code back into treatment orders. (#876)
kollil Dec 19, 2023
9a5a761
Amount units is visible now. (#879)
kollil Dec 20, 2023
5a8236d
Update of ETL Processes for Randall Data removes old ETL and inserts …
jonesgaohsu Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions GeneticsCore/resources/schemas/dbscripts/postgresql/geneticscore-17.13-17.14.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE geneticscore.mhc_data ALTER COLUMN marker TYPE varchar(1000);
1 change: 1 addition & 0 deletions GeneticsCore/resources/schemas/dbscripts/sqlserver/geneticscore-17.13-17.14.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE geneticscore.mhc_data ALTER COLUMN marker nvarchar(1000);
2 changes: 1 addition & 1 deletion GeneticsCore/src/org/labkey/GeneticsCore/GeneticsCoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 17.13;
return 17.14;
}

@Override
Expand Down
19 changes: 19 additions & 0 deletions extscheduler/resources/schemas/dbscripts/sqlserver/extscheduler-23.001-23.002.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
EXEC core.fn_dropifexists 'TempCoV19Final', 'extScheduler', 'TABLE', NULL;
GO
EXEC core.fn_dropifexists 'covid19testing', 'extScheduler', 'TABLE', NULL;
GO

EXEC core.fn_dropifexists 'tempscheduler', 'extScheduler', 'TABLE', NULL;
GO

EXEC core.fn_dropifexists 'TempCoV19Interim', 'extScheduler', 'TABLE', NULL;
GO

EXEC core.fn_dropifexists 'vw_Covid19Research', 'extScheduler', 'VIEW', NULL;
GO

EXEC core.fn_dropifexists 'vw_covid19dcmschedule', 'extScheduler', 'VIEW', NULL;
GO

EXEC core.fn_dropifexists 'vw_Covid19DCMDaily', 'extScheduler', 'VIEW', NULL;
GO
82 changes: 3 additions & 79 deletions extscheduler/resources/schemas/extscheduler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<tables xsi:schemaLocation="http://labkey.org/data/xml ..\..\..\..\..\schemas\tableInfo.xsd"
<tables xsi:schemaLocation="http://labkey.org/data/xml..\..\..\..\..\schemas\tableInfo.xsd"
xmlns="http://labkey.org/data/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<table tableName="resources" tableDbType="TABLE">
Expand Down Expand Up @@ -99,20 +99,7 @@
</column>
</columns>
</table>
<table tableName="vw_Covid19Research" tableDbType="VIEW">
<columns>
<column columnName="SChedulerID"/>
<column columnName="ResourceId"/>
<column columnName="ResourceName"/>
<column columnName="Name"/>
<column columnName="StartDate"/>
<column columnName="UserId"/>
<column columnName="CreatedBy"/>
<column columnName="Created"/>
<column columnName="Quantity"/>
<column columnName="EmployeeID"/>
</columns>
</table>

<table tableName="dateParts" tableDbType="TABLE">
<columns>
<column columnName="date"/>
Expand All @@ -127,69 +114,6 @@
<column columnName="year"/>
</columns>
</table>
<table tableName="vw_Covid19DCMSchedule" tableDbType="VIEW">
<columns>
<column columnName="SChedulerID"/>
<column columnName="ResourceId"/>
<column columnName="ResourceName"/>
<column columnName="Name"/>
<column columnName="StartDate"/>
<column columnName="UserId"/>
<column columnName="CreatedBy"/>
<column columnName="Created"/>
<column columnName="Quantity"/>
<column columnName="EmployeeID"/>
</columns>
</table>
<table tableName="Covid19Testing" tableDbType="TABLE">
<columns>
<column columnName="container"/>
<column columnName="entityId"/>
<column columnName="lastIndexed"/>
<column columnName="createdBy"/>
<column columnName="modified"/>
<column columnName="modifiedBy"/>
<column columnName="created"/>
<column columnName="Key"/>
<column columnName="SchedulerID"/>
<column columnName="ResourceID"/>
<column columnName="UserName"/>
<column columnName="UserID"/>
<column columnName="EmployeeID"/>
<column columnName="ScheduledDate"/>
<column columnName="ScheduledTime"/>
<column columnName="Create"/>
<column columnName="SampleDate"/>
<column columnName="CreatedB"/>
<column columnName="ComplianceUpdated"/>
</columns>
</table>
<table tableName="TempScheduler" tableDbType="TABLE">
<columns>
<column columnName="Searchkey"/>
<column columnName="usernames"/>
<column columnName="EventId"/>
<column columnName="StartDate"/>
<column columnName="created"/>
</columns>
</table>
<table tableName="TempCoV19Final" tableDbType="TABLE">
<columns>
<column columnName="container"/>
<column columnName="UserName"/>
<column columnName="UserID"/>
<column columnName="EventID"/>
<column columnName="StartDate"/>
<column columnName="EmployeeID"/>
<column columnName="Created"/>
</columns>
</table>
<table tableName="TempCoV19Interim" tableDbType="TABLE">
<columns>
<column columnName="EventId"/>
<column columnName="UserName"/>
<column columnName="container"/>
</columns>
</table>


</tables>
3 changes: 2 additions & 1 deletion extscheduler/src/org/labkey/extscheduler/ExtSchedulerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//update to add new data set
//update to trigger change
package org.labkey.extscheduler;

import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -27,7 +28,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 21.002;
return 23.002;
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions onprc_billing/resources/schemas/dbscripts/sqlserver/onprc_billing-23.003-23.004.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/*Corrected to remove sql script not related to this module.*/
EXEC core.fn_dropifexists 'annualinflationrate','onprc_billing','table',Null
2 changes: 1 addition & 1 deletion onprc_billing/src/org/labkey/onprc_billing/ONPRC_BillingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 23.003;
return 23.004;
}

@Override
Expand Down
105 changes: 0 additions & 105 deletions onprc_ehr/resources/etls/HansenQueriesToFile.xml
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions onprc_ehr/resources/etls/extSchedulerCovid19.xml
View file
Open in desktop

This file was deleted.

Loading
Loading