Skip to content

Improve SSRS session ID handoff #1294

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
brentlogan merged 12 commits into from
Jun 9, 2025
Merged

Improve SSRS session ID handoff #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ac8eb78
Improve SSRS session ID handoff
labkey-jeckels Mar 19, 2025
761ddec
Consolidate more SSRS code, add test coverage
labkey-jeckels Mar 19, 2025
af12504
Comments and consistency
labkey-jeckels Mar 19, 2025
d56a611
Make new test Firefox compatible
labkey-jeckels Mar 20, 2025
b0dec31
SessionID -> SessionId for the SSRS URL parameter
labkey-jeckels Mar 25, 2025
ba94dc8
Update check for sessionId
labkey-jeckels Apr 3, 2025
dd6ca6d
Merge branch 'release24.11-SNAPSHOT' into 24.11_fb_ssrsSessionId
brentlogan Apr 28, 2025
374e6b4
Merge branch 'release24.11-SNAPSHOT' into 24.11_fb_ssrsSessionId
Ohsudev May 14, 2025
c6e4ceb
Add missing import to fix build
labkey-jeckels May 19, 2025
3039a02
Merge branch 'release24.11-SNAPSHOT' into 24.11_fb_ssrsSessionId
labkey-jeckels May 19, 2025
fe44b09
Merge branch 'release24.11-SNAPSHOT' into 24.11_fb_ssrsSessionId
labkey-jeckels Jun 5, 2025
25d13c1
Clean up imports
labkey-jeckels Jun 5, 2025
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
173 changes: 8 additions & 165 deletions ONPRC_EHR_ComplianceDB/resources/views/printableComplianceReports.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
Ext4.onReady(function(){
var webpart = <%=webpartContext%>;

ONPRC.Utils.preloadSession();

Ext4.define('ONPRC.panel.PrintableComplianceReportsPanel', {
itemId: 'sheetPanel',
extend: 'Ext.panel.Panel',
Expand All @@ -28,44 +30,6 @@
html: 'NOTE:' +
'<br>Click the button below to display the Employee\'s Summary Report. The program will display a report of all training requirements for each employee.</b>',
style: 'padding-bottom: 20px;'
// },{
// xtype: 'checkcombo', //Added: 10-18-2017 R.Blasa
// itemId: 'employeeNames',
// displayField: 'FullName',
// valueField: 'employeeid',
// width: 400,
// multiSelect: true,
// fieldLabel: 'Employee Name(s)',
// store: {
// type: 'labkey-store',
// containerPath: container,
// schemaName: 'ehr_compliancedb',
// queryName: 'EmployeeActiveList',
// columns: 'employeeid, FullName',
// sort: 'lastName',
// filterArray: [LABKEY.Filter.create('isActive', true, LABKEY.Filter.Types.EQUAL)],
// autoLoad: true
// }
//
// },{
// xtype: 'combobox', //Added: 10-18-2017 R.Blasa
// itemId: 'supervisorNames',
// displayField: 'name',
// valueField: 'supervisor',
// width: 400,
// multiSelect: true,
// fieldLabel: 'Supervisor Name(s)',
// store: {
// type: 'labkey-store',
// containerPath: container,
// schemaName: 'ehr_compliancedb',
// queryName: 'SupervisorActiveList',
// columns: 'employeeid, supervisor, name',
// sort: 'supervisor',
// autoLoad: true
//
// }

}];
items.push({
layout: {
Expand All @@ -90,33 +54,8 @@
border: true,
getUrlString: function ()
{
// var panel = this.up('#sheetPanel');
// var field = panel.down('#employeeNames');
//
// var value = field.getValue() || [];
// value = Ext4.isArray(value) ? value: [value];

var params = {
SessionId: LABKEY.Utils.getSessionID(),
HostName: location.hostname

};
// if (!value)
// return;


Ext4.apply(params, {
'rs:ClearSession': true,
'rs:Command': 'render'
});

var url = LABKEY.getModuleProperty('ONPRC_EHR', 'SSRSServerURL');
var ssrsFolder = LABKEY.getModuleProperty('ONPRC_EHR', 'SSRSReportFolder');
ssrsFolder = '/' + ssrsFolder + '/' + 'Compliance/EmployeeComplianceSuperXMLReport';

url += ssrsFolder + '&' + LABKEY.ActionURL.queryString(params);

return url;
const params = ONPRC.Utils.getSsrsParams({}, true, true);
return ONPRC.Utils.getSsrsReportUrl('Compliance/EmployeeComplianceSuperXMLReport', params);
},
menu: [{
text: 'Print',
Expand All @@ -128,22 +67,8 @@

window.open(url);
}
// },{
// text: 'Print To PDF',
// handler: function(menu){
// var btn = menu.up('button');
// var url = btn.getUrlString();
// if (!url)
// return;
//
// url += '&rs:Format=PDF';
// window.open(url);
// }
}]

}]


},{

html: '<i>Report by Employee(s):</i>' //Added: 10-17-2019 R.Blasa
Expand All @@ -155,43 +80,9 @@
style: 'margin-left: 150px;',
text: 'Print Version',
border: true,
getUrlString: function(){
// var panel = this.up('#sheetPanel');
// var field = panel.down('#supervisorNames');
//
// var value = field.getValue() || [];
// value = Ext4.isArray(value) ? value: [value];

var params = {
SessionId: LABKEY.Utils.getSessionID(),
HostName: location.hostname

};
// if (!value)
// return;
//
//
// if (!Ext4.isEmpty(value))
// params.supervisor = value;
//
// if (params.EmployeeID){
// delete params.EmployeeID
// }



Ext4.apply(params, {
'rs:ClearSession': true,
'rs:Command': 'render'
});

var url = LABKEY.getModuleProperty('ONPRC_EHR', 'SSRSServerURL');
var ssrsFolder = LABKEY.getModuleProperty('ONPRC_EHR', 'SSRSReportFolder');
ssrsFolder = '/' + ssrsFolder + '/' + 'Compliance/EmployeeComplianceEmpXMLReport';

url += ssrsFolder + '&' + LABKEY.ActionURL.queryString(params);

return url;
getUrlString: function() {
const params = ONPRC.Utils.getSsrsParams({}, true, true);
return ONPRC.Utils.getSsrsReportUrl('Compliance/EmployeeComplianceEmpXMLReport', params);
},
menu: [{
text: 'Print',
Expand All @@ -203,59 +94,11 @@

window.open(url);
}
// },{
// text: 'Print To PDF',
// handler: function(menu){
// var btn = menu.up('button');
// var url = btn.getUrlString();
// if (!url)
// return;
//
// url += '&rs:Format=PDF';
// window.open(url);
// }
}]

});
return items;
},
getParamsgroup: function(supressErrors, skipRoomsIfAllSelected){
var params = {
SessionId: LABKEY.Utils.getSessionID(),
HostName: location.hostname

};



var roomFields = this.down('#animal_groups');
var rooms = roomFields.getValue() || [];
rooms = Ext4.isArray(rooms) ? rooms: [rooms];

params.rooms =rooms;

if (!rooms.length && !supressErrors){
Ext4.Msg.alert('Error', 'Must select an Animal Group name');
return;
}

return params;
},


getParams: function(supressErrors, skipRoomsIfAllSelected){
var params = {
SessionId: LABKEY.Utils.getSessionID(),
HostName: location.hostname

};



return params;
}


}
});


Expand Down
21 changes: 5 additions & 16 deletions onprc_ehr/resources/views/citesReport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
if(!ctx)
return;

/* get the participant id from the request URL: this parameter is required. */
var subjectIds = LABKEY.ActionURL.getParameter('subjectIds');
subjectIds = subjectIds ? subjectIds.split(';') : [];
ONPRC.Utils.preloadSession();

Ext4.create('Ext.panel.Panel', {
width: 400,
Expand All @@ -20,7 +18,8 @@
width: 400,
height: 200,
fieldLabel: 'Enter Animal Id(s)',
itemId: 'animalField'
itemId: 'animalField',
name: 'animalField'
}],
buttons: [{
text: 'Submit',
Expand All @@ -40,19 +39,9 @@
return;
}
//Modified: 1-17-2019 R.Blasa
var url = LABKEY.getModuleProperty('ONPRC_EHR', 'SSRSServerURL');
var ssrsFolder = LABKEY.getModuleProperty('ONPRC_EHR', 'SSRSReportFolder');
ssrsFolder = '/' + ssrsFolder + '/' + 'Clinical/CITESReport';

url += ssrsFolder + '&' + LABKEY.ActionURL.queryString({
SessionID: LABKEY.Utils.getSessionID(),
HostName: location.hostname,
window.location = ONPRC.Utils.getSsrsReportUrl('Clinical/CITESReport', ONPRC.Utils.getSsrsParams({
AnimalID: val
});

//url += '&rs:Format=PDF'
console.log(url)
window.location = url;
}));
}
}]
}).render(webpart.wrapperDivId);
Expand Down
3 changes: 1 addition & 2 deletions onprc_ehr/resources/views/ehrAdmin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
header: 'Logs',
items: [
{name: 'Labkey.log', url: '<%=contextPath%>' + '/admin-showPrimaryLog.view'},
{name: 'Labkey-errors.log', url: '<%=contextPath%>' + '/admin-showAllErrors.view'},
{name: 'ETL Log', url: '<%=contextPath%>' + '/onprc_ehr-showEtlLog.view'}
{name: 'Labkey-errors.log', url: '<%=contextPath%>' + '/admin-showAllErrors.view'}
]
},{
header: 'Notifications',
Expand Down
27 changes: 8 additions & 19 deletions onprc_ehr/resources/views/historyExport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
if(!ctx)
return;

/* get the participant id from the request URL: this parameter is required. */
var subjectIds = LABKEY.ActionURL.getParameter('subjectIds');
subjectIds = subjectIds ? subjectIds.split(';') : [];
ONPRC.Utils.preloadSession();

Ext4.create('Ext.panel.Panel', {
width: 400,
Expand Down Expand Up @@ -75,22 +73,13 @@
}
//Modified: 1-17-2019 R.Blasa
if (!hideHistory){
var url = LABKEY.getModuleProperty('ONPRC_EHR', 'SSRSServerURL');
var ssrsFolder = LABKEY.getModuleProperty('ONPRC_EHR', 'SSRSReportFolder');
ssrsFolder = '/' + ssrsFolder + '/' + 'Clinical/SalesMedicalHistoryReport';

url += ssrsFolder + '&' + LABKEY.ActionURL.queryString({
SessionID: LABKEY.Utils.getSessionID(),
HostName: location.hostname,
'rs:ClearSession': true,
Redacted: redacted ? 'true' : 'false',
AnimalId: val,
minDate: Ext4.Date.format(mindate1, 'Y-m-d'), //Added: 11-18-2016 R.Blasa
maxDate: Ext4.Date.format(maxdate1, 'Y-m-d')
});

//url += '&rs:Format=PDF'
window.location = url;
window.location = ONPRC.Utils.getSsrsReportUrl('Clinical/SalesMedicalHistoryReport',
ONPRC.Utils.getSsrsParams({
Redacted: redacted ? 'true' : 'false',
AnimalId: val,
minDate: Ext4.Date.format(mindate1, 'Y-m-d'), //Added: 11-18-2016 R.Blasa
maxDate: Ext4.Date.format(maxdate1, 'Y-m-d')
}, true));
}
else {
window.location = LABKEY.ActionURL.buildURL('ehr', 'clinicalHistoryExport', null, {
Expand Down
Loading