From 4ba64cc4ffa200463a24ecb46f83ed8a241e8bef Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Thu, 23 Jun 2022 00:10:06 +0200 Subject: [PATCH] feat: add project timesheet. --- .../ProjectDetailActionsBar.tsx | 19 ++- .../ProjectDetails/ProjectDetailProvider.tsx | 5 +- .../ProjectDetails/ProjectDetailTabs.tsx | 13 +- .../ProjectFinancialSection/components.tsx | 0 .../ProjectFinancialSection/index.tsx | 125 ++++++++++++++++++ .../ProjectTimesheet/TimesheetsTable.tsx | 124 +++++++++++++++++ .../ProjectTimesheet/components.tsx | 120 +++++++++++++++++ .../ProjectDetails/ProjectTimesheet/index.tsx | 28 ++++ .../TimeSheetDataTable/components.tsx | 83 ------------ .../TimeSheetDataTable/index.tsx | 89 ------------- .../containers/ProjectDetails/index.tsx | 8 +- 11 files changed, 426 insertions(+), 188 deletions(-) create mode 100644 src/containers/Projects/containers/ProjectDetails/ProjectFinancialSection/components.tsx create mode 100644 src/containers/Projects/containers/ProjectDetails/ProjectFinancialSection/index.tsx create mode 100644 src/containers/Projects/containers/ProjectDetails/ProjectTimesheet/TimesheetsTable.tsx create mode 100644 src/containers/Projects/containers/ProjectDetails/ProjectTimesheet/components.tsx create mode 100644 src/containers/Projects/containers/ProjectDetails/ProjectTimesheet/index.tsx delete mode 100644 src/containers/Projects/containers/ProjectDetails/TimeSheetDataTable/components.tsx delete mode 100644 src/containers/Projects/containers/ProjectDetails/TimeSheetDataTable/index.tsx diff --git a/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx b/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx index 8e2c1368e..62b76eb35 100644 --- a/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx +++ b/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx @@ -1,3 +1,4 @@ +// @ts-nocheck import React from 'react'; import { Button, @@ -15,7 +16,7 @@ import { import withSettings from '../../../Settings/withSettings'; import withSettingsActions from '../../../Settings/withSettingsActions'; import withDialogActions from 'containers/Dialog/withDialogActions'; - +import { useProjectDetailContext } from './ProjectDetailProvider'; import { compose } from 'utils'; /** @@ -32,16 +33,25 @@ function ProjectDetailActionsBar({ // #withSettingsActions addSetting, }) { + const { projectId } = useProjectDetailContext(); + // Handle new transaction button click. const handleNewTransactionBtnClick = () => {}; + const handleEditProjectBtnClick = () => { + openDialog('project-form', { + projectId, + }); + }; // Handle table row size change. const handleTableRowSizeChange = (size) => { addSetting('timesheets', 'tableSize', size); }; const handleTimeEntryBtnClick = () => { - openDialog('time-entry-form'); + openDialog('time-entry-form', { + projectId, + }); }; // Handle the refresh button click. @@ -58,14 +68,15 @@ function ProjectDetailActionsBar({ />