{/* Header */}
@@ -430,6 +533,111 @@ export const ClassManagement: React.FC = () => {
+
+ {/* Batches Section - Always Visible */}
+
+
);
};
diff --git a/RIT-EMS-main/frontend/src/components/dashboard/EventDetailsModal.tsx b/RIT-EMS-main/frontend/src/components/dashboard/EventDetailsModal.tsx
index 9f8b2e9..c69fc33 100644
--- a/RIT-EMS-main/frontend/src/components/dashboard/EventDetailsModal.tsx
+++ b/RIT-EMS-main/frontend/src/components/dashboard/EventDetailsModal.tsx
@@ -131,11 +131,17 @@ export const EventDetailsModal: React.FC
+
+
+
+
+
+
+
+
+
+ Department Batches
+Configure custom student batches for auditing & event planning.
+
+ {/* Select Department */}
+
+
+ Department:
+
+
+
+ {/* Create Batch Form */}
+
+ setNewBatchName(e.target.value)}
+ className="bg-slate-50 border border-slate-200 rounded-xl py-2 px-4 text-xs font-bold focus:bg-white focus:border-brand-indigo outline-none transition-all text-slate-800"
+ />
+
+
+
+ {tempBatches.map(batch => (
+
+
+ {tempBatches.length > 0 && (
+
+
+ ))}
+ {tempBatches.length === 0 && (
+
+ {batch.name}
+
+
+
+
+ Assign Classes to this Batch:
+ {batchDeptClassesList.length > 0 ? (
+
+
+ {batchDeptClassesList.map(cls => {
+ const isChecked = batch.classes?.includes(cls);
+ return (
+
+ );
+ })}
+
+ ) : (
+ No classes configured for {selectedBatchDept}.
+ )}
+
+ No batches created yet for {selectedBatchDept}. Use the form above to add your first batch.
+
+ )}
+
+
+
+ )}
+
- {event.academicYears.map((year: string) => (
-
- {year}
+ {(event as any).targetedBatch ? (
+
+ {(event as any).targetedBatch}
- ))}
+ ) : (
+ event.academicYears.map((year: string) => (
+
+ {year}
+
+ ))
+ )}
)}
diff --git a/RIT-EMS-main/frontend/src/components/dashboard/EventProposalForm.tsx b/RIT-EMS-main/frontend/src/components/dashboard/EventProposalForm.tsx
index fa21eb8..f44cae7 100644
--- a/RIT-EMS-main/frontend/src/components/dashboard/EventProposalForm.tsx
+++ b/RIT-EMS-main/frontend/src/components/dashboard/EventProposalForm.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect, useRef, useMemo } from 'react';
import { motion, AnimatePresence } from 'framer-motion';
import {
Calendar,
@@ -100,6 +100,7 @@ interface EventProposalFormProps {
budget?: string | number;
hasRegistrationFee?: boolean;
registrationFee?: string | number;
+ paymentLink?: string;
targetDepartments?: string[];
description?: string;
sponsors?: string[];
@@ -194,6 +195,7 @@ export const EventProposalForm: React.FC
-
-
diff --git a/RIT-EMS-main/frontend/src/components/dashboard/InstitutionalChecklist.tsx b/RIT-EMS-main/frontend/src/components/dashboard/InstitutionalChecklist.tsx
index fd61872..ed06dbb 100644
--- a/RIT-EMS-main/frontend/src/components/dashboard/InstitutionalChecklist.tsx
+++ b/RIT-EMS-main/frontend/src/components/dashboard/InstitutionalChecklist.tsx
@@ -33,6 +33,7 @@ interface Event {
category: string;
createdAt?: string;
updatedAt?: string;
+ targetedBatch?: string;
}
interface ClassMapping {
@@ -63,9 +64,19 @@ const DepartmentCard: React.FC<{
index: number;
isApplicable: boolean;
sections: string[];
+ batches: any[];
onIncompleteClick?: (data: any) => void;
isCompact?: boolean;
-}> = ({ deptName, events, selectedBatch, index, isApplicable, sections, onIncompleteClick, isCompact }) => {
+}> = ({ deptName, events, selectedBatch, index, isApplicable, sections, batches, onIncompleteClick, isCompact }) => {
+ const activeBatchesForYear = useMemo(() => {
+ return batches.filter(b =>
+ b.department === deptName &&
+ b.classes?.some((cls: string) => cls.startsWith(selectedBatch))
+ );
+ }, [batches, deptName, selectedBatch]);
+
+ const hasCustomBatches = activeBatchesForYear.length > 0;
+
const departmentEvents = events.filter(e => {
const status = e.status?.toUpperCase();
const isDeptMatch = e.department?.trim().toLowerCase() === deptName.trim().toLowerCase();
@@ -75,10 +86,9 @@ const DepartmentCard: React.FC<{
(status === 'APPROVED' || status === 'COMPLETED' || status === 'PENDING_PR');
});
- // Base requirement is 1 event per category per batch, or 2 if multiple sections exist
+ // Base requirement is 1 event per category per batch, or 1 if no custom batches exist
const getRequiredCount = (catId: string) => {
- if (catId === 'INSTITUTIONAL') return 1;
- return sections.length > 1 ? 2 : 1;
+ return 1;
};
return (
@@ -97,6 +107,11 @@ const DepartmentCard: React.FC<{
- ₹
- setFormData({...formData, registrationFee: e.target.value})}
- className="w-full bg-white border border-brand-indigo/20 rounded-xl py-4 pl-12 pr-6 text-sm font-bold text-brand-indigo focus:ring-2 ring-brand-indigo/20 outline-none"
- placeholder="Amount in INR"
- />
+ = ({ initialDat
))}
) : (
-
+
+
@@ -1102,14 +1139,59 @@ export const EventProposalForm: React.FC
+
+
+
+ ₹
+ setFormData({...formData, registrationFee: e.target.value})}
+ className="w-full bg-white border border-brand-indigo/20 rounded-xl py-4 pl-12 pr-6 text-sm font-bold text-brand-indigo focus:ring-2 ring-brand-indigo/20 outline-none"
+ placeholder="Amount in INR"
+ />
+
+
+
+
+ setFormData({...formData, paymentLink: e.target.value})}
+ className="w-full bg-white border border-brand-indigo/20 rounded-xl py-4 px-6 text-sm font-bold text-brand-indigo focus:ring-2 ring-brand-indigo/20 outline-none"
+ placeholder="https://forms.gle/... or payment link"
+ />
+
+ {deptBatches.length > 0 && (
+
)}
+
+
+ )}
+
+
+ Or select a standard academic year below:
+
{!isApplicable ? (
Inert Batch
+ ) : hasCustomBatches ? (
+
+
- {missingSections.length > 0 && currentCount > 0 && (
+ {hasCustomBatches && missingBatches.length > 0 && currentCount > 0 && (
+
+
+ Batches Left Out
+{missingBatches.map(b => b.name).join(', ')}
+
@@ -219,6 +252,7 @@ export const InstitutionalChecklist: React.FC<{
const [classes, setClasses] = useState([]);
const [loading, setLoading] = useState(true);
const [selectedBatch, setSelectedBatch] = useState('');
+ const [batches, setBatches] = useState([]);
const [currentPage, setCurrentPage] = useState(1);
const [itemsPerPage, setItemsPerPage] = useState(6);
@@ -228,9 +262,10 @@ export const InstitutionalChecklist: React.FC<{
const fetchData = async () => {
try {
- const [eventsRes, classesRes] = await Promise.all([
+ const [eventsRes, classesRes, batchesRes] = await Promise.all([
fetch(API_BASE_URL + '/api/events'),
- fetch(API_BASE_URL + '/api/classes')
+ fetch(API_BASE_URL + '/api/classes'),
+ fetch(API_BASE_URL + '/api/batches')
]);
if (eventsRes.ok && classesRes.ok) {
@@ -238,12 +273,14 @@ export const InstitutionalChecklist: React.FC<{
eventsRes.json(),
classesRes.json()
]);
+ const batchesData = batchesRes.ok ? await batchesRes.json() : [];
setEvents(eventsData);
setClasses(classesData);
+ setBatches(batchesData);
- const batches = Array.from(new Set(classesData.map((c: any) => c.academicYear.trim()))).sort().reverse();
- if (batches.length > 0 && !selectedBatch) {
- setSelectedBatch(batches[0] as string);
+ const yearBatches = Array.from(new Set(classesData.map((c: any) => c.academicYear.trim()))).sort().reverse();
+ if (yearBatches.length > 0 && !selectedBatch) {
+ setSelectedBatch(yearBatches[0] as string);
}
}
} catch (error) {
@@ -347,6 +384,7 @@ export const InstitutionalChecklist: React.FC<{
index={idx}
isApplicable={deptClasses.length > 0}
sections={sections}
+ batches={batches}
onIncompleteClick={onIncompleteClick}
isCompact={isCompact}
/>
diff --git a/RIT-EMS-main/frontend/src/components/dashboard/ManageNoticesView.tsx b/RIT-EMS-main/frontend/src/components/dashboard/ManageNoticesView.tsx
new file mode 100644
index 0000000..9f61834
--- /dev/null
+++ b/RIT-EMS-main/frontend/src/components/dashboard/ManageNoticesView.tsx
@@ -0,0 +1,798 @@
+import React, { useState, useEffect } from 'react';
+import { motion, AnimatePresence } from 'framer-motion';
+import {
+ Bell,
+ Trash2,
+ Plus,
+ Layers,
+ Settings,
+ Upload,
+ Calendar,
+ X,
+ CheckCircle2,
+ AlertTriangle,
+ Globe,
+ Loader2,
+ FileImage
+} from 'lucide-react';
+import { cn } from '../../lib/utils';
+import { API_BASE_URL } from '../../lib/config';
+import { useDialog } from '../../context/DialogContext';
+
+interface Notice {
+ id: string;
+ title: string;
+ message: string;
+ timestamp: string;
+ type: 'INFO' | 'URGENT' | 'DELAY';
+ image?: string;
+ expiresAt?: string;
+}
+
+interface SpecialEvent {
+ id: string;
+ title: string;
+ description: string;
+ link: string;
+ created_at: string;
+}
+
+export const ManageNoticesView: React.FC = () => {
+ const { showAlert, showConfirm } = useDialog();
+
+ // Navigation Tabs
+ const [activeTab, setActiveTab] = useState<'notices' | 'scroll' | 'special-events'>('notices');
+
+ // Data States
+ const [notices, setNotices] = useState([]);
+ const [specialEvents, setSpecialEvents] = useState([]);
+ const [scrollConfig, setScrollConfig] = useState({
+ isActive: false,
+ title: '',
+ message: ''
+ });
+
+ const [loading, setLoading] = useState(true);
+
+ // Modal States
+ const [isNoticeModalOpen, setIsNoticeModalOpen] = useState(false);
+ const [isEventModalOpen, setIsEventModalOpen] = useState(false);
+
+ // Form States (Notice)
+ const [noticeTitle, setNoticeTitle] = useState('');
+ const [noticeMessage, setNoticeMessage] = useState('');
+ const [noticeType, setNoticeType] = useState<'INFO' | 'URGENT' | 'DELAY'>('INFO');
+ const [noticeImage, setNoticeImage] = useState(null);
+
+ // Form States (Special Event)
+ const [eventTitle, setEventTitle] = useState('');
+ const [eventDesc, setEventDesc] = useState('');
+ const [eventLink, setEventLink] = useState('');
+ const [eventImage, setEventImage] = useState(null);
+
+ const handleEventImageUpload = (e: React.ChangeEvent) => {
+ const file = e.target.files?.[0];
+ if (file) {
+ if (file.size > 1.5 * 1024 * 1024) {
+ showAlert('File Too Large', 'Please upload an image smaller than 1.5MB.', 'error');
+ return;
+ }
+ const reader = new FileReader();
+ reader.onloadend = () => {
+ setEventImage(reader.result as string);
+ };
+ reader.readAsDataURL(file);
+ }
+ };
+
+ useEffect(() => {
+ fetchInitialData();
+ }, []);
+
+ const fetchInitialData = async () => {
+ try {
+ setLoading(true);
+ const [noticesRes, eventsRes, settingsRes] = await Promise.all([
+ fetch(`${API_BASE_URL}/api/announcements`),
+ fetch(`${API_BASE_URL}/api/special-events`),
+ fetch(`${API_BASE_URL}/api/settings`)
+ ]);
+
+ if (noticesRes.ok) {
+ const noticesData = await noticesRes.json();
+ setNotices(noticesData);
+ }
+ if (eventsRes.ok) {
+ const eventsData = await eventsRes.json();
+ setSpecialEvents(eventsData);
+ }
+ if (settingsRes.ok) {
+ const settingsData = await settingsRes.json();
+ if (settingsData.scroll_notification) {
+ setScrollConfig(settingsData.scroll_notification);
+ }
+ }
+ } catch (err) {
+ console.error('Failed to load notice configuration data:', err);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ // Sticky notice limits check
+ const handleOpenNoticeModal = () => {
+ if (notices.length >= 3) {
+ showAlert(
+ 'Limit Reached',
+ 'A maximum of 3 notices can be active on the campus notice board at any time. Please delete an existing notice first.',
+ 'info'
+ );
+ return;
+ }
+ setNoticeTitle('');
+ setNoticeMessage('');
+ setNoticeType('INFO');
+ setNoticeImage(null);
+ setIsNoticeModalOpen(true);
+ };
+
+ const handleImageUpload = (e: React.ChangeEvent) => {
+ const file = e.target.files?.[0];
+ if (file) {
+ if (file.size > 1.5 * 1024 * 1024) {
+ showAlert('File Too Large', 'Please upload an image smaller than 1.5MB.', 'error');
+ return;
+ }
+ const reader = new FileReader();
+ reader.onloadend = () => {
+ setNoticeImage(reader.result as string);
+ };
+ reader.readAsDataURL(file);
+ }
+ };
+
+ const handleAddNotice = async (e: React.FormEvent) => {
+ e.preventDefault();
+ if (!noticeTitle.trim() || !noticeMessage.trim()) {
+ showAlert('Required Fields', 'Please fill in both title and message.', 'error');
+ return;
+ }
+
+ try {
+ const response = await fetch(`${API_BASE_URL}/api/announcements`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ title: noticeTitle.trim(),
+ message: noticeMessage.trim(),
+ type: noticeType,
+ image: noticeImage
+ })
+ });
+
+ if (response.ok) {
+ setIsNoticeModalOpen(false);
+ fetchInitialData();
+ showAlert('Success', 'Notice posted successfully to Campus Notice Board.', 'success');
+ }
+ } catch (err) {
+ console.error('Failed to post notice:', err);
+ showAlert('Error', 'Failed to save notice. Please try again.', 'error');
+ }
+ };
+
+ const handleDeleteNotice = async (id: string) => {
+ showConfirm(
+ 'Remove Notice',
+ 'Are you sure you want to remove this notice from the board?',
+ async () => {
+ try {
+ const response = await fetch(`${API_BASE_URL}/api/announcements/${id}`, {
+ method: 'DELETE'
+ });
+ if (response.ok) {
+ fetchInitialData();
+ showAlert('Success', 'Notice removed successfully.', 'success');
+ }
+ } catch (err) {
+ console.error('Delete failed:', err);
+ showAlert('Error', 'Failed to delete notice.', 'error');
+ }
+ }
+ );
+ };
+
+ // Scroll Notification Updates
+ const handleSaveScrollConfig = async (e: React.FormEvent) => {
+ e.preventDefault();
+ if (scrollConfig.isActive && (!scrollConfig.title.trim() || !scrollConfig.message.trim())) {
+ showAlert('Required fields', 'Please enter a title and message for the scroll notification.', 'error');
+ return;
+ }
+
+ try {
+ const response = await fetch(`${API_BASE_URL}/api/settings`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ key: 'scroll_notification',
+ value: scrollConfig
+ })
+ });
+
+ if (response.ok) {
+ fetchInitialData();
+ showAlert('Success', 'Ancient scroll notification settings saved successfully.', 'success');
+ }
+ } catch (err) {
+ console.error('Save failed:', err);
+ showAlert('Error', 'Failed to update scroll settings.', 'error');
+ }
+ };
+
+ // Special Events Updates
+ const handleAddSpecialEvent = async (e: React.FormEvent) => {
+ e.preventDefault();
+ if (!eventTitle.trim() || !eventDesc.trim() || !eventLink.trim()) {
+ showAlert('Required Fields', 'Please fill in all special event details.', 'error');
+ return;
+ }
+
+ try {
+ const response = await fetch(`${API_BASE_URL}/api/special-events`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ title: eventTitle.trim(),
+ description: eventDesc.trim(),
+ link: eventLink.trim(),
+ created_by: 'ADMIN',
+ image: eventImage
+ })
+ });
+
+ if (response.ok) {
+ setIsEventModalOpen(false);
+ setEventTitle('');
+ setEventDesc('');
+ setEventLink('');
+ setEventImage(null);
+ fetchInitialData();
+ showAlert('Success', 'Special event added to the registry successfully.', 'success');
+ }
+ } catch (err) {
+ console.error('Post failed:', err);
+ showAlert('Error', 'Failed to create special event.', 'error');
+ }
+ };
+
+ const handleDeleteSpecialEvent = async (id: string) => {
+ showConfirm(
+ 'Delete Special Event',
+ 'Are you sure you want to remove this event from the registry?',
+ async () => {
+ try {
+ const response = await fetch(`${API_BASE_URL}/api/special-events/${id}`, {
+ method: 'DELETE'
+ });
+ if (response.ok) {
+ fetchInitialData();
+ showAlert('Success', 'Special event deleted successfully.', 'success');
+ }
+ } catch (err) {
+ console.error('Delete failed:', err);
+ showAlert('Error', 'Failed to delete event.', 'error');
+ }
+ }
+ );
+ };
+
+ if (loading) {
+ return (
+
+
+ );
+ }
+
+ return (
+
+ {/* Title */}
+
+
+
+ {/* Tabs */}
+
+
+ Notices & Banner Settings
+Configure notice boards, scroll announcements, & special events
+
+
+
+
+
+
+ {/* Notices Tab */}
+ {activeTab === 'notices' && (
+
+
+ )}
+
+ {/* Scroll Notifications Tab */}
+ {activeTab === 'scroll' && (
+
+
+
+
+
+
+ Active Campus Notices
+These cards are pinned to the student Campus Notice Board (Maximum 3 notices).
+
+ {notices.map(notice => (
+
+
+
+ ))}
+
+ {notices.length === 0 && (
+
+ 
+ )}
+
+
+
+
+
+ {notice.type}
+
+
+
+
+ {notice.image && (
+ {notice.title}
+{notice.message}
+
+ {new Date(notice.timestamp).toLocaleString([], { dateStyle: 'medium', timeStyle: 'short' })}
+
+
+ No active announcements on the notice board.
+
+ )}
+
+
+
+
+ Ancient Scroll Notifications
+Configure a custom styled scroll overlay alert visible on the student home page.
+