-
+
-
+
Accepted Requests
-
+ {/*
*/}
+
(index === 0 ? 2 : 0)}
+ slotProps={{
+ legend: {
+ direction: 'row',
+ position: { vertical: 'middle', horizontal: 'middle' },
+ padding: 0,
+ labelStyle: {
+ fontSize: 35,
+ fill: 'black',
+ fontWeight: 'bolder'
+ },
+ itemMarkWidth: 0,
+ itemMarkHeight: 0,
+ },
+ }}
+ />
@@ -193,7 +253,7 @@ export const RequestsDetails = ({flood,tsunami,fire,wind,other,today, monthly})
-
+
-
-
+
+ {/*
*/}
+
(index === 0 ? 2 : 0)}
+ slotProps={{
+ legend: {
+ direction: 'row',
+ position: { vertical: 'middle', horizontal: 'middle' },
+ padding: 0,
+ labelStyle: {
+ fontSize: 35,
+ fill: 'black',
+ fontWeight: 'bolder'
+ },
+ itemMarkWidth: 0,
+ itemMarkHeight: 0,
+ },
+ }}
+ />
Accepted Requests
diff --git a/frontend/src/components/Controller/UserControl/UsersCount.jsx b/frontend/src/components/Controller/UserControl/UsersCount.jsx
index 9be667a..a25180d 100644
--- a/frontend/src/components/Controller/UserControl/UsersCount.jsx
+++ b/frontend/src/components/Controller/UserControl/UsersCount.jsx
@@ -59,6 +59,12 @@ export const UserCount = (activeUsersDate,DisctrictUsersDate, activeAdminsDate,
getActiveDetails();
},[allData])
+ useEffect(()=>{
+ if(userActive != null){
+ console.log("User Active: ", userActive);
+ }
+ },[userActive])
+
return(
@@ -73,10 +79,10 @@ export const UserCount = (activeUsersDate,DisctrictUsersDate, activeAdminsDate,
{
- CountCard("USERS", "Total Users Count",3,newData)
+ CountCard("USERS", "Total Users Count",1,newData)
}
{
- CountCard("ADMINS", "Total Admins Count",1, newData)
+ CountCard("ADMINS", "Total Admins Count",3, newData)
}
diff --git a/frontend/src/components/Controller/UserControl/Users_Analysis.jsx b/frontend/src/components/Controller/UserControl/Users_Analysis.jsx
index e6853dc..75f4621 100644
--- a/frontend/src/components/Controller/UserControl/Users_Analysis.jsx
+++ b/frontend/src/components/Controller/UserControl/Users_Analysis.jsx
@@ -12,13 +12,15 @@ const exData = [
export const UsersAnalysis = () => {
+ const [allData, setAllData] = useState([]);
const [newData, setNewData] = useState([]);
+ const [newUsers, setNewUsers] = useState([]);
useEffect ( () => {
const fetchUserData = async () => {
try{
const data = await getAllUsers();
-
+ setAllData(data);
const groupedData = data.reduce((acc,user) => {
const department = user.department;
@@ -41,17 +43,40 @@ export const UsersAnalysis = () => {
fetchUserData();
},[]);
+ useEffect(()=>{
+ if(allData != null){
+ const today = new Date();
+ let nUser = 0, nAdmin = 0;
+ for(const us of allData){
+ const diff = today - new Date(us.createdAt);
+ if(diff/(1000*60*60*24) < 7 ){
+ if(us.accessLevel == 1){
+ console.log(us.userName);
+ nUser++;
+ }else{
+ nAdmin++;
+ }
+ }
+ }
+
+ setNewUsers([
+ {label: "Users", value: nUser},
+ {label: "Admins", value: nAdmin},
+ ]);
+ }
+ },[allData])
+
useEffect(()=> {
if(newData.length != 0) console.log("newData:",newData);
},[newData]);
return(
- {
+ {/* {
AnalysisCard("Users By District","Each Users divided by districts",exData)
- }
+ } */}
{
- AnalysisCard("New users and admin registration","Newly registered users and appointed admins",exData)
+ AnalysisCard("New users and admin registration","Newly registered users and appointed admins",newUsers)
}
{
AnalysisCard("Admins by department","Each admins divided by departments shown below", newData)
diff --git a/frontend/src/components/Controller/UserControl/Users_CountCard.jsx b/frontend/src/components/Controller/UserControl/Users_CountCard.jsx
index c78b68c..bd708e4 100644
--- a/frontend/src/components/Controller/UserControl/Users_CountCard.jsx
+++ b/frontend/src/components/Controller/UserControl/Users_CountCard.jsx
@@ -7,12 +7,13 @@ export const CountCard = (title, description,accessLevel, users) => {
useEffect(() => {
if(users){
if(accessLevel == 1){
- const adminCount = users[1].count + users[2].count;
+ const adminCount = users[1].count;
setUserCount(adminCount);
} else {
- const normalCount = users[3].count;
+ const normalCount = users[3].count + users[2].count;
setUserCount(normalCount);
}
+ console.log("GetCount:", users);
}
},[users]);
diff --git a/frontend/src/components/Controller/shelters/RowCardShelter.jsx b/frontend/src/components/Controller/shelters/RowCardShelter.jsx
index 9ce34c3..fdef232 100644
--- a/frontend/src/components/Controller/shelters/RowCardShelter.jsx
+++ b/frontend/src/components/Controller/shelters/RowCardShelter.jsx
@@ -20,15 +20,15 @@ export const RowCardShelter = ({ shelterItem, shelterDelete, shelterEdit }) => {
{ col: "Shelter ID", value: shelterItem.shelterId, width: "120px" },
{ col: "Shelter Name", value: shelterItem.shelterName, width: "250px" },
{ col: "Shelter Type", value: shelterItem.shelterType, width: "200px" },
- { col: "Location", value: shelterItem.location, width: "300px" },
- { col: "Person In Charge", value: shelterItem.personInCharge, width: "250px" },
+ { col: "Location", value: shelterItem.location, width: "350px" },
+ { col: "Person In Charge", value: shelterItem.personInCharge, width: "230px" },
{ col: "Phone Number", value: shelterItem.phoneNumber, width: "150px" },
];
setShelter(Data);
}, [])
return (
-
+
{
shelter.map((item, index) => (
{item.value}
diff --git a/frontend/src/components/Controller/shelters/ShelterAddFormTest.jsx b/frontend/src/components/Controller/shelters/ShelterAddFormTest.jsx
index c8542aa..6808479 100644
--- a/frontend/src/components/Controller/shelters/ShelterAddFormTest.jsx
+++ b/frontend/src/components/Controller/shelters/ShelterAddFormTest.jsx
@@ -8,8 +8,8 @@ export const ShelterAddFormTest = React.forwardRef(function (props, ref) {
const { initialDetails, handleClose } = props;
- const [ open, setOpen ] = useState(false);
- const [ snackMessage, setSnackMessage ] = useState({message:"", severity:""});
+ const [open, setOpen] = useState(false);
+ const [snackMessage, setSnackMessage] = useState({ message: "", severity: "" });
const [details, setDetails] = useState(initialDetails ||
{
@@ -106,7 +106,10 @@ export const ShelterAddFormTest = React.forwardRef(function (props, ref) {
-
+
+
+
+
{
+ return (
+
+
+
+
+
+
+ );
+}
diff --git a/frontend/src/pages/controller/Requests.jsx b/frontend/src/pages/controller/Requests.jsx
index 73e4640..c351a9f 100644
--- a/frontend/src/pages/controller/Requests.jsx
+++ b/frontend/src/pages/controller/Requests.jsx
@@ -13,7 +13,7 @@ import { BarSlideShow } from "../../components/Controller/Requests/BarSlideShow"
import { FaXmark, FaBars } from "react-icons/fa6";
const intialState = {
- requests: [],
+ requests: []
};
const reducer = (state, action) => {
@@ -51,12 +51,12 @@ export const Requests = () => {
otherRequests: [],
allReadRequests: [],
todayReadRequests: [],
- monthlyReadRequests: [],
+ monthlyReadRequests: []
});
const disasters = ["flood", "tsunami", "fire", "wind", "landslide"];
useEffect(() => {
const loadRequests = getRequests();
- console.log("Requests", requests);
+ console.log("Requests", loadRequests);
loadRequests.then(requests => {
// Sort requests by date and time in descending order
const sortedRequests = requests.sort((a, b) => {
@@ -103,7 +103,7 @@ export const Requests = () => {
request.requestDate.split(" ")[1] ===
new Date().toDateString().split(" ")[1]
);
- const allRead = requests.filter(request => request.read === true);
+ const allRead = requests.filter(request => request.read === false);
const todayRead = requests.filter(
request =>
request.read === true &&
@@ -132,55 +132,77 @@ export const Requests = () => {
otherRequests: other,
allReadRequests: allRead,
todayReadRequests: todayRead,
- monthlyReadRequests: monthlyRead,
+ monthlyReadRequests: monthlyRead
});
});
}, []);
+ // const handleCardClick = async request => {
+ // try {
+ // const updatedRequest = { ...request, read: true };
+ // setSelectedRequest(updatedRequest);
+ // await axios.put(
+ // `http://localhost:5000/api/requests/updateRequest/${request.requestID}`,
+ // updatedRequest
+ // );
+ // const updatedRequests = await getRequests();
+ // setShowRequests(updatedRequests);
+ // console.log("Updated Request:", updatedRequest.read);
+ // } catch (error) {
+ // console.error("Error updating request:", error);
+ // }
+ // };
+
const handleCardClick = async request => {
try {
- const updatedRequest = { ...request, read: true };
+ let updatedRequest = request;
+ if (request.read !== true) {
+ console.log("Read Request:", request);
+ // updatedRequest = { ...request, read: true };
+ const response = await axios.put(
+ `http://localhost:5000/api/requests/updateRequest/${request.requestID}`
+ );
+ updatedRequest = request;
+ console.log("response:", response.data)
+ console.log("image:", updatedRequest.image)
+ }
setSelectedRequest(updatedRequest);
- await axios.put(
- `http://localhost:5000/api/requests/updateRequest/${request.requestID}`,
- updatedRequest
- );
+ console.log("request Image", request.image);
const updatedRequests = await getRequests();
setShowRequests(updatedRequests);
- console.log("Updated Request:", updatedRequest.read);
} catch (error) {
console.error("Error updating request:", error);
}
};
const handleTag = tag => {
- if (tag == "all") {
- setShowRequests(filteredRequests.allRequests);
- } else if (tag === "flood") {
- setShowRequests(filteredRequests.floodRequests);
- } else if (tag === "tsunami") {
- setShowRequests(filteredRequests.tsunamiRequests);
- } else if (tag === "fire") {
- setShowRequests(filteredRequests.fireRequests);
- } else if (tag === "extreme wind") {
- setShowRequests(filteredRequests.extremeWindRequests);
- } else if (tag === "landslide") {
- setShowRequests(filteredRequests.landslideRequests);
- } else if (tag === "verified") {
- setShowRequests(filteredRequests.verifiedRequests);
- } else if (tag === "today") {
- setShowRequests(filteredRequests.todayRequests);
- } else if (tag === "monthly") {
- setShowRequests(filteredRequests.monthlyRequests);
- } else if (tag === "read") {
- setShowRequests(filteredRequests.allReadRequests);
- } else if (tag === "other") {
- setShowRequests(filteredRequests.otherRequests);
+ const tagMap = {
+ all: filteredRequests.allRequests,
+ flood: filteredRequests.floodRequests,
+ tsunami: filteredRequests.tsunamiRequests,
+ fire: filteredRequests.fireRequests,
+ "extreme wind": filteredRequests.extremeWindRequests,
+ landslide: filteredRequests.landslideRequests,
+ verified: filteredRequests.verifiedRequests,
+ today: filteredRequests.todayRequests,
+ monthly: filteredRequests.monthlyRequests,
+ read: filteredRequests.allReadRequests,
+ other: filteredRequests.otherRequests
+ };
+
+ const requests = tagMap[tag];
+
+ if (requests) {
+ if (requests.length === 0) {
+ message.info("Requests are empty");
+ }
+ setShowRequests(requests);
} else {
- message.info("Not Such requests");
- return [];
+ message.info("No such requests");
+ setShowRequests([]);
}
};
+
const [isMenuOpen, setIsMenuOpen] = useState(false);
const toggleMenu = () => {
setIsMenuOpen(!isMenuOpen);
@@ -227,6 +249,7 @@ export const Requests = () => {
medicalNeed={selectedRequest.medicalNeed}
otherNeeds={selectedRequest.otherNeeds}
verification={selectedRequest.verify}
+ image={selectedRequest.image}
locationLatLan={selectedRequest.disasterLocationLatLan}
/>
@@ -429,22 +452,26 @@ export const Requests = () => {
{Array.isArray(showRequests) &&
- showRequests.map(request =>
-
handleCardClick(request)}
- >
-
-
- )}
+ (showRequests.length !== 0
+ ? showRequests.map(request =>
+
handleCardClick(request)}
+ >
+
+
+ )
+ :
+ No requests available!
+
)}
}
diff --git a/frontend/src/pages/controller/ShelterLocations.jsx b/frontend/src/pages/controller/ShelterLocations.jsx
index 3a20e30..704da8d 100644
--- a/frontend/src/pages/controller/ShelterLocations.jsx
+++ b/frontend/src/pages/controller/ShelterLocations.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
import { LanguageBar } from "../../components/Controller/LanguageBar";
import { HeaderBar } from "../../components/Controller/HeaderBar";
import { deleteShelter, getAllShelters } from "../../services/shelterService";
@@ -14,9 +14,9 @@ export const ShelterLocationPage = () => {
const [open, setOpen] = useState(false);//for alerts
const [formOpen, setFormopen] = useState(false);
const [change, setChange] = useState(false);
+ const formRef = useRef(null);
-
- const [ snackMessage, setSnackMessage ] = useState({message:"", severity:""});
+ const [snackMessage, setSnackMessage] = useState({ message: "", severity: "" });
const getShelters = async () => {
const allShelters = await getAllShelters();
@@ -40,15 +40,16 @@ export const ShelterLocationPage = () => {
{ col: "Shelter ID", width: "120px" },
{ col: "Shelter Name", width: "250px" },
{ col: "Shelter Type", width: "200px" },
- { col: "Location", width: "300px" },
- { col: "Person In Charge", width: "250px" },
+ { col: "Location", width: "350px" },
+ { col: "Person In Charge", width: "230px" },
{ col: "Phone Number", width: "150px" },
+ { col: "Action", width: "100px" },
];
const [shelters, setShelters] = useState(null);
const handleDelete = async (id) => {
- try{
+ try {
const result = await deleteShelter(id);
setChange(!change);
await getShelters();
@@ -57,15 +58,15 @@ export const ShelterLocationPage = () => {
setSnackMessage(msg);
console.log("Result: ", result);
- }catch(error){
+ } catch (error) {
const msg = { message: "Shelter delete failed!", severity: "error" };
setSnackMessage(msg);
console.log(error);
}
}
- const handleEdit = () => {
-
+ const handleEdit = (id) => {
+
}
const alertClose = () => {
@@ -88,6 +89,16 @@ export const ShelterLocationPage = () => {
}
}, [snackMessage])
+ useEffect(() => {
+ if (formRef.current && formOpen) {
+ const timer = setTimeout(() => {
+ formRef.current.scrollIntoView({ behavior: 'smooth' });
+ }, 500); // 1 seconds delay
+
+ return () => clearTimeout(timer);
+ }
+ }, [formOpen])
+
return (
@@ -107,46 +118,48 @@ export const ShelterLocationPage = () => {
-
+
{
tableCols.map((item, index) => (
{item.col}
))
}
-
+
{
shelters && shelters.length > 0 ?
shelters.map((shelter, index) => (
{
handleDelete(shelter.shelterId);
- }}
- shelterEdit={()=>{}}/>
+ }}
+ shelterEdit={(id) => { handleEdit(id) }} />
))
: No shelters found
}
-
-
-
+
+
+
+
+
+
- {snackMessage.message}
-
-
+ severity={snackMessage.severity}
+ variant="filled"
+ sx={{ width: '100%' }}
+ >{snackMessage.message}
+
+
)
}
\ No newline at end of file
diff --git a/frontend/src/services/emailServices.jsx b/frontend/src/services/emailServices.jsx
new file mode 100644
index 0000000..35a75e1
--- /dev/null
+++ b/frontend/src/services/emailServices.jsx
@@ -0,0 +1,6 @@
+import axios from "axios";
+
+export const sendRespond = async (ids)=>{
+ const {data} = await axios.post("api/email/sendResponds",{ids});
+ return data;
+}
\ No newline at end of file
diff --git a/frontend/src/services/requestService.jsx b/frontend/src/services/requestService.jsx
index 4b4c057..313329a 100644
--- a/frontend/src/services/requestService.jsx
+++ b/frontend/src/services/requestService.jsx
@@ -21,6 +21,11 @@ export const setVerifyRequests = async requestIDs => {
return data;
}
+export const checkUnverifyRequests = async requestIDs => {
+ const {data} = await axios.post('api/requests/showUnverify', {requestIDs});
+ return data;
+}
+
// export const updateRequests = async (requestId, newData) => {
// const {data} = await axios.put('/api/requests/updateRequest/' + requestId, newData);
// console.log("UpdatedData", data);
})
+ )}
+
- .toString('base64')}`})
@@ -238,9 +230,9 @@ export const NewsPreview = () =>{
.toString('base64')}`})
diff --git a/frontend/src/components/Controller/Requests/Card_Requests.jsx b/frontend/src/components/Controller/Requests/Card_Requests.jsx
index ce63fda..e5c11b0 100644
--- a/frontend/src/components/Controller/Requests/Card_Requests.jsx
+++ b/frontend/src/components/Controller/Requests/Card_Requests.jsx
@@ -6,7 +6,7 @@ export const Card_Requests = ({
Time,
Date,
Location,
- AffectedPeople,
+ AffectedPeople
}) => {
return (