From 54bcbee3441e77a031e5689fae31b6e9d408bb9c Mon Sep 17 00:00:00 2001 From: "DESKTOP-QHP1O2H\\MIKE" Date: Sat, 4 Feb 2023 19:16:51 -0500 Subject: [PATCH 1/2] implemented reminder category --- src/components/Reminders/ReminderTable.jsx | 477 ++++++++------------- 1 file changed, 167 insertions(+), 310 deletions(-) diff --git a/src/components/Reminders/ReminderTable.jsx b/src/components/Reminders/ReminderTable.jsx index c438ebe..573013b 100755 --- a/src/components/Reminders/ReminderTable.jsx +++ b/src/components/Reminders/ReminderTable.jsx @@ -7,23 +7,43 @@ import SelectBox from "../Helpers/SelectBox"; export default function ReminderTable({ className }) { const [userReminders, setUserReminders] = useState([]); - const filterCategories = ["All Categories", "Appointments","Exercise/Gym", "Medication"]; - const api = new usersService(); + const [selectedCategory, setCategory] = useState(filterCategories[0]) + + useEffect(() => { getUserReminders(); }, []); - + const api = new usersService(); const getUserReminders = async () => { try { const res = await api.getUserReminders(); + setUserReminders(res.data.reminders); + console.log("res", res); } catch (error) { console.log("Error from User Reminders", error); } }; - const [selectedCategory, setCategory] = useState(filterCategories[0]); + const handleSelectCategory = (value) => { + let newValue = "" + if(value == 'All category'){ + newValue = "All category" + }else if(value == 'Exercise/GYM') { + newValue = "EXEM" + }else if(value == 'Appointment') { + newValue = "APPT" + }else{ + newValue = "MEDC" + } + setCategory(newValue); + + } + // const filterCategories = ["All Categories", "Doctors Visit", "Medications"]; + const filterCategories = ["All category", "Exercise/GYM", "Appointment", "Medication"]; + + return (
- {userReminders.map((reminders, index) =>{ - if (userReminders.length < 1 ) { - return( -
-
- - 0 Reminders Start Reminder - -
+ { + userReminders.length < 1 ? +
+
+ + 0 Reminders Start Reminder +
- )} else{ - return ( -
- - - - - - - - - - - {selectedCategory === "All Categories" ? ( - - <> - {userReminders.map((reminders, index) => ( - - - - - - + + + + + + )) + ) + : + userReminders.map((reminder, index) => { + if(reminder.category == selectedCategory){ + return ( + + + + + + + + ) + } + }) + ) + } - - + +
ItemStartEndReminder.
-
-
- data -
-
-

- {reminders.description.substring(0,30) + "..."} -

- - - Added {new Date(reminders.added).toLocaleString()} - -
-
- 		-
- - - {new Date(reminders.start_date).toLocaleString()} - -
- 		-
- - {new Date(reminders.end_date).toLocaleString()} - -
- 		- - {reminders.reminder} + + : +
+ + + + + + + + + + + { + userReminders.length > 0 && ( + selectedCategory == "All category" ? ( + userReminders.map((reminder, index) => ( + + - - - ))} - - - - ) : selectedCategory === "Doctors Visit" ? ( - <> - - - - - - - - - - - - - - - - ) : ( - <> - - - - - - - - - - - - - - - - )} - -
ItemStartEndReminder.
+
+
+ data +
+
+

+ {reminder.description.substring(0,30) + "..."} +

+ + + Added {new Date(reminder.added).toLocaleString()} -
- -
-
-
- data -
-
-

- Doctors Testing Appointament -

- - Added 10-10-2025 - -
-
- 		-
- - - 12-01-25 : 6:30 PM - -
- 		-
- - 12-01-28 : 6:30 PM - -
- 		- - 4 - - - -
-
-
- data -
-
-

- Hospital Testing Appointament -

- - Added 10-10-2025 - -
-
- 		-
- - - 12-01-25 : 6:30 PM - -
- 		-
- - 12-01-28 : 6:30 PM - -
- 		- - 4 - - - -
-
-
- data -
-
-

- Pizza Testing Appointament -

- - Added 10-10-2025 - -
-
- 		-
- - - 12-01-25 : 6:30 PM - -
- 		-
- - 12-01-28 : 6:30 PM - -
- 		- - 4 - - - -
-
-
- data -
-
-

- Pizza Testing Appointament -

- - Added 10-10-2025 - -
-
- 		-
- - - 12-01-25 : 6:30 PM - -
- 		-
- - 12-01-28 : 6:30 PM - -
- 		- - 4 - - - -
-
- - ) - - - - } - })} - - - - - + + + 		+
+ + {new Date(reminder.start_date).toLocaleString()} + +
+ 		+
+ + {new Date(reminder.end_date).toLocaleString()} + +
+ 		+ + {reminder.reminder} + + + +
+
+
+ data +
+
+

+ {reminder.description.substring(0,30) + "..."} +

+ + + Added {new Date(reminder.added).toLocaleString()} + +
+
+ 		+
+ + + {new Date(reminder.start_date).toLocaleString()} + +
+ 		+
+ + {new Date(reminder.end_date).toLocaleString()} + +
+ 		+ + {reminder.reminder} + + + +
+
+ }
- ); -} + ) +} \ No newline at end of file -- 2.34.1 From 60f9c1abc594f6ae0b947e720a9824bb0d008c48 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QHP1O2H\\MIKE" Date: Sat, 4 Feb 2023 19:19:07 -0500 Subject: [PATCH 2/2] removed line spaces --- src/components/Reminders/ReminderTable.jsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/components/Reminders/ReminderTable.jsx b/src/components/Reminders/ReminderTable.jsx index 573013b..76d4126 100755 --- a/src/components/Reminders/ReminderTable.jsx +++ b/src/components/Reminders/ReminderTable.jsx @@ -4,12 +4,10 @@ import dataImage1 from "../../assets/images/data-table-user-1.png"; import usersService from "../../services/UsersService"; import SelectBox from "../Helpers/SelectBox"; - export default function ReminderTable({ className }) { const [userReminders, setUserReminders] = useState([]); const [selectedCategory, setCategory] = useState(filterCategories[0]) - useEffect(() => { getUserReminders(); }, []); @@ -17,10 +15,8 @@ export default function ReminderTable({ className }) { const getUserReminders = async () => { try { const res = await api.getUserReminders(); - setUserReminders(res.data.reminders); console.log("res", res); - } catch (error) { console.log("Error from User Reminders", error); } @@ -38,12 +34,10 @@ export default function ReminderTable({ className }) { newValue = "MEDC" } setCategory(newValue); - } // const filterCategories = ["All Categories", "Doctors Visit", "Medications"]; const filterCategories = ["All category", "Exercise/GYM", "Appointment", "Medication"]; - return (