From dd2d6e65b98a66f0d63523d0d3d621e513248245 Mon Sep 17 00:00:00 2001
From: Moaz Dawalibi <moaazaldwalibi@gmail.com>
Date: Tue, 12 Nov 2024 17:12:43 +0300
Subject: [PATCH] fix notification filter

---
 .../AddNotification/Model/AddModel.tsx             |  1 +
 .../AddNotification/Model/FilterForm.tsx           | 14 +++++++++-----
 src/translate/ar.json                              |  6 ++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Pages/Admin/Notifications/AddNotification/Model/AddModel.tsx b/src/Pages/Admin/Notifications/AddNotification/Model/AddModel.tsx
index d16c8dd..ae71d82 100644
--- a/src/Pages/Admin/Notifications/AddNotification/Model/AddModel.tsx
+++ b/src/Pages/Admin/Notifications/AddNotification/Model/AddModel.tsx
@@ -14,6 +14,7 @@ const AddModel: React.FC = () => {
       ...values,
     });
   };
+  
   return (
     <>
       <LayoutModel
diff --git a/src/Pages/Admin/Notifications/AddNotification/Model/FilterForm.tsx b/src/Pages/Admin/Notifications/AddNotification/Model/FilterForm.tsx
index 44b63f7..f7e3ebf 100644
--- a/src/Pages/Admin/Notifications/AddNotification/Model/FilterForm.tsx
+++ b/src/Pages/Admin/Notifications/AddNotification/Model/FilterForm.tsx
@@ -1,16 +1,20 @@
-import React from "react";
 import ValidationField from "../../../../../Components/ValidationField/ValidationField";
 import { Col, Row } from "reactstrap";
-import { useFormikContext } from "formik";
+import { useGetAllUser } from "../../../../../api/user";
 
 const FilterForm = () => {
-  const formik = useFormikContext();
-
+  const { data:Users } = useGetAllUser();
+  
   return (
     <div>
       <Row>
         <Col>
-          <ValidationField placeholder="name" label="name" name="name" />
+          <ValidationField placeholder="created_at" label="created_at" name="created_at" />
+
+          <ValidationField placeholder="users" label="users" name="users" type="Select" option={Users?.data} fieldNames={{label:"username", value:"id"}} />
+
+          <ValidationField placeholder="title" label="title" name="title" />
+          
         </Col>
       </Row>
     </div>
diff --git a/src/translate/ar.json b/src/translate/ar.json
index 74488f8..575c445 100644
--- a/src/translate/ar.json
+++ b/src/translate/ar.json
@@ -582,7 +582,8 @@
     "question_content": "محتوى السؤال",
     "body": "النص",
     "seen": "شوهدت",
-    "notifiable_type": "نوع الاشعار"
+    "notifiable_type": "نوع الاشعار",
+    "users":"المستخدمون"
   },
   "select": {
     "enums": {
@@ -1035,7 +1036,8 @@
     "questionBank": "بنك الأسئلة",
     "roles": "الدور",
     "coupon": "قسيمة",
-    "notification": "إدارة الاشعارات"
+    "notification": "إدارة الاشعارات",
+    "add_notification":"إدارة الاشعارات"
   },
   "table": {
     "student": "قائمة الطلاب",