From fb9ca94dfb6c1e633dc856885ebb2d24f3a6f579 Mon Sep 17 00:00:00 2001 From: eric Date: Mon, 30 Sep 2024 16:30:58 +0300 Subject: [PATCH] Fixed problem in public site naviagtion of facilities --- components/FacilityDetailsTabsPublic.js | 20 ++-- pages/community-units/index.js | 6 +- pages/public/facilities/[id].js | 9 +- pages/public/facilities/index.js | 121 ++++++++++++++++++++++-- 4 files changed, 130 insertions(+), 26 deletions(-) diff --git a/components/FacilityDetailsTabsPublic.js b/components/FacilityDetailsTabsPublic.js index 25a050f..0bb6451 100644 --- a/components/FacilityDetailsTabsPublic.js +++ b/components/FacilityDetailsTabsPublic.js @@ -8,13 +8,13 @@ import Link from 'next/link' function FacilityDetailsTabsPulic({ facility }) { - const [user, setUser] = useState(null); + // const [user, setUser] = useState(null); //rating const [rating, setRating] = useState(0); const [comment, setComment] = useState(""); - const userCtx = useContext(UserContext); + // const userCtx = useContext(UserContext); //alert const alert = useAlert(); @@ -23,14 +23,14 @@ function FacilityDetailsTabsPulic({ facility }) { // const [isFormVisible, setIsFormVisible] = useState(false); const [formVisibility, setFormVisibility] = useState(Array(facility?.facility_services?.length).fill(false) ?? []); - useEffect(() => { - // let user_id - if (userCtx) { - let s_r = userCtx - user_id = s_r.id - setUser(s_r) - } - }, [userCtx]) + // useEffect(() => { + // // let user_id + // if (userCtx) { + // let s_r = userCtx + // user_id = s_r.id + // setUser(s_r) + // } + // }, [userCtx]) const handleServiceRating = async (event, serviceId) => { diff --git a/pages/community-units/index.js b/pages/community-units/index.js index 9fede12..5d7725c 100644 --- a/pages/community-units/index.js +++ b/pages/community-units/index.js @@ -146,14 +146,14 @@ function CommunityUnit(props) { (active ? 'bg-gray-200' : '') } onClick={() => { - window.location.href = `${process.env.NEXT_PUBLIC_API_URL}/chul/units/?format=csv&access_token=${props.token}&page_size=${orgUnitFilter !== "" ? props?.count : 30}&page=1${orgUnitFilter}`; + window.location.href = `${process.env.NEXT_PUBLIC_API_URL}/chul/units/?format=csv&access_token=${props.token}&page_size=${props?.count}&page=1${orgUnitFilter}&fields=name,facility_name,code,facility_ward,facility_subcounty,facility_county,status_name,lat_long,chps_present,chps_trained,chas_present,chas_trained,chcs_present,chcs_trained,households_monitored`; }}> CSV )} - {({ active }) => ( @@ -169,7 +169,7 @@ function CommunityUnit(props) { Excel )} - + */} )} diff --git a/pages/public/facilities/[id].js b/pages/public/facilities/[id].js index c5d131c..91cb428 100644 --- a/pages/public/facilities/[id].js +++ b/pages/public/facilities/[id].js @@ -33,14 +33,13 @@ function FacilityDetails(props) { const wardName = props?.data?.ward_name; const center = props?.geo_details?.geoLocation.center; - // const [isViewChangeLog, setIsViewChangeLog] = useState(false) const router = useRouter() - const handlePrint = (accessToken, id) => { - const url = `${process.env.NEXT_PUBLIC_API_URL}/facilities/facility_detail_report/${id}/?format=pdf&access_token=${accessToken}`; - router.push(url); - }; + // const handlePrint = (accessToken, id) => { + // const url = `${process.env.NEXT_PUBLIC_API_URL}/facilities/facility_detail_report/${id}/?format=pdf&access_token=${accessToken}`; + // router.push(url); + // }; return ( <> diff --git a/pages/public/facilities/index.js b/pages/public/facilities/index.js index 2a07e52..642b7c9 100644 --- a/pages/public/facilities/index.js +++ b/pages/public/facilities/index.js @@ -593,8 +593,86 @@ function Home(props) { {/* Main body */} {/*
*/} -
{/* CHANGED colspan */} +
{/* CHANGED colspan */} +
+ {viewAll && facilities?.results && facilities?.results.length >= 30 && ( + + )} +
{ formError && {formError} } @@ -606,7 +684,7 @@ function Home(props) { -
+

{props?.facilityCount > 0 ? '30': '0'} of {props?.facilityCount}

@@ -714,8 +792,29 @@ function Home(props) { ) : (
{!formError && !submitting && No facility found }
)} - {viewAll && facilities?.results && facilities?.results.length >= 30 && ( -
    + +
+ + +