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] Merge 23.7 to 23.11 #949

Merged
merged 7 commits into from
Mar 18, 2024
Merged

[bot] Merge 23.7 to 23.11 #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c7e31c5
23.3 fb clinical sustained medication amended (#935)
Ohsudev Mar 4, 2024
1bde381
Created a new SciShield data set. (#913)
Ohsudev Mar 5, 2024
046799f
Merge 23.3 to 23.7
labkey-teamcity Mar 8, 2024
dc9d2ba
Added Sustained Release Medication information to the remarks editor …
Ohsudev Mar 12, 2024
1a0ad5f
Modified SSRS Prime coding web link. (#946)
Ohsudev Mar 14, 2024
ed88550
Merge 23.3 to 23.7
labkey-teamcity Mar 15, 2024
8daba62
Merge 23.7 to 23.11
labkey-teamcity Mar 18, 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
11 changes: 11 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Data.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="SciShield_Data" tableDbType="TABLE">
<tableTitle>SciShield Data</tableTitle>
<columns>
</columns>
</table>
</tables>
</metadata>
</query>
20 changes: 20 additions & 0 deletions ONPRC_EHR_ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Data/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="employeeid"/>

<column name="requirementname"/>
<column name="date"/>
<column name="processed"/>
<column name="comment"/>

</columns>
<sorts>
<sort column="employeeid" descending="false"/>
<sort column="requirementname" descending="false"/>
<sort column="date" descending="true"/>
<sort column="created" descending="true"/>
</sorts>
<filters>
<filter column="processed" operator="isblank"/>
</filters>
</customView>
34 changes: 34 additions & 0 deletions ..._ComplianceDB/resources/queries/onprc_ehr_compliancedb/SciShield_Reference_Data.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="SciShield_Reference_Data" tableDbType="NOT_IN_DB">
<tableTitle>SciShield Reference Data</tableTitle>

<columns>
<column columnName ="rowId">
<isHidden>true</isHidden>
</column>
<column columnName="value">
<columnTitle>Value</columnTitle>
</column>
<column columnName="endDate">
<columnTitle>End Date</columnTitle>
</column>

<column columnName="columnName">
<columnTitle>Column Name</columnTitle>
</column>

<column columnName="Label">
<columnTitle>Label</columnTitle>
</column>

<column columnName="sort_order">
<columnTitle>Sort Order</columnTitle>
</column>
</columns>
</table>
</tables>
</metadata>
</query>

43 changes: 43 additions & 0 deletions ...omplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-0.000-24.000.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@

CREATE SCHEMA onprc_ehr_compliancedb;
GO

CREATE TABLE onprc_ehr_compliancedb.SciShield_Data
(
RowId INT IDENTITY(1,1) NOT NULL,
employeeId nvarchar(255) not null,
requirementname nvarchar(255) null,
Date datetime null,
Container ENTITYID NOT NULL,
comment nvarchar(2000) null,
CreatedBy USERID,
Created datetime,
ModifiedBy USERID,
Modified datetime,
processed int NULL

CONSTRAINT PK_ScieShield_Data PRIMARY KEY (RowId),
CONSTRAINT FK_ONPRC_EHR_COMPLIANCE_SCISHIELD_DATA_CONTAINER FOREIGN KEY (Container) REFERENCES core.Containers (EntityId)
);
CREATE INDEX IX_ONPRC_EHR_COMPLIANCEDB_SCISHIELD_DATA_CONTAINER ON onprc_ehr_compliancedb.SciShield_Data (Container);

CREATE TABLE onprc_ehr_compliancedb.SciShield_Reference_Data
(
rowId int identity(1,1),
label nvarchar(250) NULL,
value nvarchar(255) NOT NULL ,
columnName nvarchar(255) NOT NULL,
sort_order integer null,
endDate datetime NULL,
Container ENTITYID NOT NULL,
CreatedBy USERID,
Created datetime,
ModifiedBy USERID,
Modified datetime,

CONSTRAINT pk_SciShield_reference PRIMARY KEY (value),
CONSTRAINT FK_ONPRC_EHR_COMPLIANCE_REFERENCE_DATA_CONTAINER FOREIGN KEY (Container) REFERENCES core.Containers (EntityId)
);
CREATE INDEX IX_ONPRC_EHR_COMPLIANCEDB_SCISHIELD_REFERENCE_DATA_CONTAINER ON onprc_ehr_compliancedb.SciShield_Reference_Data (Container);

GO
Loading
Loading