Swathi promotion eligibility button func

fix-conflicts.js

@@ -6,7 +6,7 @@
   'src/components/BMDashboard/AddMaterial/AddMaterial.module.css',
   'src/components/BMDashboard/Equipment/Update/UpdateEquipment.module.css',
   'src/components/BMDashboard/Issues/issueChart.module.css',
-  'src/components/BMDashboard/Issues/issueCharts.module.css',
+  'src/components/BMDashboard/Issues/IssueCharts.module.css',
   'src/components/BMDashboard/ItemList/ItemListView.module.css',
   'src/components/BMDashboard/Lesson/LessonForm.module.css',
   'src/components/BMDashboard/LessonList/LessonCard.module.css',
@@ -54,17 +54,17 @@
 let count = 0;
 for (const f of files) {
   if (!fs.existsSync(f)) {
     console.log('NOT FOUND: ' + f);
     continue;
   }
   const content = fs.readFileSync(f, 'utf8');
   if (!content.includes('<<<<<<<')) {
     console.log('No conflict: ' + f);
     continue;
   }
   const resolved = resolveKeepHead(content);
   fs.writeFileSync(f, resolved, 'utf8');
   console.log('Fixed: ' + f);
   count++;
 }
 console.log('Total: ' + count);

src/actions/promotionActions.js

@@ -2,7 +2,9 @@ import axios from 'axios';
 import { ENDPOINTS } from '../utils/URL';
 
 export const getPromotionEligibility = async requestor => {
-  const res = await axios.post(ENDPOINTS.PROMOTION_ELIGIBILITY, { requestor });
+  const res = await axios.post(ENDPOINTS.PROMOTION_ELIGIBILITY, {
+    requestor,
+  });
   return res.data;
 };
 
@@ -13,3 +15,194 @@ export const postPromotionEligibility = async (memberIds, requestor) => {
   });
   return res.data;
 };
+
+export const fetchReviewerGroups = async currentUser => {
+  const res = await axios.post(ENDPOINTS.REVIEWER_GROUPS, {
+    requestor: currentUser,
+  });
+
+  return res.data;
+};
+
+export const createReviewerGroup = async (groupData, currentUser) => {
+  const res = await axios.post(ENDPOINTS.REVIEWER_GROUPS, {
+    ...groupData,
+    requestor: currentUser,
+  });
+
+  return res.data;
+};
+
+export const updateReviewerGroup = async (groupId, groupData, currentUser) => {
+  const res = await axios.put(`${ENDPOINTS.REVIEWER_GROUPS}/${groupId}`, {
+    ...groupData,
+    requestor: currentUser,
+  });
+
+  return res.data;
+};
+
+/* =========================================================
+   PR GRADING
+   ========================================================= */
+
+/**
+ * Get PR entries for multiple reviewers.
+ *
+ * Backend:
+ * POST /api/promotion-eligibility/pr-entries
+ */
+export const fetchPREntriesBulk = async (reviewerIds, currentUser) => {
+  const res = await axios.post(ENDPOINTS.PROMOTION_PR_ENTRIES_BULK, {
+    reviewerIds,
+    requestor: {
+      requestorId: currentUser?.userid,
+    },
+  });
+
+  return res.data;
+};
+
+/**
+ * Get the available PR rating options.
+ *
+ * Backend:
+ * POST /api/promotion-eligibility/pr-ratings
+ */
+export const fetchPRRatings = async currentUser => {
+  const res = await axios.post(ENDPOINTS.PR_RATINGS, {
+    requestor: {
+      requestorId: currentUser?.userid,
+    },
+  });
+
+  return res.data;
+};
+
+/**
+ * Get PR entries for a single reviewer.
+ *
+ * Backend:
+ * POST /api/promotion-eligibility/:reviewerId/pr-entries
+ */
+export const fetchPREntries = async (reviewerId, currentUser) => {
+  const res = await axios.post(ENDPOINTS.PROMOTION_PR_ENTRIES(reviewerId), {
+    requestor: {
+      requestorId: currentUser?.userid,
+    },
+  });
+
+  return res.data;
+};
+
+/**
+ * Manually add a PR entry.
+ *
+ * Backend:
+ * POST /api/promotion-eligibility/:reviewerId/pr-entries/new
+ */
+export const addPREntry = async (reviewerId, prNumber, currentUser) => {
+  const res = await axios.post(ENDPOINTS.PR_GRADING_ADD_ENTRY(reviewerId), {
+    prNumber,
+    requestor: {
+      requestorId: currentUser?.userid,
+    },
+  });
+
+  return res.data;
+};
+
+/**
+ * Import PR entries from the weekly summary.
+ *
+ * Backend:
+ * POST /api/promotion-eligibility/:reviewerId/pr-entries/import
+ */
+export const importPREntries = async (reviewerId, currentUser) => {
+  const res = await axios.post(`${ENDPOINTS.PROMOTION_PR_ENTRIES(reviewerId)}/import`, {
+    requestor: {
+      requestorId: currentUser?.userid,
+    },
+  });
+
+  return res.data;
+};
+
+/**
+ * Update or clear a PR rating.
+ *
+ * Backend:
+ * PATCH /api/promotion-eligibility/pr-entries/:entryId/rating
+ */
+export const updatePRRating = async (entryId, rating, currentUser) => {
+  const res = await axios.patch(ENDPOINTS.PR_GRADING_UPDATE_RATING(entryId), {
+    rating,
+    requestor: {
+      requestorId: currentUser?.userid,
+    },
+  });
+
+  return res.data;
+};
+
+/**
+ * Owner override for PRs Needed.
+ *
+ * Sending a number sets an override.
+ * Sending null clears the override and returns to automatic
+ * committed-hours calculation.
+ *
+ * Backend:
+ * PATCH /api/promotion-eligibility/:reviewerId/prs-needed
+ */
+export const updatePRsNeeded = async (reviewerId, prsNeeded, currentUser) => {
+  const res = await axios.patch(`${ENDPOINTS.PROMOTION_ELIGIBILITY}/${reviewerId}/prs-needed`, {
+    prsNeeded,
+    requestor: {
+      requestorId: currentUser?.userid,
+    },
+  });
+
+  return res.data;
+};
+
+/**
+ * Preview promotion team placements.
+ *
+ * Backend:
+ * POST /api/promote-members/preview
+ *
+ * This does NOT promote anyone or modify team membership.
+ */
+export const previewPromotionEligibility = async (memberIds, requestor) => {
+  const res = await axios.post(ENDPOINTS.PROMOTE_MEMBERS_PREVIEW, {
+    memberIds,
+    requestor,
+  });
+
+  return res.data;
+};
+
+/**
+ * Process promotions and optionally assign reviewers to teams.
+ *
+ * Backend:
+ * POST /api/promote-members
+ *
+ * placements:
+ * [
+ *   {
+ *     reviewerId: '...',
+ *     teamId: '...'
+ *   }
+ * ]
+ */
+export const processPromotions = async (memberIds, requestor, placements) => {
+  const res = await axios.post(ENDPOINTS.PROMOTE_MEMBERS, {
+    memberIds,
+    requestor,
+    placements,
+  });
+
+  return res.data;
+};

src/components/Announcements/Announcements.module.css

@@ -27,10 +27,12 @@
   margin-top: 5px; /* Space above input fields */
   width: 100%;
   padding: 12px;
+
   /* Increased padding */
   border: 1px solid #ccc;
   border-radius: 4px;
   box-sizing: border-box;
+
   /* Ensures padding is included in width */
 }
 
@@ -44,10 +46,12 @@ button.sendButton {
   border: none;
   border-radius: 4px;
   padding: 12px 24px;
+
   /* Increased padding */
   cursor: pointer;
   margin-top: 20px;
   box-sizing: border-box;
+
   /* Ensures padding is included in width */
 }
 
@@ -107,6 +111,7 @@ button.sendButton:hover {
 .emails {
   margin-top: 65px;
   padding: 24px;
+
   /* Increased padding */
   border: solid 1px #cacaca;
   border-radius: 20px;
@@ -170,26 +175,32 @@ button.sendButton:hover {
     width: 100%;
     margin-top: 20px;
     padding: 20px 12px;
+
     /* Adjust padding for smaller screens */
     box-sizing: border-box;
+
     /* Ensures padding is included in width */
   }
 
   .sendButton {
     width: 100%;
     margin-bottom: 10px;
     padding: 12px;
+
     /* Ensures padding is consistent */
     box-sizing: border-box;
+
     /* Ensures padding is included in width */
   }
 
   .inputTextForAnnouncement,
   :global(textarea) {
     width: 100%;
     padding: 12px;
+
     /* Ensures padding is consistent */
     box-sizing: border-box;
+
     /* Ensures padding is included in width */
   }
 }
@@ -545,6 +556,7 @@ button.sendButton:hover {
   box-shadow: -2px 0 6px rgb(0 0 0 / 12%), 2px 0 6px rgb(0 0 0 / 12%),
     0 6px 6px rgb(0 0 0 / 20%);
 }
+
 /* Dark mode background fix for entire announcements area */
 .dark-mode {
   background-color: #1a1d23 !important;
@@ -561,6 +573,7 @@ button.sendButton:hover {
 .dark-mode .tab-content {
   background-color: #1a1d23 !important;
 }
+
 /* CRITICAL: Remove white padding in dark mode */
 .dark-mode,
 .dark-mode > div,

src/components/BMDashboard/Issues/openIssueCharts.jsx

@@ -19,7 +19,7 @@ import {
   setProjectFilter,
 } from '../../../actions/bmdashboard/issueChartActions';
 import { CustomDateComponent } from './CustomDateComponent';
-import styles from './issueCharts.module.css';
+import styles from './IssueCharts.module.css';
 
 /* ---------- helpers ---------- */
 

src/components/BMDashboard/Lessons/AddLessons.module.css

@@ -59,7 +59,7 @@
   color: #f0f0f0;
   border-radius: 10px;
   padding: 1.5rem;
-  box-shadow: 0 0 12px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 0 12px rgb(0 0 0 / 30%);
 }
 
 .darkPageWrapper :global(.form-control),

src/components/BMDashboard/LogTools/LogTools.module.css

@@ -185,7 +185,7 @@
 /* Dark Mode */
 :global(.dark-mode) .logFormContainer {
   background-color: #2b2b2b;
-  color: #ffffff !important;
+  color: #fff !important;
   border-color: #444 !important;
 }
 
@@ -200,7 +200,7 @@
 
 :global(body.dark-mode) .logFormContainer {
   background-color: #1b2a41;
-  color: #ffffff;
+  color: #fff;
   border-color: #444;
 }
 

src/components/BMDashboard/WeeklyProjectSummary/ExpenditureChart/ExpenditureCard.module.css

@@ -56,7 +56,7 @@
   padding: 6px 10px;
   background: var(--section-bg);
   color: var(--text-color);
-  border: 1px solid var(--border-color, #cccccc);
+  border: 1px solid var(--border-color, #ccc);
   border-radius: 6px;
   font-size: 14px;
   cursor: pointer;
@@ -84,7 +84,7 @@
 }
 
 /* ── Responsive ─────────────────────────────────────────────── */
-@media (max-width: 640px) {
+@media (width <= 640px) {
   .card {
     padding: 16px;
   }