Compare commits
No commits in common. "eff39f9f1bab80ba5e89a41f9222047d7960ef3a" and "eb36e9cebbf511097e3cd1e3bbbaae91f65c0d33" have entirely different histories.
eff39f9f1b
...
eb36e9cebb
|
|
@ -1,76 +0,0 @@
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import useSetPageTitle from "../../../../../Hooks/useSetPageTitle";
|
|
||||||
import PageHeader from "../../../../../Layout/Dashboard/PageHeader";
|
|
||||||
import { Suspense, useEffect } from "react";
|
|
||||||
import { Spin } from "antd";
|
|
||||||
import { ModalEnum } from "../../../../../enums/Model";
|
|
||||||
import PersonalDetailsForm from "../Form/PersonalDetailsForm";
|
|
||||||
import { Formik, Form } from "formik";
|
|
||||||
import { getInitialValues, getValidationSchema } from "../Form/formUtils";
|
|
||||||
import TitleDetailsForm from "../Form/TitleDetailsForm";
|
|
||||||
import AttachmentForm from "../Form/AttachmentForm";
|
|
||||||
import { useNavigate } from "react-router-dom";
|
|
||||||
import { QueryStatusEnum } from "../../../../../enums/QueryStatus";
|
|
||||||
import { useAddNotification } from "../../../../../api/notification";
|
|
||||||
|
|
||||||
const TableHeader = () => {
|
|
||||||
const [t] = useTranslation();
|
|
||||||
const Navigate = useNavigate();
|
|
||||||
const { mutate, isSuccess, status } = useAddNotification();
|
|
||||||
useSetPageTitle(t(`page_header.add_notification`));
|
|
||||||
const handleSubmit = (values: any) => {
|
|
||||||
const DataToSend = {
|
|
||||||
...values,
|
|
||||||
location: {
|
|
||||||
lat: values.lat,
|
|
||||||
lng: values.lng,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
mutate(DataToSend);
|
|
||||||
};
|
|
||||||
useEffect(() => {
|
|
||||||
if (isSuccess === true) {
|
|
||||||
console.log(1);
|
|
||||||
Navigate('/add_Notifications')
|
|
||||||
}
|
|
||||||
}, [isSuccess])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="TableWithHeader">
|
|
||||||
<Suspense fallback={<Spin />}>
|
|
||||||
<PageHeader
|
|
||||||
pageTitle="manage_notification"
|
|
||||||
ModelAbility={ModalEnum?.NOTIFICATION_ADD}
|
|
||||||
canAdd={false}
|
|
||||||
/>
|
|
||||||
<div>
|
|
||||||
<Formik
|
|
||||||
initialValues={getInitialValues({})}
|
|
||||||
validationSchema={getValidationSchema}
|
|
||||||
onSubmit={handleSubmit}
|
|
||||||
>
|
|
||||||
{({ dirty }) => (
|
|
||||||
<Form className="Form_details_container">
|
|
||||||
<TitleDetailsForm />
|
|
||||||
<PersonalDetailsForm />
|
|
||||||
<div className="resellerButton">
|
|
||||||
<button type="button" onClick={() => Navigate('/add_Notifications')}>{t("practical.cancel")}</button>
|
|
||||||
<button type="submit" disabled={!dirty}>
|
|
||||||
{t("practical.send")} {t("models.notifications")}
|
|
||||||
{status === QueryStatusEnum.LOADING && (
|
|
||||||
<span className="Spinier_Div">
|
|
||||||
<Spin />
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</Form>
|
|
||||||
)}
|
|
||||||
</Formik>
|
|
||||||
</div>
|
|
||||||
</Suspense>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default TableHeader;
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
import React from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { FaImage } from "react-icons/fa";
|
|
||||||
import ImageBoxField from "./ImageBoxField/ImageBoxField";
|
|
||||||
import ValidationField from "../../../../../Components/ValidationField/ValidationField";
|
|
||||||
|
|
||||||
const AttachmentForm = () => {
|
|
||||||
const [t] = useTranslation();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="AttachmentForm">
|
|
||||||
<header className="header_form">
|
|
||||||
<FaImage />
|
|
||||||
<h4>{t("header.attachment")}</h4>
|
|
||||||
</header>
|
|
||||||
<div className="AttachmentFormBody ">
|
|
||||||
<main className="main_form_body">
|
|
||||||
<ImageBoxField name="personal_image" />
|
|
||||||
<ImageBoxField name="id_image" />
|
|
||||||
</main>
|
|
||||||
<div className="MapField">
|
|
||||||
<ValidationField name="lat" placeholder="lat" label="lat" />
|
|
||||||
<ValidationField name="lng" placeholder="lng" label="lng" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default AttachmentForm;
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
import React from "react";
|
|
||||||
import ValidationField from "../../../../../Components/ValidationField/ValidationField";
|
|
||||||
import { Col, Row } from "reactstrap";
|
|
||||||
|
|
||||||
const FilterForm = () => {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<Row>
|
|
||||||
<Col>
|
|
||||||
<ValidationField
|
|
||||||
placeholder="first_name"
|
|
||||||
label="first_name"
|
|
||||||
name="first_name"
|
|
||||||
/>
|
|
||||||
{/* <ValidationField placeholder="last_name" label="last_name" name="last_name" /> */}
|
|
||||||
</Col>
|
|
||||||
{/* <Col>
|
|
||||||
<ValidationField placeholder="username" label="username" name="username" />
|
|
||||||
</Col> */}
|
|
||||||
</Row>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default FilterForm;
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
.ImageBoxField {
|
|
||||||
.ImageBox {
|
|
||||||
width: 120px;
|
|
||||||
height: 120px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
border: max(1.5px, 0.1vw) dashed #a9c3f1;
|
|
||||||
margin-block: 10px;
|
|
||||||
border-radius: 5px;
|
|
||||||
z-index: 9999999 !important;
|
|
||||||
.ImageBoxIcon {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.imagePreview {
|
|
||||||
max-width: 99%;
|
|
||||||
height: auto;
|
|
||||||
max-height: 99%;
|
|
||||||
object-fit: contain;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.ImageHeader {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: flex-end;
|
|
||||||
gap: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ImageCancelIcon {
|
|
||||||
width: 16px !important;
|
|
||||||
height: 16px !important;
|
|
||||||
}
|
|
||||||
.ImageBoxIcon {
|
|
||||||
width: 20px !important;
|
|
||||||
height: 20px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,87 +0,0 @@
|
||||||
import { useFormikContext } from "formik";
|
|
||||||
import { useState, useRef, useEffect } from "react";
|
|
||||||
import "./ImageBoxField.scss";
|
|
||||||
import ImageIcon from "./ImageIcon";
|
|
||||||
import ImageCancelIcon from "./ImageCancelIcon";
|
|
||||||
import { generateImagePreview } from "./generateImagePreview";
|
|
||||||
import { getNestedValue } from "../../../../../../utils/getNestedValue";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
|
|
||||||
// Helper function to generate image preview from a File
|
|
||||||
|
|
||||||
const ImageBoxField = ({ name }: any) => {
|
|
||||||
const formik = useFormikContext<any>();
|
|
||||||
const value = getNestedValue(formik.values, name);
|
|
||||||
const [imagePreview, setImagePreview] = useState<string | null>(null);
|
|
||||||
const fileInputRef = useRef<HTMLInputElement | null>(null);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (value instanceof File) {
|
|
||||||
generateImagePreview(value, setImagePreview);
|
|
||||||
} else if (typeof value === "string") {
|
|
||||||
setImagePreview(value);
|
|
||||||
} else {
|
|
||||||
setImagePreview(null);
|
|
||||||
}
|
|
||||||
}, [value]);
|
|
||||||
|
|
||||||
const handleFileChange = (event: any) => {
|
|
||||||
const file = event.target.files[0];
|
|
||||||
if (file) {
|
|
||||||
generateImagePreview(file, setImagePreview);
|
|
||||||
formik.setFieldValue(name, file);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleButtonClick = () => {
|
|
||||||
const fileInput = fileInputRef.current;
|
|
||||||
if (fileInput) {
|
|
||||||
fileInput.click();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancel = () => {
|
|
||||||
setImagePreview("");
|
|
||||||
formik.setFieldValue(name, "");
|
|
||||||
|
|
||||||
if (fileInputRef.current) {
|
|
||||||
fileInputRef.current.value = "";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
const [t] = useTranslation();
|
|
||||||
return (
|
|
||||||
<div className="ImageBoxField">
|
|
||||||
<header>{t(`input.${name}`)}</header>
|
|
||||||
<div className="ImageHeader">
|
|
||||||
{imagePreview ? (
|
|
||||||
<>
|
|
||||||
<ImageCancelIcon
|
|
||||||
onClick={handleCancel}
|
|
||||||
className="ImageCancelIcon"
|
|
||||||
/>
|
|
||||||
<ImageIcon onClick={handleButtonClick} className="ImageBoxIcon" />
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
<div className="VisibleHidden">hidden</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="ImageBox">
|
|
||||||
{imagePreview ? (
|
|
||||||
<img src={imagePreview} alt="Preview" className="imagePreview" />
|
|
||||||
) : (
|
|
||||||
<ImageIcon onClick={handleButtonClick} className="ImageBoxIcon" />
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<input
|
|
||||||
id={`file-input-${name}`}
|
|
||||||
type="file"
|
|
||||||
accept="image/png, image/jpeg, image/webp"
|
|
||||||
style={{ display: "none" }}
|
|
||||||
onChange={handleFileChange}
|
|
||||||
ref={fileInputRef}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ImageBoxField;
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
import React from "react";
|
|
||||||
|
|
||||||
interface ImageCancelIconProps extends React.HTMLAttributes<HTMLDivElement> {}
|
|
||||||
|
|
||||||
const ImageCancelIcon: React.FC<ImageCancelIconProps> = (props) => {
|
|
||||||
return (
|
|
||||||
<div {...props}>
|
|
||||||
<svg viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path
|
|
||||||
d="M7 5.44469L12.4447 0L14 1.55531L8.55531 7L14 12.4447L12.4436 14L6.9989 8.55531L1.55531 14L0 12.4436L5.44469 6.9989L0 1.55421L1.55531 0.00109986L7 5.44469Z"
|
|
||||||
fill="#515B73"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ImageCancelIcon;
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
import React from "react";
|
|
||||||
|
|
||||||
interface ImageIconProps extends React.HTMLAttributes<HTMLDivElement> {}
|
|
||||||
|
|
||||||
const ImageIcon: React.FC<ImageIconProps> = (props) => {
|
|
||||||
return (
|
|
||||||
<div {...props}>
|
|
||||||
<svg viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<path
|
|
||||||
d="M11.25 5.625C11.25 7.11684 10.6574 8.54758 9.60248 9.60248C8.54758 10.6574 7.11684 11.25 5.625 11.25C4.13316 11.25 2.70242 10.6574 1.64752 9.60248C0.592632 8.54758 0 7.11684 0 5.625C0 4.13316 0.592632 2.70242 1.64752 1.64752C2.70242 0.592632 4.13316 0 5.625 0C7.11684 0 8.54758 0.592632 9.60248 1.64752C10.6574 2.70242 11.25 4.13316 11.25 5.625ZM6.25 3.125C6.25 2.95924 6.18415 2.80027 6.06694 2.68306C5.94973 2.56585 5.79076 2.5 5.625 2.5C5.45924 2.5 5.30027 2.56585 5.18306 2.68306C5.06585 2.80027 5 2.95924 5 3.125V5H3.125C2.95924 5 2.80027 5.06585 2.68306 5.18306C2.56585 5.30027 2.5 5.45924 2.5 5.625C2.5 5.79076 2.56585 5.94973 2.68306 6.06694C2.80027 6.18415 2.95924 6.25 3.125 6.25H5V8.125C5 8.29076 5.06585 8.44973 5.18306 8.56694C5.30027 8.68415 5.45924 8.75 5.625 8.75C5.79076 8.75 5.94973 8.68415 6.06694 8.56694C6.18415 8.44973 6.25 8.29076 6.25 8.125V6.25H8.125C8.29076 6.25 8.44973 6.18415 8.56694 6.06694C8.68415 5.94973 8.75 5.79076 8.75 5.625C8.75 5.45924 8.68415 5.30027 8.56694 5.18306C8.44973 5.06585 8.29076 5 8.125 5H6.25V3.125ZM16.25 3.75H12.2413C12.1187 3.3183 11.9542 2.89964 11.75 2.5H16.25C17.2446 2.5 18.1984 2.89509 18.9017 3.59835C19.6049 4.30161 20 5.25544 20 6.25V16.25C20 17.2446 19.6049 18.1984 18.9017 18.9017C18.1984 19.6049 17.2446 20 16.25 20H6.25C5.25544 20 4.30161 19.6049 3.59835 18.9017C2.89509 18.1984 2.5 17.2446 2.5 16.25V11.75C2.89667 11.9533 3.31333 12.1171 3.75 12.2413V16.25C3.75 16.7162 3.8775 17.1525 4.1 17.525L9.93625 11.79C10.2869 11.4457 10.7586 11.2528 11.25 11.2528C11.7414 11.2528 12.2131 11.4457 12.5637 11.79L18.4012 17.525C18.6298 17.139 18.7502 16.6986 18.75 16.25V6.25C18.75 5.58696 18.4866 4.95107 18.0178 4.48223C17.5489 4.01339 16.913 3.75 16.25 3.75ZM16.25 8.125C16.25 8.37123 16.2015 8.61505 16.1073 8.84253C16.013 9.07002 15.8749 9.27672 15.7008 9.45083C15.5267 9.62494 15.32 9.76305 15.0925 9.85727C14.865 9.9515 14.6212 10 14.375 10C14.1288 10 13.885 9.9515 13.6575 9.85727C13.43 9.76305 13.2233 9.62494 13.0492 9.45083C12.8751 9.27672 12.737 9.07002 12.6427 8.84253C12.5485 8.61505 12.5 8.37123 12.5 8.125C12.5 7.62772 12.6975 7.15081 13.0492 6.79917C13.4008 6.44754 13.8777 6.25 14.375 6.25C14.8723 6.25 15.3492 6.44754 15.7008 6.79917C16.0525 7.15081 16.25 7.62772 16.25 8.125ZM15 8.125C15 7.95924 14.9342 7.80027 14.8169 7.68306C14.6997 7.56585 14.5408 7.5 14.375 7.5C14.2092 7.5 14.0503 7.56585 13.9331 7.68306C13.8158 7.80027 13.75 7.95924 13.75 8.125C13.75 8.29076 13.8158 8.44973 13.9331 8.56694C14.0503 8.68415 14.2092 8.75 14.375 8.75C14.5408 8.75 14.6997 8.68415 14.8169 8.56694C14.9342 8.44973 15 8.29076 15 8.125ZM4.985 18.4075C5.36871 18.6321 5.80538 18.7504 6.25 18.75H16.25C16.7125 18.75 17.1437 18.625 17.515 18.4075L11.6875 12.6825C11.5707 12.568 11.4136 12.5038 11.25 12.5038C11.0864 12.5038 10.9293 12.568 10.8125 12.6825L4.985 18.4075Z"
|
|
||||||
fill="#515B73"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ImageIcon;
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
export const generateImagePreview = (
|
|
||||||
file: File,
|
|
||||||
setImagePreview: (result: string) => void,
|
|
||||||
) => {
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onloadend = () => {
|
|
||||||
setImagePreview(reader.result as string);
|
|
||||||
};
|
|
||||||
reader.readAsDataURL(file);
|
|
||||||
};
|
|
||||||
|
|
@ -1,63 +0,0 @@
|
||||||
import React from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { FaStore } from "react-icons/fa";
|
|
||||||
import ValidationField from "../../../../../Components/ValidationField/ValidationField";
|
|
||||||
import { convert_data_to_select } from "../../../../../Layout/app/Const";
|
|
||||||
import { userTypeOptions } from "../../../../../config/userTypeOptions";
|
|
||||||
import { statusType } from "../../../../../config/statusType";
|
|
||||||
import { FaUsers } from "react-icons/fa6";
|
|
||||||
|
|
||||||
const PersonalDetailsForm = ({isEdit}:{isEdit?:boolean}) => {
|
|
||||||
const [t] = useTranslation();
|
|
||||||
return (
|
|
||||||
<div className="PersonalDetailsForm">
|
|
||||||
<header className="header_form">
|
|
||||||
<FaUsers />
|
|
||||||
<h4>{t("header.users")}</h4>
|
|
||||||
</header>
|
|
||||||
<main className="main_form_body">
|
|
||||||
<ValidationField
|
|
||||||
name={"first_name"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"first_name"}
|
|
||||||
/>
|
|
||||||
<ValidationField
|
|
||||||
name={"last_name"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"last_name"}
|
|
||||||
/>
|
|
||||||
<ValidationField
|
|
||||||
name={"contact_number1"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"contact_number1"}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<ValidationField
|
|
||||||
name={"contact_number2"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"contact_number2"}
|
|
||||||
/>
|
|
||||||
<ValidationField
|
|
||||||
name={"username"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"username"}
|
|
||||||
type="text"
|
|
||||||
/>
|
|
||||||
{isEdit? "" :
|
|
||||||
<ValidationField
|
|
||||||
name={"password"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"password"}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
<ValidationField
|
|
||||||
name={"card_number"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"ID Number"}
|
|
||||||
/>
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default PersonalDetailsForm;
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
import React, { useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { FaRegAddressBook } from "react-icons/fa";
|
|
||||||
import ValidationField from "../../../../../Components/ValidationField/ValidationField";
|
|
||||||
import { useGetAllArea } from "../../../../../api/Area";
|
|
||||||
import { useGetAllCity } from "../../../../../api/City";
|
|
||||||
import { IoIosNotifications } from "react-icons/io";
|
|
||||||
|
|
||||||
const TitleDetailsForm = () => {
|
|
||||||
const [t] = useTranslation();
|
|
||||||
const {data:city} = useGetAllCity();
|
|
||||||
const [CityId, setCityId] = useState()
|
|
||||||
|
|
||||||
const {data} = useGetAllArea({
|
|
||||||
city_id:CityId
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="TitleDetailsForm">
|
|
||||||
<header className="header_form">
|
|
||||||
<IoIosNotifications />
|
|
||||||
<h4>{t("header.notification_details")}</h4>
|
|
||||||
</header>
|
|
||||||
<main className="main_form_body notification_details">
|
|
||||||
<ValidationField
|
|
||||||
name={"title"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"title"}
|
|
||||||
type="TextArea"
|
|
||||||
width={500}
|
|
||||||
/>
|
|
||||||
<ValidationField
|
|
||||||
name={"body"}
|
|
||||||
placeholder={"_"}
|
|
||||||
label={"body"}
|
|
||||||
type="TextArea"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default TitleDetailsForm;
|
|
||||||
|
|
@ -1,95 +0,0 @@
|
||||||
import * as Yup from "yup";
|
|
||||||
import { objectToKeyValueArray } from "../../../../../utils/objectToKeyValueArray";
|
|
||||||
|
|
||||||
interface Location {
|
|
||||||
lat: number;
|
|
||||||
lng: number;
|
|
||||||
}
|
|
||||||
interface User {
|
|
||||||
username: string;
|
|
||||||
phone_number?: number;
|
|
||||||
type?:string
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
interface PersonalDetailsForm {
|
|
||||||
id: number;
|
|
||||||
first_name: string | null;
|
|
||||||
last_name: string | null;
|
|
||||||
location: Location[];
|
|
||||||
contact_number1: string | null;
|
|
||||||
contact_number2: string | null;
|
|
||||||
card_number: string | null;
|
|
||||||
username: string | null;
|
|
||||||
password: string | null;
|
|
||||||
area_id: number | null;
|
|
||||||
lat:number,
|
|
||||||
lng:number
|
|
||||||
}
|
|
||||||
|
|
||||||
interface PersonalDetailsEditForm {
|
|
||||||
id: number;
|
|
||||||
first_name: string | null;
|
|
||||||
last_name: string | null;
|
|
||||||
location: Location[];
|
|
||||||
contact_number1: string | null;
|
|
||||||
contact_number2: string | null;
|
|
||||||
card_number: string | null;
|
|
||||||
user: User;
|
|
||||||
area_id: any | null;
|
|
||||||
lat:number,
|
|
||||||
lng:number
|
|
||||||
}
|
|
||||||
|
|
||||||
export const getInitialValues = (objectToEdit: Partial<PersonalDetailsForm>) => {
|
|
||||||
const location = objectToEdit?.location?.[0] || { lat: 33.5138, lng: 36.2765 };
|
|
||||||
|
|
||||||
return {
|
|
||||||
id: objectToEdit?.id ?? 0,
|
|
||||||
first_name: objectToEdit?.first_name ?? null,
|
|
||||||
last_name: objectToEdit?.last_name ?? null,
|
|
||||||
location_lat: location.lat,
|
|
||||||
location_lng: location.lng,
|
|
||||||
contact_number1: objectToEdit?.contact_number1 ?? null,
|
|
||||||
contact_number2: objectToEdit?.contact_number2 ?? null,
|
|
||||||
card_number: objectToEdit?.card_number ?? null,
|
|
||||||
username: objectToEdit?.username ?? null,
|
|
||||||
password: objectToEdit?.password ?? null,
|
|
||||||
area_id: objectToEdit?.area_id ?? null,
|
|
||||||
lat: location.lat ?? 33.5138,
|
|
||||||
lng: location.lng ?? 36.2765,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getValidationSchema = () => {
|
|
||||||
// validate input
|
|
||||||
return Yup.object().shape({
|
|
||||||
id: Yup.number().required(),
|
|
||||||
first_name: Yup.string().required('first_name is required'),
|
|
||||||
last_name: Yup.string().required('last_name is required'),
|
|
||||||
location_lat: Yup.string().required('lat is required'),
|
|
||||||
location_lng: Yup.string().required('lng is required'),
|
|
||||||
contact_number1: Yup.string().required('contact_number1 is required'),
|
|
||||||
contact_number2: Yup.string().required('contact_number2 is required'),
|
|
||||||
username: Yup.string().required('username is required'),
|
|
||||||
area_id: Yup.mixed().required('area_id is required'),
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
export const getInitialValuesEdit = (objectToEdit: Partial<PersonalDetailsEditForm>) => {
|
|
||||||
const location = objectToEdit?.location || { lat: 0, lng: 0 };
|
|
||||||
|
|
||||||
return {
|
|
||||||
id: objectToEdit?.id ?? 0,
|
|
||||||
first_name: objectToEdit?.first_name ?? null,
|
|
||||||
last_name: objectToEdit?.last_name ?? null,
|
|
||||||
location_lat: location.lat,
|
|
||||||
location_lng: location.lng,
|
|
||||||
contact_number1: objectToEdit?.contact_number1 ?? null,
|
|
||||||
contact_number2: objectToEdit?.contact_number2 ?? null,
|
|
||||||
card_number: objectToEdit?.card_number ?? null,
|
|
||||||
username: objectToEdit?.user?.username ?? null,
|
|
||||||
area_id: objectToEdit?.area_id ?? null,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
@ -8,7 +8,6 @@ import FilterLayout from "../../../../Layout/Dashboard/FilterLayout";
|
||||||
import FilterForm from "./Model/FilterForm";
|
import FilterForm from "./Model/FilterForm";
|
||||||
import { canAddNotification } from "../../../../utils/hasAbilityFn";
|
import { canAddNotification } from "../../../../utils/hasAbilityFn";
|
||||||
import { useDeleteNotification } from "../../../../api/notification";
|
import { useDeleteNotification } from "../../../../api/notification";
|
||||||
import { ABILITIES_ENUM } from "../../../../enums/abilities";
|
|
||||||
|
|
||||||
const Table = lazy(() => import("./Table"));
|
const Table = lazy(() => import("./Table"));
|
||||||
const AddModalForm = lazy(() => import("./Model/AddModel"));
|
const AddModalForm = lazy(() => import("./Model/AddModel"));
|
||||||
|
|
@ -31,16 +30,14 @@ const TableHeader = () => {
|
||||||
<Suspense fallback={<Spin />}>
|
<Suspense fallback={<Spin />}>
|
||||||
<PageHeader
|
<PageHeader
|
||||||
pageTitle="notification"
|
pageTitle="notification"
|
||||||
// ModelAbility={ModalEnum?.NOTIFICATION_ADD}
|
ModelAbility={ModalEnum?.NOTIFICATION_ADD}
|
||||||
canAdd={canAddNotification}
|
canAdd={canAddNotification}
|
||||||
locationToNavigate={`/${ABILITIES_ENUM?.NOTIFICATIONS}/add`}
|
|
||||||
modelButtonTitle="add_notification"
|
modelButtonTitle="add_notification"
|
||||||
openModel={false}
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<FilterLayout sub_children={<FilterForm />} filterTitle="table.notification" />
|
<FilterLayout sub_children={<FilterForm />} filterTitle="table.notification" />
|
||||||
<Table />
|
<Table />
|
||||||
{/* <AddModalForm /> */}
|
<AddModalForm />
|
||||||
<EditModalForm />
|
<EditModalForm />
|
||||||
<DeleteModalForm
|
<DeleteModalForm
|
||||||
deleteMutation={deleteMutation}
|
deleteMutation={deleteMutation}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import { Form, Formik } from 'formik';
|
import { Form, Formik } from 'formik';
|
||||||
|
import React from 'react'
|
||||||
import { MdOutlineArrowForwardIos } from 'react-icons/md';
|
import { MdOutlineArrowForwardIos } from 'react-icons/md';
|
||||||
import { useLocation, useNavigate } from 'react-router-dom';
|
import { useLocation, useNavigate } from 'react-router-dom';
|
||||||
import { getInitialValues, getValidationSchema } from '../../formUtil';
|
import { getInitialValues, getValidationSchema } from '../../formUtil';
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,6 @@ const User = React.lazy(() => import("./Pages/Admin/User/Page"));
|
||||||
const QuestionBank = React.lazy(() => import("./Pages/Admin/QuestionBank/Page"));
|
const QuestionBank = React.lazy(() => import("./Pages/Admin/QuestionBank/Page"));
|
||||||
const AllNotifications = React.lazy(() => import("./Pages/Admin/Notifications/Page"));
|
const AllNotifications = React.lazy(() => import("./Pages/Admin/Notifications/Page"));
|
||||||
const Notifications = React.lazy(() => import("./Pages/Admin/Notifications/AddNotification/Page"));
|
const Notifications = React.lazy(() => import("./Pages/Admin/Notifications/AddNotification/Page"));
|
||||||
const AddNotification = React.lazy(() => import("./Pages/Admin/Notifications/AddNotification/Add/Page"));
|
|
||||||
|
|
||||||
|
|
||||||
const Profile = React.lazy(() => import("./Pages/Admin/Profile/Page"));
|
const Profile = React.lazy(() => import("./Pages/Admin/Profile/Page"));
|
||||||
const Setting = React.lazy(() => import("./Pages/Admin/Setting/Page"));
|
const Setting = React.lazy(() => import("./Pages/Admin/Setting/Page"));
|
||||||
|
|
@ -403,16 +401,6 @@ export const CrudRoute: TCrudRoute[] = [
|
||||||
// abilities_value: ABILITIES_VALUES_ENUM.INDEX,
|
// abilities_value: ABILITIES_VALUES_ENUM.INDEX,
|
||||||
// prevPath: 0,
|
// prevPath: 0,
|
||||||
// },
|
// },
|
||||||
|
|
||||||
{
|
|
||||||
header: "page_header.add_notification",
|
|
||||||
element: <AddNotification />,
|
|
||||||
path: `/${ABILITIES_ENUM?.NOTIFICATIONS}/add`,
|
|
||||||
abilities: ABILITIES_ENUM?.NOTIFICATIONS,
|
|
||||||
abilities_value: ABILITIES_VALUES_ENUM.INDEX,
|
|
||||||
prevPath: 0,
|
|
||||||
},
|
|
||||||
|
|
||||||
//// RE_SELLER
|
//// RE_SELLER
|
||||||
{
|
{
|
||||||
header: "page_header.notifications",
|
header: "page_header.notifications",
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
.main_form_body {
|
.main_form_body {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 27px;
|
gap: 20px;
|
||||||
background: var(--bg);
|
background: var(--bg);
|
||||||
padding: 40px 15px 40px 0px;
|
padding: 40px 10px;
|
||||||
.ValidationField{
|
.ValidationField{
|
||||||
label{
|
label{
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
|
|
@ -13,13 +13,7 @@
|
||||||
}
|
}
|
||||||
> * {
|
> * {
|
||||||
// max-width: 30%;
|
// max-width: 30%;
|
||||||
flex-basis: 31.3%;
|
flex-basis: 31%;
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.notification_details{
|
|
||||||
> * {
|
|
||||||
flex-basis: 48%;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -154,9 +154,7 @@
|
||||||
"show_preview":"عرض المعاينة",
|
"show_preview":"عرض المعاينة",
|
||||||
"show_MMl":" MML عرض",
|
"show_MMl":" MML عرض",
|
||||||
"financial_collection":"التحصيلات",
|
"financial_collection":"التحصيلات",
|
||||||
"change_direction":"تغيير الاتجاه",
|
"change_direction":"تغيير الاتجاه"
|
||||||
"notification_details":"تفاصيل الإشعار",
|
|
||||||
"users":"المستخدمون"
|
|
||||||
},
|
},
|
||||||
"columns": {
|
"columns": {
|
||||||
"id": "الرقم التعريفي",
|
"id": "الرقم التعريفي",
|
||||||
|
|
@ -336,8 +334,7 @@
|
||||||
"student_name":"اسم الطالب",
|
"student_name":"اسم الطالب",
|
||||||
"report_content":"محتوى التقرير",
|
"report_content":"محتوى التقرير",
|
||||||
"with_report":"يوجد تقرير",
|
"with_report":"يوجد تقرير",
|
||||||
"add_notification":"إرسال إشعار",
|
"add_notification":"إرسال إشعار"
|
||||||
"send":"إرسال"
|
|
||||||
},
|
},
|
||||||
"Table": {
|
"Table": {
|
||||||
"header": "",
|
"header": "",
|
||||||
|
|
@ -434,8 +431,7 @@
|
||||||
"show_collection":"حصيلة",
|
"show_collection":"حصيلة",
|
||||||
"city":"مدينة",
|
"city":"مدينة",
|
||||||
"financialCollection":"التحصيلات",
|
"financialCollection":"التحصيلات",
|
||||||
"notification":"إدارة الاشعارات",
|
"notification":"إدارة الاشعارات"
|
||||||
"notifications":"إشعار"
|
|
||||||
},
|
},
|
||||||
"education_class_actions": {
|
"education_class_actions": {
|
||||||
"Student_Records": "سجلات الطلاب",
|
"Student_Records": "سجلات الطلاب",
|
||||||
|
|
@ -975,8 +971,7 @@
|
||||||
"Coupon":"قسيمة",
|
"Coupon":"قسيمة",
|
||||||
"financial_collection":"التحصيلات",
|
"financial_collection":"التحصيلات",
|
||||||
"show_collection":"حصيلة",
|
"show_collection":"حصيلة",
|
||||||
"notification":"إدارة الاشعارات",
|
"notification":"إدارة الاشعارات"
|
||||||
"manage_notification":"إدارة الإشعارات"
|
|
||||||
},
|
},
|
||||||
"page_header": {
|
"page_header": {
|
||||||
"home": "لوحة القيادة",
|
"home": "لوحة القيادة",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user