Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1f64243
Modified scheduler program for Radiology so that the comment informat…
Ohsudev Oct 22, 2025
7994796
Merge remote-tracking branch 'origin/25.7_fb_RadiologySchedulerEvents…
Ohsudev Mar 4, 2026
2d3da97
Merge branch 'release25.11-SNAPSHOT' into 25.11_fb_RadiologyScheduler…
Mar 31, 2026
5d8a331
Merge remote-tracking branch 'origin/25.11_fb_RadiologySchedulerEvent…
May 29, 2026
5d003ec
Modified Surgical Rounds process to allow displaying of S2 on the Rou…
Ohsudev Jul 2, 2026
4733917
Merge branch 'release26.3-SNAPSHOT' into 26.3_fb_Radiology_Scheduler_…
Ohsudev Jul 16, 2026
fa0ce8f
Modified Radiology scheduler program
Ohsudev Jul 21, 2026
b2dd186
Modified Radiology scheduler program
Ohsudev Jul 22, 2026
e4668c7
Merge branch 'release26.3-SNAPSHOT' into 26.3_fb_Radiology_Scheduler_…
Ohsudev Jul 28, 2026
0948771
Modified Radiology scheduler to include more property settings.
Ohsudev Aug 4, 2026
47cb8b4
Modified Radiology scheduler to include more property settings.
Ohsudev Aug 5, 2026
4860967
Modified Radiology scheduler to include more property settings.
Ohsudev Aug 5, 2026
8b32253
Modified Radiology scheduler to include more property settings.
Ohsudev Aug 5, 2026
3e3f98a
Merge remote-tracking branch 'origin/26.3_fb_Radiology_Scheduler_Even…
Ohsudev Aug 5, 2026
f5dbb7b
Modified Radiology scheduler to include more property settings.
Ohsudev Aug 5, 2026
ece4889
Modified Radiology scheduler to include more property settings.
Ohsudev Aug 6, 2026
9209690
Modified Radiology scheduler to include more property settings.
Ohsudev Aug 6, 2026
a30062c
Merge branch 'release26.3-SNAPSHOT' into 26.3_fb_Radiology_Scheduler_…
Ohsudev Aug 6, 2026
27f4bf6
Modified Radiology scheduler to include more property settings.
Ohsudev Aug 7, 2026
4de0f88
Merge branch 'release26.3-SNAPSHOT' into 26.3_fb_Radiology_Scheduler_…
Ohsudev Aug 27, 2026
05f9504
Modified Radiology scheduler to include a process to include comments…
Ohsudev Sep 8, 2026
ae69234
Merge branch 'release26.3-SNAPSHOT' into 26.3_fb_Radiology_Scheduler_…
Ohsudev Sep 8, 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
4 changes: 3 additions & 1 deletion extscheduler/resources/views/weeklyScheduler.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ <h3>My Events</h3>
}
else
{
var schedulerAppLink = LABKEY.ActionURL.buildURL('extscheduler', 'weeklyTest', null, {
// var schedulerAppLink = LABKEY.ActionURL.buildURL('extscheduler', 'weeklyTest', null, {
var schedulerAppLink = LABKEY.ActionURL.buildURL('extscheduler', 'weekly_Radiology', null, {
returnUrl: window.location.pathname + window.location.search
});
Ext4.get('launch-link').update('<a class="launch-button" href="' + schedulerAppLink + '">Launch Scheduler</a>');
Expand Down Expand Up @@ -75,6 +76,7 @@ <h3>My Events</h3>
items: [
{boxLabel: 'All', name: 'timeframe', inputValue: 'All', checked: true},
{boxLabel: 'Previous', name: 'timeframe', inputValue: 'Previous'},

{boxLabel: 'Upcoming', name: 'timeframe', inputValue: 'Upcoming'}
],
listeners: {
Expand Down
10 changes: 5 additions & 5 deletions extscheduler/resources/views/weeklyTest.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
'App': LABKEY.contextPath + '/extscheduler/App'
},
views : [
'EventForm',
'EventForm_Amended',
'Header',
'InfoPanel',
'NavigationBar',
'InfoPanelAmended',
'NavigationBarAmended',
'ResourceCombo',
'Resources',
'Scheduler',
'Viewport'
'SchedulerRadiology',
'ViewportRadiology'
]
});
};
Expand Down
165 changes: 165 additions & 0 deletions extscheduler/resources/views/weekly_Radiology.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">

<!-- Ext and ux styles -->
<link href="/ExtScheduler/weekview/resources/css/theme-triton/resources/theme-triton-all.css" rel="stylesheet" type="text/css"/>
<!--<link href="/ExtScheduler/css/theme-triton-all.css" rel="stylesheet" type="text/css"/>-->

<!-- Scheduler styles -->
<link href="/ExtScheduler/weekview/resources/css/sch-all-triton.css?ver=4.2.1" rel="stylesheet" type="text/css" />
<!--<link href="/ExtScheduler/css/sch-all-triton.css" rel="stylesheet" type="text/css" />-->

<!-- Ext JS includes -->
<script src="/ExtScheduler/resources/extJs/ext-all.js" type="text/javascript" nonce="<%=scriptNonce%>"></script>
<!--<script src="/ExtScheduler/js/ext-all-debug.js" type="text/javascript" nonce="<%=scriptNonce%>"></script>-->
<script src="/ExtScheduler/weekview/resources/css/theme-triton/theme-triton.js" crossorigin="anonymous" type="text/javascript" nonce="<%=scriptNonce%>"></script>
<!--<script src="/ExtScheduler/js/theme-triton-debug.js" crossorigin="anonymous" type="text/javascript" nonce="<%=scriptNonce%>"></script>-->

<!-- Scheduler files -->
<script src="/ExtScheduler/resources/extJs/sch-all.js?ver=4.2.1" type="text/javascript" nonce="<%=scriptNonce%>"></script>
<!--<script src="/ExtScheduler/js/sch-all-debug.js" type="text/javascript" nonce="<%=scriptNonce%>"></script>-->

<title>Scheduler Week View</title>
</head>
<body>
<script type="text/javascript" nonce="<%=scriptNonce%>">
Ext.onReady(function ()
{
var initScheduler = function()
{
Ext.application({
name : 'App',
mainView : 'App.view.Viewport',
paths : {
'App': LABKEY.contextPath + '/extscheduler/App'
},
views : [
'EventForm_Amended',
'HeaderAmended',
'InfoPanelAmended',
'NavigationBarAmended',
'ResourceCombo',
'Resources',
'SchedulerRadiology',
'ViewportRadiology'
]
});
};


var queryStoreData = function()
{
var resourceStore = null, eventStore = null, userStore = null;

// query to get the resource store data
LABKEY.Query.selectRows({
schemaName: 'extscheduler',
queryName: 'Resources',
columns: 'Id,Name,Color,Room,Bldg',
success: function(data) {
resourceStore = Ext.create('Sch.data.ResourceStore', {
model : 'Sch.model.Resource',
storeId : 'resource', // referenced by this store id in Scheduler.js, ResourceCombo.js, etc.
sorters : {
property : 'Name',
direction : "ASC"
},
data: data.rows
});

// only initialize the scheduler when all stores have loaded
if (eventStore != null && userStore != null) {
initScheduler();
}
}
});

// query to get the event store data
LABKEY.Query.selectRows({
schemaName: 'extscheduler',
queryName: 'Events',
columns: 'Id,ResourceId,Name,StartDate,EndDate,UserId,Alias,Owner,Comments,Quantity',
success: function(data){

// need to convert the date fields from a string to JS Date object
Ext.each(data.rows, function(row){
row.StartDate = new Date(row.StartDate);
row.EndDate = new Date(row.EndDate);
});

eventStore = Ext.create('Sch.data.EventStore', {
model : 'Sch.model.Event',
storeId : 'event', // referenced by this store id in Scheduler.js, etc.
data : data.rows
});

// only initialize the scheduler when all stores have loaded
if (resourceStore != null && userStore != null) {
initScheduler();
}
}
});

// query to get the Ext Scheduler users store data
LABKEY.Ajax.request({
url: LABKEY.ActionURL.buildURL('extscheduler', 'getSchedulerGroupMembers.api'),
method: 'POST',
success: function (response) {
var data = Ext.JSON.decode(response.responseText);

if (!data.success && data.msg)
{
data.rows = [];
Ext.Msg.alert('Error', data.msg);
}
else if (data.success && data.rows.length == 0)
{
Ext.Msg.alert('Error', 'No users found in the configured Scheduler user group. Please contact '
+ 'an administrator to verify that the Scheduler user group is configured correctly.');
}

Ext.define('User', {
extend: 'Ext.data.Model',

fields: [
{name: 'UserId', type: 'int'},
{name: 'LastName', type: 'string'},
{name: 'FirstName', type: 'string'},
{name: 'DisplayName', type: 'string'},
{
name: 'FullName',
convert: function(v, record) {
if (record.get('LastName') == null || record.get('LastName') == '')
return record.get('DisplayName');
else
return record.get('LastName') + ', ' + record.get('FirstName');
}
}
]
});

userStore = Ext.create('Ext.data.Store', {
storeId : 'users', // referenced by this store id in InfoPanel.js
model: 'User',
sorters : {
property : 'FullName',
direction : "ASC"
},
data : data.rows
});

// only initialize the scheduler when all stores have loaded
if (resourceStore != null && eventStore != null) {
initScheduler();
}
}
});
};

queryStoreData();
});
</script>
</body>
</html>
6 changes: 6 additions & 0 deletions extscheduler/resources/views/weekly_Radiology.view.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<view xmlns="http://labkey.org/data/xml/view" template="app" frame="none" title="Scheduler - Week View">
<dependencies>
<dependency path="clientapi_core"/>
<dependency path="extscheduler/css/weeklyview.css"/>
</dependencies>
</view>
Loading