This commit is contained in:
karimaldeen 2024-09-16 12:14:19 +03:00
parent 0b44bc69fb
commit 458319b49f
5 changed files with 21 additions and 3 deletions

View File

@ -15,16 +15,20 @@ import {
import ActionButtons from "../../../Components/Table/ActionButtons"; import ActionButtons from "../../../Components/Table/ActionButtons";
import ColumnsImage from "../../../Components/Columns/ColumnsImage"; import ColumnsImage from "../../../Components/Columns/ColumnsImage";
import { Grade } from "../../../types/Grade"; import { Grade } from "../../../types/Grade";
import { CiImageOff } from "react-icons/ci"; import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
import { isValidImage } from "../../../utils/isValidImage"; import { useFilterStateState } from "../../../zustand/Filter";
export const useColumns = () => { export const useColumns = () => {
const { handel_open_model } = useModalHandler(); const { handel_open_model } = useModalHandler();
const { setObjectToEdit } = useObjectToEdit((state) => state); const { setObjectToEdit } = useObjectToEdit((state) => state);
const navigate = useNavigate(); const navigate = useNavigate();
const { setFilter } = useFilterStateState();
const handelShow = (record: Grade) => { const handelShow = (record: Grade) => {
setFilter({})
navigate(`${record?.id}`); navigate(`${record?.id}`);
}; };

View File

@ -11,11 +11,13 @@ import {
canEditQuestion, canEditQuestion,
} from "../../../utils/hasAbilityFn"; } from "../../../utils/hasAbilityFn";
import ActionButtons from "../../../Components/Table/ActionButtons"; import ActionButtons from "../../../Components/Table/ActionButtons";
import { useFilterStateState } from "../../../zustand/Filter";
export const useColumns = () => { export const useColumns = () => {
const { setObjectToEdit } = useObjectToEdit((state) => state); const { setObjectToEdit } = useObjectToEdit((state) => state);
const navigate = useNavigate(); const navigate = useNavigate();
const { setIsOpen } = useModalState((state) => state); const { setIsOpen } = useModalState((state) => state);
const { setFilter } = useFilterStateState();
const handelDelete = (data: any) => { const handelDelete = (data: any) => {
setObjectToEdit(data); setObjectToEdit(data);
@ -28,6 +30,8 @@ export const useColumns = () => {
const unit = lesson?.unit; const unit = lesson?.unit;
const subject = unit?.subject; const subject = unit?.subject;
const grade = subject?.grade; const grade = subject?.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}`); 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}`);
}; };
const [t] = useTranslation(); const [t] = useTranslation();

View File

@ -19,14 +19,18 @@ import ActionButtons from "../../../Components/Table/ActionButtons";
import { Unit } from "../../../types/Unit"; import { Unit } from "../../../types/Unit";
import { ConvertEnumToTranslate } from "../../../utils/ConvertEnumToTranslate"; import { ConvertEnumToTranslate } from "../../../utils/ConvertEnumToTranslate";
import { DragHandleUnit } from "./DrapableTable"; import { DragHandleUnit } from "./DrapableTable";
import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
import { useFilterStateState } from "../../../zustand/Filter";
export const useColumns = () => { export const useColumns = () => {
const { handel_open_model } = useModalHandler(); const { handel_open_model } = useModalHandler();
const { setFilter } = useFilterStateState();
const { setObjectToEdit } = useObjectToEdit((state) => state); const { setObjectToEdit } = useObjectToEdit((state) => state);
const navigate = useNavigate(); const navigate = useNavigate();
const handelShow = (record: Unit) => { const handelShow = (record: Unit) => {
setFilter({})
navigate(`${ABILITIES_ENUM?.UNIT}/${record?.id}`); navigate(`${ABILITIES_ENUM?.UNIT}/${record?.id}`);
}; };

View File

@ -15,14 +15,18 @@ import {
} from "../../../utils/hasAbilityFn"; } from "../../../utils/hasAbilityFn";
import ActionButtons from "../../../Components/Table/ActionButtons"; import ActionButtons from "../../../Components/Table/ActionButtons";
import { DragHandleLesson } from "./DrapableTable"; import { DragHandleLesson } from "./DrapableTable";
import { useFilterState } from "../../../Components/Utils/Filter/FilterState";
import { useFilterStateState } from "../../../zustand/Filter";
export const useColumns = () => { export const useColumns = () => {
const { handel_open_model } = useModalHandler(); const { handel_open_model } = useModalHandler();
const { setObjectToEdit } = useObjectToEdit((state) => state); const { setObjectToEdit } = useObjectToEdit((state) => state);
const navigate = useNavigate(); const navigate = useNavigate();
const { setFilter } = useFilterStateState();
const handelShow = (record: any) => { const handelShow = (record: any) => {
setFilter({})
navigate(`${ABILITIES_ENUM.LESSON}/${record?.id}`); navigate(`${ABILITIES_ENUM.LESSON}/${record?.id}`);
}; };

View File

@ -14,12 +14,13 @@ import {
} from "../../../../utils/hasAbilityFn"; } from "../../../../utils/hasAbilityFn";
import { ABILITIES_ENUM } from "../../../../enums/abilities"; import { ABILITIES_ENUM } from "../../../../enums/abilities";
import { Subject } from "../../../../types/Subject"; import { Subject } from "../../../../types/Subject";
import { CiImageOff } from "react-icons/ci"; import { useFilterStateState } from "../../../../zustand/Filter";
export const useColumns = () => { export const useColumns = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const { setObjectToEdit } = useObjectToEdit((state) => state); const { setObjectToEdit } = useObjectToEdit((state) => state);
const { setIsOpen } = useModalState((state) => state); const { setIsOpen } = useModalState((state) => state);
const { setFilter } = useFilterStateState();
const handelDelete = (record: Subject) => { const handelDelete = (record: Subject) => {
setObjectToEdit(record); setObjectToEdit(record);
@ -31,6 +32,7 @@ export const useColumns = () => {
}; };
const handelShow = (record: Subject) => { const handelShow = (record: Subject) => {
setFilter({})
navigate(`${ABILITIES_ENUM?.SUBJECT}/${record?.id}`); navigate(`${ABILITIES_ENUM?.SUBJECT}/${record?.id}`);
}; };