From e3c93c23307736b4922ba5bb23e33d38969af279 Mon Sep 17 00:00:00 2001 From: Moaz Dawalibi Date: Tue, 22 Oct 2024 15:06:50 +0300 Subject: [PATCH] fixes --- src/Pages/Admin/Coupon/useTableColumns.tsx | 39 +++++++++--- src/Pages/Admin/Manager/Add/Page.tsx | 11 +++- .../Manager/Form/PersonalDetailsForm.tsx | 19 +++++- .../Admin/Manager/Form/TitleDetailsForm.tsx | 29 +++++++-- .../Admin/QuestionBank/Model/FilterForm.tsx | 4 -- .../Reseller/Form/PersonalDetailsForm.tsx | 63 ------------------- .../Admin/Reseller/Form/TitleDetailsForm.tsx | 3 +- src/Pages/Admin/Reseller/show/Table.tsx | 1 - .../Admin/Reseller/show/useTableColumns.tsx | 1 - src/Pages/Admin/Student/Model/EditModel.tsx | 4 +- src/Pages/Admin/Student/Model/ModelForm.tsx | 33 +++++----- .../Admin/Student/Model/ModelFormEdit.tsx | 60 ------------------ src/Pages/Admin/Student/Model/formUtil.ts | 3 +- src/Pages/Admin/Student/useTableColumns.tsx | 3 + src/translate/ar.json | 4 +- src/types/Coupon.ts | 1 + 16 files changed, 109 insertions(+), 169 deletions(-) delete mode 100644 src/Pages/Admin/Student/Model/ModelFormEdit.tsx diff --git a/src/Pages/Admin/Coupon/useTableColumns.tsx b/src/Pages/Admin/Coupon/useTableColumns.tsx index 08f0464..cbedbf0 100644 --- a/src/Pages/Admin/Coupon/useTableColumns.tsx +++ b/src/Pages/Admin/Coupon/useTableColumns.tsx @@ -56,15 +56,36 @@ export const useColumns = () => { ellipsis:true }, { - title: t("columns.image"), - dataIndex: "image", - key: "image", + title: `${t("columns.amount")}`, + dataIndex: "amount", + key: "amount", align: "center", - render: (_text: any, record: Coupon) => { - let str = record?.amount; - - return ; - }, + render: (_text, record) => record?.amount, + ellipsis:true + }, + { + title: `${t("columns.code")}`, + dataIndex: "code", + key: "code", + align: "center", + render: (_text, record) => record?.code, + ellipsis:true + }, + { + title: `${t("columns.due_to")}`, + dataIndex: "due_to", + key: "due_to", + align: "center", + render: (_text, record) => record?.due_to, + // ellipsis:true + }, + { + title: `${t("columns.status")}`, + dataIndex: "status", + key: "status", + align: "center", + render: (_text, record) => record?.status, + ellipsis:true }, { @@ -77,7 +98,7 @@ export const useColumns = () => { handelDelete(record)} onEdit={() => handleEdit(record)} diff --git a/src/Pages/Admin/Manager/Add/Page.tsx b/src/Pages/Admin/Manager/Add/Page.tsx index df1c7a0..eb4ba8d 100644 --- a/src/Pages/Admin/Manager/Add/Page.tsx +++ b/src/Pages/Admin/Manager/Add/Page.tsx @@ -10,12 +10,16 @@ import { Formik, Form } from "formik"; import { getInitialValues, getValidationSchema } from "../Form/formUtils"; import TitleDetailsForm from "../Form/TitleDetailsForm"; import AttachmentForm from "../Form/AttachmentForm"; +import { useAddManager } from "../../../../api/manager"; +import { QueryStatusEnum } from "../../../../enums/QueryStatus"; const TableHeader = () => { const [t] = useTranslation(); useSetPageTitle(t(`page_header.add_reseller`)); + const {mutate,status } = useAddManager(); const handelSubmit = (values: any) => { console.log(values, "values"); + mutate({...values}); }; return (
@@ -38,7 +42,12 @@ const TableHeader = () => {
diff --git a/src/Pages/Admin/Manager/Form/PersonalDetailsForm.tsx b/src/Pages/Admin/Manager/Form/PersonalDetailsForm.tsx index 2cdf203..a853aef 100644 --- a/src/Pages/Admin/Manager/Form/PersonalDetailsForm.tsx +++ b/src/Pages/Admin/Manager/Form/PersonalDetailsForm.tsx @@ -5,9 +5,17 @@ import ValidationField from "../../../../Components/ValidationField/ValidationFi import { convert_data_to_select } from "../../../../Layout/app/Const"; import { userTypeOptions } from "../../../../config/userTypeOptions"; import { statusType } from "../../../../config/statusType"; +import { useGetRole } from "../../../../api/role"; const PersonalDetailsForm = () => { const [t] = useTranslation(); + const {data} = useGetRole(); + const RoleData = data?.data + console.log(RoleData); + const sex = [ + { name: "male", id: "male" }, + { name: "female", id: "female" }, + ]; return (
@@ -23,7 +31,7 @@ const PersonalDetailsForm = () => { { name={"sex"} placeholder={"_"} label={"sex"} + type="Select" + option={sex} /> { name={"email_address"} placeholder={"_"} label={"email_address"} + type="email" />
diff --git a/src/Pages/Admin/Manager/Form/TitleDetailsForm.tsx b/src/Pages/Admin/Manager/Form/TitleDetailsForm.tsx index e7faa2a..043df6a 100644 --- a/src/Pages/Admin/Manager/Form/TitleDetailsForm.tsx +++ b/src/Pages/Admin/Manager/Form/TitleDetailsForm.tsx @@ -1,12 +1,21 @@ -import React from "react"; +import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { FaRegAddressBook } from "react-icons/fa"; import ValidationField from "../../../../Components/ValidationField/ValidationField"; import { nationalities } from "../../../../types/App"; +import { useGetAllArea } from "../../../../api/Area"; +import { useGetAllCity } from "../../../../api/City"; const TitleDetailsForm = () => { const [t] = useTranslation(); - + const {data:city} = useGetAllCity(); + const [CityId, setCityId] = useState() + console.log(city); + + const {data} = useGetAllArea({ + city_id:CityId + }); + return (
@@ -15,13 +24,23 @@ const TitleDetailsForm = () => {
setCityId(e)} /> - + + {/* */}
); diff --git a/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx b/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx index 195bb5e..2008884 100644 --- a/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx +++ b/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx @@ -31,7 +31,6 @@ const FilterForm = () => { const GradeOption = Grade?.data ?? [] const canChangeGradePage = !!Grade?.links?.next; const GradePage = Grade?.meta?.current_page; - console.log(Grade?.meta?.current_page); /// subject_id @@ -68,7 +67,6 @@ const FilterForm = () => { page: TagCurrentPage }); - console.log(Tag); const TagOption = Tag?.data ?? [] const canChangeTagPage = !!Tag?.links?.next; @@ -92,7 +90,6 @@ const FilterForm = () => { canChangePage={canChangeGradePage} PageName={"GradeCurrentPage"} page={GradePage} - /> @@ -111,7 +108,6 @@ const FilterForm = () => { canChangePage={canChangeSubjectPage} PageName={"SubjectCurrentPage"} page={SubjectPage} - /> diff --git a/src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx b/src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx index 1318ffc..672eee6 100644 --- a/src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx +++ b/src/Pages/Admin/Reseller/Form/PersonalDetailsForm.tsx @@ -54,69 +54,6 @@ const PersonalDetailsForm = ({isEdit}:{isEdit?:boolean}) => { placeholder={"_"} label={"ID Number"} /> - {/* - */} - {/* - - - - - - - - - - */}
); diff --git a/src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx b/src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx index e7d8e22..a134a64 100644 --- a/src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx +++ b/src/Pages/Admin/Reseller/Form/TitleDetailsForm.tsx @@ -2,7 +2,6 @@ import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { FaRegAddressBook } from "react-icons/fa"; import ValidationField from "../../../../Components/ValidationField/ValidationField"; -import { nationalities } from "../../../../types/App"; import { useGetAllArea } from "../../../../api/Area"; import { useGetAllCity } from "../../../../api/City"; @@ -10,7 +9,7 @@ const TitleDetailsForm = () => { const [t] = useTranslation(); const {data:city} = useGetAllCity(); const [CityId, setCityId] = useState() - + const {data} = useGetAllArea({ city_id:CityId }); diff --git a/src/Pages/Admin/Reseller/show/Table.tsx b/src/Pages/Admin/Reseller/show/Table.tsx index ffebfbf..ca3acb5 100644 --- a/src/Pages/Admin/Reseller/show/Table.tsx +++ b/src/Pages/Admin/Reseller/show/Table.tsx @@ -8,7 +8,6 @@ const App = ({salesTable = false ,response}:{salesTable?:boolean,response:any}) } else { return ; } - }; export default App; diff --git a/src/Pages/Admin/Reseller/show/useTableColumns.tsx b/src/Pages/Admin/Reseller/show/useTableColumns.tsx index c10eef2..0ffad1b 100644 --- a/src/Pages/Admin/Reseller/show/useTableColumns.tsx +++ b/src/Pages/Admin/Reseller/show/useTableColumns.tsx @@ -1,5 +1,4 @@ import { TableColumnsType } from "antd"; -import { user } from "../../../../types/Item"; import { useTranslation } from "react-i18next"; import { ReSeller } from "../../../../types/ReSeller"; diff --git a/src/Pages/Admin/Student/Model/EditModel.tsx b/src/Pages/Admin/Student/Model/EditModel.tsx index 16b604c..07dcea9 100644 --- a/src/Pages/Admin/Student/Model/EditModel.tsx +++ b/src/Pages/Admin/Student/Model/EditModel.tsx @@ -13,10 +13,10 @@ const EditModel: React.FC = () => { const { objectToEdit } = useObjectToEdit((state) => state); const handleSubmit = (values: any) => { - const Data_to_send = { ...values }; + const Data_to_send = { ...values, grade_id:values.grade_id?.id}; mutate(Data_to_send); }; - + return ( <> { placeholder="password" label="password" /> + + )} + + + {!isEdit && ( + <> - - + + )} - - - diff --git a/src/Pages/Admin/Student/Model/ModelFormEdit.tsx b/src/Pages/Admin/Student/Model/ModelFormEdit.tsx deleted file mode 100644 index 45e3909..0000000 --- a/src/Pages/Admin/Student/Model/ModelFormEdit.tsx +++ /dev/null @@ -1,60 +0,0 @@ -import { Col, Row } from "reactstrap"; -import ValidationField from "../../../../Components/ValidationField/ValidationField"; -import { useGetAllGrade } from "../../../../api/grade"; -import { useValidationValidationParamState } from "../../../../Components/ValidationField/state/ValidationValidationParamState"; -import { useObjectToEdit } from "../../../../zustand/ObjectToEditState"; - -const Form = ({ isEdit = false }: { isEdit?: boolean }) => { - const { ValidationParamState } = useValidationValidationParamState(); - const { GradeName, GradeCurrentPage } = ValidationParamState; - - const { data: Grade, isLoading: isLoadingGrade } = useGetAllGrade({ - name: GradeName, - page: GradeCurrentPage, - }); - const { objectToEdit } = useObjectToEdit((state) => state); - const GradeOption = Grade?.data ?? []; - const canChangeGradePage = !!Grade?.links?.next; - const GradePage = Grade?.meta?.current_page; - - const sex = [ - { name: "male", id: "male" }, - { name: "female", id: "female" }, - ]; - console.log(objectToEdit); - const GradeValue = GradeOption?.find((e:any) => e.id === objectToEdit?.grade_id) - - return ( - - - - - - - - - - - ); -}; - -export default Form; diff --git a/src/Pages/Admin/Student/Model/formUtil.ts b/src/Pages/Admin/Student/Model/formUtil.ts index 7fd87b9..645ec38 100644 --- a/src/Pages/Admin/Student/Model/formUtil.ts +++ b/src/Pages/Admin/Student/Model/formUtil.ts @@ -1,11 +1,10 @@ import * as Yup from "yup"; import { Student, StudentInitialValues } from "../../../../types/Student"; +import { useGetAllGrade } from "../../../../api/grade"; export const getInitialValues = ( objectToEdit: Partial, ): StudentInitialValues => { - console.log(objectToEdit); - return { id: objectToEdit?.user_id, first_name: objectToEdit?.first_name ?? "", diff --git a/src/Pages/Admin/Student/useTableColumns.tsx b/src/Pages/Admin/Student/useTableColumns.tsx index 5582906..a882da3 100644 --- a/src/Pages/Admin/Student/useTableColumns.tsx +++ b/src/Pages/Admin/Student/useTableColumns.tsx @@ -47,6 +47,7 @@ export const useColumns = () => { key: "first_name", align: "center", render: (_text, record) => record?.first_name, + ellipsis:true, }, { title: `${t("columns.last_name")}`, @@ -54,6 +55,8 @@ export const useColumns = () => { key: "last_name", align: "center", render: (_text, record) => record?.last_name, + ellipsis:true, + }, { title: `${t("columns.sex")}`, diff --git a/src/translate/ar.json b/src/translate/ar.json index 73a7f8f..5a5071a 100644 --- a/src/translate/ar.json +++ b/src/translate/ar.json @@ -241,7 +241,9 @@ "show":"عرض", "paid_price":"المبلغ المدفوع", "unit":"الوحدة", - "lesson":"الدرس" + "lesson":"الدرس", + "code":"رمز", + "due_to":"صالح الى" }, "practical": { "to_confirm_deletion_please_re_enter": "لتأكيد الحذف، يرجى إعادة الإدخال", diff --git a/src/types/Coupon.ts b/src/types/Coupon.ts index eb72d21..53ae805 100644 --- a/src/types/Coupon.ts +++ b/src/types/Coupon.ts @@ -17,5 +17,6 @@ export type Coupon = { due_to: string; // URL of the user's amount code: string; // URL of the user's amount grade: string; // URL of the user's amount + status:string; }; export type CouponInitialValues = Partial>;