pagesize default 15 and bug fixed add task modal

dilmurod
Dilmurod 3 weeks ago
parent 029dc9da8d
commit 7474864294

@ -66,9 +66,9 @@ const AccountingCurrent: React.FC = () => {
const currentInfo = new Date().toLocaleString("default", { month: "long" });
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -55,7 +55,7 @@ interface SalaryData {
const AccountingHistory: React.FC = () => {
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const [open, setOpen] = useState(false);
const [userData, setUserData] = useState<SalaryData | null>(null);
@ -81,7 +81,7 @@ const AccountingHistory: React.FC = () => {
const [loading, setLoading] = useState(false);
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -91,9 +91,9 @@ const AccountingCurrent: React.FC = () => {
};
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -7,9 +7,9 @@ import { LeftOutlined, RightOutlined } from "@ant-design/icons";
function ConfirmedMonths() {
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -18,7 +18,7 @@ import { theme } from "antd";
const Call = ({ socketData }: { socketData: TSocket | undefined }) => {
const [status, setStatus] = useState("Awaiting");
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const [tableData, setTableData] = useState<TCall[]>();
const { data, isLoading, refetch } = useCallData({
@ -27,7 +27,7 @@ const Call = ({ socketData }: { socketData: TSocket | undefined }) => {
page_size: pageSize,
});
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -23,7 +23,7 @@ const Company = () => {
const [search, setSearch] = useState<string>();
const [page, setPage] = useState<number>(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const { data, isLoading, refetch } = useCompanyPaginated({
name: search,
is_active: undefined,
@ -31,7 +31,7 @@ const Company = () => {
page_size: pageSize,
});
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -359,7 +359,7 @@ const CompanyEdit = () => {
bottom: 0,
left: 0,
width: "100%",
// backgroundColor: token.colorBgContainer,
backgroundColor: token.colorBgContainer,
boxShadow: "0 4px 8px rgba(0, 0, 0, 0.4)",
padding: "10px 0",
zIndex: 1000,

@ -20,7 +20,7 @@ import { theme } from "antd";
const Customer = () => {
const [open, setOpen] = useState(false);
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const showModal = () => {
setOpen(true);
};
@ -35,7 +35,7 @@ const Customer = () => {
page: page,
});
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -30,9 +30,9 @@ const Requests = ({ socketData }: { socketData: TSocket | undefined }) => {
const [requestData, setRequestData] = useState<TRequests | undefined>();
const [status, setStatus] = useState("Pending");
const [page, setPage] = useState<number>(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -11,9 +11,9 @@ import { theme } from "antd";
const Service = () => {
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -82,11 +82,11 @@ const Stat = () => {
const [startDate, setStartDate] = useState(start_date);
const [endDate, setEndDate] = useState(end_date);
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const [forSalary, setForSalary] = useState(true);
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -81,14 +81,39 @@ const AddTask = ({
// console.log(customerData.data);
// team select
// useEffect(() => {
// if (companyId) {
// const selectedCompany = companyData?.find(
// (item) => item.id === companyId
// );
// form.setFieldsValue({
// assigned_to_id: selectedCompany?.team?.id,
// });
// customerController
// .customerByCompany(
// {
// name: customerName,
// page: 1,
// page_size: 5,
// },
// companyId
// )
// .then((data) => {
// setCustomerData(data.data);
// });
// }
// }, [companyId, customerName]);
useEffect(() => {
if (companyId) {
const selectedCompany = companyData?.find(
(item) => item.id === companyId
);
form.setFieldsValue({
assigned_to_id: selectedCompany?.team?.id || undefined,
});
if (companyId && companyData?.length) {
const selectedCompany = companyData.find((item) => item.id === companyId);
if (selectedCompany?.team?.id) {
form.setFieldsValue({
assigned_to_id: selectedCompany.team.id,
});
}
customerController
.customerByCompany(
{
@ -100,9 +125,13 @@ const AddTask = ({
)
.then((data) => {
setCustomerData(data.data);
})
.catch((error) => {
console.error("Customer fetch error:", error);
setCustomerData([]);
});
}
}, [companyId, customerName]);
}, [companyId, customerName, companyData]);
// service select
const serviceOptions = ServiceData?.data?.map((item: any) => ({
@ -158,7 +187,9 @@ const AddTask = ({
];
form.setFieldsValue(updatedValues);
})
.catch((error) => {});
.catch((error) => {
console.log(error);
});
}
}
}
@ -331,7 +362,7 @@ const AddTask = ({
]}
>
<Select
placeholder="Teams"
placeholder="Team"
options={TeamData?.data?.map((item: any) => ({
label: item?.name,
value: item?.id,

@ -43,12 +43,12 @@ const Task = ({
const [search, setSearch] = useState<string>("");
const [status, setStatus] = useState<any>();
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const [uploadOpen, setUploadOpen] = useState(false);
const [errorModal, setErrorModal] = useState(false);
const [uncomletedData, setUncomletedData] = useState<TTask[]>();
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);
@ -65,7 +65,7 @@ const Task = ({
// &&(!status || status.includes(socketData?.task?.status))
) {
setCharacters((prev: any) => {
if (prev && prev?.length >= 10) {
if (prev && prev?.length >= pageSize) {
prev?.pop();
}
if (socketData.type === "task_create" && socketData.task) {

@ -9,7 +9,7 @@ import { LeftOutlined, PlusOutlined, RightOutlined } from "@ant-design/icons";
const Team = () => {
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const { data, isLoading, refetch } = useTeamData({
page: page,
@ -21,7 +21,7 @@ const Team = () => {
setOpen(true);
};
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -35,9 +35,9 @@ const Update = () => {
const { Option } = Select;
const [page, setPage] = useState<number>(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

@ -17,7 +17,7 @@ import { Button, Input, Pagination, Space, Typography } from "antd";
const User = () => {
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(10);
const [pageSize, setPageSize] = useState(15);
const [open, setOpen] = useState(false);
const [search, setSearch] = useState("");
const showModal = () => {
@ -43,7 +43,7 @@ const User = () => {
page_size: pageSize,
});
const pageSizeOptions = [10, 20, 30, 40, 50];
const pageSizeOptions = [15, 20, 30, 40, 50];
const handlePageSizeChange = (value: number) => {
setPageSize(value);

Loading…
Cancel
Save