diff --git a/src/Components/Table/QRCodeGenerator.tsx b/src/Components/Table/QRCodeGenerator.tsx index b2fd304..759a830 100644 --- a/src/Components/Table/QRCodeGenerator.tsx +++ b/src/Components/Table/QRCodeGenerator.tsx @@ -2,12 +2,10 @@ import React from 'react'; import QRCode from 'react-qr-code'; -const QRCodeGenerator = ({url,serial}:any) => { -const qrValue = `${url}/${serial}` -console.log(qrValue) +const QRCodeGenerator = ({url}:any) => { return (
- +
); }; diff --git a/src/Layout/Dashboard/QrCodeModels.tsx b/src/Layout/Dashboard/QrCodeModels.tsx index 88844b9..444b8c3 100644 --- a/src/Layout/Dashboard/QrCodeModels.tsx +++ b/src/Layout/Dashboard/QrCodeModels.tsx @@ -42,7 +42,7 @@ const QrCodeModels: React.FC = ({
- +
diff --git a/src/Pages/Admin/QuestionBank/Page.tsx b/src/Pages/Admin/QuestionBank/Page.tsx index 4bc0890..85def28 100644 --- a/src/Pages/Admin/QuestionBank/Page.tsx +++ b/src/Pages/Admin/QuestionBank/Page.tsx @@ -7,6 +7,7 @@ import { useDeleteQuestion } from "../../../api/Question"; import PageHeader from "../../../Layout/Dashboard/PageHeader"; import FilterLayout from "../../../Layout/Dashboard/FilterLayout"; import FilterForm from "./Model/FilterForm"; +import QrCodeModels from "../../../Layout/Dashboard/QrCodeModels"; const Table = lazy(() => import("./Table")); const DeleteModalForm = lazy( @@ -36,6 +37,9 @@ const TableHeader = () => { deleteMutation={deleteMutation} ModelEnum={ModalEnum?.QUESTION_BANK_DELETE} /> + ); diff --git a/src/Pages/Admin/QuestionBank/useTableColumns.tsx b/src/Pages/Admin/QuestionBank/useTableColumns.tsx index fdadc72..e996e95 100644 --- a/src/Pages/Admin/QuestionBank/useTableColumns.tsx +++ b/src/Pages/Admin/QuestionBank/useTableColumns.tsx @@ -34,6 +34,11 @@ export const useColumns = () => { 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}`); }; + const handleClickQr = (data:any)=>{ + setObjectToEdit(data); + setIsOpen(ModalEnum?.QUESTION_QR); + } + const [t] = useTranslation(); const columns: TableColumnsType = [ @@ -178,6 +183,8 @@ export const useColumns = () => { index={index} onDelete={() => handelDelete(record)} onEdit={() => handleEdit(record)} + canShowQr={true} + onShoqQr={() =>handleClickQr(record)} /> ); },