Merge branch 'development' into Aditya-feat/Add-Smart-Insights-and-Predictive-Utilization-Analysis-to-the-Utilization-Chart

Author: rithika-paii

package-lock.json

@@ -64,7 +64,7 @@
     "html-to-pdfmake": "^2.0.6",
     "html2canvas": "^1.4.1",
     "jest": "^30.2.0",
-    "joi": "^18.1.2",
+    "joi": "^18.2.1",
     "joi-browser": "^13.4.0",
     "jquery": "^3.7.1",
     "jspdf": "^4.2.1",
@@ -82,7 +82,7 @@
     "object-hash": "^3.0.0",
     "path-browserify": "^1.0.1",
     "pdfmake": "^0.2.20",
-    "plotly.js": "^3.3.1",
+    "plotly.js": "^3.5.0",
     "popper.js": "^1.16.1",
     "prop-types": "^15.7.2",
     "rc-slider": "^11.1.8",

package.json

@@ -0,0 +1,62 @@
+import axios from 'axios';
+import { ENDPOINTS } from '~/utils/URL';
+import {
+  KI_INVENTORY_FETCH_REQUEST,
+  KI_INVENTORY_FETCH_SUCCESS,
+  KI_INVENTORY_FETCH_FAILURE,
+  KI_INVENTORY_STATS_REQUEST,
+  KI_INVENTORY_STATS_SUCCESS,
+  KI_INVENTORY_STATS_FAILURE,
+  KI_PRESERVED_ITEMS_REQUEST,
+  KI_PRESERVED_ITEMS_SUCCESS,
+  KI_PRESERVED_ITEMS_FAILURE,
+} from '../constants/KIInventoryConstants';
+
+const createFetchAction = (requestType, successType, failureType, endpoint, defaultErrorMsg) => async dispatch => {
+  dispatch({ type: requestType });
+  try {
+    const res = await axios.get(endpoint);
+    dispatch({ type: successType, payload: res.data.data });
+  } catch (err) {
+    dispatch({
+      type: failureType,
+      payload: err.response?.data?.message || defaultErrorMsg,
+    });
+  }
+};
+
+/**
+ * Fetch all inventory items across all categories.
+ * GET /api/kitchenandinventory/inventory/items
+ */
+export const fetchInventoryItems = () => createFetchAction(
+  KI_INVENTORY_FETCH_REQUEST,
+  KI_INVENTORY_FETCH_SUCCESS,
+  KI_INVENTORY_FETCH_FAILURE,
+  ENDPOINTS.KI_INVENTORY_ITEMS,
+  'Failed to fetch inventory items.'
+);
+
+/**
+ * Fetch inventory stats — total items, critical stock count, low stock count.
+ * GET /api/kitchenandinventory/inventory/items/stats
+ */
+export const fetchInventoryStats = () => createFetchAction(
+  KI_INVENTORY_STATS_REQUEST,
+  KI_INVENTORY_STATS_SUCCESS,
+  KI_INVENTORY_STATS_FAILURE,
+  ENDPOINTS.KI_INVENTORY_STATS,
+  'Failed to fetch inventory stats.'
+);
+
+/**
+ * Fetch preserved ingredient items (expiry >= 1 year from now).
+ * GET /api/kitchenandinventory/inventory/items/ingredients/preserved
+ */
+export const fetchPreservedItems = () => createFetchAction(
+  KI_PRESERVED_ITEMS_REQUEST,
+  KI_PRESERVED_ITEMS_SUCCESS,
+  KI_PRESERVED_ITEMS_FAILURE,
+  ENDPOINTS.KI_INVENTORY_PRESERVED,
+  'Failed to fetch preserved items.'
+);

src/actions/KIInventoryActions.js

@@ -1,30 +1,30 @@
 import axios from 'axios';
 import { toast } from 'react-toastify';
 import { formatDate } from '~/utils/formatDate';
+import { ENDPOINTS } from '~/utils/URL';
 import {
-  GET_ALL_BADGE_DATA,
   ADD_SELECT_BADGE,
-  REMOVE_SELECT_BADGE,
   CLEAR_NAME_AND_SELECTED,
   CLEAR_SELECTED,
+  CLOSE_ALERT,
+  GET_ALL_BADGE_DATA,
+  GET_BADGE_COUNT,
   GET_FIRST_NAME,
   GET_LAST_NAME,
   GET_MESSAGE,
-  CLOSE_ALERT,
   GET_USER_ID,
-  GET_BADGE_COUNT,
+  REMOVE_SELECT_BADGE,
   RESET_BADGE_COUNT,
   SET_ACTIVE_TAB,
 } from '../constants/badge';
-import { ENDPOINTS } from '~/utils/URL';
 
 export const ALERT_DELAY = process.env.NODE_ENV === 'test' ? 0 : 6000;
 
 const getAllBadges = allBadges => {
   const action = {
     type: GET_ALL_BADGE_DATA,
     allBadges,
-  };  
+  };
   return action;
 };
 
@@ -34,13 +34,13 @@ export const fetchAllBadges = (forceRefresh = false) => {
       // Check the endpoint
       const baseUrl = ENDPOINTS.BADGE();
       const url = forceRefresh ? `${baseUrl}?t=${Date.now()}` : baseUrl;
-      
+
       const response = await axios.get(url);
-      
+
       const actionResult = getAllBadges(response.data);
-      
+
       dispatch(actionResult);
-            
+
       return response.status;
     } catch (err) {
       return err.response?.status || 500;
@@ -168,7 +168,7 @@ export const returnUpdatedBadgesCollection = (badgeCollection, selectedBadgesId)
       const currentTs = Date.now();
       const currentDate = formatDate();
 
-      for (let i = 0; i < newBadgeCollection.length; i+=1) {
+      for (let i = 0; i < newBadgeCollection.length; i += 1) {
         const badgeObj = newBadgeCollection[i];
         if (badgeId === badgeObj.badge) {
           // If the badge is found, increment the count and mark it as included
@@ -200,45 +200,30 @@ export const returnUpdatedBadgesCollection = (badgeCollection, selectedBadgesId)
 };
 
 export const returnUpdatedBadgesCollectionSingleUser = (badgeCollection, selectedBadgesId) => {
-  let newBadgeCollection = Array.from(badgeCollection);
-
-  const updatedOrAddedBadges = {};
+  const newBadgeCollection = badgeCollection.map(b => ({
+    ...b,
+    earnedDate: [...(b.earnedDate || [])],
+    badge: b.badge && typeof b.badge === 'object' ? b.badge._id : b.badge,
+  }));
+  const currentTs = Date.now();
+  const currentDate = formatDate();
 
   selectedBadgesId.forEach(originalBadgeId => {
     let badgeId = originalBadgeId;
     if (badgeId.includes('assign-badge-')) badgeId = badgeId.replace('assign-badge-', '');
 
-    if (!updatedOrAddedBadges[badgeId]) {
-      let included = false;
-      const currentTs = Date.now();
-      const currentDate = formatDate();
-
-      newBadgeCollection = newBadgeCollection.map(badgeObj => {
-                            if (badgeId === badgeObj.badge) {
-                              if (!included) {
-                                included = true;
-                                updatedOrAddedBadges[badgeId] = true;
-                                return {
-                                  ...badgeObj,
-                                  count: badgeObj.count ? badgeObj.count + 1 : 1,
-                                  lastModified: currentTs,
-                                  earnedDate: [...badgeObj.earnedDate, currentDate]
-                                };
-                              }
-                              updatedOrAddedBadges[badgeId] = true;
-                            }
-                            return badgeObj;
-       });
-
-      if (!included) {
-        newBadgeCollection.push({
-          badge: badgeId,
-          count: 1,
-          lastModified: currentTs,
-          earnedDate: [currentDate],
-        });
-        updatedOrAddedBadges[badgeId] = true;
-      }
+    const existing = newBadgeCollection.find(b => b.badge === badgeId);
+    if (existing) {
+      existing.count = (existing.count || 0) + 1;
+      existing.lastModified = currentTs;
+      existing.earnedDate.push(currentDate);
+    } else {
+      newBadgeCollection.push({
+        badge: badgeId,
+        count: 1,
+        lastModified: currentTs,
+        earnedDate: [currentDate],
+      });
     }
   });
 
@@ -276,8 +261,10 @@ export const assignBadgesByUserID = (userId, selectedBadges) => {
       return;
     }
     const { badgeCollection } = res.data;
-    for (let i = 0; i < badgeCollection.length; i+=1) {
-      badgeCollection[i].badge = badgeCollection[i].badge._id;
+    for (let i = 0; i < badgeCollection.length; i += 1) {
+      if (badgeCollection[i].badge && typeof badgeCollection[i].badge === 'object') {
+        badgeCollection[i].badge = badgeCollection[i].badge._id;
+      }
     }
 
     const userToBeAssignedBadge = res.data._id;

src/actions/badgeManagement.js

@@ -0,0 +1,43 @@
+import axios from 'axios';
+import { ENDPOINTS } from '../../utils/URL';
+import {
+  FETCH_COST_BREAKDOWN_START,
+  FETCH_COST_BREAKDOWN_SUCCESS,
+  FETCH_COST_BREAKDOWN_ERROR,
+  FETCH_COST_DETAIL_START,
+  FETCH_COST_DETAIL_SUCCESS,
+  FETCH_COST_DETAIL_ERROR,
+  CLEAR_COST_DETAIL,
+} from '../../constants/bmdashboard/costBreakdownConstants';
+
+export const fetchCostBreakdown = ({ projectId, startDate, endDate } = {}) => {
+  return async dispatch => {
+    dispatch({ type: FETCH_COST_BREAKDOWN_START });
+    try {
+      const url = ENDPOINTS.BM_COST_BREAKDOWN(projectId, startDate, endDate);
+      const res = await axios.get(url);
+      dispatch({ type: FETCH_COST_BREAKDOWN_SUCCESS, payload: res.data });
+    } catch (error) {
+      const msg = error.response?.data?.error || 'Failed to load cost breakdown';
+      dispatch({ type: FETCH_COST_BREAKDOWN_ERROR, payload: msg });
+    }
+  };
+};
+
+export const fetchCostDetail = ({ projectId, startDate, endDate } = {}) => {
+  return async dispatch => {
+    dispatch({ type: FETCH_COST_DETAIL_START });
+    try {
+      const url = ENDPOINTS.BM_COST_BREAKDOWN(projectId, startDate, endDate, true);
+      const res = await axios.get(url);
+      dispatch({ type: FETCH_COST_DETAIL_SUCCESS, payload: res.data });
+    } catch (error) {
+      const msg = error.response?.data?.error || 'Failed to load category details';
+      dispatch({ type: FETCH_COST_DETAIL_ERROR, payload: msg });
+    }
+  };
+};
+
+export const clearCostDetail = () => ({
+  type: CLEAR_COST_DETAIL,
+});

src/actions/bmdashboard/costBreakdownActions.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-undef */
-import { Component, useEffect } from 'react';
+import { Component, useEffect, Suspense } from 'react';
 import { Provider, useSelector } from 'react-redux';
 import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { PersistGate } from 'redux-persist/integration/react';
@@ -234,7 +234,7 @@ class App extends Component {
               <Router>
                 <ThemeManager />
                 <UpdateDocumentTitle />
-                {routes}
+                <Suspense fallback={<Loading />}>{routes}</Suspense>
               </Router>
             </ModalProvider>
           </QueryClientProvider>

src/components/App.jsx

@@ -12,7 +12,7 @@ export const events = [
     registrations: 100,
     attendees: 78,
     completed: 75,
-    walkouts: 5,
+    walkouts: 3,
     date: getDateString(-30), // Past date - will show as Completed
     time: '09:00 AM - 05:00 PM',
     link: 'https://conferencea.com',
@@ -27,7 +27,7 @@ export const events = [
     registrations: 50,
     attendees: 44,
     completed: 38,
-    walkouts: 2,
+    walkouts: 6,
     date: getDateString(7), // Future date - will show as Upcoming
     time: '10:00 AM - 02:00 PM',
     link: 'https://workshopb.com',
@@ -42,7 +42,7 @@ export const events = [
     registrations: 75,
     attendees: 63,
     completed: 55,
-    walkouts: 5,
+    walkouts: 8,
     date: getDateString(0), // Today - will show as In Progress if current time is within range
     time: '12:00 AM - 11:59 PM',
     link: 'https://seminarc.com',

src/components/AttendanceSystem/mockData.js

@@ -37,7 +37,7 @@ function DescriptionItem({ label, value, title }) {
 
   return (
     <div>
-      <Button onClick={toggle} color="link" className="descriptionItem_button">
+      <Button onClick={toggle} color="link" className={styles.descriptionItem_button}>
         {label}
       </Button>
       <EquipmentModal modal={modal} toggle={toggle} title={title} value={value} />

src/components/BMDashboard/Equipment/Detail/EquipmentDetail.jsx

@@ -112,7 +112,7 @@ function EquipmentsInputs({ equipment, setEquipment, project, setProject }) {
   };
 
   return (
-    <div className="container">
+    <div className={styles.container}>
       <Form>
         <Row className={`align-items-center ${styles.InputsMargin}`}>
           <Col className={`${styles.InputsMargin}`}>

src/components/BMDashboard/Equipment/List/EquipmentsInputs.jsx

@@ -546,7 +546,7 @@ export default function UpdateEquipment() {
                 onChange={e => setStatus(e.target.value)}
                 required
                 style={selectInputStyle}
-                className="custom-select"
+                className={styles['custom-select']}
               >
                 <option value="">Select status</option>
                 <option value="Working well">Working well</option>
@@ -571,7 +571,7 @@ export default function UpdateEquipment() {
                 onChange={e => setLastUsedBy(e.target.value)}
                 required
                 style={selectInputStyle}
-                className="custom-select"
+                className={styles['custom-select']}
               >
                 <option value="">Select user</option>
                 <option value="Jane Doe (Volunteer #1)">Jane Doe (Volunteer #1)</option>
@@ -611,7 +611,7 @@ export default function UpdateEquipment() {
                 onChange={e => setLastUsedFor(e.target.value)}
                 required
                 style={selectInputStyle}
-                className="custom-select"
+                className={styles['custom-select']}
               >
                 <option value="">Select usage</option>
                 <option value="Kitchen - tiling">Kitchen - tiling</option>