Skip to content

Commit 4f99a60

Browse files
Remove print-only heading and footer from participation landing page
1 parent 819b761 commit 4f99a60

4 files changed

Lines changed: 2280 additions & 2578 deletions

File tree

src/components/CommunityPortal/Reports/Participation/DropOffTracking.jsx

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ function DropOffTracking() {
99

1010
const getDateRange = () => {
1111
const today = new Date();
12-
let startDate, endDate;
12+
let startDate;
13+
let endDate;
1314

1415
if (selectedTime === 'Today') {
1516
startDate = new Date(today);
@@ -38,24 +39,18 @@ function DropOffTracking() {
3839
}
3940
if (selectedTime !== 'All Time') {
4041
const { startDate, endDate } = getDateRange();
41-
const eventDate = new Date(event.eventDate);
42-
return eventDate >= startDate && eventDate <= endDate;
42+
const eventDate = new Date(event.eventTime.split(' pm ')[1]);
43+
if (startDate && endDate) {
44+
return eventDate >= startDate && eventDate <= endDate;
45+
}
4346
}
4447
return true;
4548
});
4649

4750
const darkMode = useSelector(state => state.theme.darkMode);
4851

4952
return (
50-
<<<<<<< HEAD
5153
<div className={`${styles.trackingContainer} ${darkMode ? styles.trackingContainerDark : ''}`}>
52-
=======
53-
<div
54-
className={`tracking-container-global ${styles.trackingContainer} ${
55-
darkMode ? styles.trackingContainerDark : ''
56-
}`}
57-
>
58-
>>>>>>> origin/development
5954
<div className={`${styles.trackingHeader} ${darkMode ? styles.trackingHeaderDark : ''}`}>
6055
<h3>Drop-off and no-show rate tracking</h3>
6156
<div className={styles.trackingFilters}>
@@ -74,55 +69,27 @@ function DropOffTracking() {
7469
</select>
7570
</div>
7671
</div>
77-
<<<<<<< HEAD
7872
<div className={styles.trackingSummary}>
7973
<div className={`${styles.trackingRate} ${darkMode ? styles.trackingRateDark : ''}`}>
8074
<p className={styles.trackingRateValue}>
8175
+5%
8276
<span className={darkMode ? styles.spanDark : ''}>Last week</span>
83-
=======
84-
85-
<div className={styles.trackingSummary}>
86-
<div className={`${styles.trackingRate} ${darkMode ? styles.trackingRateDark : ''}`}>
87-
<p className={styles.trackingRateValue}>
88-
+5% <span>Last week</span>
89-
</p>
90-
<p className={styles.trackingRateSubheading}>
91-
<span> Drop-off rate</span>
92-
>>>>>>> origin/development
9377
</p>
78+
<p>Drop-off rate</p>
9479
</div>
9580
<div className={`${styles.trackingRate} ${darkMode ? styles.trackingRateDark : ''}`}>
9681
<p className={styles.trackingRateValue}>
97-
<<<<<<< HEAD
9882
+5% <span className={darkMode ? styles.spanDark : ''}>Last week</span>
99-
=======
100-
+5% <span>Last week</span>
101-
</p>
102-
<p className={styles.trackingRateSubheading}>
103-
<span> No-show rate </span>
104-
>>>>>>> origin/development
10583
</p>
84+
<p>No-show rate</p>
10685
</div>
10786
</div>
108-
<<<<<<< HEAD
109-
=======
110-
111-
>>>>>>> origin/development
11287
<div
11388
className={`${styles.trackingListContainer} ${
11489
darkMode ? styles.trackingListContainerDark : ''
11590
}`}
11691
>
117-
<<<<<<< HEAD
11892
<table className={`${styles.trackingTable} ${darkMode ? styles.trackingTableDark : ''}`}>
119-
=======
120-
<table
121-
className={`tracking-table-global ${styles.trackingTable} ${
122-
darkMode ? `tracking-table-global-dark ${styles.trackingTableDark}` : ''
123-
}`}
124-
>
125-
>>>>>>> origin/development
12693
<thead>
12794
<tr>
12895
<th>Event name</th>

src/components/CommunityPortal/Reports/Participation/EventParticipation.jsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ function EventParticipation() {
5151
darkMode ? styles.participationLandingPageDark : ''
5252
}`}
5353
>
54-
{/* Print-only page title header */}
55-
<div className={`${styles.printOnly} ${styles.printHeader}`}>
56-
<div className={styles.printHeaderTitle}>Social And Recreational Management</div>
57-
<div className={styles.printHeaderSubtitle}>Event Participation</div>
58-
</div>
59-
6054
<EventParticipationHeader />
6155
<EngagementSummaryCards />
6256
<div className={styles.chartsSection}>
@@ -71,11 +65,6 @@ function EventParticipation() {
7165
<NoShowInsights />
7266
</div>
7367
<MyCases />
74-
75-
{/* Print-only footer note */}
76-
<div className={`${styles.printOnly} ${styles.printFooter}`}>
77-
Generated from Event Participation
78-
</div>
7968
</div>
8069
);
8170
}

src/components/CommunityPortal/Reports/Participation/MyCases.jsx

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ function MyCases() {
5555
const placeholderAvatar = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';
5656

5757
const renderCardView = () => (
58-
<<<<<<< HEAD
59-
<div className={styles.caseCards}>
60-
{filteredEvents.map(event => (
61-
<div className={`${styles.caseCard} ${darkMode ? styles.caseCardDark : ''}`} key={event.id}>
62-
<span className={styles.eventBadge}>{event.eventType}</span>
63-
=======
6458
<div
6559
className={`case-cards-global ${styles.caseCards} ${
6660
expanded || isExporting ? styles.expanded : ''
@@ -74,7 +68,6 @@ function MyCases() {
7468
<span className={styles.eventBadge} data-type={event.eventType}>
7569
{event.eventType}
7670
</span>
77-
>>>>>>> origin/development
7871
<span className={`${styles.eventTime} ${darkMode ? styles.eventTimeDark : ''}`}>
7972
{event.eventTime}
8073
</span>
@@ -83,9 +76,6 @@ function MyCases() {
8376
</span>
8477
<div className={`${styles.attendeesInfo} ${darkMode ? styles.attendeesInfoDark : ''}`}>
8578
<div className={styles.avatars}>
86-
<<<<<<< HEAD
87-
<img alt="profile img" />
88-
=======
8979
<img
9080
alt="profile img"
9181
src={placeholderAvatar}
@@ -94,7 +84,6 @@ function MyCases() {
9484
crossOrigin="anonymous"
9585
loading="lazy"
9686
/>
97-
>>>>>>> origin/development
9887
</div>
9988
<span
10089
className={`${styles.attendeesCount} ${darkMode ? styles.attendeesCountDark : ''}`}
@@ -106,12 +95,6 @@ function MyCases() {
10695
);
10796

10897
const renderListView = () => (
109-
<<<<<<< HEAD
110-
<ul className={styles.caseList}>
111-
{filteredEvents.map(event => (
112-
<li
113-
className={`${styles.caseListItem} ${darkMode ? styles.caseListItemDark : ''}`}
114-
=======
11598
<ul
11699
className={`case-list-global ${styles.caseList} ${
117100
expanded || isExporting ? styles.expanded : ''
@@ -122,7 +105,6 @@ function MyCases() {
122105
className={`case-list-item-global ${styles.caseListItem} ${
123106
darkMode ? styles.caseListItemDark : ''
124107
}`}
125-
>>>>>>> origin/development
126108
key={event.id}
127109
>
128110
<span className={styles.eventType}>{event.eventType}</span>
@@ -141,15 +123,6 @@ function MyCases() {
141123
);
142124

143125
return (
144-
<<<<<<< HEAD
145-
<div className={`${styles.myCasesPage} ${darkMode ? styles.myCasesPageDark : ''}`}>
146-
<header className={`${styles.header} ${darkMode ? styles.headerDark : ''}`}>
147-
<h2 className={`${styles.sectionTitle} ${darkMode ? styles.sectionTitleDark : ''}`}>
148-
My Cases
149-
</h2>
150-
<div className={styles.headerActions}>
151-
<div className={styles.viewSwitcher}>
152-
=======
153126
<div
154127
className={`my-cases-global ${styles.myCasesPage} ${darkMode ? styles.myCasesPageDark : ''}`}
155128
>
@@ -159,7 +132,6 @@ function MyCases() {
159132
</h2>
160133
<div className={styles.headerActions}>
161134
<div className={`view-switcher-global ${styles.viewSwitcher}`}>
162-
>>>>>>> origin/development
163135
<button
164136
type="button"
165137
className={view === 'calendar' ? styles.active : ''}
@@ -182,11 +154,7 @@ function MyCases() {
182154
List
183155
</button>
184156
</div>
185-
<<<<<<< HEAD
186-
<div className={styles.filterWrapper}>
187-
=======
188157
<div className={`filter-wrapper-global ${styles.filterWrapper}`}>
189-
>>>>>>> origin/development
190158
<select
191159
className={styles.filterDropdown}
192160
value={filter}
@@ -198,11 +166,7 @@ function MyCases() {
198166
<option value="thisMonth">This Month</option>
199167
</select>
200168
</div>
201-
<<<<<<< HEAD
202-
<button type="button" className={styles.createNew}>
203-
=======
204169
<button type="button" className={`create-new-global ${styles.createNew}`}>
205-
>>>>>>> origin/development
206170
+ Create New
207171
</button>
208172
{filteredEvents.length > 10 && !isExporting && (

0 commit comments

Comments
 (0)