diff --git a/src/Layout/Ui/NavBar.tsx b/src/Layout/Ui/NavBar.tsx index 5ec38a7..f82f99e 100644 --- a/src/Layout/Ui/NavBar.tsx +++ b/src/Layout/Ui/NavBar.tsx @@ -17,7 +17,6 @@ const NavBar = ({ isOpen }: { isOpen: boolean }) => { const navigate = useNavigate(); const PrevPath = getPrevPathRoute(location.pathname); const [t] = useTranslation(); - console.log(search_array); const translateArray = translateOptions(search_array, t); diff --git a/src/Pages/Admin/QuestionBank/Table.tsx b/src/Pages/Admin/QuestionBank/Table.tsx index 30d6306..f30decb 100644 --- a/src/Pages/Admin/QuestionBank/Table.tsx +++ b/src/Pages/Admin/QuestionBank/Table.tsx @@ -12,7 +12,6 @@ const App: React.FC = () => { const { setFilter, Filter } = useFilterStateState(); const sort_by = Filter?.sort_by; - console.log(filterState, "filterState"); const response = useGetAllQuestion({ nullable_parent: "null", diff --git a/src/Pages/Admin/QuestionBank/useTableColumns.tsx b/src/Pages/Admin/QuestionBank/useTableColumns.tsx index fe8f9bb..2633afa 100644 --- a/src/Pages/Admin/QuestionBank/useTableColumns.tsx +++ b/src/Pages/Admin/QuestionBank/useTableColumns.tsx @@ -23,13 +23,14 @@ export const useColumns = () => { const { setFilter } = useFilterStateState(); const handelDelete = (data: any) => { + // console.log(data); + setObjectToEdit(data); setIsOpen(ModalEnum?.QUESTION_DELETE); }; const handleNavigateToReport = (record: any) => { setFilter({}); - // console.log(record); navigate(`/report/${record?.report?.id}`); }; @@ -38,8 +39,11 @@ export const useColumns = () => { const lesson = record?.lessons?.[0]; const unit = lesson?.unit; const subject = unit?.subject; - const grade = subject?.grade; + const grade = subject?.grades[0]; + console.log(record ,"lesson"); + // console.log(grade,"grade"); + setFilter({}); navigate( `/${ABILITIES_ENUM?.GRADE}/${grade?.id}/${ABILITIES_ENUM?.SUBJECT}/${subject?.id}/${ABILITIES_ENUM?.UNIT}/${unit?.id}/${ABILITIES_ENUM?.LESSON}/${lesson?.id}/${ABILITIES_ENUM?.QUESTION}/${record?.id}`, @@ -74,10 +78,12 @@ export const useColumns = () => { key: "lessons", align: "center", render: (text, record) => { + console.log(record); + const lesson = record?.lessons?.[0]; const unit = lesson?.unit; const subject = unit?.subject; - const grade = subject?.grade; + const grade = subject?.grades[0]; return <> {grade?.name} >; }, @@ -117,7 +123,6 @@ export const useColumns = () => { align: "center", render: (text, record) => { const lesson = record?.lessons?.[0]; - console.log(lesson, "lesson"); return <> {lesson?.name} >; }, @@ -144,7 +149,7 @@ export const useColumns = () => { render: (text, record) => { const tags = - record?.tags?.map((item: any) => { + record?.tags?.map((item: any) => { return item?.name; }) ?? []; return ( @@ -174,13 +179,15 @@ export const useColumns = () => { ? t("columns.base_question") : t("columns.normal_question"), }, - + { title: "#", key: "actions", align: "center", - - render: ({ _text, record, index }: any) => { + render: (_text, record, index) => { + const { report }:any = record || {}; + console.log(record); + return (