diff --git a/src/components/dashboard/Officer_EventRequestForm/EventRequestFormPreview.tsx b/src/components/dashboard/Officer_EventRequestForm/EventRequestFormPreview.tsx index ec9e950..f65ca15 100644 --- a/src/components/dashboard/Officer_EventRequestForm/EventRequestFormPreview.tsx +++ b/src/components/dashboard/Officer_EventRequestForm/EventRequestFormPreview.tsx @@ -453,7 +453,7 @@ const EventRequestFormPreview: React.FC = ({

- Please review all information carefully before submitting. You can go back to any section to make changes if needed. + Please review all information to make sure it is correct. Please contact the event coordinator any issues occur

)} diff --git a/src/components/dashboard/Officer_EventRequestForm/UserEventRequests.tsx b/src/components/dashboard/Officer_EventRequestForm/UserEventRequests.tsx index 9195718..821b2db 100644 --- a/src/components/dashboard/Officer_EventRequestForm/UserEventRequests.tsx +++ b/src/components/dashboard/Officer_EventRequestForm/UserEventRequests.tsx @@ -159,6 +159,12 @@ const EventRequestModal: React.FC<{ isOpen: boolean, onClose: () => void, childr ); }; +// Add a utility function to truncate text with an ellipsis +const truncateText = (text: string, maxLength: number) => { + if (!text) return ''; + return text.length > maxLength ? text.substring(0, maxLength) + '...' : text; +}; + const UserEventRequests: React.FC = ({ eventRequests: initialEventRequests }) => { const [eventRequests, setEventRequests] = useState(initialEventRequests); const [selectedRequest, setSelectedRequest] = useState(null); @@ -226,10 +232,9 @@ const UserEventRequests: React.FC = ({ eventRequests: in try { const date = new Date(dateString); return date.toLocaleDateString('en-US', { - year: 'numeric', month: 'short', day: 'numeric', - hour: '2-digit', + hour: 'numeric', minute: '2-digit' }); } catch (e) { @@ -377,56 +382,84 @@ const UserEventRequests: React.FC = ({ eventRequests: in {viewMode === 'table' ? ( -
- - +
+
+ - - - - - - - - + + + + + + + + {eventRequests.map((request) => ( - - - + + + - - + - @@ -447,24 +480,30 @@ const UserEventRequests: React.FC = ({ eventRequests: in >
-

{request.name}

+

+ + {truncateText(request.name, 25)} + +

{request.status || 'Pending'}
- + - {formatDate(request.start_date_time)} + {formatDate(request.start_date_time)}
- + - {request.location} + + {truncateText(request.location, 25)} +
@@ -479,17 +518,19 @@ const UserEventRequests: React.FC = ({ eventRequests: in )}
-
- -
+
Event NameDateLocationPR MaterialsAS FundingSubmittedStatusActionsEvent NameDateLocationPRASSubmittedStatusView
{request.name}{formatDate(request.start_date_time)}{request.location} +
+ + {truncateText(request.name, 18)} + +
+
+
+ + {formatDate(request.start_date_time)} + +
+
+
+ + {truncateText(request.location, 14)} + +
+
{request.flyers_needed ? ( Yes ) : ( No )} + {request.as_funding_required ? ( Yes ) : ( No )} {formatDate(request.created)} +
+ + {formatDate(request.created)} + +
+
{request.status || 'Submitted'} -
+
+