Skip to content
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

Path-first URLs #928

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Path-first URLs #928

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
15 changes: 7 additions & 8 deletions ONPRC_EHR_ComplianceDB/resources/views/ComplianceEditorPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,29 @@
header: 'Reports',
items: [{
name: 'Summary of Requirements By Employee',
url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceRecentTests&query.employeeid/isActive~eq=true'
url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceRecentTests&query.employeeid/isActive~eq=true'
}, {
name: 'Requirements Overdue/Due Soon',
url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceRecentTests&query.viewName=Overdue and Due Soon'
url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceRecentTests&query.viewName=Overdue and Due Soon'
}, {
name: 'Procedure - Requirements Overdue/Due Soon',
url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceProcedureRecentTests&query.viewName=Overdue and Due Soon withNoEHRS OccHealth'
url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceProcedureRecentTests&query.viewName=Overdue and Due Soon withNoEHRS OccHealth'
}, {
name: 'Occupational Health - Requirements Overdue/Due Soon',
url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceRecentTests&query.viewName=Occupational%20Health%20Compliance'
url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceRecentTests&query.viewName=Occupational%20Health%20Compliance'
}, {
name: 'Occupational Health - Measles Overdue/Due Soon',
url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Measles45DayAlert&query.DaysOverDue~neqornull=-1'
url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Measles45DayAlert&query.DaysOverDue~neqornull=-1'
}
]
}, {
header: 'Employee Information',
items: [{
name: 'Employee List',
url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Employees&query.viewName=' + employeeDefaultView
url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Employees&query.viewName=' + employeeDefaultView
}, {
name: 'View/Edit Dates Employees Completed Requirements',
url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=CompletionDates'
url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=CompletionDates'

}]
}, {
Expand All @@ -61,7 +61,6 @@
}, {
name: 'Respirator Protection Report - Quarantine',
url: ctx['SSRSServerURL'] + '%2fPrime+Reports%2fCompliance%2fRespiratorProtectionQuarantine&rs:Command=Render'

}]
}]
});
Expand Down
38 changes: 19 additions & 19 deletions ONPRC_EHR_ComplianceDB/resources/views/begin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
sections: [{
header: 'Reports',
items: [{
name: 'Summary of Requirements By Employee', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceRecentTests&query.employeeid/isActive~eq=true'
name: 'Summary of Requirements By Employee', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceRecentTests&query.employeeid/isActive~eq=true'
},{
name: 'Requirements Overdue/Due Soon', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceProcedureRecentTests&query.viewName=Overdue and Due Soon'
name: 'Requirements Overdue/Due Soon', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceProcedureRecentTests&query.viewName=Overdue and Due Soon'
},{
name: 'Procedure - Requirements Overdue/Due Soon', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceProcedureRecentTests&query.viewName=Overdue and Due Soon withNoEHRS OccHealth'
name: 'Procedure - Requirements Overdue/Due Soon', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceProcedureRecentTests&query.viewName=Overdue and Due Soon withNoEHRS OccHealth'
},{
name: 'Occupational Health - Requirements Overdue/Due Soon', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceProcedureRecentTests&query.viewName=Occupational%20Health%20Compliance'
name: 'Occupational Health - Requirements Overdue/Due Soon', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=ComplianceProcedureRecentTests&query.viewName=Occupational%20Health%20Compliance'
},{
name: 'Occupational Health - Measles Overdue/Due Soon', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Measles45DayAlert&query.DaysOverDue~neqornull=-1'
name: 'Occupational Health - Measles Overdue/Due Soon', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Measles45DayAlert&query.DaysOverDue~neqornull=-1'
},{
name: 'Requirements Overdue/Due Soon (Full SSRS Reports)', url: ctx['SSRSServerURL'] +'%2fPrime+Reports%2fCompliance%2fOverdue_Soon_Report&rs:Command=Render'
},{
Expand All @@ -39,42 +39,42 @@
},{
header: 'Employee Information',
items: [{
name: 'Employee List', url: '<%=contextPath%>/ldk' + container + '/updateQuery.view?schemaName=ehr_compliancedb&query.queryName=Employees&query.viewName=' + employeeDefaultView
name: 'Employee List', url: '<%=contextPath%>' + container + '/ldk-updateQuery.view?schemaName=ehr_compliancedb&query.queryName=Employees&query.viewName=' + employeeDefaultView
},{
name: 'View/Edit Dates Employees Completed Requirements', url: '<%=contextPath%>/ldk' + container + '/updateQuery.view?schemaName=ehr_compliancedb&query.queryName=CompletionDates'
name: 'View/Edit Dates Employees Completed Requirements', url: '<%=contextPath%>' + container + '/ldk-updateQuery.view?schemaName=ehr_compliancedb&query.queryName=CompletionDates'
// },{
// name: 'Enter Employees Completed Requirements(Special Access)', url: ctx['SSRSServerURL'] +'%2fPrime+Reports%2fCompliance%2fEmployeeCompletionDatesInput&rs:Command=Render'

}]
},{
header: 'Configuration of Requirements',
items: [{
name: 'View/Edit Requirements Tracked In System', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Requirements&query.viewName=Active'
name: 'View/Edit Requirements Tracked In System', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Requirements&query.viewName=Active'
},{
name: 'View/Edit Requirements For Specific Units/Categories', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=RequirementsPerCategory'
name: 'View/Edit Requirements For Specific Units/Categories', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=RequirementsPerCategory'
},{
name: 'View/Edit Additional Requirements For Specific Employees', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=RequirementsPerEmployee'
name: 'View/Edit Additional Requirements For Specific Employees', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=RequirementsPerEmployee'
},{
name: 'View/Edit Exemptions To Requirements', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeRequirementExemptions'
name: 'View/Edit Exemptions To Requirements', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeRequirementExemptions'
},{
name: 'View/Edit Dates Employees Per Unit/Category', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=employeeperUnit'
name: 'View/Edit Dates Employees Per Unit/Category', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=employeeperUnit'
}]
},{
header: 'Administration / System Maintenance',
items: [{
name: 'View/Edit Allowable Employee Categories', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeCategory'
name: 'View/Edit Allowable Employee Categories', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeCategory'
},{
name: 'View/Edit Allowable Employee Titles', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeTitles'
name: 'View/Edit Allowable Employee Titles', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeTitles'
},{
name: 'View/Edit Allowable Employee Types', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeTypes'
name: 'View/Edit Allowable Employee Types', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeTypes'
},{
name: 'View/Edit Allowable Requirement Types', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=RequirementType'
name: 'View/Edit Allowable Requirement Types', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=RequirementType'
},{
name: 'View/Edit Allowable Locations', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeLocations'
name: 'View/Edit Allowable Locations', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=EmployeeLocations'
},{
name: 'View/Edit Allowable Unit Names', url: '<%=contextPath%>/query' + container + '/executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Unit_Names'
name: 'View/Edit Allowable Unit Names', url: '<%=contextPath%>' + container + '/query-executeQuery.view?schemaName=ehr_compliancedb&query.queryName=Unit_Names'
},{
name: 'View/Edit Employee Host Names', url: '<%=contextPath%>/ldk' + container + '/updateQuery.view?schemaName=ehr_compliancedb&query.queryName=Compliance_Reference_Data'
name: 'View/Edit Employee Host Names', url: '<%=contextPath%>' + container + '/ldk-updateQuery.view?schemaName=ehr_compliancedb&query.queryName=Compliance_Reference_Data'
},{
name: 'Employee Per Unit/Category Form', url: LABKEY.ActionURL.buildURL('ehr','dataEntryForm', '/ONPRC/Admin/Compliance',{formType: 'employeeunitrecords'})
},{
Expand Down
2 changes: 1 addition & 1 deletion mergesync/resources/views/begin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,6 @@
</li>
</ul>
<p>
<a href="<%=contextPath%>/mergesync<%=containerPath%>/instructions.view">Click here to view more detailed documentation on the Merge Sync process</a>
<a href="<%=contextPath%><%=containerPath%>/mergesync-instructions.view">Click here to view more detailed documentation on the Merge Sync process</a>
</p>
<div id="etl_div"/>
2 changes: 1 addition & 1 deletion mergesync/src/org/labkey/mergesync/MergeSyncModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
Resource r = getModuleResource("/scripts/mergesync/mergesync.js");
assert r != null;
EHRService.get().registerTriggerScript(this, r);
DetailsURL details = DetailsURL.fromString("/mergeSync/begin.view", ContainerManager.getSharedContainer());
DetailsURL details = DetailsURL.fromString("/mergeSync-begin.view", ContainerManager.getSharedContainer());
AdminConsole.addLink(AdminConsole.SettingsLinkType.Management, "merge sync admin", details.getActionURL(), AdminPermission.class);

MergeSyncManager.get().init();
Expand Down
2 changes: 1 addition & 1 deletion ogasync/src/org/labkey/ogasync/OGASyncModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ protected void init()
public void doStartupAfterSpringConfig(ModuleContext moduleContext)
{
OGASyncManager.get().init();
DetailsURL details = DetailsURL.fromString("/ogaSync/begin.view", ContainerManager.getSharedContainer());
DetailsURL details = DetailsURL.fromString("/ogaSync-begin.view", ContainerManager.getSharedContainer());
AdminConsole.addLink(AdminConsole.SettingsLinkType.Management, "oga sync admin", details.getActionURL(), AdminPermission.class);
}
}
4 changes: 2 additions & 2 deletions onprc_billing/resources/web/onprc_billing/model/sources/ARTCoreMisc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('BILLINGSAVECLOSE', {
name: 'closeBtn',
requiredQC: 'In Progress',
errorThreshold: 'WARN',
successURL: '/project/ONPRC/Core%20Facilities/ART%20Core/begin.view?pageId=ART%20Core%20Billing',
successURL: '/ONPRC/Core%20Facilities/ART%20Core/project-begin.view?pageId=ART%20Core%20Billing',
disabled: true,
itemId: 'closeBtn',
handler: function(btn){
Expand All @@ -273,7 +273,7 @@ EHR.DataEntryUtils.registerDataEntryFormButton('BILLINGFINAL', {
requiredQC: 'Completed',
targetQC: 'Completed',
errorThreshold: 'INFO',
successURL: '/project/ONPRC/Core%20Facilities/ART%20Core/begin.view?pageId=ART%20Core%20Billing',
successURL: '/ONPRC/Core%20Facilities/ART%20Core/project-begin.view?pageId=ART%20Core%20Billing',
disabled: true,
itemId: 'finalBtn',
handler: function(btn){
Expand Down
Loading