Merge pull request #1374 from mozzy11/develop

filter lab units by user roles on the activity
I-TECH-UW · Jan 8, 2025 · 3386e5f · 3386e5f
2 parents 015d4aa + 1dfb007
commit 3386e5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 216 deletions.
diff --git a/frontend/src/components/reports/common/ReportByDate.js b/frontend/src/components/reports/common/ReportByDate.js
@@ -15,7 +15,7 @@ import "../../Style.css";
 import { AlertDialog } from "../../common/CustomNotification";
 import CustomDatePicker from "../../common/CustomDatePicker";
 import config from "../../../config.json";
-import { encodeDate } from "../../utils/Utils";
+import { encodeDate, Roles } from "../../utils/Utils";
 import { getFromOpenElisServer } from "../../utils/Utils";
 const ReportByDate = (props) => {
   const intl = useIntl();
@@ -122,7 +122,7 @@ const ReportByDate = (props) => {
           getFromOpenElisServer("/rest/panels", setTempData);
           break;
         case "activityReportByTestSection":
-          getFromOpenElisServer("/rest/test-sections", setTempData);
+          getFromOpenElisServer("/rest/user-test-sections/"+ Roles.REPORTS, setTempData);
           break;
         default:
           break;

diff --git a/frontend/src/components/reports/routine/ActivityReport.js b/frontend/src/components/reports/routine/ActivityReport.js