Skip to content

21.7 fb compliance entry addendum #265

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

Merged
Ohsudev merged 4 commits into from
Nov 16, 2021
Merged

21.7 fb compliance entry addendum #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12694a9
Created a version of BSU age class
Ohsudev Nov 16, 2021
154e3fb
Adding files for the Compliance input screens project that have missi…
Ohsudev Nov 16, 2021
142bcbf
Update EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_Com…
labkey-jeckels Nov 16, 2021
d939674
Update EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_Com…
labkey-jeckels Nov 16, 2021
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
22 changes: 22 additions & 0 deletions EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN trackingflag varchar(100);

ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN objectid ENTITYID;

ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN taskid ENTITYID;

CREATE TABLE ehr_compliancedb.EmployeePerUnit
(
RowId SERIAL NOT NULL,
EmployeeId varchar(255) not null,
unit varchar(255) null,
category varchar(255) null,
Container ENTITYID NOT NULL,
CreatedBy USERID,
Created timestamp,
ModifiedBy USERID,
Modified timestamp,
taskid entityid,
objectid entityid,

CONSTRAINT PK_EmployeePerUnits PRIMARY KEY (RowId)
);
24 changes: 24 additions & 0 deletions EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag nvarchar(100);

ALTER TABLE ehr_compliancedb.RequirementsPerCategory add objectid ENTITYID;

ALTER TABLE ehr_compliancedb.RequirementsPerCategory add taskid ENTITYID;


CREATE TABLE ehr_compliancedb.EmployeePerUnit
(
RowId INT IDENTITY(1,1) NOT NULL,
EmployeeId nvarchar(255) not null,
unit nvarchar(255) null,
category nvarchar(255) null,
Container ENTITYID NOT NULL,
CreatedBy USERID,
Created datetime,
ModifiedBy USERID,
Modified datetime,
taskid entityid,
objectid entityid

CONSTRAINT PK_EmployeePerUnits PRIMARY KEY (RowId)
);
91 changes: 91 additions & 0 deletions EHR_ComplianceDB/resources/schemas/ehr_compliancedb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,21 @@
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
<column columnName="trackingflag">
<isUserEditable>true</isUserEditable>
<nullable>true</nullable>
<isHidden>false</isHidden>
</column>
<column columnName="taskid">
<isUserEditable>false</isUserEditable>
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
<column columnName="objectid">
<isUserEditable>false</isUserEditable>
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
</columns>
</table>
<table tableName="requirementsperemployee" tableDbType="TABLE">
Expand Down Expand Up @@ -804,4 +819,80 @@
</column>
</columns>
</table>
<table tableName="employeePerUnit" tableDbType="TABLE">
<auditLogging>DETAILED</auditLogging>
<javaCustomizer class="org.labkey.ldk.query.DefaultTableCustomizer" />
<tableTitle>Requirements Per Employee</tableTitle>
<pkColumnName>rowid</pkColumnName>
<columns>
<column columnName="rowid">
<isAutoInc>true</isAutoInc>
<isKeyField>true</isKeyField>
<columnTitle>Key</columnTitle>
</column>
<column columnName="employeeid">
<columnTitle>Employee Id</columnTitle>
<fk>
<fkDbSchema>ehr_compliancedb</fkDbSchema>
<fkTable>employees</fkTable>
<fkColumnName>employeeid</fkColumnName>
</fk>
</column>
<column columnName="unit">
<columnTitle>Unit</columnTitle>
<fk>
<fkDbSchema>ehr_compliancedb</fkDbSchema>
<fkTable>unit_names</fkTable>
<fkColumnName>unit</fkColumnName>
</fk>
</column>
<column columnName="category">
<columnTitle>Unit</columnTitle>
<fk>
<fkDbSchema>ehr_compliancedb</fkDbSchema>
<fkTable>employeecategory</fkTable>
<fkColumnName>categoryname</fkColumnName>
</fk>
</column>
<column columnName="container">
<isUserEditable>false</isUserEditable>
<isHidden>true</isHidden>
<fk>
<fkDbSchema>core</fkDbSchema>
<fkTable>containers</fkTable>
<fkColumnName>entityid</fkColumnName>
</fk>
</column>
<column columnName="taskid">
<isUserEditable>false</isUserEditable>
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
<column columnName="objectid">
<isUserEditable>false</isUserEditable>
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
<column columnName="createdby">
<isUserEditable>false</isUserEditable>
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
<column columnName="created">
<isUserEditable>false</isUserEditable>
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
<column columnName="modifiedby">
<isUserEditable>false</isUserEditable>
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
<column columnName="modified">
<isUserEditable>false</isUserEditable>
<nullable>true</nullable>
<isHidden>true</isHidden>
</column>
</columns>
</table>
</tables>
2 changes: 1 addition & 1 deletion EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 12.40;
return 12.41;
}

@Override
Expand Down