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 #275

Merged
merged 4 commits into from
Dec 5, 2023
Merged

Hotfix forms #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
370e65f
Added MOH logo
ertush Nov 20, 2023
581c313
Added healthit log
ertush Nov 20, 2023
c6eca5e
Updated page/facilities/edit/[id].js
ertush Dec 4, 2023
3a152da
Added BasicDetailsForm.js
ertush Dec 5, 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
189 changes: 79 additions & 110 deletions components/Forms/BasicDetailsForm.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions components/Forms/EditForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,30 @@ export function EditForm() {
// State
const [geoJSON, setGeoJSON] = useLocalStorageState({
key: 'geo_json',
value: options['20']?.geolocation?.geoJSON
value: options?.geolocation?.geoJSON
}).actions.use();

const [wardName, setWardName] = useLocalStorageState({
key: 'ward_name',
value: options['19']?.data?.ward_name
value: options?.data?.ward_name
}).actions.use();

const [geoCenter, setGeoCenter] = useLocalStorageState({
key: 'geo_center',
value: options['20']?.geolocation?.centerCoordinates
value: options?.geolocation?.centerCoordinates
}).actions.use();

const [facilityId, setFacilityId] = useLocalStorageState({
key: 'facility_id',
value: options['19']?.data?.id
value: options?.data?.id
}).actions.use();

// Update facility ID in the store

useEffect(() => {

setFacilityId(options['19']?.data?.id)
console.log({options})
setFacilityId(options?.data?.id)

}, [])

Expand Down
40 changes: 20 additions & 20 deletions components/Forms/FacilityContactsForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@ export function FacilityContactsForm() {
// Constants

const options = useContext(FormOptionsContext);
const contactTypeOptions = options['11']?.contact_types;
const jobTitleOptions = options['10']?.job_titles;
const contactTypeOptions = options.contact_types;
const jobTitleOptions = options.job_titles;

const facilityContactsData = {}

facilityContactsData['officer_name'] = options['19']?.data?.officer_in_charge?.name;
facilityContactsData['officer_reg_no'] = options['19']?.data?.officer_in_charge?.reg_no;
facilityContactsData['officer_title'] = options['19']?.data?.officer_in_charge?.title;
facilityContactsData['officer_name'] = options?.data?.officer_in_charge?.name;
facilityContactsData['officer_reg_no'] = options?.data?.officer_in_charge?.reg_no;
facilityContactsData['officer_title'] = options?.data?.officer_in_charge?.title;


options['19']?.data?.facility_contacts?.forEach((contact, i) => {
options?.data?.facility_contacts?.forEach((contact, i) => {
facilityContactsData[`contact_${i}`] = contact.contact
facilityContactsData[`contact_type_${i}`] = options['11']?.contact_types?.find(({label}) => label == contact?.contact_type_name)?.value;
facilityContactsData[`contact_type_${i}`] = options.contact_types?.find(({label}) => label == contact?.contact_type_name)?.value;
})


options['19']?.data?.officer_in_charge?.contacts?.forEach((contact, i) => {
options?.data?.officer_in_charge?.contacts?.forEach((contact, i) => {
facilityContactsData[`officer_details_contact_${i}`] = contact?.contact
facilityContactsData[`officer_details_contact_type_${i}`] = options['11']?.contact_types?.find(({label}) => label == contact?.contact_type_name)?.value;
facilityContactsData[`officer_details_contact_type_${i}`] = options.contact_types?.find(({label}) => label == contact?.contact_type_name)?.value;
})


Expand All @@ -63,7 +63,7 @@ export function FacilityContactsForm() {
const alert = useAlert()


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


const [facilityContacts, setFacilityContacts] = useState([
Expand Down Expand Up @@ -108,19 +108,19 @@ export function FacilityContactsForm() {


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

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

// Effects

useEffect(() => {
const contacts = [];
const officerContacts = [];

const initialValueObj = options['19']?.data ? facilityContactsData : typeof initialValues == 'string' ? JSON.parse(initialValues) : {}
const initialValueObj = options?.data ? facilityContactsData : typeof initialValues == 'string' ? JSON.parse(initialValues) : {}

// console.log({initialValues, initialValueObj})
const contactCount = Object.keys(initialValueObj).filter(x => /^contact_\d/.test(x)).length;
Expand Down Expand Up @@ -217,8 +217,8 @@ export function FacilityContactsForm() {
initialValues={formValues}
onSubmit={(values) => {

options['19']?.data ?
handleFacilityContactsUpdates(options['22']?.token, values, facilityId)
options?.data ?
handleFacilityContactsUpdates(options.token, values, facilityId)
.then((resp) => {
defer(() => updatedSavedChanges(true));
if (resp.ok) {
Expand All @@ -229,7 +229,7 @@ export function FacilityContactsForm() {
`${process.env.NEXT_PUBLIC_API_URL}/facilities/facilities/${facilityId}/`,
{
headers: {
'Authorization': 'Bearer ' + options['22']?.token,
'Authorization': 'Bearer ' + options.token,
'Accept': 'application/json, text/plain, */*',
'Content-Type': 'application/json;charset=utf-8'
}
Expand All @@ -249,7 +249,7 @@ export function FacilityContactsForm() {
`${process.env.NEXT_PUBLIC_API_URL}/facilities/facility_updates/${results?.latest_update}/`,
{
headers: {
'Authorization': 'Bearer ' + options['22']?.token,
'Authorization': 'Bearer ' + options.token,
'Accept': 'application/json, text/plain, */*',
'Content-Type': 'application/json;charset=utf-8'
}
Expand Down Expand Up @@ -290,7 +290,7 @@ export function FacilityContactsForm() {
)
)
:
handleFacilityContactsSubmit(options['18']?.token, values, [formId, setFormId, facilityId])
handleFacilityContactsSubmit(options.token, values, [formId, setFormId, facilityId])
.then(resp => {
if(resp.statusText.include("OK")){
alert.success('Facility Contacts Saved successfully', {
Expand Down Expand Up @@ -544,7 +544,7 @@ export function FacilityContactsForm() {
</div>

{
options['19']?.data ?
options?.data ?

<div className='flex justify-end items-center w-full'>
<button
Expand Down
30 changes: 15 additions & 15 deletions components/Forms/GeolocationForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,28 @@ export function GeolocationForm({useGeoJSON, useGeoData}) {
}


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


// handle Edit staff

const facilityGeolocationData = {}

if(options['19']?.data?.lat_long){
facilityGeolocationData['latitude'] = options['19']?.data?.lat_long[0] ?? null
facilityGeolocationData['longitude'] = options['19']?.data?.lat_long[1] ?? null
if(options?.data?.lat_long){
facilityGeolocationData['latitude'] = options?.data?.lat_long[0] ?? null
facilityGeolocationData['longitude'] = options?.data?.lat_long[1] ?? null
}else{
facilityGeolocationData['longitude'] = []
facilityGeolocationData['latitude'] = []
}

const coordinates_id = options['19']?.data?.coordinates;
const coordinates_id = options?.data?.coordinates;
const [responseError, setResponseError] = useState(null);


// console.log({options})

facilityGeolocationData['collection_date'] = options['18']?.collection_date?.split('T')[0]
facilityGeolocationData['collection_date'] = options.collection_date?.split('T')[0]



Expand All @@ -87,11 +87,11 @@ export function GeolocationForm({useGeoJSON, useGeoData}) {


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

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



Expand All @@ -108,7 +108,7 @@ export function GeolocationForm({useGeoJSON, useGeoData}) {
return (
<Formik
initialValues={formValues}
onSubmit={(values) => { options['19']?.data ? ((values, coordinates_id, facilityId) => {
onSubmit={(values) => { options?.data ? ((values, coordinates_id, facilityId) => {

const payload = {
collection_date: (new Date(values.collection_date)).toISOString(),
Expand All @@ -120,7 +120,7 @@ export function GeolocationForm({useGeoJSON, useGeoData}) {
}


handleGeolocationUpdates(options['22']?.token, payload, coordinates_id)
handleGeolocationUpdates(options.token, payload, coordinates_id)
.then((resp) => {
defer(() => updatedSavedChanges(true));

Expand All @@ -135,7 +135,7 @@ export function GeolocationForm({useGeoJSON, useGeoData}) {
`${process.env.NEXT_PUBLIC_API_URL}/facilities/facilities/${facilityId}/`,
{
headers: {
'Authorization': 'Bearer ' + options['22']?.token,
'Authorization': 'Bearer ' + options.token,
'Accept': 'application/json, text/plain, */*',
'Content-Type': 'application/json;charset=utf-8'
}
Expand All @@ -155,7 +155,7 @@ export function GeolocationForm({useGeoJSON, useGeoData}) {
`${process.env.NEXT_PUBLIC_API_URL}/facilities/facility_update/${results?.latest_update}/`,
{
headers: {
'Authorization': 'Bearer ' + options['22']?.token,
'Authorization': 'Bearer ' + options.token,
'Accept': 'application/json, text/plain, */*',
'Content-Type': 'application/json;charset=utf-8'
}
Expand Down Expand Up @@ -207,7 +207,7 @@ export function GeolocationForm({useGeoJSON, useGeoData}) {

})(values, coordinates_id, facilityId)
:
handleGeolocationSubmit(options['18']?.token, values, [formId, setFormId, facilityId])
handleGeolocationSubmit(options.token, values, [formId, setFormId, facilityId])
.then(resp => {
if(resp.status == 201){
alert.success('Geolocation details saved successfull')
Expand Down Expand Up @@ -324,7 +324,7 @@ export function GeolocationForm({useGeoJSON, useGeoData}) {

{/* Finish | Cancel & Geolocation */}
{
options['19']?.data ?
options?.data ?

<div className='flex justify-end items-center w-full'>
<button
Expand Down
12 changes: 6 additions & 6 deletions components/Forms/HumanResourceForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function HumanResourceForm() {
const [formId, setFormId] = useContext(FormContext);
const[facilityId, _] = useContext(FacilityIdContext);

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



Expand All @@ -45,7 +45,7 @@ export function HumanResourceForm() {
categories: hrCategories,
}

})(options['17']?.hr ?? [])
})(options.hr ?? [])


//Event handlers
Expand All @@ -67,10 +67,10 @@ export function HumanResourceForm() {
itemsCategory={null}
categoryItems={hrOptions.categories}
itemsCategoryName={'human resource'}
token={options['18']?.token ?? options['22']?.token}
options={options['17']?.hr}
token={options.token}
options={options.hr}
itemId={facilityId}
item={options['19']?.data ?? null}
item={options?.data ?? null}
handleItemsSubmit={handleHrSubmit}
handleItemsUpdate={handleHrUpdates}
removeItemHandler={() => null}
Expand All @@ -80,7 +80,7 @@ export function HumanResourceForm() {
nextItemCategory={'finish'}
previousItemCategory={'infrastructure'}
setIsSaveAndFinish={updatedSavedChanges}
itemData={options['19']?.data ? options['19']?.data?.facility_humanresources : null}
itemData={options?.data ? options?.data?.facility_humanresources : null}

/>

Expand Down
12 changes: 6 additions & 6 deletions components/Forms/InfrastructureForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function InfrastructureForm() {
const[facilityId, _] = useContext(FacilityIdContext);


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



Expand All @@ -42,7 +42,7 @@ export function InfrastructureForm() {
categories: infraCategories,
}

})(options['16']?.infrastructure ?? [])
})(options.infrastructure ?? [])

//Event handlers
const handleInfrastructurePrevious = useCallback(() => {
Expand All @@ -63,10 +63,10 @@ export function InfrastructureForm() {
otherItemsCategory={null}
itemsCategoryName={'infrastructure'}
categoryItems={infrastructureOption.categories}
options={options['16']?.infrastructure}
token={options['18']?.token ?? options['22']?.token}
options={options.infrastructure}
token={options.token}
itemId={facilityId}
item={options['19']?.data ?? null}
item={options?.data ?? null}
handleItemsSubmit={handleInfrastructureSubmit}
handleItemsUpdate={handleInfrastructureUpdates}
removeItemHandler={() => null}
Expand All @@ -78,7 +78,7 @@ export function InfrastructureForm() {
nextItemCategory={'human resource'}
previousItemCategory={'services'}
setIsSaveAndFinish={updatedSavedChanges}
itemData={options['19']?.data ? options['19']?.data?.facility_infrastructure : null}
itemData={options?.data ? options?.data?.facility_infrastructure : null}
/>

</div>
Expand Down
Loading
Loading