fix: resolve merge conflicts with development branch

Author: shashankm9

jsconfig.json

@@ -1,5 +1,10 @@
 {
   "compilerOptions": {
-    "baseUrl": "src"
-  }
+    "baseUrl": "src",
+    "paths": {
+      "~/*": ["./*"]
+    }
+  },
+  "include": ["src"]
 }
+

package.json

@@ -68,6 +68,7 @@
     "joi-browser": "^13.4.0",
     "jquery": "^3.7.1",
     "jspdf": "^4.2.1",
+    "jspdf-autotable": "^5.0.7",
     "jwt-decode": "^2.2.0",
     "leaflet": "^1.9.4",
     "leaflet.heat": "^0.2.0",
@@ -103,6 +104,7 @@
     "react-router-dom": "^5.2.0",
     "react-router-hash-link": "^2.3.1",
     "react-select": "^5.10.2",
+    "react-simple-maps": "^3.0.0",
     "react-spinners": "^0.15.0",
     "react-sticky": "^6.0.3",
     "react-table": "^7.8.0",

src/actions/prAnalytics/weeklyGradingActions.js

@@ -0,0 +1,32 @@
+import axios from 'axios';
+import { ENDPOINTS } from '../../utils/URL';
+
+export const getWeeklyGrading = (teamCode, date, token) => async dispatch => {
+  try {
+    const params = { team: teamCode };
+    if (date) params.date = date;
+
+    const response = await axios.get(ENDPOINTS.WEEKLY_GRADING, {
+      params,
+      headers: { Authorization: `${token}` },
+    });
+    return response.data;
+  } catch (error) {
+    dispatch({ type: 'SET_ERROR', error: error.message });
+    throw error;
+  }
+};
+
+export const saveWeeklyGrading = (teamCode, date, gradings, token) => async dispatch => {
+  try {
+    const response = await axios.post(
+      ENDPOINTS.WEEKLY_GRADING_SAVE,
+      { teamCode, date, gradings },
+      { headers: { Authorization: `${token}` } },
+    );
+    return response.data;
+  } catch (error) {
+    dispatch({ type: 'SET_ERROR', error: error.message });
+    throw error;
+  }
+};

src/components/AttendanceSystem/AttendanceNoShowCharts.module.css

@@ -90,22 +90,22 @@
   border: 1px solid #d1d5db;
   border-radius: 6px;
   background-color: white;
-  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 2px 0 rgb(0 0 0 / 5%);
   outline: none;
 }
 
 .card {
   background-color: white;
   border-radius: 8px;
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 6px rgb(0 0 0 / 10%);
   padding: 24px;
   margin-bottom: 24px;
 }
 
 .chartsCard {
   background-color: white;
   border-radius: 8px;
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 6px rgb(0 0 0 / 10%);
   padding: 24px;
 }
 
@@ -166,6 +166,7 @@
   height: 12px;
   border-radius: 50%;
 }
+
 .statusValue {
   font-size: 18px;
   font-weight: 600;
@@ -241,7 +242,7 @@
 .upcomingChartsCard {
   background-color: white;
   border-radius: 8px;
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 4px 6px rgb(0 0 0 / 10%);
   padding: 24px;
   text-align: center;
 }
@@ -252,23 +253,26 @@
   margin: 0;
 }
 
-@media (min-width: 768px) {
+@media (width >= 768px) {
   .chartsContainer {
     flex-direction: row;
     justify-content: space-between;
   }
+
   .chartWrapper {
     width: 48%;
   }
 }
 
-@media (max-width: 480px) {
+@media (width <= 480px) {
   .pageTitle {
     font-size: 20px;
   }
+
   .cardTitle {
     font-size: 20px;
   }
+
   .chartSectionTitle {
     font-size: 16px;
   }
@@ -304,7 +308,7 @@
 :global(.dark-mode) .upcomingChartsCard,
 :global(.dark-mode) .upcomingContainer {
   background-color: #1f2937; /* Darker card background */
-  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 4px 6px rgb(0 0 0 / 30%);
   color: #f9fafb;
 }
 

src/components/BMDashboard/Equipment/Detail/EquipmentDetailPage.module.css

@@ -1,6 +1,7 @@
+/* stylelint-disable declaration-block-no-duplicate-properties */
 .equipmentDetailPage {
   font-size: 0.95rem;
-  margin: 1.5rem auto 3rem auto;
+  margin: 1.5rem auto 3rem;
   max-width: 720px;
 }
 
@@ -112,8 +113,8 @@ button.descriptionItem_button:hover {
 /* Hide native select arrow to prevent double-chevron; use single custom arrow */
 .editableField select {
   appearance: none !important;
-  -webkit-appearance: none !important;
-  -moz-appearance: none !important;
+  appearance: none !important;
+  appearance: none !important;
   background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12' fill='%23495057'%3E%3Cpath d='M6 8L1 3h10z'/%3E%3C/svg%3E") !important;
   background-repeat: no-repeat !important;
   background-position: right 0.75rem center !important;
@@ -172,7 +173,7 @@ button.descriptionItem_button:hover {
 
 :global(body.dark-mode) .equipmentDetailPageHeader h1,
 :global(body.bm-dashboard-dark) .equipmentDetailPageHeader h1 {
-  color: #ffffff;
+  color: #fff;
 }
 
 :global(body.dark-mode) :global(.EquipmentDetailPage__dashed_line),
@@ -227,8 +228,8 @@ button.descriptionItem_button:hover {
 :global(body.dark-mode) .editableField select,
 :global(body.bm-dashboard-dark) .editableField select {
   appearance: none;
-  -webkit-appearance: none;
-  -moz-appearance: none;
+  appearance: none;
+  appearance: none;
   background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12' fill='%23e0eaf5'%3E%3Cpath d='M6 8L1 3h10z'/%3E%3C/svg%3E");
   background-repeat: no-repeat;
   background-position: right 0.75rem center;