From 8eeb3b6d0368c3e8718fc0e6c7cdb37cfdfa4343 Mon Sep 17 00:00:00 2001
From: Moaz Dawalibi <moaazaldwalibi@gmail.com>
Date: Tue, 12 Nov 2024 15:13:59 +0300
Subject: [PATCH] fix add notification section

---
 .../AddNotification/Add/Page.tsx              |  4 ++--
 .../Form/PersonalDetailsForm.tsx              |  6 ++---
 .../AddNotification/Form/TitleDetailsForm.tsx | 23 +++++++++++++++----
 .../question/Model/EditForm/FormContainer.tsx |  3 +--
 src/Styles/Pages/reSeller.scss                | 12 +++++++---
 src/translate/ar.json                         |  6 +++--
 6 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/Pages/Admin/Notifications/AddNotification/Add/Page.tsx b/src/Pages/Admin/Notifications/AddNotification/Add/Page.tsx
index 229e064..f476457 100644
--- a/src/Pages/Admin/Notifications/AddNotification/Add/Page.tsx
+++ b/src/Pages/Admin/Notifications/AddNotification/Add/Page.tsx
@@ -51,12 +51,12 @@ const TableHeader = () => {
           >
             {({ dirty }) => (
               <Form className="Form_details_container">
-                <PersonalDetailsForm />
                 <TitleDetailsForm />
+                <PersonalDetailsForm />
                 <div className="resellerButton">
                   <button type="button" onClick={() => Navigate('/add_Notifications')}>{t("practical.cancel")}</button>
                   <button type="submit" disabled={!dirty}>
-                    {t("practical.add")} {t("models.notification")}
+                    {t("practical.send")} {t("models.notifications")}
                     {status === QueryStatusEnum.LOADING && (
                       <span className="Spinier_Div">
                         <Spin />
diff --git a/src/Pages/Admin/Notifications/AddNotification/Form/PersonalDetailsForm.tsx b/src/Pages/Admin/Notifications/AddNotification/Form/PersonalDetailsForm.tsx
index 719233b..3c75c64 100644
--- a/src/Pages/Admin/Notifications/AddNotification/Form/PersonalDetailsForm.tsx
+++ b/src/Pages/Admin/Notifications/AddNotification/Form/PersonalDetailsForm.tsx
@@ -5,15 +5,15 @@ import ValidationField from "../../../../../Components/ValidationField/Validatio
 import { convert_data_to_select } from "../../../../../Layout/app/Const";
 import { userTypeOptions } from "../../../../../config/userTypeOptions";
 import { statusType } from "../../../../../config/statusType";
-import { IoIosNotifications } from "react-icons/io";
+import { FaUsers } from "react-icons/fa6";
 
 const PersonalDetailsForm = ({isEdit}:{isEdit?:boolean}) => {
   const [t] = useTranslation();
   return (
     <div className="PersonalDetailsForm">
       <header className="header_form">
-        <IoIosNotifications />
-        <h4>{t("header.notification_details")}</h4>
+        <FaUsers />
+        <h4>{t("header.users")}</h4>
       </header>
       <main className="main_form_body">
         <ValidationField
diff --git a/src/Pages/Admin/Notifications/AddNotification/Form/TitleDetailsForm.tsx b/src/Pages/Admin/Notifications/AddNotification/Form/TitleDetailsForm.tsx
index cb04ba6..e363f75 100644
--- a/src/Pages/Admin/Notifications/AddNotification/Form/TitleDetailsForm.tsx
+++ b/src/Pages/Admin/Notifications/AddNotification/Form/TitleDetailsForm.tsx
@@ -4,7 +4,7 @@ import { FaRegAddressBook } from "react-icons/fa";
 import ValidationField from "../../../../../Components/ValidationField/ValidationField";
 import { useGetAllArea } from "../../../../../api/Area";
 import { useGetAllCity } from "../../../../../api/City";
-import { FaUsers } from "react-icons/fa6";
+import { IoIosNotifications } from "react-icons/io";
 
 const TitleDetailsForm = () => {
   const [t] = useTranslation();
@@ -18,11 +18,24 @@ const TitleDetailsForm = () => {
   return (
     <div className="TitleDetailsForm">
       <header className="header_form">
-        <FaUsers />
-        <h4>{t("header.users")}</h4>
+        <IoIosNotifications />
+        <h4>{t("header.notification_details")}</h4>
       </header>
-      <main className="main_form_body">
-        {/* <ValidationField name={"address"} placeholder={"_"} label={"address"} /> */}
+      <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>
   );
diff --git a/src/Pages/Admin/question/Model/EditForm/FormContainer.tsx b/src/Pages/Admin/question/Model/EditForm/FormContainer.tsx
index a441b7f..e9a2f55 100644
--- a/src/Pages/Admin/question/Model/EditForm/FormContainer.tsx
+++ b/src/Pages/Admin/question/Model/EditForm/FormContainer.tsx
@@ -1,5 +1,4 @@
 import { Form, Formik } from 'formik';
-import React from 'react'
 import { MdOutlineArrowForwardIos } from 'react-icons/md';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { getInitialValues, getValidationSchema } from '../../formUtil';
@@ -88,7 +87,7 @@ const FormContainer = ({objectToEdit,handleSubmit,Loading,handleValidateSingleQu
           <div className="exercise_add_buttons">
             <div onClick={handleCancel}>{t("practical.back")}</div>
             <div
-            className={`relative ${dirty ? "" : "disabled"}`}
+            // className={`relative ${dirty ? "" : "disabled"}`}
             onClick={()=>{ Loading ? ()=>{} : handleValidateSingleQuestion(values,isValid,handleSubmit,t)  }}
           >             {t("practical.edit")}
               {Loading && (
diff --git a/src/Styles/Pages/reSeller.scss b/src/Styles/Pages/reSeller.scss
index a646fc2..76483ed 100644
--- a/src/Styles/Pages/reSeller.scss
+++ b/src/Styles/Pages/reSeller.scss
@@ -1,9 +1,9 @@
 .main_form_body {
   display: flex;
   flex-wrap: wrap;
-  gap: 20px;
+  gap: 27px;
   background: var(--bg);
-  padding: 40px 10px;
+  padding: 40px 15px 40px 0px;
   .ValidationField{
     label{
       font-weight: 600;
@@ -13,7 +13,13 @@
   }
   > * {
     // max-width: 30%;
-    flex-basis: 31%;
+    flex-basis: 31.3%;
+  }
+}
+
+.notification_details{
+  > * {
+    flex-basis: 48%;
   }
 }
 
diff --git a/src/translate/ar.json b/src/translate/ar.json
index d354c29..6fbb000 100644
--- a/src/translate/ar.json
+++ b/src/translate/ar.json
@@ -336,7 +336,8 @@
     "student_name":"اسم الطالب",
     "report_content":"محتوى التقرير",
     "with_report":"يوجد تقرير",
-    "add_notification":"إرسال إشعار"
+    "add_notification":"إرسال إشعار",
+    "send":"إرسال"
   },
   "Table": {
     "header": "",
@@ -433,7 +434,8 @@
     "show_collection":"حصيلة",
     "city":"مدينة",
     "financialCollection":"التحصيلات",
-    "notification":"إدارة الاشعارات"
+    "notification":"إدارة الاشعارات",
+    "notifications":"إشعار"
   },
   "education_class_actions": {
     "Student_Records": "سجلات الطلاب",