From 14236c7c9af449504eda903f41b4e09bf7c3fe58 Mon Sep 17 00:00:00 2001
From: Pranay-Gottimukula
 <97828875+Pranay-Gottimukula@users.noreply.github.com>
Date: Mon, 1 Jun 2026 01:41:18 +0530
Subject: [PATCH 1/8] PPO frontend (#450)

---
 src/app/(routes)/admin/oncampus-offers/page.tsx | 14 ++++++++++++--
 src/dto/onCampusOfferDTO.ts                     |  9 +++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/app/(routes)/admin/oncampus-offers/page.tsx b/src/app/(routes)/admin/oncampus-offers/page.tsx
index ab949ff..52eadd3 100644
--- a/src/app/(routes)/admin/oncampus-offers/page.tsx
+++ b/src/app/(routes)/admin/oncampus-offers/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { fetchAllSeasons, fetchOnCampusOffers, deleteOnCampusOffers } from "@/helpers/api";
 import generateColumns from "@/components/NewTableComponent/ColumnMapping";
-import { onCampusOfferDTO } from "@/dto/onCampusOfferDTO";
+import { onCampusOfferDTO, ON_CAMPUS_OFFER_STATUS_LABELS } from "@/dto/onCampusOfferDTO";
 import Table from "@/components/NewTableComponent/Table";
 import { useEffect, useState } from "react";
 import Loader from "@/components/Loader/loader";
@@ -12,7 +12,17 @@ const internHiddenColumns = ["salary.firstYearCTC", "salary.totalCTC", "salary.s
 const placementHiddenColumns = ["salary.stipend", "salary.otherCompensations", "salary.salaryPeriod"];
 
 const OnCampusOffersPage = () => {
-  const columns = generateColumns(onCampusOfferDTO);
+  const columns = generateColumns(onCampusOfferDTO).map((col: any) =>
+    col.accessorKey === "status"
+      ? {
+          ...col,
+          cell: ({ getValue }: { getValue: () => unknown }) => {
+            const val = getValue() as string;
+            return ON_CAMPUS_OFFER_STATUS_LABELS[val] ?? val;
+          },
+        }
+      : col,
+  );
   const [seasons, setSeasons] = useState<{ id: string; name: string, type: string }[]>([]);
   const [selectedSeason, setSelectedSeason] = useState<string>("");
   const [loading, setLoading] = useState(true);
diff --git a/src/dto/onCampusOfferDTO.ts b/src/dto/onCampusOfferDTO.ts
index 555f01b..e797a1f 100644
--- a/src/dto/onCampusOfferDTO.ts
+++ b/src/dto/onCampusOfferDTO.ts
@@ -1,3 +1,12 @@
+export const ON_CAMPUS_OFFER_STATUS_LABELS: Record<string, string> = {
+  ACCEPTED: "Accepted",
+  REJECTED: "Rejected",
+  ONGOING: "Ongoing",
+  PPO_ACCEPTED: "PPO Accepted",
+  PLACEMENT_FTE: "FTE (Direct)",
+  PLACEMENT_PPO: "FTE (via PPO)",
+};
+
 const onCampusOfferDTO = [
   {
     status: "string",

From 43654875c8846e4cd364adefbed5ad7097835b48 Mon Sep 17 00:00:00 2001
From: metamyte <89248467+metamyteee@users.noreply.github.com>
Date: Mon, 1 Jun 2026 01:42:15 +0530
Subject: [PATCH 2/8] events in schedule (#446)

Co-authored-by: Prince Kumar <x.prince.x@outlook.com>
---
 src/components/Calendar/CalenderComponent/Labels.tsx | 6 +++---
 src/components/Calendar/context/ContextWrapper.tsx   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/Calendar/CalenderComponent/Labels.tsx b/src/components/Calendar/CalenderComponent/Labels.tsx
index 04a2de3..9f731a2 100644
--- a/src/components/Calendar/CalenderComponent/Labels.tsx
+++ b/src/components/Calendar/CalenderComponent/Labels.tsx
@@ -3,14 +3,14 @@ import GlobalContext from "../context/GlobalContext";
 import { labelsClasses } from "../context/ContextWrapper";
 
 let colors =
-  "text-green-400 text-red-400 text-indigo-400 text-gray-400 text-blue-400 text-purple-400";
+  "text-green-400 text-red-400 text-indigo-400 text-gray-400 text-blue-400 text-purple-400 text-yellow-400";
 export default function Labels() {
   const { labels, updateLabel } = useContext(GlobalContext);
 
   return (
     <React.Fragment>
       <p className="text-white font-bold ">Label</p>
-      {Array.from(labelsClasses.entries()).map(([label, color], idx) => {
+      {Array.from(labelsClasses.entries()).map(([label, colors], idx) => {
         const checked =
           labels.find((lbl) => lbl.label === label)?.checked || false;
         return (
@@ -19,7 +19,7 @@ export default function Labels() {
               type="checkbox"
               checked={checked}
               onChange={() => updateLabel({ label, checked: !checked })}
-              className={`form-checkbox h-5 w-5 text-${color}-400 rounded focus:ring-0 cursor-pointer`}
+              className={`form-checkbox h-5 w-5 text-${colors}-400 rounded focus:ring-0 cursor-pointer`}
             />
             <span className="ml-2 text-white font-medium capitalize">
               {label}
diff --git a/src/components/Calendar/context/ContextWrapper.tsx b/src/components/Calendar/context/ContextWrapper.tsx
index 96ca84a..0a0bc2e 100644
--- a/src/components/Calendar/context/ContextWrapper.tsx
+++ b/src/components/Calendar/context/ContextWrapper.tsx
@@ -16,6 +16,7 @@ export const labelsClasses = new Map([
   ["COMPLETED", "blue"],
   ["APPLICATION", "purple"],
   ["POLL", "gray"],
+  ["EVENTS","yellow"],
 ]);
 
 function savedEventsReducer(

From 23d65104d2b0691289a61b5074606e097bc8306d Mon Sep 17 00:00:00 2001
From: Sakshya2504 <singhkaserasakshya2504@gmail.com>
Date: Tue, 2 Jun 2026 16:57:04 +0530
Subject: [PATCH 3/8] NoticeBoard (#451)

---
 src/app/(routes)/admin/noticeboard/page.tsx | 300 +-------------------
 src/components/Sidebar.tsx                  |   7 +-
 2 files changed, 4 insertions(+), 303 deletions(-)

diff --git a/src/app/(routes)/admin/noticeboard/page.tsx b/src/app/(routes)/admin/noticeboard/page.tsx
index 6e5b086..7f4ce55 100644
--- a/src/app/(routes)/admin/noticeboard/page.tsx
+++ b/src/app/(routes)/admin/noticeboard/page.tsx
@@ -1,299 +1,5 @@
-"use client";
+import NoticeBoard from "@/components/Admin/NoticeBoard";
 
-import React, { useState, ChangeEvent, FormEvent } from "react";
-import { useRouter } from "next/navigation";
-
-interface AnnouncementFormData {
-    clubname: string;
-    heading: string;
-    info: string;
-    announcelogo: string;
-}
-
-export default function Announce(): JSX.Element {
-    const router = useRouter();
-
-    const [group, setGroup] = useState("all");
-    const [manualEmails, setManualEmails] = useState("");
-    const [loading, setLoading] = useState(false);
-    const [errors, setErrors] = useState<string[]>([]);
-    const [logoPreview, setLogoPreview] = useState("");
-
-    const [formData, setFormData] = useState<AnnouncementFormData>({
-        clubname: "CAMC",
-        heading: "",
-        info: "",
-        announcelogo: "",
-    });
-
-    const handleChange = (
-        e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
-    ) => {
-        const { name, value } = e.target;
-
-        setFormData((prev) => ({
-            ...prev,
-            [name]: value,
-        }));
-
-        if (errors.length > 0) {
-            setErrors([]);
-        }
-    };
-
-    const handleLogoChange = (e: ChangeEvent<HTMLInputElement>) => {
-        const file = e.target.files?.[0];
-
-        if (!file) {
-            return;
-        }
-
-        const reader = new FileReader();
-
-        reader.onloadend = () => {
-            const imageBase64 = reader.result as string;
-
-            setLogoPreview(imageBase64);
-
-            setFormData((prev) => ({
-                ...prev,
-                announcelogo: imageBase64,
-            }));
-        };
-
-        reader.readAsDataURL(file);
-    };
-
-    const validateForm = () => {
-        const validationErrors: string[] = [];
-
-        if (!formData.heading.trim()) {
-            validationErrors.push("Announcement heading is required.");
-        }
-
-        if (!formData.info.trim()) {
-            validationErrors.push("Announcement content is required.");
-        }
-
-        setErrors(validationErrors);
-
-        return validationErrors.length === 0;
-    };
-
-    const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
-        e.preventDefault();
-
-        if (!validateForm()) {
-            return;
-        }
-
-        setLoading(true);
-        setErrors([]);
-
-        try {
-            const emailsArray = manualEmails
-                .split(",")
-                .map((email) => email.trim())
-                .filter((email) => email.length > 0);
-
-            const response = await fetch(
-                `${process.env.NEXT_PUBLIC_BACKEND_URL}/api/v1/announce`,
-                {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json",
-                    },
-                    credentials: "include",
-                    body: JSON.stringify({
-                        ...formData,
-                        group,
-                        emails: emailsArray,
-                    }),
-                }
-            );
-
-            const result = await response.json();
-
-            if (!response.ok) {
-                if (result.errors && Array.isArray(result.errors)) {
-                    setErrors(result.errors);
-                } else {
-                    setErrors([result.message || "Failed to publish announcement."]);
-                }
-
-                return;
-            }
-
-            alert(result.message || "Announcement published successfully.");
-
-            setFormData({
-                clubname: "CAMC",
-                heading: "",
-                info: "",
-                announcelogo: "",
-            });
-
-            setLogoPreview("");
-            setManualEmails("");
-            setGroup("all");
-
-            router.push("/admin/noticeboardview");
-        } catch (error: any) {
-            setErrors([
-                error?.message || "Something went wrong while publishing announcement.",
-            ]);
-        } finally {
-            setLoading(false);
-        }
-    };
-
-    return (
-        <div className="min-h-screen bg-slate-50 px-4 py-10">
-            <div className="mx-auto w-full max-w-2xl rounded-2xl bg-white shadow-lg border border-slate-200">
-                <div className="flex items-center justify-between border-b border-slate-200 px-8 py-6">
-                    <h1 className="text-2xl font-bold text-slate-900">
-                        Create Announcement
-                    </h1>
-
-                    <button
-                        type="button"
-                        onClick={() => router.back()}
-                        className="flex h-9 w-9 items-center justify-center rounded-full bg-red-500 text-white hover:bg-red-600 transition"
-                    >
-                        ×
-                    </button>
-                </div>
-
-                <form onSubmit={handleSubmit} className="p-8">
-                    {errors.length > 0 && (
-                        <div className="mb-6 rounded-lg border border-red-200 bg-red-50 p-4">
-                            {errors.map((error, index) => (
-                                <p key={index} className="text-sm text-red-600">
-                                    {error}
-                                </p>
-                            ))}
-                        </div>
-                    )}
-
-                    <div className="mb-6">
-                        <label className="mb-2 block text-sm font-semibold text-slate-700">
-                            Club Name
-                        </label>
-
-                        <input
-                            type="text"
-                            value={formData.clubname}
-                            readOnly
-                            className="w-full rounded-lg border border-slate-300 bg-slate-100 px-4 py-3 text-slate-700"
-                        />
-                    </div>
-
-                    <div className="mb-6">
-                        <label className="mb-2 block text-sm font-semibold text-slate-700">
-                            Heading
-                        </label>
-
-                        <input
-                            type="text"
-                            name="heading"
-                            value={formData.heading}
-                            onChange={handleChange}
-                            placeholder="Enter announcement heading"
-                            className="w-full rounded-lg border border-slate-300 px-4 py-3 outline-none focus:border-blue-600"
-                        />
-                    </div>
-
-                    <div className="mb-6">
-                        <label className="mb-2 block text-sm font-semibold text-slate-700">
-                            Announcement Content
-                        </label>
-
-                        <textarea
-                            name="info"
-                            value={formData.info}
-                            onChange={handleChange}
-                            placeholder="Write your announcement here"
-                            rows={6}
-                            className="w-full rounded-lg border border-slate-300 px-4 py-3 outline-none focus:border-blue-600 resize-none"
-                        />
-                    </div>
-
-                    <div className="mb-6">
-                        <label className="mb-2 block text-sm font-semibold text-slate-700">
-                            Announcement Logo
-                        </label>
-
-                        <div className="flex items-center gap-4">
-                            <label className="flex h-24 w-24 cursor-pointer items-center justify-center overflow-hidden rounded-lg border border-slate-300 bg-slate-50">
-                                {logoPreview ? (
-                                    <img
-                                        src={logoPreview}
-                                        alt="Announcement logo"
-                                        className="h-full w-full object-cover"
-                                    />
-                                ) : (
-                                    <span className="text-xs text-slate-400 text-center px-2">
-                                        Upload Logo
-                                    </span>
-                                )}
-
-                                <input
-                                    type="file"
-                                    accept="image/*"
-                                    onChange={handleLogoChange}
-                                    className="hidden"
-                                />
-                            </label>
-
-                            <p className="text-sm text-slate-500">
-                                Optional image that will appear with the announcement.
-                            </p>
-                        </div>
-                    </div>
-
-                    <div className="mb-6">
-                        <label className="mb-2 block text-sm font-semibold text-slate-700">
-                            Recipient Group
-                        </label>
-
-                        <select
-                            value={group}
-                            onChange={(e) => setGroup(e.target.value)}
-                            className="w-full rounded-lg border border-slate-300 px-4 py-3 outline-none focus:border-blue-600"
-                        >
-                            <option value="none">None</option>
-                            <option value="all@iiti.ac.in">All Students</option>
-                            <option value="managerplacement@iiti.ac.in">Manager</option>
-                        </select>
-                    </div>
-
-                    <div className="mb-8">
-                        <label className="mb-2 block text-sm font-semibold text-slate-700">
-                            Extra Emails
-                        </label>
-
-                        <input
-                            type="text"
-                            value={manualEmails}
-                            onChange={(e) => setManualEmails(e.target.value)}
-                            placeholder="example1@gmail.com, example2@gmail.com"
-                            className="w-full rounded-lg border border-slate-300 px-4 py-3 outline-none focus:border-blue-600"
-                        />
-
-                        <p className="mt-2 text-sm text-slate-500">
-                            Enter additional email addresses separated by commas.
-                        </p>
-                    </div>
-
-                    <button
-                        type="submit"
-                        disabled={loading}
-                        className="w-full rounded-lg bg-blue-700 px-4 py-3 text-white font-semibold hover:bg-blue-800 disabled:cursor-not-allowed disabled:bg-blue-400 transition"
-                    >
-                        {loading ? "Publishing..." : "Publish Announcement"}
-                    </button>
-                </form>
-            </div>
-        </div>
-    );
+export default function Page() {
+    return <NoticeBoard />;
 }
\ No newline at end of file
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
index d81fa64..0cc7e8d 100644
--- a/src/components/Sidebar.tsx
+++ b/src/components/Sidebar.tsx
@@ -11,8 +11,7 @@ import RecruiterDashboard from "./SideBar/Roles/recruiter";
 import FacultyDashboard from "./SideBar/Roles/faculty";
 import { jwtDecode } from "jwt-decode";
 import TpcMemberDashboard from "./SideBar/Roles/tpcMember";
-import NoticeBoard from "./Admin/NoticeBoard";
-import NoticeBoardView from "./Admin/NoticeBoardView";
+
 const Sidebar = () => {
   const context = useContext(ToggleContext);
   const [isAdmin, setIsAdmin] = useState<boolean>(false);
@@ -103,8 +102,6 @@ const Sidebar = () => {
             {/* Mobile Role-specific Navigation */}
             <div className="space-y-2">
               {isAdmin && <AdminDashboard />}
-              {isAdmin && <NoticeBoard />}
-              {isAdmin && <NoticeBoardView/>}
               {isStudent && <StudentDashboard />}
               {isRecruiter && <RecruiterDashboard />}
               {isFaculty && <FacultyDashboard />}
@@ -245,8 +242,6 @@ const Sidebar = () => {
             <NavButtonGroup loggedIn={isLoggedIn} />
           </div>
           {isAdmin && <AdminDashboard />}
-          {isAdmin && <NoticeBoard />}
-          {isAdmin && <NoticeBoardView/>}
           {isStudent && <StudentDashboard />}
           {isRecruiter && <RecruiterDashboard />}
           {isFaculty && <FacultyDashboard />}

From 60c30698f8919724e6cc25738d716d147063e2a3 Mon Sep 17 00:00:00 2001
From: Anand Vivek <anand1234.vivek@gmail.com>
Date: Mon, 8 Jun 2026 15:26:17 +0530
Subject: [PATCH 4/8] bulk cpi update (#455)

---
 src/helpers/admin/api.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/helpers/admin/api.ts b/src/helpers/admin/api.ts
index 8b4dd46..b219a5e 100644
--- a/src/helpers/admin/api.ts
+++ b/src/helpers/admin/api.ts
@@ -79,3 +79,9 @@ export async function deleteRegistrations(ids: string[]): Promise<any> {
     queryParam: { id: ids },
   });
 }
+export async function updateStudents(payload: any[]): Promise<any> {
+  return apiCall("/students", {
+    method: "PATCH",
+    body: payload,
+  });
+}

From ae62c5ebbadadf5905c3aedbf0b42b68b56d8cc3 Mon Sep 17 00:00:00 2001
From: Anand Vivek <anand1234.vivek@gmail.com>
Date: Mon, 8 Jun 2026 15:34:42 +0530
Subject: [PATCH 5/8] bulk cpi update (#456)

---
 src/app/(routes)/admin/students/page.tsx | 58 +++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/app/(routes)/admin/students/page.tsx b/src/app/(routes)/admin/students/page.tsx
index bd60b43..e774383 100644
--- a/src/app/(routes)/admin/students/page.tsx
+++ b/src/app/(routes)/admin/students/page.tsx
@@ -6,7 +6,12 @@ import type { DTO } from "@/dto/StudentDto";
 import generateColumns from "@/components/NewTableComponent/ColumnMapping";
 import { jsondto } from "@/dto/StudentDto";
 import { CSVImportModal } from "@/components/common/CSVImportModal";
-import { addStudents, promoteToManagers, deleteStudents } from "@/helpers/admin/api";
+import {
+  addStudents,
+  promoteToManagers,
+  deleteStudents,
+  updateStudents,
+} from "@/helpers/admin/api";
 import { fetchPrograms, fetchAllSeasons } from "@/helpers/api";
 import { Program } from "@/dto/SalaryDto";
 import { toast } from "react-hot-toast";
@@ -36,6 +41,7 @@ const StudentPage = () => {
   const [selectedRows, setSelectedRows] = useState<DTO[]>([]);
   const [seasons, setSeasons] = useState<{ id: string; name: string }[]>([]);
   const [bulkLoading, setBulkLoading] = useState(false);
+  const [cpiImportOpen, setCpiImportOpen] = useState(false);
 
   const visibleColumns = columns.filter(
     (column: any) => !hiddenColumns.includes(column?.accessorKey),
@@ -97,7 +103,38 @@ const StudentPage = () => {
     }
     setImportLoading(false);
   };
+  const handleCpiImport = async (data: any[]) => {
+    try {
+      const payload = data
+        .map((row) => {
+          const student = students.find(
+            (s) => String(s.rollNo) === String(row.rollNo),
+          );
+
+          if (!student) return null;
+
+          return {
+            id: student.id,
+            cpi: Number(row.cpi),
+          };
+        })
+        .filter(Boolean);
+      if (payload.length === 0) {
+        toast.error("No matching roll numbers found");
+        return;
+      }
+      await updateStudents(payload);
+
+      toast.success(`Updated CPI for ${payload.length} students`);
 
+      const updatedData = await fetchStudentData();
+      setStudents(updatedData);
+
+      setCpiImportOpen(false);
+    } catch (e) {
+      toast.error("Failed to update CPI");
+    }
+  };
   const parseStudentRow = (row: any) => {
     if (!row.rollNo || !row.name || !row.email) return null;
 
@@ -203,6 +240,9 @@ const StudentPage = () => {
         toast.error("Failed to delete students");
       }
       setBulkLoading(false);
+    } else if (action === "update-cpi") {
+      setBulkModalOpen(false);
+      setCpiImportOpen(true);
     }
     // Add more actions here later
   };
@@ -243,6 +283,16 @@ const StudentPage = () => {
         entityName="students"
         cleanData={true}
       />
+      <CSVImportModal
+        open={cpiImportOpen}
+        onClose={() => setCpiImportOpen(false)}
+        onSubmit={handleCpiImport}
+        templateHeaders={["rollNo", "cpi"]}
+        templateFileName="cpi_update_template.csv"
+        entityName="cpi updates"
+        parseRow={(row) => row}
+        cleanData={true}
+      />
       <div>
         {students.length > 0 && (
           <Table
@@ -260,7 +310,11 @@ const StudentPage = () => {
         actions={[
           { label: "Create registration for season", value: "register-season" },
           { label: "Promote to CAMC Member", value: "promote-tpc" },
-          { label: "🗑️ Delete Students (Admin Only)", value: "delete-students" },
+          {
+            label: "🗑️ Delete Students (Admin Only)",
+            value: "delete-students",
+          },
+          { label: "Bulk CPI Update (Admin Only)", value: "update-cpi" },
         ]}
         onSubmit={handleBulkModalSubmit}
         seasons={seasons}

From f0c6909fd4df466af77c4c833dad38f9b9469f30 Mon Sep 17 00:00:00 2001
From: metamyte <89248467+metamyteee@users.noreply.github.com>
Date: Sat, 13 Jun 2026 00:54:01 +0530
Subject: [PATCH 6/8] fixed jaf small issues (#458)

---
 src/components/JAF/JobDetails.tsx | 38 +++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/components/JAF/JobDetails.tsx b/src/components/JAF/JobDetails.tsx
index d7a649e..e9a5200 100644
--- a/src/components/JAF/JobDetails.tsx
+++ b/src/components/JAF/JobDetails.tsx
@@ -1405,7 +1405,7 @@ const JobDetails = ({
                                           >
                                             <Button
                                               type="text"
-                                              size="small"
+                                              size="large"
                                               icon={
                                                 expandedYears.has(year)
                                                   ? "▼"
@@ -1418,7 +1418,7 @@ const JobDetails = ({
                                                 minWidth: 20,
                                                 height: 20,
                                                 padding: 0,
-                                                fontSize: 10,
+                                                fontSize: 15,
                                                 color: "#6b7280",
                                               }}
                                             />
@@ -2673,6 +2673,33 @@ const JobDetails = ({
                             </Form.Item>
                           </Col>
                         </Row>
+                         <Row gutter={[16, 12]} className="md:gutter-24">
+                          <Col span={24}>
+                            <Form.Item
+                              name={[field.name, "hasBondRequirement"]}
+                              valuePropName="checked"
+                              initialValue={false}
+                              className="mb-3 md:mb-4"
+                            >
+                              <Checkbox
+                                onChange={(e) => {
+                                  if (!e.target.checked) {
+                                    form.setFieldValue(["salaries", index, "bondAmount"], 0);
+                                    form.setFieldValue(["salaries", index, "bondDuration"], "");
+                                    setFieldValue(`salaries.${index}.bondAmount`, 0);
+                                    setFieldValue(`salaries.${index}.bondDuration`, "");
+                                  }
+                                }}
+                              >
+                                <Text strong className="text-xs md:text-sm text-gray-700">
+                                  Is there a  bond requirement?
+                                </Text>
+                              </Checkbox>
+                            </Form.Item>
+                          </Col>
+                        </Row>
+
+                        {form.getFieldValue(["salaries", index, "hasBondRequirement"]) === true && (
                         <Row gutter={[24, 16]}>
                           <Col span={12}>
                             <Form.Item
@@ -2751,7 +2778,8 @@ const JobDetails = ({
                             </Form.Item>
                           </Col>
                         </Row>
-                      </>
+                       )}  
+                    </>
                     ) : (
                       <>
                         <Title
@@ -3214,7 +3242,7 @@ const JobDetails = ({
                               style={{ fontSize: 14, color: "#374151" }}
                             >
                               <span style={{ color: "#ef4444" }}>* </span>
-                              Duration
+                              Duration (in Min)
                             </Text>
                           }
                           name={[field.name, "duration"]}
@@ -3373,7 +3401,7 @@ const JobDetails = ({
                               style={{ fontSize: 14, color: "#374151" }}
                             >
                               <span style={{ color: "#ef4444" }}>* </span>
-                              Duration
+                              Duration (in Min)
                             </Text>
                           }
                           name={[field.name, "duration"]}

From e7196c708a3bd48c289304894f81ef72a61e90ca Mon Sep 17 00:00:00 2001
From: Prince Kumar <ep230051013@iiti.ac.in>
Date: Sun, 12 Jul 2026 23:49:36 +0530
Subject: [PATCH 7/8] Events time (#461)

Co-authored-by: Prince Kumar <x.prince.x@outlook.com>
---
 src/components/Admin/JobEvents.tsx     | 41 +++++++++++++++-----------
 src/components/jobs/AddEventDialog.tsx |  7 ++++-
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/components/Admin/JobEvents.tsx b/src/components/Admin/JobEvents.tsx
index 6cab9ae..ecf9df6 100644
--- a/src/components/Admin/JobEvents.tsx
+++ b/src/components/Admin/JobEvents.tsx
@@ -36,6 +36,17 @@ const options = typeOptions.map((option) => ({
   label: option,
 }));
 
+const formatDateTimeLocalValue = (date: string | Date) => {
+  const value = new Date(date);
+  const timezoneOffset = value.getTimezoneOffset() * 60000;
+
+  return new Date(value.getTime() - timezoneOffset).toISOString().slice(0, 16);
+};
+
+const convertDateTimeLocalToISOString = (date: string) => {
+  return new Date(date).toISOString();
+};
+
 export const EditEvent = ({
   open,
   setOpen,
@@ -91,10 +102,8 @@ export const EditEvent = ({
         roundNumber: eventData.roundNumber,
         type: eventData.type,
         metadata: eventData.metadata,
-        startDateTime: new Date(eventData.startDateTime)
-          .toISOString()
-          .slice(0, 16),
-        endDateTime: new Date(eventData.endDateTime).toISOString().slice(0, 16),
+        startDateTime: formatDateTimeLocalValue(eventData.startDateTime),
+        endDateTime: formatDateTimeLocalValue(eventData.endDateTime),
         visibleToRecruiter: eventData.visibleToRecruiter,
         additionalData: eventData.additionalData || {},
       });
@@ -158,18 +167,14 @@ export const EditEvent = ({
     setFormValues({ ...formValues, additionalData: newAdditionalData });
   };
 
-  const convertToISOFormat = (date: string) => {
-    return new Date(date).toISOString();
-  };
-
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setUpdating(true);
     try {
       const updatedValues = {
         ...formValues,
-        startDateTime: convertToISOFormat(formValues.startDateTime),
-        endDateTime: convertToISOFormat(formValues.endDateTime),
+        startDateTime: convertDateTimeLocalToISOString(formValues.startDateTime),
+        endDateTime: convertDateTimeLocalToISOString(formValues.endDateTime),
         // Only include additionalData if round number is 0
         additionalData: Number(formValues.roundNumber) === 0 ? formValues.additionalData : {},
       };
@@ -483,6 +488,8 @@ export const AddEvent = ({
     try {
       const eventData = {
         ...formValues,
+        startDateTime: convertDateTimeLocalToISOString(formValues.startDateTime),
+        endDateTime: convertDateTimeLocalToISOString(formValues.endDateTime),
         // Only include additionalData if round number is 0
         additionalData: Number(formValues.roundNumber) === 0 ? formValues.additionalData : {},
       };
@@ -794,13 +801,13 @@ const MakeJobOfferModal = ({
   ]);
 
   const makeOffer = async (salaryId: string) => {
-    await postOnCampusOffer([
-      {
-        salaryId: salaryId,
-        studentId: studentIds[0],
+    await postOnCampusOffer(
+      studentIds.map((studentId) => ({
+        salaryId,
+        studentId,
         status: "ACCEPTED",
-      },
-    ]);
+      })),
+    );
     toast.success("Made a successful offer!");
     window.location.reload();
   };
@@ -809,7 +816,7 @@ const MakeJobOfferModal = ({
     const fetchSalaries = async () => {
       const salaries = await getStudentSalaryOffers(
         lastEvent.job.id,
-        studentIds[0],
+          studentIds[0],
       );
       const newSalaries = salaries.map((salary) => ({
         select: (
diff --git a/src/components/jobs/AddEventDialog.tsx b/src/components/jobs/AddEventDialog.tsx
index b91279d..275565e 100644
--- a/src/components/jobs/AddEventDialog.tsx
+++ b/src/components/jobs/AddEventDialog.tsx
@@ -15,6 +15,11 @@ import { useState } from "react";
 import submit from "../action";
 import { createJobEvent } from "@/helpers/api";
 import toast from "react-hot-toast";
+
+const convertDateTimeLocalToISOString = (date: string) => {
+  return new Date(date).toISOString();
+};
+
 interface Props {
   jobId: String;
 }
@@ -90,7 +95,7 @@ export function AddEventDialog({ jobId }: Props) {
                     jobId,
                     type,
                     round,
-                    date,
+                    convertDateTimeLocalToISOString(date),
                   );
                   if (success) {
                     submit("AllEvents");

From 4feae68b4679b3b1b88892f1956596b625288993 Mon Sep 17 00:00:00 2001
From: metamyte <89248467+metamyteee@users.noreply.github.com>
Date: Mon, 13 Jul 2026 14:54:34 +0530
Subject: [PATCH 8/8] jaf mandatory value changes (#460)

Co-authored-by: Prince Kumar <x.prince.x@outlook.com>
Co-authored-by: Pranay-Gottimukula <97828875+Pranay-Gottimukula@users.noreply.github.com>
Co-authored-by: Sakshya2504 <singhkaserasakshya2504@gmail.com>
Co-authored-by: Anand Vivek <anand1234.vivek@gmail.com>
Co-authored-by: Prince Kumar <ep230051013@iiti.ac.in>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 .../(routes)/recruiter/jobs/[jobID]/page.tsx  | 50 +++++++++----------
 src/components/JAF/JobDetails.tsx             | 23 +++++----
 src/components/JAF/TermsAndConditions.js      |  2 +-
 src/validation/jaf.validation.ts              | 11 ++--
 4 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/src/app/(routes)/recruiter/jobs/[jobID]/page.tsx b/src/app/(routes)/recruiter/jobs/[jobID]/page.tsx
index 8c21955..ffe3863 100644
--- a/src/app/(routes)/recruiter/jobs/[jobID]/page.tsx
+++ b/src/app/(routes)/recruiter/jobs/[jobID]/page.tsx
@@ -94,7 +94,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
       ...prev,
       selectionProcedure: {
         ...prev.selectionProcedure,
-        tests: [...(prev.selectionProcedure.tests || []), newTest],
+        tests: [...(prev.selectionProcedure?.tests || []), newTest],
       },
     }));
   };
@@ -104,7 +104,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
       ...prev,
       selectionProcedure: {
         ...prev.selectionProcedure,
-        tests: prev.selectionProcedure.tests.filter((_, i) => i !== index),
+        tests: (prev.selectionProcedure?.tests ?? []).filter((_, i) => i !== index),
       },
     }));
   };
@@ -116,7 +116,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
       selectionProcedure: {
         ...prev.selectionProcedure,
         interviews: [
-          ...(prev.selectionProcedure.interviews || []),
+          ...(prev.selectionProcedure?.interviews || []),
           newInterview,
         ],
       },
@@ -128,9 +128,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
       ...prev,
       selectionProcedure: {
         ...prev.selectionProcedure,
-        interviews: prev.selectionProcedure.interviews.filter(
-          (_, i) => i !== index,
-        ),
+        interviews: (prev.selectionProcedure?.interviews ?? []).filter((_, i) => i !== index),
       },
     }));
   };
@@ -337,7 +335,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                 <div className="font-semibold my-2">Selection mode</div>{" "}
                 {editMode ? (
                   <select
-                    value={formData.selectionProcedure.selectionMode}
+                    value={formData.selectionProcedure?.selectionMode}
                     onChange={(e) => {
                       setFormData((prev) => ({
                         ...prev,
@@ -353,7 +351,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                     <option>HYBRID</option>
                   </select>
                 ) : (
-                  <div>{job.selectionProcedure.selectionMode}</div>
+                  <div>{job.selectionProcedure?.selectionMode}</div>
                 )}
               </div>
               <div>
@@ -362,7 +360,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                   <input
                     type="checkbox"
                     name="shortlistFromResume"
-                    checked={formData.selectionProcedure.shortlistFromResume}
+                    checked={formData.selectionProcedure?.shortlistFromResume}
                     onChange={(e) => {
                       setFormData((prev) => ({
                         ...prev,
@@ -375,7 +373,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                   />
                 ) : (
                   <div>
-                    {job.selectionProcedure.shortlistFromResume ? "YES" : "NO"}
+                    {job.selectionProcedure?.shortlistFromResume ? "YES" : "NO"}
                   </div>
                 )}
               </div>
@@ -385,7 +383,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                   <input
                     type="checkbox"
                     name="groupDiscussion"
-                    checked={formData.selectionProcedure.groupDiscussion}
+                    checked={formData.selectionProcedure?.groupDiscussion}
                     onChange={(e) => {
                       setFormData((prev) => ({
                         ...prev,
@@ -398,7 +396,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                   />
                 ) : (
                   <div>
-                    {job.selectionProcedure.groupDiscussion ? "YES" : "NO"}
+                    {job.selectionProcedure?.groupDiscussion ? "YES" : "NO"}
                   </div>
                 )}
               </div>
@@ -409,7 +407,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                     type="number"
                     name="numberOfMembers"
                     value={
-                      formData.selectionProcedure.requirements
+                      formData.selectionProcedure?.requirements
                         ?.numberOfMembers || ""
                     }
                     onChange={(e) => {
@@ -418,7 +416,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                         selectionProcedure: {
                           ...prev.selectionProcedure,
                           requirements: {
-                            ...(prev.selectionProcedure.requirements || {}),
+                            ...(prev.selectionProcedure?.requirements || {}),
                             numberOfMembers: e.target.value,
                           },
                         },
@@ -427,7 +425,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                   />
                 ) : (
                   <div>
-                    {job.selectionProcedure.requirements?.numberOfMembers ||
+                    {job.selectionProcedure?.requirements?.numberOfMembers ||
                       "N/A"}
                   </div>
                 )}
@@ -438,7 +436,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                 <div className="font-semibold bg-gray-200">Tests</div>
                 <ul className="list-disc capitalize">
                   {editMode
-                    ? (formData.selectionProcedure.tests || []).map(
+                    ? (formData.selectionProcedure?.tests || []).map(
                         (test, index) => (
                           <li
                             key={index}
@@ -464,7 +462,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                                 value={test.type || ""}
                                 onChange={(e) => {
                                   const updatedTests =
-                                    formData.selectionProcedure.tests.map(
+                                    formData.selectionProcedure?.tests.map(
                                       (t, i) =>
                                         i === index
                                           ? { ...t, type: e.target.value }
@@ -496,7 +494,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                                 value={test.duration || ""}
                                 onChange={(e) => {
                                   const updatedTests =
-                                    formData.selectionProcedure.tests.map(
+                                    formData.selectionProcedure?.tests.map(
                                       (t, i) =>
                                         i === index
                                           ? { ...t, duration: e.target.value }
@@ -515,7 +513,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                           </li>
                         ),
                       )
-                    : (job.selectionProcedure.tests || []).map(
+                    : (job.selectionProcedure?.tests || []).map(
                         (test, index) => (
                           <li key={index} className="my-2">
                             <div>
@@ -541,7 +539,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                 <div className="font-semibold bg-gray-200">Interviews</div>
                 <ul className="list-disc capitalize">
                   {editMode
-                    ? (formData.selectionProcedure.interviews || []).map(
+                    ? (formData.selectionProcedure?.interviews || []).map(
                         (interview, index) => (
                           <li
                             key={index}
@@ -567,7 +565,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                                 value={interview.type || ""}
                                 onChange={(e) => {
                                   const updatedInterviews =
-                                    formData.selectionProcedure.interviews.map(
+                                    formData.selectionProcedure?.interviews.map(
                                       (i, j) =>
                                         j === index
                                           ? { ...i, type: e.target.value }
@@ -601,7 +599,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                                 value={interview.duration || ""}
                                 onChange={(e) => {
                                   const updatedInterviews =
-                                    formData.selectionProcedure.interviews.map(
+                                    formData.selectionProcedure?.interviews.map(
                                       (i, j) =>
                                         j === index
                                           ? { ...i, duration: e.target.value }
@@ -620,7 +618,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                           </li>
                         ),
                       )
-                    : (job.selectionProcedure.interviews || []).map(
+                    : (job.selectionProcedure?.interviews || []).map(
                         (interview, index) => (
                           <li key={index} className="my-2">
                             <div>
@@ -649,7 +647,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                       type="text"
                       name="otherRequirements"
                       value={
-                        formData.selectionProcedure.requirements
+                        formData.selectionProcedure?.requirements
                           ?.otherRequirements || ""
                       }
                       onChange={(e) => {
@@ -658,7 +656,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                           selectionProcedure: {
                             ...prev.selectionProcedure,
                             requirements: {
-                              ...(prev.selectionProcedure.requirements || {}),
+                              ...(prev.selectionProcedure?.requirements || {}),
                               otherRequirements: e.target.value,
                             },
                           },
@@ -667,7 +665,7 @@ const JobDetailPage = ({ params }: { params: { jobID: string } }) => {
                     />
                   ) : (
                     <div>
-                      {job.selectionProcedure.requirements?.otherRequirements ||
+                      {job.selectionProcedure?.requirements?.otherRequirements ||
                         "N/A"}
                     </div>
                   )}
diff --git a/src/components/JAF/JobDetails.tsx b/src/components/JAF/JobDetails.tsx
index e9a5200..3c08f81 100644
--- a/src/components/JAF/JobDetails.tsx
+++ b/src/components/JAF/JobDetails.tsx
@@ -831,7 +831,7 @@ const JobDetails = ({
                 <Form.Item
                   label={
                     <Text strong className="text-xs md:text-sm text-gray-700">
-                      Internship Duration
+                      Internship Duration(In Month)
                     </Text>
                   }
                   validateStatus={
@@ -861,13 +861,9 @@ const JobDetails = ({
               <Form.Item
                 label={
                   <Text strong className="text-xs md:text-sm text-gray-700">
-                    <span className="text-red-500">* </span>
                     Work Location
                   </Text>
                 }
-                required
-                hasFeedback
-                validateStatus={getFieldError("location") ? "error" : undefined}
                 help={getFieldError("location")}
                 className="mb-3 md:mb-4"
               >
@@ -1352,6 +1348,17 @@ const JobDetails = ({
                                     selected
                                   </Text>
                                 </div>
+                                  <Text
+                                    style={{
+                                      fontSize: 14,
+                                      color: "#9ca3af",
+                                      display: "block",
+                                      marginTop: 4,
+                                      fontStyle: "bold",
+                                    }}
+                                  >
+                                    Please select relevant branches/specialization from the dropdown below.
+                                  </Text>
                               </div>
 
                               <div
@@ -3091,15 +3098,9 @@ const JobDetails = ({
               <Form.Item
                 label={
                   <Text strong className="text-xs md:text-sm text-gray-700">
-                    <span className="text-red-500">* </span>
                     Selection Mode
                   </Text>
                 }
-                required
-                hasFeedback
-                validateStatus={
-                  getFieldError("selectionMode") ? "error" : undefined
-                }
                 help={getFieldError("selectionMode")}
                 className="mb-3 md:mb-4"
               >
diff --git a/src/components/JAF/TermsAndConditions.js b/src/components/JAF/TermsAndConditions.js
index e5e4958..14aafcf 100644
--- a/src/components/JAF/TermsAndConditions.js
+++ b/src/components/JAF/TermsAndConditions.js
@@ -15,7 +15,7 @@ export const FullTime = [
 export const Intern = [
   "It may be noted that IITs have maintained a high rank in many surveys done by many organizations, wherein several departments have achieved the best positions nationally and internationally as well. The recognition could not have been possible without your support. We are once again striving to strengthen our position in Rankings wherein, a team of survey ranking committee may contact you to ask some queries. For example\na. To nominate up to 10 institutions that they rate as being the best for producing graduates.\nb. To nominate up to 30 international institutions outside of their country/territory of knowledge that they rate as being the best for Producing graduates.\nIIT Indore requests you to respond whenever contacted by such ranking agencies/organizations.",
   "Recruiter must abide by the information filled in JAF as above and AIPC Guidelines to the Recruiters (https://aipciits.com/guidelines/).",
-  "After successful completion of the internship, it is highly desirable that the status of the PPOs be informed within two weeks of the completion of the internship and preferably not later than 15th September 2025 (for 2 months internship). Companies are advised to leverage PPO instead of PPI as the latter does not provide significant benefits either to students or companies.",
+  "After successful completion of the internship, it is highly desirable that the status of the PPOs be informed within two weeks of the completion of the internship and preferably not later than 15th September 2027 (for 2 months internship). Companies are advised to leverage PPO instead of PPI as the latter does not provide significant benefits either to students or companies.",
   "Companies on campus are advised not to engage in any off-campus activity before/after the campus process. For any issues the company should contact the Placement Cell of the IIT Indore.",
   "Same stipend for the same internship profile and role across all IITs.",
   "It is strongly recommended to keep some students in waitlist in addition to your final selection.",
diff --git a/src/validation/jaf.validation.ts b/src/validation/jaf.validation.ts
index 700b13e..feb80c0 100644
--- a/src/validation/jaf.validation.ts
+++ b/src/validation/jaf.validation.ts
@@ -155,7 +155,8 @@ export const jobDetailsValidationSchema = Yup.object({
     ),
 
   location: Yup.string()
-    .required("Job location is required")
+    .transform((value) => (value === "" ? undefined : value))
+    .notRequired()
     .min(2, "Location must be at least 2 characters")
     .max(200, "Location must not exceed 200 characters"),
 
@@ -248,11 +249,9 @@ export const jobDetailsValidationSchema = Yup.object({
 
   // Selection procedure
   selectionMode: Yup.string()
-    .oneOf(
-      Object.values(SelectionModeEnum),
-      "Please select a valid selection mode",
-    )
-    .required("Selection mode is required"),
+    .transform((value) => (value === "" ? undefined : value))
+    .oneOf(Object.values(SelectionModeEnum), "Please select a valid selection mode")
+    .notRequired(),
 
   shortlistFromResume: Yup.boolean().required(
     "Please specify if shortlisting from resume is required",