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

Created Environmental Assessment table structures. #906

Closed
wants to merge 1 commit into from
Closed

Created Environmental Assessment table structures. #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 51 additions & 0 deletions onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.007-23.008.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
CREATE TABLE onprc_ehr.Environmental_Assessment(
rowid int IDENTITY(100,1) NOT NULL,
date datetime NULL,
service_requested varchar(300) NULL,
charge_unit varchar(300) NULL,
testing_location varchar(300) NULL,
test_type varchar(300) NULL,
test_results varchar(100) NULL,
pass_fail varchar(100) NULL,
biological_Cycle varchar(300) NULL,
biological_BI varchar(300) NULL,
action varchar(300) NULL,
performedby varchar(300) NULL,
remarks varchar(300) NULL,
water_source varchar(300) NULL,
surface_tested varchar(300) NULL,
retest varchar(300) NULL,
colony_count varchar(300) NULL,
test_method varchar(300) NULL,
objectid ENTITYID Not Null,
createdby int NULL,
created datetime NULL,
modifiedby int NULL,
modified datetime NULL,
Container ENTITYID NOT NULL,
taskid entityid,
qcstate int NULL,
formsort int NULL


CONSTRAINT PK_assessment PRIMARY KEY (objectid)
)

GO


CREATE TABLE onprc_ehr.Environmental_Reference_Data (
rowId int identity(1,1),
label varchar(250) DEFAULT NULL,
value varchar(500) ,
columnName varchar(255) NOT NULL,
sort_order integer null,
endDate datetime DEFAULT NULL,

CONSTRAINT pk_referenceenv PRIMARY KEY (value)
)


GO


71 changes: 71 additions & 0 deletions onprc_ehr/resources/schemas/onprc_ehr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,4 +1309,75 @@
</columns>
</table>

<table tableName="Environmental_Assessment" tableDbType="TABLE" useColumnOrder="true">
<tableTitle>Environmental Assessment</tableTitle>
<javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
<auditLogging>DETAILED</auditLogging>
<columns>
<column columnName="rowid">
<columnTitle>Rowid</columnTitle>
</column>
<column columnName="date">
</column>
<column columnName="service_requested">
</column>
<column columnName="charge_unit">
</column>
<column columnName="testing_location">
</column>
<column columnName="test_type">
</column>
<column columnName="test_method"/>
<column columnName="test_results">
</column>
<column columnName="pass_fail">
</column>
<column columnName="biological_cycle">
</column>
<column columnName="biological_BI">
</column>
<column columnName="action">
</column>
<column columnName="water_source"/>
<column columnName="surface_tested"/>
<column columnName="retest"/>
<column columnName="colony_Count"/>
<column columnName="performedby">
</column>
<column columnName="remarks"/>
<column columnName="objectid"/>
<column columnName="createdby"/>
<column columnName="created"/>
<column columnName="modified"/>
<column columnName="modifiedby"/>
<column columnName="container"/>
<column columnName="taskid"/>
<column columnName="qcstate"/>
<column columnName="formsort"/>
</columns>
</table>

<table tableName="Environmental_Reference_Data" tableDbType="TABLE" useColumnOrder="true">
<tableTitle>Environmental Reference_ Data</tableTitle>
<javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
<auditLogging>DETAILED</auditLogging>
<columns>
<column columnName="rowid">
<columnTitle>Row ID</columnTitle>
</column>
<column columnName="label">
</column>
<column columnName="value">
</column>
<column columnName="columnName">
</column>
<column columnName="sort_order">
</column>
<column columnName="endDate">
</column>

</columns>
</table>


</tables>
2 changes: 1 addition & 1 deletion onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java
View file
Open in desktop
Copy link
Collaborator

@kollil kollil Jan 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Raymond, Team city build has been failing since yesterday. I have an updated sql script version num # 23.008 in the code and the xml file is updated too. At some point, we both need to collaborate before we upload into prod.

Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 23.007;
return 23.008;
}

@Override
Expand Down