Skip to content

Commit

Permalink
modified pageNodeScripts reference to prepened each pageNodeScript wi…
Browse files Browse the repository at this point in the history
…th "node_modules/" instead of "node_modules/inputmask/dist/". prepended pageNodeScript variables with "inputmask/dist/" where appropriate. also added chart.js libraries as pageNodeScripts variables, no longer dynamically loaded as a part of deprecated IE integration logic, for #170
  • Loading branch information
OHSUCMP committed Feb 7, 2024
1 parent 73ecd1e commit 21c0321
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions src/main/java/edu/ohsu/cmp/coach/controller/HomeController.java
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,20 @@ public String view(HttpSession session, Model model,
model.addAttribute("sessionEstablished", true);
model.addAttribute("loessBandwidth", bandwidthOverride == null ? -1:bandwidthOverride);
model.addAttribute("pageStyles", new String[] { "home.css?v=4", "recommendations.css?v=1" });
model.addAttribute("pageNodeScripts", new String[] { "jquery.inputmask.js", "bindings/inputmask.binding.js" });
model.addAttribute("pageScripts", new String[] { "science.js/science.v1.js", "science.js/lib/d3/d3.js", "home.js?v=2", "recommendations.js?v=2" });
model.addAttribute("pageNodeScripts", new String[] {
"inputmask/dist/jquery.inputmask.js",
"inputmask/dist/bindings/inputmask.binding.js",
"chart.js/dist/Chart.js",
"chartjs-adapter-date-fns/dist/chartjs-adapter-date-fns.bundle.js",
"chartjs-plugin-annotation/dist/chartjs-plugin-annotation.js"
});
model.addAttribute("pageScripts", new String[] {
"science.js/science.v1.js",
"science.js/lib/d3/d3.js",
"home.js?v=2",
"recommendations.js?v=2",
"bpchart.js"
});
model.addAttribute("patient", workspace.getPatient());
model.addAttribute("bpGoal", goalService.getCurrentBPGoal(sessionId));
model.addAttribute("bpGoalUpdated", workspace.getBpGoalUpdated());
Expand Down

0 comments on commit 21c0321

Please sign in to comment.