From 72ebfc90a5d1b5c27472ce238dd5d904cbf01a64 Mon Sep 17 00:00:00 2001 From: kollil Date: Thu, 10 Apr 2025 12:45:35 -0700 Subject: [PATCH 1/2] Changed the default begin date & time to next day at 8am. Refer to tkt #12214 --- .../web/onprc_ehr/model/sources/Surgery.js | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js index 61bbf3f28..70a15fb92 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js @@ -35,7 +35,7 @@ EHR.model.DataModelManager.registerMetadata('onprc_Surgery', { shownInGrid: true, defaultValue: 'Surgical', allowBlank: false - } + }, }, 'study.clinical_observations': { @@ -68,6 +68,25 @@ EHR.model.DataModelManager.registerMetadata('onprc_Surgery', { defaultValue: 'Surgery', hidden: true }, + //Added by Kollil, Changed the default begin date & time to next day at 8am. Refer to tkt #12214 + date: { + xtype: 'xdatetime', + extFormat: LABKEY.extDefaultDateTimeFormat, + allowBlank: false, + editorConfig: { + defaultHour: 8, + defaultMinutes: 0 + }, + getInitialValue: function(v, rec) { + if (v) + return v; + + var ret = Ext4.Date.clearTime(new Date()); + ret = Ext4.Date.add(ret, Ext4.Date.DAY, 1); + ret.setHours(8); + return ret; + } + }, title: { hidden: true }, @@ -142,4 +161,5 @@ EHR.model.DataModelManager.registerMetadata('onprc_Surgery', { } } } -}); \ No newline at end of file +}); + From b7018a83a71709bb0eacdb9b99d713f0971360a5 Mon Sep 17 00:00:00 2001 From: kollil Date: Sun, 4 May 2025 22:25:35 -0700 Subject: [PATCH 2/2] New commit of the code --- onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js | 1 + 1 file changed, 1 insertion(+) diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js index 70a15fb92..59bae003e 100644 --- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js +++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Surgery.js @@ -69,6 +69,7 @@ EHR.model.DataModelManager.registerMetadata('onprc_Surgery', { hidden: true }, //Added by Kollil, Changed the default begin date & time to next day at 8am. Refer to tkt #12214 + //This change will automatically update the times in the bottom data entry panels ont eh screen date: { xtype: 'xdatetime', extFormat: LABKEY.extDefaultDateTimeFormat,