| @@ -56,12 +56,12 @@ const ClaimSearch: React.FC<Props> = ({ claims }) => { | |||||
| const columns = useMemo<Column<ClaimResult>[]>( | const columns = useMemo<Column<ClaimResult>[]>( | ||||
| () => [ | () => [ | ||||
| { | |||||
| name: "action", | |||||
| label: t("Actions"), | |||||
| onClick: onClaimClick, | |||||
| buttonIcon: <EditNote />, | |||||
| }, | |||||
| // { | |||||
| // name: "action", | |||||
| // label: t("Actions"), | |||||
| // onClick: onClaimClick, | |||||
| // buttonIcon: <EditNote />, | |||||
| // }, | |||||
| { name: "created", label: t("Creation Date") }, | { name: "created", label: t("Creation Date") }, | ||||
| { name: "name", label: t("Related Project Name") }, | { name: "name", label: t("Related Project Name") }, | ||||
| { name: "cost", label: t("Cost (HKD)") }, | { name: "cost", label: t("Cost (HKD)") }, | ||||
| @@ -397,8 +397,9 @@ const ClaimInputGrid: React.FC<ClaimInputGridProps> = ({ ...props }) => { | |||||
| }} | }} | ||||
| /> | /> | ||||
| <BottomBar getCostTotal={getCostTotal} setRows={setRows} setRowModesModel={setRowModesModel} | |||||
| sx={{flex:2}}/> | |||||
| <BottomBar getCostTotal={getCostTotal} setRows={setRows} setRowModesModel={setRowModesModel} | |||||
| // sx={{flex:2}} | |||||
| /> | |||||
| </Box> | </Box> | ||||
| ); | ); | ||||
| } | } | ||||
| @@ -10,9 +10,9 @@ import { useRouter } from "next/navigation"; | |||||
| import React, { useCallback, useState } from "react"; | import React, { useCallback, useState } from "react"; | ||||
| import { useTranslation } from "react-i18next"; | import { useTranslation } from "react-i18next"; | ||||
| import ClaimProjectDetails from "./ClaimDetails"; | import ClaimProjectDetails from "./ClaimDetails"; | ||||
| import TaskSetup from "./TaskSetup"; | |||||
| import StaffAllocation from "./StaffAllocation"; | |||||
| import ResourceMilestone from "./ResourceMilestone"; | |||||
| // import TaskSetup from "./TaskSetup"; | |||||
| // import StaffAllocation from "./StaffAllocation"; | |||||
| // import ResourceMilestone from "./ResourceMilestone"; | |||||
| const CreateProject: React.FC = () => { | const CreateProject: React.FC = () => { | ||||
| const [tabIndex, setTabIndex] = useState(0); | const [tabIndex, setTabIndex] = useState(0); | ||||
| @@ -32,7 +32,7 @@ const CustomModal: React.FC<CustomModalProps> = ({ ...props }) => { | |||||
| const ModalContent = () => { | const ModalContent = () => { | ||||
| return ( | return ( | ||||
| // <Grid item sx={{ m: 3 }}> | // <Grid item sx={{ m: 3 }}> | ||||
| <div style={PROJECT_MODAL_STYLE}> | |||||
| <div > | |||||
| <Typography variant="h6" id="modal-title"> | <Typography variant="h6" id="modal-title"> | ||||
| {props.title??"Modal Title"} | {props.title??"Modal Title"} | ||||
| </Typography> | </Typography> | ||||
| @@ -50,7 +50,7 @@ const EnterTimesheetModal: React.FC<EnterTimesheetModalProps> = ({ ...props }) = | |||||
| return ( | return ( | ||||
| <Modal open={props.isOpen} onClose={props.onClose}> | <Modal open={props.isOpen} onClose={props.onClose}> | ||||
| <div style={PROJECT_MODAL_STYLE}> | |||||
| <div> | |||||
| {/* <Typography variant="h5" id="modal-title" sx={{flex:1}}> | {/* <Typography variant="h5" id="modal-title" sx={{flex:1}}> | ||||
| <div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}> | <div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}> | ||||
| Timesheet Input | Timesheet Input | ||||
| @@ -58,7 +58,7 @@ const EnterTimesheetModal: React.FC<EnterTimesheetModalProps> = ({ ...props }) = | |||||
| </Typography> */} | </Typography> */} | ||||
| <Card style={{flex: 10, marginBottom:'20px'}}> | <Card style={{flex: 10, marginBottom:'20px'}}> | ||||
| <TimesheetInputGrid setLockConfirm={setLockConfirm}/> | |||||
| {/* <TimesheetInputGrid setLockConfirm={setLockConfirm}/> */} | |||||
| </Card> | </Card> | ||||
| <div style={{ | <div style={{ | ||||
| @@ -502,7 +502,8 @@ const TimesheetInputGrid: React.FC<TimesheetInputGridProps> = ({ ...props }) => | |||||
| /> | /> | ||||
| <BottomBar getHoursTotal={getHoursTotal} setRows={setRows} setRowModesModel={setRowModesModel} setLockConfirm={setLockConfirm} | <BottomBar getHoursTotal={getHoursTotal} setRows={setRows} setRowModesModel={setRowModesModel} setLockConfirm={setLockConfirm} | ||||
| sx={{flex:3}}/> | |||||
| // sx={{flex:3}} | |||||
| /> | |||||
| </Box> | </Box> | ||||
| ); | ); | ||||
| } | } | ||||