diff --git a/build.zip b/build.zip deleted file mode 100644 index abd27ea..0000000 Binary files a/build.zip and /dev/null differ diff --git a/src/API/LayoutApi/accounting.ts b/src/API/LayoutApi/accounting.ts index e4adfb1..82cc57c 100644 --- a/src/API/LayoutApi/accounting.ts +++ b/src/API/LayoutApi/accounting.ts @@ -6,6 +6,12 @@ import instance from "../api"; export type TAccountingGetParams = { month: string; + search?: string; + team?: string; +}; +export type TAccountingHistoryGetParams = { + search?: string; + team?: string; }; export const AccountingController = { @@ -19,9 +25,16 @@ export const AccountingController = { }); return data; }, - async history() { + async history(filterObject: TAccountingHistoryGetParams) { + const params = { ...filterObject }; + if (!!filterObject.search) params.search = filterObject.search; + if (!!filterObject.team) params.team = filterObject.team; + const { data } = await instance.get( - `/employees-salaries-history/` + `/employees-salaries-history/`, + { + params, + } ); return data; }, diff --git a/src/API/LayoutApi/companies.ts b/src/API/LayoutApi/companies.ts index 1e41658..9b07cd1 100644 --- a/src/API/LayoutApi/companies.ts +++ b/src/API/LayoutApi/companies.ts @@ -30,6 +30,7 @@ export const companyController = { if (!!filterObject.name) params.name = filterObject.name; if (!!filterObject.is_active) params.is_active = filterObject.is_active; if (!!filterObject.page) params.page = filterObject.page; + if (!!filterObject.page_size) params.page_size = filterObject.page_size; const { data } = await instance.get(`companies/`, { params, diff --git a/src/API/LayoutApi/update.ts b/src/API/LayoutApi/update.ts index e490945..4d6a972 100644 --- a/src/API/LayoutApi/update.ts +++ b/src/API/LayoutApi/update.ts @@ -24,9 +24,9 @@ export type TUpdatePostParams = { }; export const updateController = { - async read(status: string) { - const { data } = await instance.get( - `shift-updates/?status=${status}` + async read(status: string, page: number, page_size: number) { + const { data } = await instance.get( + `shift-updates/?status=${status}&page=${page}&page_size=${page_size}` ); return data; }, diff --git a/src/API/LayoutApi/users.ts b/src/API/LayoutApi/users.ts index 47d896a..4c760d8 100644 --- a/src/API/LayoutApi/users.ts +++ b/src/API/LayoutApi/users.ts @@ -28,11 +28,10 @@ export const userController = { async read(filterObject: TUsersGetParams) { const params = { ...filterObject }; - if (!!filterObject.page && filterObject.page !== 0) - params.page = filterObject.page; - params.page_size = filterObject.page_size; - if (!!filterObject.name) params.name = filterObject.name; + if (!!filterObject.page) params.page = filterObject.page; + if (!!filterObject.page_size) params.page_size = filterObject.page_size; + if (Array.isArray(filterObject.team)) { params.team = filterObject.team.join(", "); } @@ -40,7 +39,7 @@ export const userController = { params.role = filterObject.role.join(", "); } - const { data } = await instance.get(`users/`, { params }); + const { data } = await instance.get(`users/`, { params }); return data; }, diff --git a/src/App.css b/src/App.css index 60cd075..cbe7719 100644 --- a/src/App.css +++ b/src/App.css @@ -188,7 +188,7 @@ padding: 10px 15px 10px 12px; border: none; border-radius: 8px; - background: rgba(249, 158, 44, 1); + background: #f99e2c; color: rgba(255, 255, 255, 1); font-size: 14px; font-weight: 500; @@ -215,10 +215,10 @@ letter-spacing: -0.01em; text-align: left; font-family: Inter; - border: 1px solid rgba(215, 216, 224, 1); + border: 1px solid #d7d8e0; box-shadow: 0px 1px 3px 0px rgba(20, 22, 41, 0.1); - background: rgba(255, 255, 255, 1); - color: rgba(15, 17, 28, 1); + background: #ffffff; + color: #0f111c; cursor: pointer; } .btn-refresh-dark { @@ -926,3 +926,10 @@ gap: 10px; } } + +.ant-picker-disabled .ant-picker-input input { + color: #bbb !important; +} +.ant-picker-disabled .ant-picker-suffix { + color: #bbb !important; +} diff --git a/src/App.tsx b/src/App.tsx index caffc44..a68437e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -196,7 +196,7 @@ const App: React.FC = () => { ), getItem( - Accounting, + Salaries, "accounting/", ) diff --git a/src/Auth/Login.tsx b/src/Auth/Login.tsx index c5e1fc0..f77513c 100644 --- a/src/Auth/Login.tsx +++ b/src/Auth/Login.tsx @@ -73,7 +73,7 @@ const Login: React.FC = () => { size={"large"} {...input} type="text" - placeholder="username or e-mail" + placeholder="Username or e-mail" /> {(meta.error || meta.submitError) && meta.touched && ( diff --git a/src/Auth/ResetPassword.tsx b/src/Auth/ResetPassword.tsx index 73055ec..f3da9e3 100644 --- a/src/Auth/ResetPassword.tsx +++ b/src/Auth/ResetPassword.tsx @@ -68,7 +68,7 @@ const ResetPassword: React.FC = () => { size={"large"} {...input} type="text" - placeholder="username or e-mail" + placeholder="Username or E-mail" /> {(meta.error || meta.submitError) && meta.touched && ( diff --git a/src/Components/Accounting/Accounting.tsx b/src/Components/Accounting/Accounting.tsx index 9bb3e02..9582870 100644 --- a/src/Components/Accounting/Accounting.tsx +++ b/src/Components/Accounting/Accounting.tsx @@ -1,22 +1,108 @@ -import { Tabs, Typography } from "antd"; +import { Button, DatePicker, Tabs, Typography } from "antd"; +import { ReloadOutlined } from "@ant-design/icons"; +import { theme } from "antd"; -import React, { useState } from "react"; +import currentMonthActive from "../../assets/currentMonthActive.svg"; +import currentMonth from "../../assets/currentMonth.svg"; + +import lastMonth from "../../assets/lastMonth.svg"; +import lastMonthActive from "../../assets/lastMonthActive.svg"; + +import historyActive from "../../assets/historyActive.svg"; +import history from "../../assets/history.svg"; + +import React, { useMemo, useState } from "react"; import TabPane from "antd/es/tabs/TabPane"; import AccountingCurrent from "./AccountingCurrent"; import AccountingLast from "./AccountingLast"; import AccountingHistory from "./AccountingHistory"; +import dayjs from "dayjs"; +import { useAccountingData } from "../../Hooks/Accounting"; const Accounting: React.FC = () => { + const { token } = theme.useToken(); + const [activeTab, setActiveTab] = useState("1"); + const month = activeTab === "1" ? "current" : "last"; + + const { data, isLoading, refetch } = useAccountingData({ + month: month, + }); + + const now = dayjs(); + const perviousMonth = now.subtract(1, "month"); + return (
- Accounting + Salaries + {activeTab == "1" ? ( +
+ + +
+ ) : ( + "" + )} + {activeTab == "2" ? ( +
+ + +
+ ) : ( + "" + )}
{ + icon Current Month } @@ -37,6 +128,11 @@ const Accounting: React.FC = () => { + icon Last Month } @@ -47,6 +143,11 @@ const Accounting: React.FC = () => { + icon History } diff --git a/src/Components/Accounting/AccountingCurrent.tsx b/src/Components/Accounting/AccountingCurrent.tsx index 76f1bae..613c652 100644 --- a/src/Components/Accounting/AccountingCurrent.tsx +++ b/src/Components/Accounting/AccountingCurrent.tsx @@ -1,19 +1,460 @@ -import { Table, Tooltip } from "antd"; -import React from "react"; -import tagIcon from "../../assets/tagIcon.png"; -import { QuestionCircleOutlined } from "@ant-design/icons"; +import { + Button, + DatePicker, + Drawer, + Dropdown, + Form, + Input, + Menu, + message, + Modal, + Select, + Table, + Tooltip, + Typography, +} from "antd"; +import React, { useEffect, useRef, useState } from "react"; +import tagIcon from "../../assets/tagIcon.svg"; +import { + CloseOutlined, + DeleteOutlined, + DollarOutlined, + EditOutlined, + EllipsisOutlined, + PlusOutlined, + QuestionCircleOutlined, + SearchOutlined, +} from "@ant-design/icons"; import { theme } from "antd"; import { useAccountingData } from "../../Hooks/Accounting"; +import moment, { Moment } from "moment"; +import api from "../../API/api"; +import { useTeamData } from "../../Hooks/Teams"; + +type Employee = { + id: number; + full_name: string; + username: string; +}; + +type BonusData = { + employee: Employee; + charges: any[]; + total: number; +}; + +interface BonusesTableProps { + bonusesData: BonusData[]; +} const AccountingCurrent: React.FC = () => { + const themes = localStorage.getItem("theme") === "true" ? true : false; + + const [open, setOpen] = useState(false); + const [selectedUser, setSelectedUser] = useState(null); + + const currentInfo = new Date().toLocaleString("default", { month: "long" }); + + const { Option } = Select; + + const currentMonth = moment().month(); + const currentYear = moment().year(); + const today = moment().endOf("day"); + + const disabledDate = (current: any) => { + return ( + current && + (current.month() !== currentMonth || + current.year() !== currentYear || + current.isAfter(today)) + ); + }; + + const [form] = Form.useForm(); + const [selectedUserId, setSelectedUserId] = useState(null); + const [selectedDate, setSelectedDate] = useState(null); + + const [isBonusModalVisible, setIsBonusModalVisible] = useState(false); + const [isChargeModalVisible, setIsChargeModalVisible] = useState(false); + + const [bonusesData, setBonusesData] = useState([]); + const [chargesData, setChargesData] = useState([]); + + const [search, setSearch] = useState(""); + const [team, setTeam] = useState(""); + + const showBonusModal = (userId: any) => { + setSelectedUserId(userId); // Tanlangan user_id ni saqlash + setIsBonusModalVisible(true); + }; + + const showChargeModal = (userId: any) => { + setIsChargeModalVisible(true); + setSelectedUserId(userId); + }; + + const handleCancel = () => { + setIsBonusModalVisible(false); + setIsChargeModalVisible(false); + }; + const { data, refetch, isLoading } = useAccountingData({ month: "current", + search: search, + team: team, }); + const handleDateChange = (date: any) => { + setSelectedDate(date); + form.setFieldsValue({ date }); // Form.Item ichidagi qiymatni yangilash + }; + + const handleOkCharge = () => { + form + .validateFields() + .then((values) => { + const { date, amount, notes } = values; + + if (selectedUserId) { + api + .post(`/add-charge/${selectedUserId}/`, { + date: date ? date.toISOString().split("T")[0] : null, + amount: amount, + reason: notes, + }) + .then((response) => { + message.success(response.data.message); + setIsChargeModalVisible(false); + form.resetFields(); + refetch(); + }) + .catch((error) => { + console.error("API error:", error); + }); + } + }) + .catch((info) => { + console.log("Validate Failed:", info); + }); + }; + const handleOkBonus = () => { + form + .validateFields() + .then((values) => { + const { date, amount, notes } = values; + + if (selectedUserId) { + api + .post(`/add-bonus/${selectedUserId}/`, { + date: date ? date.toISOString().split("T")[0] : null, + amount: amount, + reason: notes, + }) + .then((response) => { + message.success(response.data.message); + setIsBonusModalVisible(false); + form.resetFields(); + refetch(); + }) + .catch((error) => { + console.error("API error:", error); + }); + } + }) + .catch((info) => { + console.log("Validate Failed:", info); + }); + }; + + const menu = (userId: any) => ( + + showBonusModal(userId)}> + Add Bonus + + showChargeModal(userId)}> + Add Charge + + + ); + + useEffect(() => { + if (isBonusModalVisible || isChargeModalVisible) { + setOpen(false); + } + }, [isBonusModalVisible, isChargeModalVisible]); + + const handleRowClick = (record: any, e: React.MouseEvent) => { + setSelectedUser(record); + + const target = e.target as HTMLElement; + + const employee_id = record.employee_id; + const apiUrl = `/bonuses/${employee_id}`; + const chargeUrl = `/charges/${employee_id}`; + + const params = { + month: "current", + }; + + api + .get(apiUrl, { params }) + .then((response) => { + console.log("API response:", response); + const formattedData = response.data?.bonuses?.map( + (bonus: any, index: any) => ({ + no: index + 1, + id: bonus.id, + date: bonus.date, + amount: bonus.amount, + reason: bonus.reason || "", + username: response.data.employee.username, + total: response.data.total, + }) + ); + + setBonusesData(formattedData); + }) + .catch((error) => { + console.error("Error:", error); + }); + + api + .get(chargeUrl, { params }) + .then((response) => { + const formattedData = response.data.charges.map( + (charges: any, index: any) => ({ + no: index + 1, + id: charges.id, + // date: charges.date, + amount: charges.amount, + reason: charges.reason || "", + username: response.data.employee.username, + total: response.data.total, + }) + ); + + setChargesData(formattedData); + }) + .catch((error) => { + console.error("Error:", error); + }); + + if (!target.closest(".ant-dropdown-trigger")) { + setOpen(true); + } + }; + + const [isEditModalVisible, setIsEditModalVisible] = useState(false); + const [isEditBonusModalVisible, setIsEditBonusModalVisible] = useState(false); + + const [selectedRecord, setSelectedRecord] = useState<{ id?: string } | null>( + null + ); + const [selectedRecordBonus, setSelectedRecordBonus] = useState<{ + id?: string; + } | null>(null); + + const showModalBonusEdit = (record: any) => { + if (!record || typeof record !== "object") { + console.error("Invalid record:", record); + return; + } + + setSelectedRecordBonus(record); + form.setFieldsValue(record); + setIsEditBonusModalVisible(true); + }; + const showModal = (record: any) => { + if (!record || typeof record !== "object") { + console.error("Invalid record:", record); + return; + } + + setSelectedRecord(record); + form.setFieldsValue(record); + setIsEditModalVisible(true); + }; + + const Cancel = () => { + setIsEditModalVisible(false); + setIsEditBonusModalVisible(false); + form.resetFields(); + }; + + const handleOkBonusEdit = async () => { + try { + const values = await form.validateFields(); + + if (!selectedRecordBonus) { + throw new Error("No record selected!"); + } + + const updatedData = { ...(selectedRecordBonus || {}), ...values }; + + const response = await api.put( + `bonus/${selectedRecordBonus.id}/`, + updatedData, + { + headers: { + "Content-Type": "application/json", + }, + } + ); + + if (response.status === 202) { + setBonusesData((prevData: any) => + prevData.map((item: any) => + item.id === selectedRecordBonus.id + ? { ...item, ...updatedData } + : item + ) + ); + refetch(); + + setIsEditBonusModalVisible(false); + } else { + throw new Error("Server Error"); + } + } catch (error) { + console.error(error); + } + }; + + // EDIT modal Charge + const handleOk = async () => { + try { + const values = await form.validateFields(); + + if (!selectedRecord) { + throw new Error("No record selected!"); + } + + const updatedData = { + ...(selectedRecord || {}), + ...values, + }; + + const response = await api.put( + `charge/${selectedRecord.id}/`, + updatedData, + { + headers: { + "Content-Type": "application/json", + }, + } + ); + + if (response.status === 202) { + setChargesData((prevData: any) => + prevData.map((item: any) => + item.id === selectedRecord.id ? { ...item, ...updatedData } : item + ) + ); + refetch(); + + setIsEditModalVisible(false); + } else { + throw new Error("Server Error"); + } + } catch (error) { + console.error(error); + } + }; + const { token } = theme.useToken(); + const timerRef = useRef(null); + const handleSearchChange = (e: React.ChangeEvent) => { + if (timerRef.current) { + clearTimeout(timerRef.current); + } + + const searchText = e.target.value; + timerRef.current = setTimeout(() => { + setSearch(searchText); + }, 1000); + }; + + const teamData = useTeamData({}); + const teamOptions: { label: string; value: any }[] | undefined = + teamData?.data?.map((item) => ({ + label: item?.name, + value: item?.name, + })); + const additionalOption = { + label: "all", + value: "", + }; + if (teamOptions) { + teamOptions.unshift(additionalOption); + } + + const deleteFunctionBonus = (record: any) => { + const { id } = record; + + const apiUrl = `/bonus/${id}`; + + api + .delete(apiUrl) + .then((response) => { + if (response.status === 200) { + setBonusesData((prevData: any) => { + const updatedData = prevData.filter((item: any) => item.id !== id); + return updatedData; + }); + message.success(response.data.message); + } + refetch(); + }) + .catch((error) => { + console.error(error); + }); + }; + const deleteFunctionCharge = (record: any) => { + const { id } = record; + + const apiUrl = `/charge/${id}`; + + api + .delete(apiUrl) + .then((response) => { + if (response.status === 200) { + setChargesData((prevData: any) => { + const updatedData = prevData.filter((item: any) => item.id !== id); + return updatedData; + }); + message.success(response.data.message); + } + refetch(); + }) + .catch((error) => { + console.error(error); + }); + }; + return ( -
+
+ +
+ } + onChange={handleSearchChange} + /> +
+ } + type="number" + style={{ width: "100%" }} + placeholder="0" + onKeyPress={(e) => { + if (e.key === "-" || e.key === "e") { + e.preventDefault(); + } + }} + /> + + + {/* Textarea */} + + + + + + + {/* Charge Modal */} + + + Add + + } + cancelText={ + + + Cancel + + } + > +
+ {/* Date Picker */} + + + + + {/* Amount Input */} + + } + type="number" + style={{ width: "100%" }} + placeholder="0" + onKeyPress={(e) => { + if (e.key === "-" || e.key === "e") { + e.preventDefault(); + } + }} + /> + + + {/* Textarea */} + + + +
+ + + {/* EDIT CHARGE MODAL */} + + + + Save + + } + cancelText={ + + + Cancel + + } + > +
+ + } + type="number" + style={{ width: "100%" }} + placeholder="0" + onKeyPress={(e) => { + if (e.key === "-" || e.key === "e") { + e.preventDefault(); + } + }} + /> + + + {/* Textarea */} + + + +
+ + + {/* EDIT Bonus MODAL */} + + + + Save + + } + cancelText={ + + + Cancel + + } + > +
+ + } + type="number" + style={{ width: "100%" }} + placeholder="0" + onKeyPress={(e) => { + if (e.key === "-" || e.key === "e") { + e.preventDefault(); + } + }} + /> + + + + + +
+
); }; diff --git a/src/Components/Accounting/AccountingDetails.tsx b/src/Components/Accounting/AccountingDetails.tsx index f51ff70..dae9733 100644 --- a/src/Components/Accounting/AccountingDetails.tsx +++ b/src/Components/Accounting/AccountingDetails.tsx @@ -3,7 +3,7 @@ import { useParams } from "react-router-dom"; import axios from "axios"; import Typography from "antd/es/typography/Typography"; import { DatePicker, DatePickerProps, Table } from "antd"; -import tagIcon from "../../assets/tagIcon.png"; +import tagIcon from "../../assets/tagIcon.svg"; import dayjs from "dayjs"; interface User { diff --git a/src/Components/Accounting/AccountingHistory.tsx b/src/Components/Accounting/AccountingHistory.tsx index 4add5d8..73a40e0 100644 --- a/src/Components/Accounting/AccountingHistory.tsx +++ b/src/Components/Accounting/AccountingHistory.tsx @@ -1,17 +1,149 @@ -import { Table, Tooltip } from "antd"; -import React from "react"; -import tagIcon from "../../assets/tagIcon.png"; -import { QuestionCircleOutlined } from "@ant-design/icons"; +import { + Button, + Drawer, + Input, + Select, + Table, + Tooltip, + Typography, +} from "antd"; +import React, { useEffect, useRef, useState } from "react"; +import tagIcon from "../../assets/tagIcon.svg"; +import { + CloseOutlined, + QuestionCircleOutlined, + SearchOutlined, +} from "@ant-design/icons"; import { theme } from "antd"; +import api from "../../API/api"; import { useAccountingHistory } from "../../Hooks/Accounting"; +import { useTeamData } from "../../Hooks/Teams"; + +const { Title } = Typography; + +interface Salary { + id: number; + month: string; + year: number; + number_of_tasks: number; + total_points: number; + salary_type: string; + base_salary: string; + performance_salary: string; + total_salary: string; +} + +interface Employee { + id: number; + first_name: string; + last_name: string; + username: string; +} + +interface SalaryData { + employee: Employee; + salaries: Salary[]; + total: number; +} const AccountingHistory: React.FC = () => { - const { data, refetch, isLoading } = useAccountingHistory(); + const [open, setOpen] = useState(false); + + const [userData, setUserData] = useState(null); + + const [years, setYears] = useState([]); + + const [search, setSearch] = useState(""); + const [team, setTeam] = useState(""); + + const themes = localStorage.getItem("theme") === "true" ? true : false; + const { data, refetch, isLoading } = useAccountingHistory({ + search: search, + team: team, + }); + + const [selectedUser, setSelectedUser] = useState(null); + + const handleRowClick = async (record: any, e: any) => { + setSelectedUser(record); + setOpen(true); + + const id = record.id; + + try { + const response = await api.get(`/employee-salaries/${id}/`); + setUserData(response.data); + + const newYears = Array.from( + new Set(response.data.salaries.map((salary: Salary) => salary.year)) + ).map((year) => Number(year)); + setYears(newYears); + } catch (error) { + console.error(error); + } + }; + + useEffect(() => { + if (userData && userData.salaries && userData.salaries.length > 0) { + const newYears = Array.from( + new Set(userData.salaries.map((salary: Salary) => Number(salary.year))) + ).sort((a, b) => b - a); + + setYears(newYears); + } + }, [userData]); const { token } = theme.useToken(); + const timerRef = useRef(null); + const handleSearchChange = (e: React.ChangeEvent) => { + if (timerRef.current) { + clearTimeout(timerRef.current); + } + + const searchText = e.target.value; + timerRef.current = setTimeout(() => { + setSearch(searchText); + }, 1000); + }; + + const teamData = useTeamData({}); + const teamOptions: { label: string; value: any }[] | undefined = + teamData?.data?.map((item) => ({ + label: item?.name, + value: item?.name, + })); + const additionalOption = { + label: "all", + value: "", + }; + if (teamOptions) { + teamOptions.unshift(additionalOption); + } + return ( -
+
+ +
+ } + onChange={handleSearchChange} + /> +
+ } + onChange={handleSearchChange} + /> +
+ } + type="number" + min={0} + style={{ width: "100%" }} + placeholder="0" + onKeyPress={(e) => { + if (e.key === "-" || e.key === "e") { + e.preventDefault(); + } + }} + /> + + + {/* Textarea */} + + + + + + + {/* Charge Modal */} + + + Add + + } + cancelText={ + + + Cancel + + } + > +
+ {/* Date Picker */} + + + + + {/* Amount Input */} + + } + type="number" + style={{ width: "100%" }} + placeholder="0" + onKeyPress={(e) => { + if (e.key === "-" || e.key === "e") { + e.preventDefault(); + } + }} + /> + + + {/* Textarea */} + + + +
+ + + {/* EDIT CHARGE MODAL */} + + + + Save + + } + cancelText={ + + + Cancel + + } + > +
+ + } + type="number" + style={{ width: "100%" }} + placeholder="0" + onKeyPress={(e) => { + if (e.key === "-" || e.key === "e") { + e.preventDefault(); + } + }} + /> + + + {/* Textarea */} + + + +
+ + + {/* EDIT Bonus MODAL */} + + + + Save + + } + cancelText={ + + + Cancel + + } + > +
+ + } + type="number" + style={{ width: "100%" }} + placeholder="0" + onKeyPress={(e) => { + if (e.key === "-" || e.key === "e") { + e.preventDefault(); + } + }} + /> + - {/* */} + + + +
+
); }; diff --git a/src/Components/CallRequests/Call.tsx b/src/Components/CallRequests/Call.tsx index a518f56..683a58f 100644 --- a/src/Components/CallRequests/Call.tsx +++ b/src/Components/CallRequests/Call.tsx @@ -21,7 +21,7 @@ const Call = ({ socketData }: { socketData: TSocket | undefined }) => { const { data, isLoading, refetch } = useCallData({ status: status, page: page, - page_size: 15, + page_size: 10, }); // const theme = localStorage.getItem("theme") === "true" ? true : false; @@ -101,7 +101,7 @@ const Call = ({ socketData }: { socketData: TSocket | undefined }) => {
- +
); diff --git a/src/Components/Companies/Companies.tsx b/src/Components/Companies/Companies.tsx index 9f8e97c..73191f2 100644 --- a/src/Components/Companies/Companies.tsx +++ b/src/Components/Companies/Companies.tsx @@ -6,16 +6,13 @@ import { StepBackwardOutlined, LeftOutlined, RightOutlined, + PlusOutlined, + SearchOutlined, } from "@ant-design/icons"; import { useCompanyPaginated } from "../../Hooks/Companies"; import { Button, Input, Space, Typography } from "antd"; import { theme } from "antd"; -// @ts-ignore -import IconSearch from "../../assets/searchIcon.png"; -//@ts-ignore -import addicon from "../../assets/addiconpng.png"; - import { role } from "../../App"; const Company = () => { @@ -67,18 +64,31 @@ const Company = () => {
Companies {role !== "Checker" && ( - + + )}
-
+ {/*
{ placeholder="Search" onChange={handleSearchChange} /> +
*/} +
+ } + onChange={handleSearchChange} + />
- + { diff --git a/src/Components/Customers/Customers.tsx b/src/Components/Customers/Customers.tsx index d5b2061..56903b8 100644 --- a/src/Components/Customers/Customers.tsx +++ b/src/Components/Customers/Customers.tsx @@ -1,7 +1,12 @@ import { useRef, useState } from "react"; import AddCustomer from "./AddCustomer"; import CustomerTable from "./CustomersTable"; -import { LeftOutlined, RightOutlined } from "@ant-design/icons"; +import { + LeftOutlined, + PlusOutlined, + RightOutlined, + SearchOutlined, +} from "@ant-design/icons"; import { useCustomerData } from "../../Hooks/Customers"; //@ts-ignore import addicon from "../../assets/addiconpng.png"; @@ -25,7 +30,7 @@ const Customer = () => { const { data, isLoading, refetch } = useCustomerData({ name: search, is_active: undefined, - page_size: 15, + page_size: 10, page: page, }); @@ -59,13 +64,25 @@ const Customer = () => { {open && }
Drivers - + */} +
-
+ {/*
{ placeholder="Search" onChange={handleSearchChange} /> +
*/} +
+ } + onChange={handleSearchChange} + />
- + { const [companyName, setCompanyName] = useState(""); const [companyVal, setCompanyVal] = useState(); - const { data: companyData } = useCompanyData({ name: companyName }); + const { data: companyData } = useCompanyData({ + name: companyName, + }); return (
@@ -132,6 +134,7 @@ const CustomerEdit = () => { label="Company" > { placeholder="Search" onChange={handleSearchChange} /> +
*/} +
+ } + onChange={handleSearchChange} + />
setStatus(e.target.value)} @@ -126,7 +134,7 @@ const Requests = ({ socketData }: { socketData: TSocket | undefined }) => { setRequestData={setRequestData} /> - + (); const [customerName, setCustomerName] = useState(); + const [customerNameCompany, setCustomerNameCompany] = useState(); const [driverId, setDriverId] = useState(); - const companyData = useCompanyData({ name: companyName }); const [companyId, setCompanyId] = useState(); const [customerOption, setCustomerOption] = useState(); + + const companyData = useCompanyData({ + name: companyName, + page: 1, + page_size: 5, + }); + const customerData = useCustomerData({ name: customerName, page: 1, page_size: 5, for_driver_request: true, }); + const customerDataByCompany = useCustomerByComanyData( { name: customerName, @@ -53,19 +63,49 @@ const RequestsEdit = ({ companyId ); + // useEffect(() => { + // if (companyId && customerDataByCompany) { + // const newCustomerOption = customerDataByCompany.data?.data?.map( + // (item) => ({ + // label: item.name, + // value: item.id, + // }) + // ); + // console.log(customerDataByCompany.data); + // if ( + // JSON.stringify(newCustomerOption) !== JSON.stringify(customerOption) + // ) { + // setCustomerOption(newCustomerOption); + // } + // } else if (!companyId && customerData) { + // const newCustomerOption = customerData.data?.data.map((item) => ({ + // label: `${item?.name} - ${item.company?.name}`, + // value: item.id, + // })); + + // if ( + // JSON.stringify(newCustomerOption) !== JSON.stringify(customerOption) + // ) { + // setCustomerOption(newCustomerOption); + // } + // } + // }, [companyId, customerData, customerDataByCompany, customerOption]); + useEffect(() => { if (companyId && customerDataByCompany) { - const newCustomerOption = customerDataByCompany.data?.data?.map( - (item) => ({ - label: item.name, - value: item.id, - }) - ); + const customerData = customerDataByCompany.data; + if (Array.isArray(customerData)) { + const newCustomerOption = customerData.map((item) => ({ + label: `${item?.name} - ${item.company?.name}`, + value: item?.id, + })); - if ( - JSON.stringify(newCustomerOption) !== JSON.stringify(customerOption) - ) { - setCustomerOption(newCustomerOption); + if ( + JSON.stringify(newCustomerOption) !== JSON.stringify(customerOption) + ) { + setCustomerOption(newCustomerOption); + } + } else { } } else if (!companyId && customerData) { const newCustomerOption = customerData.data?.data.map((item) => ({ @@ -84,7 +124,6 @@ const RequestsEdit = ({ const assignClick = () => { const value = { ...requestData, - status: "Assigned", customer_id: driverId, }; requestsController.requestPatch(value, requestData?.id).then(() => { @@ -93,6 +132,28 @@ const RequestsEdit = ({ }); }; + const timerRef = useRef(null); + + const handleSearch = (value: string) => { + if (timerRef.current) { + clearTimeout(timerRef.current); + } + + timerRef.current = setTimeout(() => { + setCustomerName(value); + }, 1000); + }; + + const handleSearchCompany = (value: string) => { + if (timerRef.current) { + clearTimeout(timerRef.current); + } + + timerRef.current = setTimeout(() => { + setCompanyName(value); + }, 1000); + }; + return (
setCompanyName(value)} + // onSearch={(value) => setCompanyName(value)} + onSearch={handleSearchCompany} onChange={(value: number) => setCompanyId(value)} - options={companyData?.data?.map((item) => ({ - label: item?.name, - value: item?.id, - }))} + // options={companyData?.data?.map((item: any) => ({ + // label: item?.name, + // value: item?.id, + // }))} + options={ + Array.isArray((companyData as any)?.data?.data) + ? (companyData as any).data.data.map((item: any) => ({ + label: item?.name || "No Name", + value: item?.id || "No ID", + })) + : [] + } filterOption={false} autoClearSearchValue={false} allowClear @@ -220,10 +290,16 @@ const RequestsEdit = ({ style={{ width: "50%" }} showSearch placeholder="Search Driver" - onSearch={(value) => setCustomerName(value)} + // onSearch={(value) => setCustomerName(value)} + onSearch={handleSearch} onChange={(value: number) => setDriverId(value)} options={customerOption} - filterOption={false} + // options={options} + filterOption={(input: string, option?: { label?: string }) => + option?.label + ?.toLowerCase() + .includes(input.toLowerCase()) ?? false + } autoClearSearchValue={false} allowClear /> @@ -255,8 +331,8 @@ const RequestsEdit = ({ alignItems: "center", }} className="btn-add" + icon={} > - New driver
diff --git a/src/Components/Requests/RequestsTable.tsx b/src/Components/Requests/RequestsTable.tsx index 5dca020..7cf832c 100644 --- a/src/Components/Requests/RequestsTable.tsx +++ b/src/Components/Requests/RequestsTable.tsx @@ -5,7 +5,7 @@ import { RefetchQueryFilters, } from "react-query"; // @ts-ignore -import tagIcon from "../../assets/tagIcon.png"; +import tagIcon from "../../assets/tagIcon.svg"; import moment from "moment"; import { TRequests } from "../../types/Requests/TRequests"; import { useEffect, useState } from "react"; @@ -86,12 +86,13 @@ const RequestsTable = ({ ...u, }))} loading={isLoading} - size="middle" + size="small" columns={[ { title: , dataIndex: "no", width: "5%", + align: "center", }, { title: "Full name", diff --git a/src/Components/Services/ServiceTable.tsx b/src/Components/Services/ServiceTable.tsx index 6b3fad0..c4b42fb 100644 --- a/src/Components/Services/ServiceTable.tsx +++ b/src/Components/Services/ServiceTable.tsx @@ -7,7 +7,7 @@ import { } from "react-query"; import { TService } from "../../types/Service/TService"; // @ts-ignore -import tagIcon from "../../assets/tagIcon.png"; +import tagIcon from "../../assets/tagIcon.svg"; import { role } from "../../App"; import { theme } from "antd"; @@ -94,6 +94,7 @@ const ServiceTable = ({ }, }} bordered + size="middle" />
); diff --git a/src/Components/Services/Services.tsx b/src/Components/Services/Services.tsx index 1f149f7..c84d231 100644 --- a/src/Components/Services/Services.tsx +++ b/src/Components/Services/Services.tsx @@ -4,8 +4,9 @@ import AddService from "./AddService"; import ServiceTable from "./ServiceTable"; //@ts-ignore import addicon from "../../assets/addiconpng.png"; +import { PlusOutlined } from "@ant-design/icons"; import { role } from "../../App"; -import { Pagination, Space, Typography } from "antd"; +import { Button, Pagination, Space, Typography } from "antd"; import { theme } from "antd"; const Service = () => { @@ -13,12 +14,6 @@ const Service = () => { const { token } = theme.useToken(); - const page_size = 10; - - const handlePageChange = (page: number) => { - setPage(page); - }; - const { data, isLoading, refetch } = useServiceData(); const [open, setOpen] = useState(false); const showModal = () => { @@ -31,10 +26,23 @@ const Service = () => {
Services {role !== "Checker" && ( - + + + )}
diff --git a/src/Components/Statistics/Statistic.tsx b/src/Components/Statistics/Statistic.tsx index be2713c..f369cec 100644 --- a/src/Components/Statistics/Statistic.tsx +++ b/src/Components/Statistics/Statistic.tsx @@ -26,10 +26,12 @@ import { Button, DatePicker, DatePickerProps, + Input, Select, Tabs, Typography, } from "antd"; +import { SearchOutlined } from "@ant-design/icons"; import TabPane from "antd/es/tabs/TabPane"; // @ts-ignore import IconSearch from "../../assets/searchIcon.png"; @@ -478,7 +480,7 @@ const Stat = () => { marginBottom: 10, }} > -
+ {/*
{ placeholder="Search" onChange={handleTechSupportSearchChange} /> +
*/} +
+ } + onChange={handleTechSupportSearchChange} + />
{ marginBottom: 10, }} > -
+ {/*
{ placeholder="Search" onChange={handleSearchChange} /> +
*/} +
+ } + onChange={handleSearchChange} + />
+
*/} +
+ } + onChange={handleSearchChange} + />
({ - label: items.username, - value: items.id, - }))} + showSearch + options={data?.map( + (item: any): { label: string; value: number } => ({ + label: item.username, + value: item.id, + }) + )} + filterOption={(input: string, option?: { label?: string }) => + option?.label?.toLowerCase().includes(input.toLowerCase()) ?? + false + } /> diff --git a/src/Components/Teams/TeamEdit.tsx b/src/Components/Teams/TeamEdit.tsx index 4b6735c..2908d22 100644 --- a/src/Components/Teams/TeamEdit.tsx +++ b/src/Components/Teams/TeamEdit.tsx @@ -20,7 +20,7 @@ import { role } from "../../App"; import { useUserData } from "../../Hooks/Users"; import AddUserToTeam from "./AddUserToTeam"; // @ts-ignore -import tagIcon from "../../assets/tagIcon.png"; +import tagIcon from "../../assets/tagIcon.svg"; // @ts-ignore import infoIcon from "../../assets/infoIcon.png"; // @ts-ignore @@ -38,6 +38,7 @@ type MyObjectType = { const TeamEdit = () => { const { id } = useParams(); const { data, refetch, status }: MyObjectType = useTeamOne(id); + let navigate = useNavigate(); const onSubmit = async (value: any) => { @@ -57,7 +58,7 @@ const TeamEdit = () => { } }; - const userData = useUserData({ name: "", team: id }); + const userData = useUserData({ name: "", team: data?.name }); const [open, setOpen] = useState(false); const showModal = () => { @@ -147,7 +148,7 @@ const TeamEdit = () => { key="2" > ({ + dataSource={userData?.data?.map((item: any, i: any) => ({ no: i + 1, ...item, }))} @@ -178,8 +179,8 @@ const TeamEdit = () => { /> + */} + + diff --git a/src/Components/Updates/Update.tsx b/src/Components/Updates/Update.tsx index 3ff36f4..402ae93 100644 --- a/src/Components/Updates/Update.tsx +++ b/src/Components/Updates/Update.tsx @@ -1,23 +1,44 @@ -import { useState } from "react"; +import { useRef, useState } from "react"; import AddUpdate from "./AddUpdate"; -import { Select, Typography, theme } from "antd"; +import { Button, Input, Select, Space, Typography, theme } from "antd"; +import { + LeftOutlined, + PlusOutlined, + ReloadOutlined, + RightOutlined, +} from "@ant-design/icons"; import UpdateTable from "./UpdateTable"; import { useUpdateData } from "../../Hooks/Update"; -//@ts-ignore -import addicon from "../../assets/addiconpng.png"; -//@ts-ignore -import refreshicon from "../../assets/refreshIcon.png"; + const Update = () => { const [open, setOpen] = useState(false); + + const timerRef = useRef(null); + + const handleSelectChange = (value: any) => { + if (timerRef.current) { + clearTimeout(timerRef.current); + } + + timerRef.current = setTimeout(() => { + setStatus(value); + }, 1000); + }; + const [status, setStatus] = useState([ "New", "In Progress", "Paper", "Setup", ]); + const { Option } = Select; - const { data, refetch, isLoading } = useUpdateData(status); + const [page, setPage] = useState(1); + + const page_size: number = 10; + + const { data, refetch, isLoading } = useUpdateData(status, page, page_size); const showModal = () => { setOpen(true); @@ -25,17 +46,42 @@ const Update = () => { const { token } = theme.useToken(); + const Next = () => { + const a = Number(page) + 1; + setPage(a); + }; + const Previos = () => { + Number(page); + if (page > 1) { + const a = Number(page) - 1; + setPage(a); + } + }; + return (
{open && }
Updates
- - + {/* + */} +
- + + + + + { + let num = e.target.value; + if (Number(num) && num !== "0") { + setPage(Number(num)); + } + }} + /> + + +
); }; diff --git a/src/Components/Updates/UpdateEdit.tsx b/src/Components/Updates/UpdateEdit.tsx index b46d2af..c581a29 100644 --- a/src/Components/Updates/UpdateEdit.tsx +++ b/src/Components/Updates/UpdateEdit.tsx @@ -15,7 +15,11 @@ import { Upload, } from "antd"; import { updateController } from "../../API/LayoutApi/update"; -import { UploadOutlined } from "@ant-design/icons"; +import { + InfoCircleFilled, + InfoCircleOutlined, + UploadOutlined, +} from "@ant-design/icons"; import Notfound from "../../Utils/Notfound"; import { companyController } from "../../API/LayoutApi/companies"; import { customerController } from "../../API/LayoutApi/customers"; @@ -148,6 +152,7 @@ const UpdateEdit = () => { } } const [activeTab, setActiveTab] = useState("1"); + return (
{role !== "Checker" || inCharge == admin_id || inCharge == null ? ( @@ -194,14 +199,20 @@ const UpdateEdit = () => { > {companyId !== null && ( -
+ - {companyValue !== undefined && ( + {/* {data?.company.id !== undefined && ( + // + )} */} + {data?.company.id !== undefined && ( )} @@ -209,14 +220,14 @@ const UpdateEdit = () => { )} {customerId !== null && ( - + - {customerValue !== undefined && ( + {data?.customer.id !== undefined && ( )} diff --git a/src/Components/Updates/UpdateTable.tsx b/src/Components/Updates/UpdateTable.tsx index 8b83e66..cd1125c 100644 --- a/src/Components/Updates/UpdateTable.tsx +++ b/src/Components/Updates/UpdateTable.tsx @@ -1,4 +1,5 @@ -import { Space, Table, Tooltip, theme } from "antd"; +import { Button, Space, Table, Tooltip, theme } from "antd"; +import { PushpinOutlined } from "@ant-design/icons"; import moment from "moment"; import { useCompanyData } from "../../Hooks/Companies"; import { useCustomerData } from "../../Hooks/Customers"; @@ -12,7 +13,7 @@ import { import { TUpdate } from "../../types/Update/TUpdate"; import { useEffect, useState } from "react"; // @ts-ignore -import tagIcon from "../../assets/tagIcon.png"; +import tagIcon from "../../assets/tagIcon.svg"; // @ts-ignore import pin from "../../assets/pinicon.png"; // @ts-ignore @@ -39,9 +40,9 @@ const UpdateTable = ({ options?: (RefetchOptions & RefetchQueryFilters) | undefined ) => Promise>; }) => { - const CompanyData = useCompanyData({}); - const CustomerData = useCustomerData({}); - const AdminData = useUserData({}); + // const CompanyData = useCompanyData({}); + // const CustomerData = useCustomerData({}); + // const AdminData = useUserData({}); const [isTextSelected, setIsTextSelected] = useState(false); @@ -86,7 +87,7 @@ const UpdateTable = ({ const { token } = theme.useToken(); return ( -
+
({ onClick: (event) => Row(record, event), @@ -94,18 +95,18 @@ const UpdateTable = ({ dataSource={data?.map((u, i) => ({ no: i + 1, ...u, - company_name: CompanyData?.data?.find( - (company: any) => company.id === u.company_id - )?.name, - customer_name: CustomerData?.data?.data?.find( - (customer: any) => customer.id === u.customer_id - )?.name, - in_charge_name: AdminData?.data?.find( - (admin: any) => admin.id === u.provider_id - )?.username, - executor_name: AdminData?.data?.find( - (admin: any) => admin.id === u.executor_id - )?.username, + // company_name: CompanyData?.data?.find( + // (company: any) => company.id === u.company_id + // )?.name, + // customer_name: CustomerData?.data?.data?.find( + // (customer: any) => customer.id === u.customer_id + // )?.name, + // in_charge_name: AdminData?.data?.find( + // (admin: any) => admin.id === u.provider_id + // )?.username, + // executor_name: AdminData?.data?.find( + // (admin: any) => admin.id === u.executor_id + // )?.username, created: moment(u?.created_at, "YYYY-MM-DD HH:mm:ss").format( "DD.MM.YYYY HH:mm" ), @@ -116,6 +117,7 @@ const UpdateTable = ({ title: , dataIndex: "no", width: "4%", + align: "center", }, { title: "Company", @@ -154,15 +156,15 @@ const UpdateTable = ({ }, { title: "Created by", - dataIndex: "provider ", + dataIndex: "provider", ellipsis: { showTitle: false, }, responsive: ["xl"], width: "10%", - render: (note: string) => ( - - {note} + render: (provider: { username: string }) => ( + + {provider?.username} ), }, @@ -174,9 +176,9 @@ const UpdateTable = ({ }, responsive: ["lg"], width: "10%", - render: (note: string) => ( - - {note} + render: (executor: { username: string }) => ( + + {executor?.username} ), }, @@ -243,15 +245,31 @@ const UpdateTable = ({ { title: "Actions", dataIndex: "action", - width: "8%", + width: "6%", + align: "center", render: (record: TUpdate) => { return (
{record.status !== "Done" && ( {record.is_pinned ? ( - + + icon={} + > ) : ( - + + icon={} + > )} )} @@ -296,22 +326,24 @@ const UpdateTable = ({ loading={isLoading} size="small" scroll={{ x: "768px" }} - pagination={{ - pageSize: 15, - size: "default", - style: { - margin: 0, - justifyContent: "end", - position: "fixed", - bottom: 0, - left: 0, - width: "100%", - backgroundColor: token.colorBgContainer, - boxShadow: "0 4px 8px rgba(0, 0, 0, 0.4)", - padding: "10px 0", - zIndex: 1000, - }, - }} + // pagination={{ + // pageSize: 10, + // size: "default", + // style: { + // margin: 0, + // justifyContent: "end", + // position: "fixed", + // bottom: 0, + // left: 0, + // width: "100%", + // backgroundColor: token.colorBgContainer, + // boxShadow: "0 4px 8px rgba(0, 0, 0, 0.4)", + // padding: "10px 0", + // zIndex: 1000, + // }, + // showLessItems: true, + // }} + pagination={false} bordered />
diff --git a/src/Components/Users/UserEdit.tsx b/src/Components/Users/UserEdit.tsx index 9b057bd..f7ceead 100644 --- a/src/Components/Users/UserEdit.tsx +++ b/src/Components/Users/UserEdit.tsx @@ -87,17 +87,20 @@ const UserEdit = () => { const [showInput, setShowInput] = useState(false); const handleChange = (value: string) => { - if (data?.role.name === "Checker") { - setShowInput(value === "hybrid"); + if (data?.role.name !== "Accountant") { + setShowInput(true); } }; const [form] = Form.useForm(); useEffect(() => { - if (data?.role.name === "Checker" && data?.salary_type === "hybrid") { + if ( + (data?.role.name !== "Accountant" && data?.salary_type === "hybrid") || + data?.salary_type === "fixed" + ) { setShowInput(true); - } else if (data?.role.name !== "Checker") { + } else if (data?.role.name === "Accountant") { setShowInput(false); } }, [data]); @@ -204,7 +207,7 @@ const UserEdit = () => { )} - {data?.role?.name === "Checker" && + {data?.role?.name !== "Accountant" && form.getFieldsValue().role_id !== 3 && ( { > + diff --git a/src/Components/Users/UserTable.tsx b/src/Components/Users/UserTable.tsx index 6ab364e..08ca0d2 100644 --- a/src/Components/Users/UserTable.tsx +++ b/src/Components/Users/UserTable.tsx @@ -8,7 +8,7 @@ import { } from "react-query"; import { useNavigate } from "react-router-dom"; // @ts-ignore -import tagIcon from "../../assets/tagIcon.png"; +import tagIcon from "../../assets/tagIcon.svg"; import { isMobile, role } from "../../App"; import { userController } from "../../API/LayoutApi/users"; @@ -50,7 +50,7 @@ const UserTable = ({ const { token } = theme.useToken(); return ( -
+
Row(record)} dataSource={data?.map((u, i) => ({ @@ -61,7 +61,7 @@ const UserTable = ({ ...u, }))} loading={isLoading} - size="middle" + size="small" columns={[ { title: , @@ -106,24 +106,24 @@ const UserTable = ({ index % 2 === 0 ? "odd-row" : "even-row" } scroll={{ x: "768px" }} - pagination={{ - pageSize: 10, - size: "default", - style: { - margin: 0, - justifyContent: "end", - position: "fixed", - bottom: 0, - left: 0, - width: "100%", - backgroundColor: token.colorBgContainer, - boxShadow: "0 4px 8px rgba(0, 0, 0, 0.4)", - padding: "10px 0", - zIndex: 1000, - }, - showLessItems: true, - }} - // pagination={false} + // pagination={{ + // pageSize: 10, + // size: "default", + // style: { + // margin: 0, + // justifyContent: "end", + // position: "fixed", + // bottom: 0, + // left: 0, + // width: "100%", + // backgroundColor: token.colorBgContainer, + // boxShadow: "0 4px 8px rgba(0, 0, 0, 0.4)", + // padding: "10px 0", + // zIndex: 1000, + // }, + // showLessItems: true, + // }} + pagination={false} bordered /> diff --git a/src/Components/Users/Users.tsx b/src/Components/Users/Users.tsx index 5cd6823..49e2068 100644 --- a/src/Components/Users/Users.tsx +++ b/src/Components/Users/Users.tsx @@ -2,7 +2,12 @@ import { useRef, useState } from "react"; import { useUserData } from "../../Hooks/Users"; import AddUser from "./AddUser"; import UserTable from "./UserTable"; -import { LeftOutlined, RightOutlined } from "@ant-design/icons"; +import { + LeftOutlined, + PlusOutlined, + RightOutlined, + SearchOutlined, +} from "@ant-design/icons"; import { theme } from "antd"; // @ts-ignore import IconSearch from "../../assets/searchIcon.png"; @@ -33,6 +38,8 @@ const User = () => { const { data, refetch, isLoading } = useUserData({ name: search, team: "", + page: page, + page_size: 10, }); const timerRef = useRef(null); @@ -55,17 +62,29 @@ const User = () => { {open && }
Users - + */} +
-
+ {/*
{ placeholder="Search" onChange={handleSearchChange} /> +
*/} +
+ } + onChange={handleSearchChange} + />
- + - {/* + { - */} +
); }; diff --git a/src/Hooks/Accounting/index.ts b/src/Hooks/Accounting/index.ts index 72a1bae..c96edf5 100644 --- a/src/Hooks/Accounting/index.ts +++ b/src/Hooks/Accounting/index.ts @@ -2,23 +2,33 @@ import { useQuery } from "react-query"; import { AccountingController, TAccountingGetParams, + TAccountingHistoryGetParams, } from "../../API/LayoutApi/accounting"; -export const useAccountingData = ({ month }: TAccountingGetParams) => { +export const useAccountingData = ({ + month, + search, + team, +}: TAccountingGetParams) => { return useQuery( - [`stats/all-users/`, month], + [`/employees-salaries`, month, search, team], () => AccountingController.read({ month, + search, + team, }), { refetchOnWindowFocus: false } ); }; -export const useAccountingHistory = () => { +export const useAccountingHistory = ({ + search, + team, +}: TAccountingHistoryGetParams) => { return useQuery( - [`employees-salaries-history/`], - () => AccountingController.history(), + [`/employees-salaries-history/`, search, team], + () => AccountingController.history({ search, team }), { refetchOnWindowFocus: false, } diff --git a/src/Hooks/Companies/index.ts b/src/Hooks/Companies/index.ts index 4f93196..0ddaee3 100644 --- a/src/Hooks/Companies/index.ts +++ b/src/Hooks/Companies/index.ts @@ -7,11 +7,12 @@ import { export const useCompanyData = ({ name, page, + page_size, is_active, }: TCompanyGetParams) => { return useQuery( - [`companies/`, name, page, is_active], - () => companyController.read({ name, page, is_active }), + [`companies/`, name, page, is_active,page_size], + () => companyController.read({ name, page, is_active,page_size }), { refetchOnWindowFocus: false } ); }; diff --git a/src/Hooks/Customers/index.ts b/src/Hooks/Customers/index.ts index a990d9b..871e2f4 100644 --- a/src/Hooks/Customers/index.ts +++ b/src/Hooks/Customers/index.ts @@ -32,7 +32,7 @@ export const useCustomerByComanyData = ( return useQuery( [`customers-by-company/${id}`, obj], () => customerController.customerByCompany(obj, id), - { refetchOnWindowFocus: false } + { refetchOnWindowFocus: false, enabled: !!id } ); }; diff --git a/src/Hooks/Update/index.ts b/src/Hooks/Update/index.ts index 3b85208..bd205e7 100644 --- a/src/Hooks/Update/index.ts +++ b/src/Hooks/Update/index.ts @@ -9,10 +9,14 @@ import { updateController } from "../../API/LayoutApi/update"; // ); // }; -export const useUpdateData = (status: string) => { +export const useUpdateData = ( + status: string, + page: number, + page_size: number +) => { return useQuery( - [`shift-updates`, status], - () => updateController.read(status), + [`shift-updates`, status, page, page_size], + () => updateController.read(status, page, page_size), { refetchOnWindowFocus: false } ); }; diff --git a/src/assets/currentMonth.svg b/src/assets/currentMonth.svg new file mode 100644 index 0000000..7ca8487 --- /dev/null +++ b/src/assets/currentMonth.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/currentMonthActive.svg b/src/assets/currentMonthActive.svg new file mode 100644 index 0000000..c343838 --- /dev/null +++ b/src/assets/currentMonthActive.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/history.svg b/src/assets/history.svg new file mode 100644 index 0000000..add2fef --- /dev/null +++ b/src/assets/history.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/historyActive.svg b/src/assets/historyActive.svg new file mode 100644 index 0000000..0838d5b --- /dev/null +++ b/src/assets/historyActive.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/lastMonth.svg b/src/assets/lastMonth.svg new file mode 100644 index 0000000..6acd2d4 --- /dev/null +++ b/src/assets/lastMonth.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/lastMonthActive.svg b/src/assets/lastMonthActive.svg new file mode 100644 index 0000000..8324d91 --- /dev/null +++ b/src/assets/lastMonthActive.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/tagIcon.png b/src/assets/tagIcon.png deleted file mode 100644 index c3e1987..0000000 Binary files a/src/assets/tagIcon.png and /dev/null differ diff --git a/src/assets/tagIcon.svg b/src/assets/tagIcon.svg new file mode 100644 index 0000000..50ae94b --- /dev/null +++ b/src/assets/tagIcon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/types/Update/TUpdate.ts b/src/types/Update/TUpdate.ts index 07e71ab..61cc734 100644 --- a/src/types/Update/TUpdate.ts +++ b/src/types/Update/TUpdate.ts @@ -1,18 +1,18 @@ export type TUpdate = { - id: number; - company_id?: number; - customer_id?: number; - provider_id?: number; - executor_id?: number | null; - company?: number; - customer?: number; - provider?: number; - executor?: number | null; - status: string; - note: string; - solution: string; - is_active: boolean; - is_pinned: boolean; - updated_at: Date; - created_at: Date; -} \ No newline at end of file + id: number; + company_id?: number; + customer_id?: number; + provider_id?: number; + executor_id?: number | null; + company?: number; + customer?: number; + provider?: number; + executor?: number | null; + status: string; + note: string; + solution: string; + is_active: boolean; + is_pinned: boolean; + updated_at: Date; + created_at: Date; +}; diff --git a/src/types/User/TUser.ts b/src/types/User/TUser.ts index ed4385b..fc46778 100644 --- a/src/types/User/TUser.ts +++ b/src/types/User/TUser.ts @@ -1,21 +1,12 @@ export type TUser = { - id: number; - username: string; - team: {id: number, name: string} - role: {id: number, name: string} - first_name: string | ''; - last_name: string | ''; - is_active: boolean; - is_superuser: boolean; - salary_type: string; - salary_base_amount: number; -} - -export type TUserResponse = { - page: number; - page_size: number; - next: string | null; - previous: string | null; - current_time: string; - data: TUser[]; -}; \ No newline at end of file + id: number; + username: string; + team: { id: number; name: string }; + role: { id: number; name: string }; + first_name: string | ""; + last_name: string | ""; + is_active: boolean; + is_superuser: boolean; + salary_type: string; + salary_base_amount: number; +};