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

change base url and websocket , bug fixes update,accounting history page

Browse Source
dilmurod
Dilmurod 1 month ago
parent df1cac3298
commit ff15af483e
5 changed files with 82 additions and 83 deletions
Show Stats Download Patch File Download Diff File

6
src/API/api.ts
Unescape View File

@ -4,9 +4,9 @@ import axios from "axios";
// baseURL: "http://10.10.10.64:8080/api/v1/", // baseURL: "http://10.10.10.64:8080/api/v1/",
// }); // });
const instance = axios.create({ const instance = axios.create({
// baseURL: "https://board-api.ontime-logs.com/api/v1/", baseURL: "https://board-api.ontime-logs.com/api/v1/",
baseURL: "https://api.tteld.co/api/v1/", // baseURL: "https://api.tteld.co/api/v1/",
// baseURL: "http://10.10.10.64:8000/api/v1/", // baseURL: "http://10.10.10.29:8000/api/v1/",
}); });
const token: string | null = localStorage.getItem("access"); const token: string | null = localStorage.getItem("access");

4
src/App.tsx
Unescape View File

@ -286,8 +286,8 @@ const App: React.FC = () => {
// ); // );
// taskSocket = new WebSocket(`wss://api.tteld.co/global/?user_id=${admin_id}`); // taskSocket = new WebSocket(`wss://api.tteld.co/global/?user_id=${admin_id}`);
taskSocket = new WebSocket( taskSocket = new WebSocket(
// `wss://board-socket.ontime-logs.com/global/?user_id=${admin_id}` `wss://board-api.ontime-logs.com/global/?user_id=${admin_id}`
`wss://ontime-socket.tteld.co/global/?user_id=${admin_id}` // `wss://ontime-socket.tteld.co/global/?user_id=${admin_id}`
// `ws://10.10.10.64:8000/global/?user_id=${admin_id}` // `ws://10.10.10.64:8000/global/?user_id=${admin_id}`
); );

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

@ -467,81 +467,80 @@ const AccountingHistory: React.FC = () => {
{years.length === 0 ? ( {years.length === 0 ? (
<Spin spinning={loading} /> <Spin spinning={loading} />
) : ( ) : (
years.map((year) => ( years.map((year) => {
<div key={year} style={{ marginBottom: 32 }}> const salariesForYear =
<Title level={3}>{year}</Title> userData?.salaries?.filter((salary) => salary.year === year) ||
{userData && [];
userData.salaries
.filter((salary) => salary.year === year)
.map((filteredSalary) => (
<Table
loading={loading}
key={filteredSalary.id}
dataSource={[filteredSalary]}
columns={[
{
title: <img src={tagIcon} alt="" />,
dataIndex: "no",
width: "5%",
align: "center",
render: (text, record, index) => index + 1,
},
{ title: "Year", dataIndex: "year" },
{ title: "Month", dataIndex: "month" },
{ return (
title: "Total Charges", <div key={year} style={{ marginBottom: 32 }}>
dataIndex: "total_charges", <Title level={3}>{year}</Title>
render: (text: string, record: any) => ( <Table
<span>${record.total_charges}</span> loading={loading}
), dataSource={salariesForYear}
}, columns={[
{ {
title: "Total Bonus", title: <img src={tagIcon} alt="" />,
dataIndex: "total_bonuses", dataIndex: "no",
render: (text: string, record: any) => ( width: "5%",
<span>${record.total_bonuses}</span> align: "center",
), render: (text, record, index) => index + 1,
}, },
{ { title: "Year", dataIndex: "year" },
title: "Total Salary", { title: "Month", dataIndex: "month" },
dataIndex: "total_salary", {
render: (text: string, record: any) => ( title: "Total Charges",
<span>${record.total_salary}</span> dataIndex: "total_charges",
), render: (text: string, record: any) => (
}, <span>${record.total_charges}</span>
{ ),
title: "Action", },
dataIndex: "salary_document_path", {
align: "center", title: "Total Bonus",
render: (text, record) => ( dataIndex: "total_bonuses",
<Tooltip render: (text: string, record: any) => (
title={ <span>${record.total_bonuses}</span>
record.salary_document_path ),
? "View Document" },
: "No Document" {
} title: "Total Salary",
> dataIndex: "total_salary",
<Button render: (text: string, record: any) => (
type="primary" <span>${record.total_salary}</span>
icon={<EyeOutlined />} ),
onClick={() => },
record.salary_document_path && {
window.open(record.salary_document_path) title: "Action",
} dataIndex: "salary_document_path",
disabled={!record.salary_document_path} align: "center",
/> render: (text, record) => (
</Tooltip> <Tooltip
), title={
}, record.salary_document_path
]} ? "View Document"
rowKey="id" : "No Document"
pagination={false} }
bordered >
/> <Button
))} type="primary"
</div> icon={<EyeOutlined />}
)) onClick={() =>
record.salary_document_path &&
window.open(record.salary_document_path)
}
disabled={!record.salary_document_path}
/>
</Tooltip>
),
},
]}
rowKey="id"
pagination={false}
bordered
/>
</div>
);
})
)} )}
</div> </div>
</Drawer> </Drawer>

4
src/Components/Updates/UpdateEdit.tsx
Unescape View File

@ -210,9 +210,9 @@ const UpdateEdit = () => {
// readOnly // readOnly
// /> // />
)} */} )} */}
{data?.company.id !== undefined && ( {data?.company?.id !== null && (
<Input <Input
defaultValue={data?.company?.name} defaultValue={data?.company?.name || " "}
readOnly readOnly
/> />
)} )}

4
src/Components/Updates/UpdateTable.tsx
Unescape View File

@ -192,8 +192,8 @@ const UpdateTable = ({
render: (status: string) => ( render: (status: string) => (
<span> <span>
{status === "Done" && <p className="status-done">Done</p>} {status === "Done" && <p className="status-done">Done</p>}
{status === "Checking" && ( {status === "In Progress" && (
<p className="status-in-progress">Checking</p> <p className="status-in-progress">In Progress</p>
)} )}
{status === "New" && <p className="status-new">New</p>} {status === "New" && <p className="status-new">New</p>}
{status === "Setup" && <p className="status-new">Setup</p>} {status === "Setup" && <p className="status-new">Setup</p>}

Write Preview
Loading…
Cancel
Save