Skip to content

Commit

Permalink
Merge pull request #352 from ertush/hotfix
Browse files Browse the repository at this point in the history 
Hotfix
  • Loading branch information
@ertush
ertush authored Mar 29, 2024
2 parents 65e48a2 + 3f4677f commit 0e3cd18
Show file tree
Hide file tree
Showing 10 changed files with 367 additions and 304 deletions.
53 changes: 39 additions & 14 deletions components/FacilityDetailsTabs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,34 @@ import React from 'react'
import * as Tabs from "@radix-ui/react-tabs";
import { CheckCircleIcon, XCircleIcon } from "@heroicons/react/solid";

function FacilityDetailsTabs({ facility }) {
function FacilityDetailsTabs({ facility, token }) {

const [cus, setCUs] = React.useState(null)


React.useEffect(() => {


async function fetchCHUs() {
fetch(`${process.env.NEXT_PUBLIC_API_URL}/chul/units/?facility=${facility?.id}`, {
headers: {
'Accept': 'application/json',
'Authorization': `Bearer ${token}`
}
})
.then(resp => resp.json())
.then(cu => {
setCUs(cu?.results)
})
}

fetchCHUs()

}, [])

return (
<div className="col-span-5 rounded md:col-span-3 flex bg-gray-50 shadow-md flex-col gap-3 mt-4">

<Tabs.Root
orientation="horizontal"
className="w-full flex flex-col flex-wrap tab-root"
Expand Down Expand Up @@ -44,9 +69,10 @@ function FacilityDetailsTabs({ facility }) {
value="community_units"
className="p-2 whitespace-nowrap focus:outline:none flex items-center justify-center text-gray-500 text-base hover:text-black cursor-default border-b-2 border-transparent tab-item"
>
Facility Units
Community Health Units
</Tabs.Tab>
</Tabs.List>

<Tabs.Panel
value="overview"
className="grow-1 py-1 px-4 tab-panel"
Expand Down Expand Up @@ -587,10 +613,7 @@ function FacilityDetailsTabs({ facility }) {
>
<div className="col-span-4 md:col-span-4 flex flex-col gap-y-2 group items-center justify-start text-left">
<div className="bg-gray-50 w-full px-2 my-4">
{/* <h3 className="text-2xl w-full flex flex-wrap justify-between items-center leading-tight tracking-tight"> */}
{/* <span className="font-semibold">Services</span> */}
{/* {user && user?.id ? <a href={"/facility/edit/"+facility?.id+"#services"} className="text-base text-gray-700 font-medium hover:text-black focus:text-black active:text-black">Edit services</a> : ""} */}
{/* </h3> */}

<ul>
{facility?.facility_services &&
facility?.facility_services.length > 0 ? (
Expand Down Expand Up @@ -722,25 +745,27 @@ function FacilityDetailsTabs({ facility }) {
<div className="col-span-4 md:col-span-4 flex flex-col gap-y-2 group items-center justify-start text-left">
<div className="bg-gray-50 w-full px-2 my-4">
<ul>
{facility?.facility_units &&
facility?.facility_units.length > 0 ? (
facility?.facility_units.map((unit) => (
{
cus?.length > 0 ? (
cus?.map((cu) => (
<li
key={unit.id}
key={cu?.id}
className="w-full flex flex-row justify-between gap-2 my-2 p-3 border-b border-gray-400"
>
<div>
<p className="text-gray-800 text-base">
{unit.unit_name}
{cu?.name}
</p>
<small className="text-xs text-gray-500">
{unit.regulating_body_name || ""}
{cu?.code || "-"}
</small>
</div>
<div className="flex flex-row gap-1 items-center">
<CheckCircleIcon className="h-6 w-6 text-gray-500" />
<label className="text-sm text-gray-600">
Active
{
cu?.status_name
}
</label>
</div>
</li>
Expand All @@ -749,7 +774,7 @@ function FacilityDetailsTabs({ facility }) {
<li className="w-full bg-yellow-100 flex flex-row gap-2 my-2 p-3 border border-yellow-300 text-yellow-900 text-base leading-none">
<p>No units in this facility?.</p>
</li>
)}
)}
</ul>
</div>
</div>
Expand Down
7 changes: 6 additions & 1 deletion components/Forms/GeolocationForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,12 @@ export function GeolocationForm({ editMode }) {

if (payload) {

fetch(`${process.env.NEXT_PUBLIC_API_URL}/gis/facility_coordinates/${options?.data?.lat_long && options?.data?.coordinates + '/'}`, {
const url = options?.data?.lat_long && options?.data?.coordinates ?
`${process.env.NEXT_PUBLIC_API_URL}/gis/facility_coordinates/${options?.data?.lat_long && `${options?.data?.coordinates}/`}` :
`${process.env.NEXT_PUBLIC_API_URL}/gis/facility_coordinates/`


fetch(url, {
headers: {
'Authorization': 'Bearer ' + options?.token,
'Accept': 'application/json, text/plain, */*',
Expand Down
10 changes: 5 additions & 5 deletions components/HeaderLayout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ export default function HeaderLayout({



<li className={`text-lg h-[50px] w-full border-b border-b-gray-300 flex items-center group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-600 ${/\/community-units\/.+/.test(currentPath) || /\/community-units/.test(currentPath) && 'border-r-2 border-r-gray-50 bg-blue-700/85 text-gray-100'} ${currentPath == "/public/chu" && 'border-r-2 border-r-gray-50 bg-blue-700/85 text-gray-100'}`}>
<li className={`text-lg h-[50px] w-full border-b text-nowrap border-b-gray-300 flex items-center group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-600 ${/\/community-units\/.+/.test(currentPath) || /\/community-units/.test(currentPath) && 'border-r-2 border-r-gray-50 bg-blue-700/85 text-gray-100'} ${currentPath == "/public/chu" && 'border-r-2 border-r-gray-50 bg-blue-700/85 text-gray-100'}`}>
<Link href={`${userID !== 6 && isLoggedIn ? '/community-units' : '/public/chu'}`}>Community Units</Link>
</li>

Expand Down Expand Up @@ -356,7 +356,7 @@ export default function HeaderLayout({
) &&
isLoggedIn &&
<li className={`text-lg h-[50px] w-full border-b border-b-gray-300 flex items-center group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-600 ${currentPath == "/system_setup" && 'border-r-2 border-r-gray-50 bg-blue-700/85 text-gray-100'}`}>
<Link href='/system_setup'>System Setup</Link>
<Link href='/system_setup'><span>System Setup</span></Link>
</li>
}

Expand Down Expand Up @@ -496,7 +496,7 @@ export default function HeaderLayout({

{
userID &&
<li className={`text-lg h-[60px] flex text-center justify-center items-center group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-100 ${currentPath == "/community-units" && 'border-b-2 border-b-gray-50 bg-blue-500/85'} ${currentPath == "/public/chu" && 'border-b-2 border-b-gray-50 bg-blue-500/85'}`}>
<li className={`text-lg h-[60px] flex text-center justify-center text-nowrap items-center group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-100 ${currentPath == "/community-units" && 'border-b-2 border-b-gray-50 bg-blue-500/85'} ${currentPath == "/public/chu" && 'border-b-2 border-b-gray-50 bg-blue-500/85'}`}>
<Link href={`${userID !== 6 && isLoggedIn ? '/community-units' : '/public/chu'}`}>Community Units</Link>
</li>
}
Expand Down Expand Up @@ -535,7 +535,7 @@ export default function HeaderLayout({
groupID == 5)
) &&
isLoggedIn &&
<li className={`text-lg h-[60px] flex text-center justify-center items-center group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-100 ${currentPath == "/system_setup" && 'border-b-2 border-b-gray-50 bg-blue-500/85'}`}>
<li className={`text-lg h-[60px] flex text-center justify-center text-nowrap items-center group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-100 ${currentPath == "/system_setup" && 'border-b-2 border-b-gray-50 bg-blue-500/85'}`}>
<Link href='/system_setup'>System Setup</Link>
</li>
}
Expand All @@ -555,7 +555,7 @@ export default function HeaderLayout({
(groupID == 7 ||
groupID == 5) &&
isLoggedIn &&
<li className={`text-lg h-[60px] flex text-center justify-center items-center group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-100 ${currentPath == "/admin_offices" && 'border-b-2 border-b-gray-50 bg-blue-500/85'}`}>
<li className={`text-lg h-[60px] flex text-center justify-center items-center text-nowrap group-hover:border-b-2 group-hover:border-b-gray-50 duration-200 ease-out hover:bg-blue-500/85 px-4 font-semibold capitalize text-gray-100 ${currentPath == "/admin_offices" && 'border-b-2 border-b-gray-50 bg-blue-500/85'}`}>
<Link href='/admin_offices'>Admin Offices</Link>
</li>
}
Expand Down
Loading

0 comments on commit 0e3cd18

Please sign in to comment.