Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix forms #243

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Hotfix forms #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7566593
Updated Landing Page
ertush Oct 10, 2023
1d0c1b5
Updated ci.yml workflow
ertush Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ on:
branches: [ main ]

env:
NEXT_PUBLIC_API_URL: 'https://api.kmhfltest.health.go.ke/api'
TOKEN_URL: 'https://api.kmhfltest.health.go.ke/o/token'
NEXT_PUBLIC_API_URL: 'https://api.kmhfl.health.go.ke/api'
TOKEN_URL: 'https://api.kmhfl.health.go.ke/o/token'
CLIENT_ID: ${{ secrets.CLIENT_ID }}
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
GRANT_TYPE: 'password'
NEXT_PUBLIC_CLIENT_USERNAME: '[email protected]'
NEXT_PUBLIC_CLIENT_PASSWORD: ${{secrets.NEXT_PUBLIC_CLIENT_PASSWORD}}
NEXT_PUBLIC_CLIENT_PUBLIC_ID: ${{secrets.NEXT_PUBLIC_CLIENT_PUBLIC_ID}}
NEXT_PUBLIC_CLIENT_PUBLIC_SECRET: ${{secrets.NEXT_PUBLIC_CLIENT_PUBLIC_SECRET}}
NEXT_PUBLIC_PUBLIC_TOKEN_URL: 'https://api.kmhfltest.health.go.ke/o/token/'
NEXT_PUBLIC_PUBLIC_TOKEN_URL: 'https://api.kmhfl.health.go.ke/o/token/'

jobs:

Expand Down
171 changes: 85 additions & 86 deletions components/Forms/BasicDetailsForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { useAlert } from 'react-alert';
import { defer } from "underscore";
import { handleBasicDetailsSubmit, handleBasicDetailsUpdates } from '../../controllers/facility/facilityHandlers';
import { FacilityUpdatesContext } from '../../pages/facilities/edit/[id]';
import useSWR from 'swr';
// import { sortOptions } from '../../utils/sort';


Expand Down Expand Up @@ -50,7 +51,7 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
facility_catchment_population: "",
reporting_in_dhis: "",
admission_status: "",
nhif_accreditation: "",
nhi36414cf_accreditation: "",
is_classified: "",
open_whole_day: "",
open_late_night: "",
Expand Down Expand Up @@ -82,28 +83,22 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
const [_, setGeoJSON] = useGeoJSON();
const [__, setWardName] = useGeoData('ward_data');
const [___, setGeoCenter] = useGeoData('geo_data');
// const [subCountyOptions, setSubCountyOptions] = useState([]);
const [isCountyOption, setIsCountyOption] = useState(false);

const { updatedSavedChanges, updateFacilityUpdateData } = options['19']?.data ? useContext(FacilityUpdatesContext) : {updatedSavedChanges: null, updateFacilityUpdateData: null }

// Facility update data
// Facility update data

const [initialValues, handleFormUpdate] = useLocalStorageState({
key: options['19']?.data ? 'basic_details_edit_form' : 'basic_details_form',
value: options['19']?.data ? facilityBasicDetails : formFields
}).actions.use();


// console.log({ facilityBasicDetails });



const formValues = options['19']?.data ? facilityBasicDetails : initialValues && initialValues.length > 1 ? JSON.parse(initialValues) : formFields



// Modify form values


const [filteredOptions, setFilteredOptions] = useState({
facilityTypeDetailOptions: [],
ownerTypeOptions: []
Expand Down Expand Up @@ -139,52 +134,6 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
})()


// const facilityOptions = (() => {
// const f_types = [
// 'STAND ALONE',
// 'DISPENSARY',
// 'MEDICAL CLINIC',
// 'NURSING HOME',
// 'HOSPITALS',
// 'HEALTH CENTRE',
// 'MEDICAL CENTRE'
// ]

// const all_ftypes = []


// for (let type in f_types) all_ftypes.push(options[0]?.facility_types.find(({ sub_division }) => sub_division === f_types[type]))

// return [{
// label: all_ftypes[0].sub_division,
// value: all_ftypes[0].parent
// },
// {
// label: all_ftypes[1].sub_division,
// value: all_ftypes[1].parent
// },
// {
// label: all_ftypes[2].sub_division,
// value: all_ftypes[2].parent
// },
// {
// label: all_ftypes[3].sub_division,
// value: all_ftypes[3].parent
// },
// {
// label: all_ftypes[4].sub_division,
// value: all_ftypes[4].parent
// },
// {
// label: all_ftypes[5].sub_division,
// value: all_ftypes[5].parent
// }

// ]

// })()


const operationStatusOptions = [
{
value: '190f470f-9678-47c3-a771-de7ceebfc53c',
Expand All @@ -197,7 +146,6 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
];



// Effects
useEffect(() => {

Expand Down Expand Up @@ -392,32 +340,54 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {

});


// console.log({sub_counties, subCountyOptions, error})

// Refs
const facilityTypeDetailsRef = useRef(null);
const checkListFileRef = useRef(null);

if(options['19']?.data){

formValues['facility_type'] = facilityTypeOptions.find(({label}) => label == options['19']?.data?.facility_type_parent)?.value
formValues['facility_type_details'] = filteredOptions.facilityTypeDetailOptions.find(({label}) => label == options['19']?.data?.facility_type_name)?.value

delete formValues['facility_checklist_document'];


// delete formValues['facility_checklist_document'];
// formValues['facility_checklist_document'] = new File([],'Checklist File',undefined)
}

// console.log({formValues})

// const fetcher = url => {

// fetch(url, {
// headers: {
// 'Authorization': `Bearer ${options['18']?.token ?? options['22']?.token }`,
// 'Accept': 'application/json',
// 'Content-Type': 'application/json, **/**'

// }
// })

// }


// const {data:sub_counties, error} = useSWR(updateSubCountyOptions ? `${process.env.NEXT_PUBLIC_API_URL}/common/sub_counties/${formikState?.values.county_id}` : null, fetcher)


return (
<Formik
initialValues={formValues}
onSubmit={(values) => options['19']?.data ?
// Update existing facility
handleBasicDetailsUpdates(options['22']?.token, values, facilityId, updatedSavedChanges, alert)
handleBasicDetailsUpdates(options['22']?.token, values, facilityId, updatedSavedChanges)
.then((resp) => {
defer(() => updatedSavedChanges(true));

if (resp.ok) {

alert.success('Facility Basic details updated successfully');
localStorage.clear();

fetch(
`${process.env.NEXT_PUBLIC_API_URL}/facilities/facilities/${facilityId}/`,
{
Expand Down Expand Up @@ -468,51 +438,80 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
)
);
}
else{
alert.error('Unable to update facility basic details')
}
})
.catch((e) =>
console.error(
"unable to fetch facility data. Error:",
e.message
)
)

)
:
// Post new facility
handleBasicDetailsSubmit(options['18']?.token, values, formId, setFormId, checkListFileRef.current, alert, setGeoJSON, setWardName, setGeoCenter, setFacilityId)}
validationSchema={toFormikValidationSchema(formSchema)}
enableReinitialize
>

{
{
(formikState) => {
const errors = formikState.errors;

const errors = formikState.errors;

const fetcher = (url, token) => {

fetch(url, {
mode:'no-cors',
headers: {
'Authorization': `Bearer ${token}`,
'Accept': 'application/json, text/plain, */*',
'Content-Type': 'application/json;charset=utf-8'

//Effects
}
})

useEffect(() => {
}

if(!options['19']?.data){
handleFormUpdate(JSON.stringify(formikState?.values))
}

}, [handleFormUpdate, formikState?.values])
// const {data:sub_counties, error} = useSWR(isCountyOption ? [`${process.env.NEXT_PUBLIC_API_URL}/common/sub_counties/${formikState?.values.county_id}`, options['18']?.token ?? options['22']?.token ] : null, fetcher)

// Form Validations

// if(formikState?.values?.facility_type !== ""){

//Effects

// const facilityTypeDetails = options['1']?.facility_type_details?.find(
// ({ value }) => value.includes(formikState?.values?.facility_type)
// )?.value ?? " ";
useEffect(() => {


// // console.log({facilityTypeDetails})
// }
if(!options['19']?.data){
handleFormUpdate(JSON.stringify(formikState?.values))
}

if(formikState.values?.county_id !== ""){
// Call
console.log({county:formikState.values?.county_id })
setIsCountyOption(true)
}

return () => {
setIsCountyOption(false)
}

}, [handleFormUpdate, formikState?.values])


// Form Validations

// if(formikState?.values?.facility_type !== ""){


// const facilityTypeDetails = options['1']?.facility_type_details?.find(
// ({ value }) => value.includes(formikState?.values?.facility_type)
// )?.value ?? " ";


// // console.log({facilityTypeDetails})
// }


// Hours/Days duration form rules
if (formikState?.values?.open_whole_day) {
formikState?.values?.open_late_night = true;
Expand Down Expand Up @@ -680,7 +679,7 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
placeholder="Select a facility type..."
required
name='facility_type'
disabled={options['19']?.data ? true: false}
// disabled={options['19']?.data ? true: false}
/>
{errors.facility_type && <span className='font-normal text-sm text-red-500 text-start'>{errors.facility_type}</span>}

Expand All @@ -704,7 +703,7 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
placeholder="Select facility type details..."
required
name='facility_type_details'
disabled={options['19']?.data ? true: false}
// disabled={options['19']?.data ? true: false}

/>

Expand Down Expand Up @@ -1306,7 +1305,7 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
</span>
</label>
<Select
options={options['6']?.counties} //
options={options['6']?.counties} //
required
placeholder="Select County ..."
name='county_id'
Expand All @@ -1330,7 +1329,7 @@ export function BasicDeatilsForm({ useGeoJSON, useGeoData }) {
</span>
</label>
<Select
options={options['7']?.sub_counties}
options={/*sub_counties ?? */options['7']?.sub_counties}
required
placeholder="Select Sub County..."
name='sub_county_id'
Expand Down
14 changes: 12 additions & 2 deletions components/Forms/FacilityContactsForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { FacilityUpdatesContext } from '../../pages/facilities/edit/[id]';
import { FacilityIdContext } from './Form'
import { defer } from 'underscore';
import { Alert } from "@mui/lab";
import { useAlert } from 'react-alert';



Expand Down Expand Up @@ -59,6 +60,8 @@ export function FacilityContactsForm() {
const[facilityId, _] = useContext(FacilityIdContext);
const [responseError, setResponseError] = useState(null);

const alert = useAlert()


const { updatedSavedChanges, updateFacilityUpdateData } = options['19']?.data ? useContext(FacilityUpdatesContext) : {updatedSavedChanges: null, updateFacilityUpdateData: null }

Expand Down Expand Up @@ -216,9 +219,12 @@ export function FacilityContactsForm() {

options['19']?.data ?
handleFacilityContactsUpdates(options['22']?.token, values, facilityId)
.then(({ statusText }) => {
.then((resp) => {
defer(() => updatedSavedChanges(true));
if (statusText == "OK") {
if (resp.ok) {

alert.success('Facility Contacts Updated successfully')

fetch(
`${process.env.NEXT_PUBLIC_API_URL}/facilities/facilities/${facilityId}/`,
{
Expand Down Expand Up @@ -272,6 +278,10 @@ export function FacilityContactsForm() {
)
);
}
else
{
alert.error("Unable to update facility contacts")
}
})
.catch((e) =>
console.error(
Expand Down
Loading