Abdujamol
/
taskboard
mirror of https://github.com/etoyowimura/taskboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fixes and pdf generation per user

Browse Source
dilmurod
Dilmurod 2 weeks ago
parent a612475609
commit c06c96e5c9
3 changed files with 333 additions and 56 deletions
Show Stats Download Patch File Download Diff File

172
src/Components/Accounting/AccountingCurrent.tsx
Unescape View File

@ -14,8 +14,13 @@ import {
Typography, Typography,
} from "antd"; } from "antd";
import React, { useEffect, useRef, useState } from "react"; import React, { useEffect, useRef, useState } from "react";
import dayjs from "dayjs";
import "dayjs/locale/en";
import localizedFormat from "dayjs/plugin/localizedFormat";
import tagIcon from "../../assets/tagIcon.svg"; import tagIcon from "../../assets/tagIcon.svg";
import { import {
CheckOutlined,
CloseOutlined, CloseOutlined,
DeleteOutlined, DeleteOutlined,
DollarOutlined, DollarOutlined,
@ -27,7 +32,7 @@ import {
} from "@ant-design/icons"; } from "@ant-design/icons";
import { theme } from "antd"; import { theme } from "antd";
import { useAccountingData } from "../../Hooks/Accounting"; import { useAccountingData } from "../../Hooks/Accounting";
import moment, { Moment } from "moment"; import moment from "moment";
import api from "../../API/api"; import api from "../../API/api";
import { useTeamData } from "../../Hooks/Teams"; import { useTeamData } from "../../Hooks/Teams";
@ -48,6 +53,7 @@ interface BonusesTableProps {
} }
const AccountingCurrent: React.FC = () => { const AccountingCurrent: React.FC = () => {
dayjs.extend(localizedFormat);
const themes = localStorage.getItem("theme") === "true" ? true : false; const themes = localStorage.getItem("theme") === "true" ? true : false;
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
@ -57,11 +63,18 @@ const AccountingCurrent: React.FC = () => {
const { Option } = Select; const { Option } = Select;
const currentMonth = moment().month(); // const currentMonth = moment().month();
const currentYear = moment().year(); // const currentYear = moment().year();
const today = moment().endOf("day"); // const today = moment().endOf("day");
const currentMonth = dayjs().month(); // Hozirgi oy
const currentYear = dayjs().year(); // Hozirgi yil
const today = dayjs().endOf("day");
// const date = dayjs(new Date()); // new Date() ni dayjs bilan o'rnating
// const formattedDate = date.locale("en").format("YYYY-MM-DD");
const disabledDate = (current: any) => { const disabledDate = (current: dayjs.Dayjs) => {
return ( return (
current && current &&
(current.month() !== currentMonth || (current.month() !== currentMonth ||
@ -70,9 +83,11 @@ const AccountingCurrent: React.FC = () => {
); );
}; };
const [form] = Form.useForm();
const [selectedUserId, setSelectedUserId] = useState(null); const [selectedUserId, setSelectedUserId] = useState(null);
const [selectedDate, setSelectedDate] = useState<Moment | null>(null); // const [selectedDate, setSelectedDate] = useState<Moment | null>(null);
const [selectedDate, setSelectedDate] = useState<dayjs.Dayjs | null>(null);
const [form] = Form.useForm();
const [isBonusModalVisible, setIsBonusModalVisible] = useState(false); const [isBonusModalVisible, setIsBonusModalVisible] = useState(false);
const [isChargeModalVisible, setIsChargeModalVisible] = useState(false); const [isChargeModalVisible, setIsChargeModalVisible] = useState(false);
@ -104,9 +119,9 @@ const AccountingCurrent: React.FC = () => {
team: team, team: team,
}); });
const handleDateChange = (date: any) => { const handleDateChange = (date: dayjs.Dayjs | null) => {
setSelectedDate(date); setSelectedDate(date);
form.setFieldsValue({ date }); // Form.Item ichidagi qiymatni yangilash form.setFieldsValue({ date });
}; };
const handleOkCharge = () => { const handleOkCharge = () => {
@ -115,10 +130,14 @@ const AccountingCurrent: React.FC = () => {
.then((values) => { .then((values) => {
const { date, amount, notes } = values; const { date, amount, notes } = values;
const formattedDate = selectedDate
? selectedDate.format("YYYY-MM-DD")
: null;
if (selectedUserId) { if (selectedUserId) {
api api
.post(`/add-charge/${selectedUserId}/`, { .post(`/add-charge/${selectedUserId}/`, {
date: date ? date.toISOString().split("T")[0] : null, date: formattedDate,
amount: amount, amount: amount,
reason: notes, reason: notes,
}) })
@ -143,10 +162,14 @@ const AccountingCurrent: React.FC = () => {
.then((values) => { .then((values) => {
const { date, amount, notes } = values; const { date, amount, notes } = values;
const formattedDate = selectedDate
? selectedDate.format("YYYY-MM-DD")
: null;
if (selectedUserId) { if (selectedUserId) {
api api
.post(`/add-bonus/${selectedUserId}/`, { .post(`/add-bonus/${selectedUserId}/`, {
date: date ? date.toISOString().split("T")[0] : null, date: formattedDate,
amount: amount, amount: amount,
reason: notes, reason: notes,
}) })
@ -199,7 +222,6 @@ const AccountingCurrent: React.FC = () => {
api api
.get(apiUrl, { params }) .get(apiUrl, { params })
.then((response) => { .then((response) => {
console.log("API response:", response);
const formattedData = response.data?.bonuses?.map( const formattedData = response.data?.bonuses?.map(
(bonus: any, index: any) => ({ (bonus: any, index: any) => ({
no: index + 1, no: index + 1,
@ -225,7 +247,7 @@ const AccountingCurrent: React.FC = () => {
(charges: any, index: any) => ({ (charges: any, index: any) => ({
no: index + 1, no: index + 1,
id: charges.id, id: charges.id,
// date: charges.date, date: charges.date,
amount: charges.amount, amount: charges.amount,
reason: charges.reason || "", reason: charges.reason || "",
username: response.data.employee.username, username: response.data.employee.username,
@ -260,8 +282,10 @@ const AccountingCurrent: React.FC = () => {
return; return;
} }
const { date, ...fieldsWithoutDate } = record;
setSelectedRecordBonus(record); setSelectedRecordBonus(record);
form.setFieldsValue(record); form.setFieldsValue(fieldsWithoutDate);
setIsEditBonusModalVisible(true); setIsEditBonusModalVisible(true);
}; };
const showModal = (record: any) => { const showModal = (record: any) => {
@ -270,8 +294,11 @@ const AccountingCurrent: React.FC = () => {
return; return;
} }
const { date, ...fieldsWithoutDate } = record;
setSelectedRecord(record); setSelectedRecord(record);
form.setFieldsValue(record); form.setFieldsValue(fieldsWithoutDate);
setIsEditModalVisible(true); setIsEditModalVisible(true);
}; };
@ -281,6 +308,52 @@ const AccountingCurrent: React.FC = () => {
form.resetFields(); form.resetFields();
}; };
// const handleOkBonusEdit = async () => {
// try {
// const values = await form.validateFields();
// console.log(values);
// 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 handleOkBonusEdit = async () => { const handleOkBonusEdit = async () => {
try { try {
const values = await form.validateFields(); const values = await form.validateFields();
@ -289,7 +362,11 @@ const AccountingCurrent: React.FC = () => {
throw new Error("No record selected!"); throw new Error("No record selected!");
} }
const updatedData = { ...(selectedRecordBonus || {}), ...values }; // Faqat kerakli maydonlarni olish
const updatedData = {
amount: values.amount,
reason: values.reason, // Formda `notes` deb saqlanayotgan bo‘lsa
};
const response = await api.put( const response = await api.put(
`bonus/${selectedRecordBonus.id}/`, `bonus/${selectedRecordBonus.id}/`,
@ -320,7 +397,46 @@ const AccountingCurrent: React.FC = () => {
} }
}; };
// 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 handleOk = async () => { const handleOk = async () => {
try { try {
const values = await form.validateFields(); const values = await form.validateFields();
@ -329,9 +445,10 @@ const AccountingCurrent: React.FC = () => {
throw new Error("No record selected!"); throw new Error("No record selected!");
} }
// Faqat kerakli maydonlarni olish (masalan, `amount` va `reason`)
const updatedData = { const updatedData = {
...(selectedRecord || {}), amount: values.amount,
...values, reason: values.reason,
}; };
const response = await api.put( const response = await api.put(
@ -474,6 +591,7 @@ const AccountingCurrent: React.FC = () => {
title: "Username", title: "Username",
dataIndex: "username", dataIndex: "username",
key: "username", key: "username",
sorter: (a, b) => a.username.localeCompare(b.username),
render: (text, record) => ( render: (text, record) => (
<Tooltip <Tooltip
title={ title={
@ -561,6 +679,8 @@ const AccountingCurrent: React.FC = () => {
{ {
title: "Base Salary", title: "Base Salary",
dataIndex: "salary_base_amount", dataIndex: "salary_base_amount",
sorter: (a: any, b: any) =>
a.salary_base_amount - b.salary_base_amount,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.salary_base_amount}</p> <p>${record?.salary_base_amount}</p>
), ),
@ -568,6 +688,8 @@ const AccountingCurrent: React.FC = () => {
{ {
title: "Performance Salary", title: "Performance Salary",
dataIndex: "performance_salary", dataIndex: "performance_salary",
sorter: (a: any, b: any) =>
a.performance_salary - b.performance_salary,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.performance_salary}</p> <p>${record?.performance_salary}</p>
), ),
@ -575,6 +697,8 @@ const AccountingCurrent: React.FC = () => {
{ {
title: "Charges", title: "Charges",
dataIndex: "total_charges", dataIndex: "total_charges",
sorter: (a: any, b: any) => a.total_charges - b.total_charges,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.total_charges}</p> <p>${record?.total_charges}</p>
), ),
@ -582,6 +706,7 @@ const AccountingCurrent: React.FC = () => {
{ {
title: "Bonuses", title: "Bonuses",
dataIndex: "total_bonuses", dataIndex: "total_bonuses",
sorter: (a: any, b: any) => a.total_bonuses - b.total_bonuses,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.total_bonuses}</p> <p>${record?.total_bonuses}</p>
), ),
@ -597,6 +722,7 @@ const AccountingCurrent: React.FC = () => {
), ),
dataIndex: "salary", dataIndex: "salary",
key: "salary", key: "salary",
sorter: (a: any, b: any) => a.salary - b.salary,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<span>${record.salary}</span> <span>${record.salary}</span>
), ),
@ -899,7 +1025,7 @@ const AccountingCurrent: React.FC = () => {
disabledDate={disabledDate} disabledDate={disabledDate}
format="YYYY MMMM DD" format="YYYY MMMM DD"
onChange={handleDateChange} onChange={handleDateChange}
// value={selectedDate ? dayjs(selectedDate) : null} value={selectedDate ? selectedDate : null}
/> />
</Form.Item> </Form.Item>
@ -961,7 +1087,7 @@ const AccountingCurrent: React.FC = () => {
disabledDate={disabledDate} disabledDate={disabledDate}
format="YYYY MMMM DD" format="YYYY MMMM DD"
onChange={handleDateChange} onChange={handleDateChange}
// value={selectedDate ? dayjs(selectedDate) : null} value={selectedDate ? selectedDate : null}
/> />
</Form.Item> </Form.Item>
@ -1001,7 +1127,7 @@ const AccountingCurrent: React.FC = () => {
maskClosable={false} maskClosable={false}
okText={ okText={
<span> <span>
<PlusOutlined style={{ marginRight: 4 }} /> <CheckOutlined style={{ marginRight: 4 }} />
Save Save
</span> </span>
} }
@ -1048,7 +1174,7 @@ const AccountingCurrent: React.FC = () => {
maskClosable={false} maskClosable={false}
okText={ okText={
<span> <span>
<PlusOutlined style={{ marginRight: 4 }} /> <CheckOutlined style={{ marginRight: 4 }} />
Save Save
</span> </span>
} }

46
src/Components/Accounting/AccountingHistory.tsx
Unescape View File

@ -3,6 +3,7 @@ import {
Drawer, Drawer,
Input, Input,
Select, Select,
Spin,
Table, Table,
Tooltip, Tooltip,
Typography, Typography,
@ -11,6 +12,7 @@ import React, { useEffect, useRef, useState } from "react";
import tagIcon from "../../assets/tagIcon.svg"; import tagIcon from "../../assets/tagIcon.svg";
import { import {
CloseOutlined, CloseOutlined,
EyeOutlined,
QuestionCircleOutlined, QuestionCircleOutlined,
SearchOutlined, SearchOutlined,
} from "@ant-design/icons"; } from "@ant-design/icons";
@ -31,6 +33,7 @@ interface Salary {
base_salary: string; base_salary: string;
performance_salary: string; performance_salary: string;
total_salary: string; total_salary: string;
salary_document_path: string;
} }
interface Employee { interface Employee {
@ -64,6 +67,8 @@ const AccountingHistory: React.FC = () => {
const [selectedUser, setSelectedUser] = useState<any>(null); const [selectedUser, setSelectedUser] = useState<any>(null);
const [loading, setLoading] = useState(false);
const handleRowClick = async (record: any, e: any) => { const handleRowClick = async (record: any, e: any) => {
setSelectedUser(record); setSelectedUser(record);
setOpen(true); setOpen(true);
@ -80,6 +85,8 @@ const AccountingHistory: React.FC = () => {
setYears(newYears); setYears(newYears);
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} finally {
setLoading(false); // Loading holatini o'chirish
} }
}; };
@ -163,6 +170,7 @@ const AccountingHistory: React.FC = () => {
title: "Username", title: "Username",
dataIndex: "username", dataIndex: "username",
key: "username", key: "username",
sorter: (a, b) => a.username.localeCompare(b.username),
render: (text, record) => ( render: (text, record) => (
<Tooltip <Tooltip
title={ title={
@ -276,6 +284,8 @@ const AccountingHistory: React.FC = () => {
{ {
title: "Base Salary", title: "Base Salary",
dataIndex: "total_base_salary", dataIndex: "total_base_salary",
sorter: (a: any, b: any) =>
a.total_base_salary - b.total_base_salary,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.total_base_salary}</p> <p>${record?.total_base_salary}</p>
), ),
@ -283,6 +293,8 @@ const AccountingHistory: React.FC = () => {
{ {
title: "Performance Salary", title: "Performance Salary",
dataIndex: "total_performance_salary", dataIndex: "total_performance_salary",
sorter: (a: any, b: any) =>
a.total_performance_salary - b.total_performance_salary,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.total_performance_salary}</p> <p>${record?.total_performance_salary}</p>
), ),
@ -290,6 +302,7 @@ const AccountingHistory: React.FC = () => {
{ {
title: "Total Charges", title: "Total Charges",
dataIndex: "total_charges", dataIndex: "total_charges",
sorter: (a: any, b: any) => a.total_charges - b.total_charges,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.total_charges}</p> <p>${record?.total_charges}</p>
), ),
@ -297,6 +310,7 @@ const AccountingHistory: React.FC = () => {
{ {
title: "Total Bonuses", title: "Total Bonuses",
dataIndex: "total_bonuses", dataIndex: "total_bonuses",
sorter: (a: any, b: any) => a.total_bonuses - b.total_bonuses,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.total_bonuses}</p> <p>${record?.total_bonuses}</p>
), ),
@ -305,6 +319,8 @@ const AccountingHistory: React.FC = () => {
title: "Total Salary", title: "Total Salary",
dataIndex: "total_earned_salary", dataIndex: "total_earned_salary",
key: "total_earned_salary", key: "total_earned_salary",
sorter: (a: any, b: any) =>
a.total_earned_salary - b.total_earned_salary,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<span>${record.total_earned_salary}</span> <span>${record.total_earned_salary}</span>
), ),
@ -449,7 +465,7 @@ const AccountingHistory: React.FC = () => {
<div style={{ marginTop: 24 }}> <div style={{ marginTop: 24 }}>
{years.length === 0 ? ( {years.length === 0 ? (
<p>No data available for the years.</p> <Spin spinning={loading} />
) : ( ) : (
years.map((year) => ( years.map((year) => (
<div key={year} style={{ marginBottom: 32 }}> <div key={year} style={{ marginBottom: 32 }}>
@ -459,6 +475,7 @@ const AccountingHistory: React.FC = () => {
.filter((salary) => salary.year === year) .filter((salary) => salary.year === year)
.map((filteredSalary) => ( .map((filteredSalary) => (
<Table <Table
loading={loading}
key={filteredSalary.id} key={filteredSalary.id}
dataSource={[filteredSalary]} dataSource={[filteredSalary]}
columns={[ columns={[
@ -493,6 +510,33 @@ const AccountingHistory: React.FC = () => {
<span>${record.total_salary}</span> <span>${record.total_salary}</span>
), ),
}, },
{
title: "Action",
dataIndex: "salary_document_path",
align: "center",
render: (text, record) => (
<Tooltip
title={
record.salary_document_path
? "View Document"
: "No Document"
}
>
<Button
type="primary"
icon={<EyeOutlined />}
onClick={() =>
record.salary_document_path &&
window.open(
record.salary_document_path,
"_blank"
)
}
disabled={!record.salary_document_path}
/>
</Tooltip>
),
},
]} ]}
rowKey="id" rowKey="id"
pagination={false} pagination={false}

171
src/Components/Accounting/AccountingLast.tsx
Unescape View File

@ -17,6 +17,7 @@ import React, { useEffect, useRef, useState } from "react";
import tagIcon from "../../assets/tagIcon.svg"; import tagIcon from "../../assets/tagIcon.svg";
import { import {
CheckCircleOutlined, CheckCircleOutlined,
CheckOutlined,
CloseOutlined, CloseOutlined,
DeleteOutlined, DeleteOutlined,
DollarOutlined, DollarOutlined,
@ -32,6 +33,8 @@ import { useAccountingData } from "../../Hooks/Accounting";
import moment from "moment"; import moment from "moment";
import api from "../../API/api"; import api from "../../API/api";
import dayjs from "dayjs"; import dayjs from "dayjs";
import "dayjs/locale/en";
import localizedFormat from "dayjs/plugin/localizedFormat";
import { useTeamData } from "../../Hooks/Teams"; import { useTeamData } from "../../Hooks/Teams";
type Employee = { type Employee = {
@ -51,6 +54,7 @@ interface BonusesTableProps {
} }
const AccountingCurrent: React.FC = () => { const AccountingCurrent: React.FC = () => {
dayjs.extend(localizedFormat);
const themes = localStorage.getItem("theme") === "true" ? true : false; const themes = localStorage.getItem("theme") === "true" ? true : false;
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
@ -63,12 +67,17 @@ const AccountingCurrent: React.FC = () => {
month: "long", month: "long",
}); });
const lastMonth = moment().subtract(1, "months").month(); // const lastMonth = moment().subtract(1, "months").month();
const lastMonthYear = moment().subtract(1, "months").year(); // const lastMonthYear = moment().subtract(1, "months").year();
// const lastMonthDefault = dayjs().subtract(1, "month");
// const today = moment().endOf("day");
const lastMonth = dayjs().subtract(1, "month").month();
const lastMonthYear = dayjs().subtract(1, "month").year();
const lastMonthDefault = dayjs().subtract(1, "month"); const lastMonthDefault = dayjs().subtract(1, "month");
const today = moment().endOf("day"); const today = dayjs().endOf("day");
const disabledDate = (current: any) => { const disabledDate = (current: dayjs.Dayjs) => {
return ( return (
current && current &&
(current.month() !== lastMonth || (current.month() !== lastMonth ||
@ -77,9 +86,10 @@ const AccountingCurrent: React.FC = () => {
); );
}; };
const [form] = Form.useForm();
const [selectedUserId, setSelectedUserId] = useState(null); const [selectedUserId, setSelectedUserId] = useState(null);
const [selectedDate, setSelectedDate] = useState<moment.Moment | null>(null); const [selectedDate, setSelectedDate] = useState<dayjs.Dayjs | null>(null);
const [form] = Form.useForm();
const [isBonusModalVisible, setIsBonusModalVisible] = useState(false); const [isBonusModalVisible, setIsBonusModalVisible] = useState(false);
const [isChargeModalVisible, setIsChargeModalVisible] = useState(false); const [isChargeModalVisible, setIsChargeModalVisible] = useState(false);
@ -111,7 +121,7 @@ const AccountingCurrent: React.FC = () => {
team: team, team: team,
}); });
const handleDateChange = (date: any) => { const handleDateChange = (date: dayjs.Dayjs | null) => {
setSelectedDate(date); setSelectedDate(date);
form.setFieldsValue({ date }); form.setFieldsValue({ date });
}; };
@ -122,10 +132,14 @@ const AccountingCurrent: React.FC = () => {
.then((values) => { .then((values) => {
const { date, amount, notes } = values; const { date, amount, notes } = values;
const formattedDate = selectedDate
? selectedDate.format("YYYY-MM-DD")
: null;
if (selectedUserId) { if (selectedUserId) {
api api
.post(`/add-charge/${selectedUserId}/`, { .post(`/add-charge/${selectedUserId}/`, {
date: date ? date.toISOString().split("T")[0] : null, date: formattedDate,
amount: amount, amount: amount,
reason: notes, reason: notes,
}) })
@ -150,10 +164,14 @@ const AccountingCurrent: React.FC = () => {
.then((values) => { .then((values) => {
const { date, amount, notes } = values; const { date, amount, notes } = values;
const formattedDate = selectedDate
? selectedDate.format("YYYY-MM-DD")
: null;
if (selectedUserId) { if (selectedUserId) {
api api
.post(`/add-bonus/${selectedUserId}/`, { .post(`/add-bonus/${selectedUserId}/`, {
date: date ? date.toISOString().split("T")[0] : null, date: formattedDate,
amount: amount, amount: amount,
reason: notes, reason: notes,
}) })
@ -210,7 +228,7 @@ const AccountingCurrent: React.FC = () => {
(bonus: any, index: any) => ({ (bonus: any, index: any) => ({
no: index + 1, no: index + 1,
id: bonus.id, id: bonus.id,
// date: bonus.date, date: bonus.date,
amount: bonus.amount, amount: bonus.amount,
reason: bonus.reason || "", reason: bonus.reason || "",
username: response.data.employee.username, username: response.data.employee.username,
@ -231,7 +249,7 @@ const AccountingCurrent: React.FC = () => {
(charges: any, index: any) => ({ (charges: any, index: any) => ({
no: index + 1, no: index + 1,
id: charges.id, id: charges.id,
// date: charges.date, date: charges.date,
amount: charges.amount, amount: charges.amount,
reason: charges.reason || "", reason: charges.reason || "",
username: response.data.employee.username, username: response.data.employee.username,
@ -266,11 +284,10 @@ const AccountingCurrent: React.FC = () => {
return; return;
} }
// const recordWithoutDate = { ...record }; const { date, ...fieldsWithoutDate } = record;
// delete recordWithoutDate.date;
setSelectedRecordBonus(record); setSelectedRecordBonus(record);
form.setFieldsValue(record); form.setFieldsValue(fieldsWithoutDate);
setIsEditBonusModalVisible(true); setIsEditBonusModalVisible(true);
}; };
const showModal = (record: any) => { const showModal = (record: any) => {
@ -279,11 +296,11 @@ const AccountingCurrent: React.FC = () => {
return; return;
} }
// const recordWithoutDate = { ...record }; const { date, ...fieldsWithoutDate } = record;
// delete recordWithoutDate.date;
setSelectedRecord(record); setSelectedRecord(record);
form.setFieldsValue(record); form.setFieldsValue(fieldsWithoutDate);
setIsEditModalVisible(true); setIsEditModalVisible(true);
}; };
@ -293,19 +310,65 @@ const AccountingCurrent: React.FC = () => {
form.resetFields(); form.resetFields();
}; };
// const handleOkBonusEdit = async () => {
// try {
// // Formani tekshirish
// const values = await form.validateFields();
// if (!selectedRecordBonus) {
// throw new Error("No record selected!");
// }
// // Obyektni biriktirish: selectedRecord va formdagi values
// const updatedData = { ...(selectedRecordBonus || {}), ...values };
// // Axios so‘rovini yuborish
// const response = await api.put(
// `bonus/${selectedRecordBonus.id}/`,
// updatedData,
// {
// headers: {
// "Content-Type": "application/json",
// },
// }
// );
// // Javobni tekshirish
// 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 handleOkBonusEdit = async () => { const handleOkBonusEdit = async () => {
try { try {
// Formani tekshirish
const values = await form.validateFields(); const values = await form.validateFields();
if (!selectedRecordBonus) { if (!selectedRecordBonus) {
throw new Error("No record selected!"); throw new Error("No record selected!");
} }
// Obyektni biriktirish: selectedRecord va formdagi values // Faqat kerakli maydonlarni olish
const updatedData = { ...(selectedRecordBonus || {}), ...values }; const updatedData = {
amount: values.amount,
reason: values.reason, // Formda `notes` deb saqlanayotgan bo‘lsa
};
// Axios so‘rovini yuborish
const response = await api.put( const response = await api.put(
`bonus/${selectedRecordBonus.id}/`, `bonus/${selectedRecordBonus.id}/`,
updatedData, updatedData,
@ -316,7 +379,6 @@ const AccountingCurrent: React.FC = () => {
} }
); );
// Javobni tekshirish
if (response.status === 202) { if (response.status === 202) {
setBonusesData((prevData: any) => setBonusesData((prevData: any) =>
prevData.map((item: any) => prevData.map((item: any) =>
@ -336,7 +398,46 @@ const AccountingCurrent: React.FC = () => {
} }
}; };
// 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 handleOk = async () => { const handleOk = async () => {
try { try {
const values = await form.validateFields(); const values = await form.validateFields();
@ -345,9 +446,10 @@ const AccountingCurrent: React.FC = () => {
throw new Error("No record selected!"); throw new Error("No record selected!");
} }
// Faqat kerakli maydonlarni olish (`amount` va `reason` yoki `notes`)
const updatedData = { const updatedData = {
...(selectedRecord || {}), amount: values.amount,
...values, reason: values.reason, // Agar `reason` bo‘lmasa, `notes`ni ishlatish
}; };
const response = await api.put( const response = await api.put(
@ -424,7 +526,6 @@ const AccountingCurrent: React.FC = () => {
if (response.status === 200) { if (response.status === 200) {
setBonusesData((prevData: any) => { setBonusesData((prevData: any) => {
const updatedData = prevData.filter((item: any) => item.id !== id); const updatedData = prevData.filter((item: any) => item.id !== id);
console.log("Updated Data:", updatedData);
return updatedData; return updatedData;
}); });
message.success(response.data.message); message.success(response.data.message);
@ -446,7 +547,6 @@ const AccountingCurrent: React.FC = () => {
if (response.status === 200) { if (response.status === 200) {
setChargesData((prevData: any) => { setChargesData((prevData: any) => {
const updatedData = prevData.filter((item: any) => item.id !== id); const updatedData = prevData.filter((item: any) => item.id !== id);
console.log("Updated Data:", updatedData);
return updatedData; return updatedData;
}); });
message.success(response.data.message); message.success(response.data.message);
@ -605,6 +705,7 @@ const AccountingCurrent: React.FC = () => {
title: "Username", title: "Username",
dataIndex: "username", dataIndex: "username",
key: "username", key: "username",
sorter: (a, b) => a.username.localeCompare(b.username),
render: (text, record) => ( render: (text, record) => (
<Tooltip <Tooltip
title={ title={
@ -692,6 +793,8 @@ const AccountingCurrent: React.FC = () => {
{ {
title: "Base Salary", title: "Base Salary",
dataIndex: "salary_base_amount", dataIndex: "salary_base_amount",
sorter: (a: any, b: any) =>
a.salary_base_amount - b.salary_base_amount,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.salary_base_amount}</p> <p>${record?.salary_base_amount}</p>
), ),
@ -699,6 +802,8 @@ const AccountingCurrent: React.FC = () => {
{ {
title: "Performance Salary", title: "Performance Salary",
dataIndex: "performance_salary", dataIndex: "performance_salary",
sorter: (a: any, b: any) =>
a.performance_salary - b.performance_salary,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.performance_salary}</p> <p>${record?.performance_salary}</p>
), ),
@ -706,6 +811,7 @@ const AccountingCurrent: React.FC = () => {
{ {
title: "Charges", title: "Charges",
dataIndex: "total_charges", dataIndex: "total_charges",
sorter: (a: any, b: any) => a.total_charges - b.total_charges,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.total_charges}</p> <p>${record?.total_charges}</p>
), ),
@ -713,6 +819,7 @@ const AccountingCurrent: React.FC = () => {
{ {
title: "Bonuses", title: "Bonuses",
dataIndex: "total_bonuses", dataIndex: "total_bonuses",
sorter: (a: any, b: any) => a.total_bonuses - b.total_bonuses,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<p>${record?.total_bonuses}</p> <p>${record?.total_bonuses}</p>
), ),
@ -721,6 +828,7 @@ const AccountingCurrent: React.FC = () => {
title: "Salary", title: "Salary",
dataIndex: "salary", dataIndex: "salary",
key: "salary", key: "salary",
sorter: (a: any, b: any) => a.salary - b.salary,
render: (text: string, record: any) => ( render: (text: string, record: any) => (
<span>${record.salary}</span> <span>${record.salary}</span>
), ),
@ -1141,8 +1249,7 @@ const AccountingCurrent: React.FC = () => {
format="YYYY MMMM DD" format="YYYY MMMM DD"
defaultPickerValue={lastMonthDefault} defaultPickerValue={lastMonthDefault}
onChange={handleDateChange} onChange={handleDateChange}
value={selectedDate ? selectedDate : null}
// value={lastMonthDefault}
/> />
</Form.Item> </Form.Item>
@ -1206,7 +1313,7 @@ const AccountingCurrent: React.FC = () => {
defaultPickerValue={lastMonthDefault} defaultPickerValue={lastMonthDefault}
format="YYYY MMMM DD" format="YYYY MMMM DD"
onChange={handleDateChange} onChange={handleDateChange}
// value={selectedDate} value={selectedDate ? selectedDate : null}
/> />
</Form.Item> </Form.Item>
@ -1246,7 +1353,7 @@ const AccountingCurrent: React.FC = () => {
maskClosable={false} maskClosable={false}
okText={ okText={
<span> <span>
<PlusOutlined style={{ marginRight: 4 }} /> <CheckOutlined style={{ marginRight: 4 }} />
Save Save
</span> </span>
} }
@ -1293,7 +1400,7 @@ const AccountingCurrent: React.FC = () => {
maskClosable={false} maskClosable={false}
okText={ okText={
<span> <span>
<PlusOutlined style={{ marginRight: 4 }} /> <CheckOutlined style={{ marginRight: 4 }} />
Save Save
</span> </span>
} }

Write Preview
Loading…
Cancel
Save