Skip to content

[bot] Merge 26.8 to develop #1016

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
github-actions merged 5 commits into from
Aug 19, 2026
Merged

[bot] Merge 26.8 to develop #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76332f8
26.3 fb ios app production merge fix (#1009)
aschmidt34 Aug 13, 2026
2b7e2e8
Handle missing file history when listing virology results to import (…
labkey-martyp Aug 14, 2026
bfcf66f
Merge 26.3 to 26.7
labkey-teamcity Aug 17, 2026
49650c4
Merge 26.7 to 26.8
labkey-teamcity Aug 18, 2026
075e358
Merge 26.8 to develop
labkey-teamcity Aug 19, 2026
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
3 changes: 3 additions & 0 deletions WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,5 +232,8 @@
<dataset name="cases" id="6020" category="Clinical" type="Standard">
<tags/>
</dataset>
<dataset name="anesthesiaRecovery" id="4440" category="Clinical" type="Standard">
<tags/>
</dataset>
</datasets>
</datasets>
113 changes: 113 additions & 0 deletions WNPRC_EHR/resources/referenceStudy/study/datasets/datasets_metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16334,4 +16334,117 @@
</index>
</indices>
</table>
<table tableName="anesthesiaRecovery" tableDbType="TABLE">
<columns>
<column columnName="Id">
<datatype>varchar</datatype>
<columnTitle>Id</columnTitle>
<description>Subject identifier</description>
<propertyURI>http://cpas.labkey.com/Study#ParticipantId</propertyURI>
<conceptURI>http://cpas.labkey.com/Study#ParticipantId</conceptURI>
<nullable>false</nullable>
<url replaceMissing="blankValue">/ehr/participantView.view?participantId=${id}</url>
<importAliases>
<importAlias>ptid</importAlias>
<importAlias>participantid</importAlias>
</importAliases>
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>Animal</fkTable>
<fkColumnName>Id</fkColumnName>
</fk>
<facetingBehavior>ALWAYS_OFF</facetingBehavior>
<scale>32</scale>
</column>
<column columnName="uniqueRowId">
<datatype>integer</datatype>
</column>
<column columnName="date">
<datatype>timestamp</datatype>
</column>
<column columnName="recoveryStart">
<datatype>timestamp</datatype>
</column>
<column columnName="observerComments">
<datatype>varchar</datatype>
</column>
<column columnName="observer">
<datatype>varchar</datatype>
</column>
<column columnName="recoveryId">
<datatype>varchar</datatype>
</column>
<column columnName="room">
<datatype>varchar</datatype>
</column>
<column columnName="observation">
<datatype>varchar</datatype>
</column>
<column columnName="assignedTo">
<datatype>varchar</datatype>
</column>
<column columnName="recoverySpeed">
<datatype>varchar</datatype>
</column>
<column columnName="recoveryCondition">
<datatype>varchar</datatype>
</column>
<column columnName="recoveryReason">
<datatype>varchar</datatype>
</column>
<column columnName="submitterInitials">
<datatype>varchar</datatype>
</column>
<column columnName="groupId">
<datatype>varchar</datatype>
</column>
<column columnName="finalizeComments">
<datatype>varchar</datatype>
</column>
<column columnName="location">
<datatype>varchar</datatype>
</column>
<column columnName="cage">
<datatype>varchar</datatype>
</column>
<column columnName="cageLockSecure">
<datatype>varchar</datatype>
</column>
<column columnName="deviceId">
<datatype>varchar</datatype>
</column>
<!-- <column columnName="recoveryReasonFinal">-->
<!-- <datatype>varchar</datatype>-->
<!-- </column>-->
<!-- <column columnName="groupIdFinal">-->
<!-- <datatype>varchar</datatype>-->
<!-- </column>-->
<!-- <column columnName="recoveryStartTime">-->
<!-- <datatype>timestamp</datatype>-->
<!-- </column>-->
<!-- <column columnName="cageFinal">-->
<!-- <datatype>timestamp</datatype>-->
<!-- </column>-->
<!-- <column columnName="roomFinal">-->
<!-- <datatype>timestamp</datatype>-->
<!-- </column>-->
<!-- <column columnName="taskid">-->
<!-- <datatype>varchar</datatype>-->
<!-- <columnTitle>Task Id</columnTitle>-->
<!-- <propertyURI>urn:ehr.labkey.org/#TaskId</propertyURI>-->
<!-- <rangeURI>http://www.w3.org/2001/XMLSchema#string</rangeURI>-->
<!-- <shownInUpdateView>false</shownInUpdateView>-->
<!-- <shownInDetailsView>false</shownInDetailsView>-->
<!-- <dimension>false</dimension>-->
<!-- <url replaceMissing="blankValue"><![CDATA[/ehr/taskDetails.view?formtype=${taskid/formtype}&taskid=${taskid}]]></url>-->
<!-- <fk>-->
<!-- <fkDbSchema>ehr</fkDbSchema>-->
<!-- <fkTable>tasks</fkTable>-->
<!-- <fkColumnName>taskid</fkColumnName>-->
<!-- </fk>-->
<!-- <facetingBehavior>ALWAYS_OFF</facetingBehavior>-->
<!-- <scale>100</scale>-->
<!-- </column>-->
</columns>
</table>
</tables>
17 changes: 12 additions & 5 deletions WNPRC_EHR/resources/web/ehr/ext3/ehrGridFormPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,8 +1077,8 @@ EHR.ext.GridFormPanel = Ext.extend(Ext.Panel,
if (extension === 'xlsx' || extension === 'xls') {
// need to get the date it was uploaded,
// since 'record' only provides the date when the actual file was created
promises.push(getFileHistory(virologyResultsFolder, record.data.name).then((history) => {
files.push({"name": history[0], "uploaded": history[1][0].data.date})
promises.push(getFileHistory(virologyResultsFolder, record.data.name).then((file) => {
files.push(file)
}))

}
Expand Down Expand Up @@ -1113,6 +1113,10 @@ EHR.ext.GridFormPanel = Ext.extend(Ext.Panel,
importFromFileWindow.removeAll();
importFromFileWindow.add(selectFilePanel);
importFromFileWindow.doLayout();
}).catch((e) => {
Ext.Msg.hide();
console.error(e);
Ext.Msg.alert('Error', 'Unable to build the list of files to import.');
})

},
Expand All @@ -1130,14 +1134,17 @@ EHR.ext.GridFormPanel = Ext.extend(Ext.Panel,
}
});
function getFileHistory(fileSystem, filename) {
// Always resolves so one unreadable file still leaves the rest importable.
return new Promise(resolve => {
fileSystem.getHistory({
path: '/' + filename,
success: function(fileSystem,path,history) {
resolve([filename,history]);
// A file placed on the server outside of an upload has no audit record.
resolve({name: filename, uploaded: history && history.length ? history[0].data.date : null});
},
failure: function(f) {
reject(f);
console.error('Unable to read file history for ' + filename, f);
resolve({name: filename, uploaded: null});
}
})
});
Expand Down Expand Up @@ -1307,7 +1314,7 @@ EHR.ext.GridFormPanel = Ext.extend(Ext.Panel,
html: '<span>' + file.name + '</span>'
},
{
html: '<span>' + new Date(file.uploaded).format("Y-m-d H:i")+ '</span>'
html: '<span>' + (file.uploaded ? new Date(file.uploaded).format("Y-m-d H:i") : 'Unknown') + '</span>'
},
];

Expand Down
6 changes: 6 additions & 0 deletions WNPRC_EHR/test/sampledata/wnprc_ehr/wnprcEhrTestStudyPolicy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,5 +443,11 @@
<ns:datasetPermission datasetName="BehaviorAbstract" groupName="EHR Full Updaters" role="org.labkey.ehr.security.EHRFullUpdaterRole"/>
<ns:datasetPermission datasetName="BehaviorAbstract" groupName="EHR Request Admins" role="org.labkey.ehr.security.EHRRequestAdminRole"/>
<ns:datasetPermission datasetName="BehaviorAbstract" groupName="EHR Requestors" role="org.labkey.ehr.security.EHRRequestorRole"/>
<ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Administrators" role="org.labkey.ehr.security.EHRDataAdminRole"/>
<ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Basic Submitters" role="org.labkey.ehr.security.EHRBasicSubmitterRole"/>
<ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Full Submitters" role="org.labkey.ehr.security.EHRFullSubmitterRole"/>
<ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Full Updaters" role="org.labkey.ehr.security.EHRFullUpdaterRole"/>
<ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Request Admins" role="org.labkey.ehr.security.EHRRequestAdminRole"/>
<ns:datasetPermission datasetName="anesthesiaRecovery" groupName="EHR Requestors" role="org.labkey.ehr.security.EHRRequestorRole"/>
</ns:perDatasetPermissions>
</ns:studySecurityPolicy>
2 changes: 1 addition & 1 deletion wnprc_ios_app/src/org/labkey/wnprc_ios_app/wnprc_ios_appModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 25.001;
return 26.001;
}

@Override
Expand Down
Loading