From 10e1e28c69b4bb941e4f387337bcd8c9911f6567 Mon Sep 17 00:00:00 2001 From: karimaldeen Date: Tue, 24 Sep 2024 15:43:20 +0300 Subject: [PATCH] finish map#178 --- .../Admin/Reseller/Form/AttachmentForm.tsx | 11 +++++++++- src/Pages/Admin/Reseller/Form/formUtils.ts | 8 ++++++- src/Pages/Admin/Reseller/field/MyMap.tsx | 2 +- src/Styles/Pages/reSeller.scss | 21 +++++++++++++++++++ src/translate/ar.json | 5 ++++- 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/Pages/Admin/Reseller/Form/AttachmentForm.tsx b/src/Pages/Admin/Reseller/Form/AttachmentForm.tsx index a4f7a7a..34180ca 100644 --- a/src/Pages/Admin/Reseller/Form/AttachmentForm.tsx +++ b/src/Pages/Admin/Reseller/Form/AttachmentForm.tsx @@ -2,6 +2,8 @@ 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"; +import MyMap from "../field/MyMap"; const AttachmentForm = () => { const [t] = useTranslation(); @@ -12,10 +14,17 @@ const AttachmentForm = () => {

{t("header.attachment")}

-
+
+
+
+ + + +
+
); }; diff --git a/src/Pages/Admin/Reseller/Form/formUtils.ts b/src/Pages/Admin/Reseller/Form/formUtils.ts index b9ecdf9..eebfd4b 100644 --- a/src/Pages/Admin/Reseller/Form/formUtils.ts +++ b/src/Pages/Admin/Reseller/Form/formUtils.ts @@ -23,6 +23,8 @@ interface PersonalDetailsForm { username: string | null; password: string | null; area_id: number | null; + lat:number, + lng:number } interface PersonalDetailsEditForm { @@ -35,10 +37,12 @@ interface PersonalDetailsEditForm { card_number: string | null; user: User; area_id: number | null; + lat:number, + lng:number } export const getInitialValues = (objectToEdit: Partial) => { - const location = objectToEdit?.location?.[0] || { lat: 0, lng: 0 }; + const location = objectToEdit?.location?.[0] || { lat: 33.5138, lng: 36.2765 }; return { id: objectToEdit?.id ?? 0, first_name: objectToEdit?.first_name ?? null, @@ -51,6 +55,8 @@ export const getInitialValues = (objectToEdit: Partial) => username: objectToEdit?.username ?? null, password: objectToEdit?.password ?? null, area_id: objectToEdit?.area_id ?? null, + lat: location.lat ?? 33.5138, + lng: location.lng ?? 36.2765, }; }; diff --git a/src/Pages/Admin/Reseller/field/MyMap.tsx b/src/Pages/Admin/Reseller/field/MyMap.tsx index cec20df..46fbc21 100644 --- a/src/Pages/Admin/Reseller/field/MyMap.tsx +++ b/src/Pages/Admin/Reseller/field/MyMap.tsx @@ -51,7 +51,7 @@ const MyMap: React.FC = () => { return (
-
diff --git a/src/Styles/Pages/reSeller.scss b/src/Styles/Pages/reSeller.scss index c99df2a..f76ede5 100644 --- a/src/Styles/Pages/reSeller.scss +++ b/src/Styles/Pages/reSeller.scss @@ -83,3 +83,24 @@ + + +.MapField{ + display: flex; + flex-wrap: wrap; + flex-direction: column; + min-height: 400px; + +} +.AttachmentFormBody{ + display: flex; + margin-top: 20px; + padding-left: 50px; + .ImageBoxField{ + min-width: 200px; + } + + >*{ + min-width: 50%; + } +} \ No newline at end of file diff --git a/src/translate/ar.json b/src/translate/ar.json index 8c6446e..d6aaaa6 100644 --- a/src/translate/ar.json +++ b/src/translate/ar.json @@ -309,7 +309,10 @@ "account_activities":"أنشطة الحساب", "This will close your account. Your account will be interactive when you log in again":"سيؤدي هذا إلى إغلاق حسابك. سيكون حسابك تفاعليا عند تسجيل الدخول مرة أخرى", "Your account will be permanently deleted":"سيتم حذف حسابك نهائيا", - "search":"بحث" + "search":"بحث", + "Map":"الخريطة", + "Show":"عرض", + "Hide":"اخفاء" }, "Table": { "header": "",