Skip to content

Modified flag program to include the time settings when entering start… #1580

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 1 commit into from
Dec 23, 2025
Merged

Modified flag program to include the time settings when entering start… #1580

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
4 changes: 2 additions & 2 deletions onprc_ehr/resources/queries/study/flags.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<column columnName="Id"/>
<column columnName="date">
<columnTitle>Date Added</columnTitle>
<formatString>Date</formatString>
<formatString>DateTime</formatString>
</column>
<column columnName="enddate">
<columnTitle>Date Removed</columnTitle>
<isHidden>false</isHidden>
<formatString>Date</formatString>
<formatString>DateTime</formatString>
</column>
<column columnName="project">
<isHidden>true</isHidden>
Expand Down
4 changes: 2 additions & 2 deletions onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,8 @@ exports.init = function(EHR){
EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.INIT, 'study', 'flags', function(event, helper){
helper.setScriptOptions({
allowFutureDates: true,
removeTimeFromDate: true,
removeTimeFromEndDate: true
removeTimeFromDate: false,
removeTimeFromEndDate: false
});

EHR.Server.TriggerManager.unregisterAllHandlersForQueryNameAndEvent('study', 'flags', EHR.Server.TriggerManager.Events.AFTER_INSERT);
Expand Down
33 changes: 33 additions & 0 deletions onprc_ehr/resources/web/onprc_ehr/model/sources/Flag_settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright (c) 2014 LabKey Corporation
*
* Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
*/
EHR.model.DataModelManager.registerMetadata('Flag_Settings', {
allQueries: {

},
byQuery: {
'study.flags': {
date: {
xtype: 'xdatetime',
extFormat: LABKEY.extDefaultDateTimeFormat,
editorConfig: {
dateFormat: LABKEY.extDefaultDateFormat,
timeFormat: 'H:i'
}

},
enddate: {
xtype: 'xdatetime',
extFormat: LABKEY.extDefaultDateTimeFormat,
editorConfig: {
dateFormat: LABKEY.extDefaultDateFormat,
timeFormat: 'H:i'
}

}

}
}
});
7 changes: 7 additions & 0 deletions onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.labkey.api.security.GroupManager;
import org.labkey.api.security.permissions.AdminPermission;
import org.labkey.api.security.permissions.Permission;
import org.labkey.api.view.template.ClientDependency;
import org.labkey.security.xml.GroupEnumType;

import java.util.ArrayList;
Expand All @@ -49,6 +50,12 @@ public FlagsFormType(DataEntryFormContext ctx, Module owner)
new SimpleGridPanel("study", "flags", "Flags")
));

addClientDependency(ClientDependency.supplierFromPath("onprc_ehr/model/sources/Flag_settings.js"));

for (FormSection s : getFormSections())
{
s.addConfigSource("Flag_Settings");
}

}

Expand Down