Ver código fonte

add sub-contract fee to project

tags/Baseline_30082024_FRONTEND_UAT
cyril.tsui 1 ano atrás
pai
commit
40c274424d
5 arquivos alterados com 14 adições e 1 exclusões
  1. +1
    -0
      src/app/api/projects/actions.ts
  2. +1
    -0
      src/app/api/projects/index.ts
  3. +1
    -0
      src/components/CreateProject/CreateProject.tsx
  4. +10
    -0
      src/components/CreateProject/ProjectClientDetails.tsx
  5. +1
    -1
      src/components/CreateProject/TaskSetup.tsx

+ 1
- 0
src/app/api/projects/actions.ts Ver arquivo

@@ -63,6 +63,7 @@ export interface CreateProjectInputs {

// Miscellaneous
expectedProjectFee: number;
subContractFee?: number;
}

export interface ManhourAllocation {


+ 1
- 0
src/app/api/projects/index.ts Ver arquivo

@@ -36,6 +36,7 @@ export interface MainProject {
clientContactId: number;
clientSubsidiaryId: number;
expectedProjectFee: number;
subContractFee: number;
}

export interface ProjectCategory {


+ 1
- 0
src/components/CreateProject/CreateProject.tsx Ver arquivo

@@ -280,6 +280,7 @@ const CreateProject: React.FC<Props> = ({
projectName: mainProjects !== undefined ? mainProjects[0].projectName : undefined,
projectDescription: mainProjects !== undefined ? mainProjects[0].projectDescription : undefined,
expectedProjectFee: mainProjects !== undefined ? mainProjects[0].expectedProjectFee : undefined,
subContractFee: mainProjects !== undefined ? mainProjects[0].subContractFee : undefined,
clientId: allCustomers !== undefined ? allCustomers[0].id : undefined,
...defaultInputs,



+ 10
- 0
src/components/CreateProject/ProjectClientDetails.tsx Ver arquivo

@@ -330,6 +330,16 @@ const ProjectClientDetails: React.FC<Props> = ({
/>
</Grid>

<Grid item xs={6}>
<TextField
label={t("Sub-Contract Fee")}
fullWidth
type="number"
inputProps={{ step: "0.01" }}
{...register("subContractFee", { valueAsNumber: true })}
/>
</Grid>

<Grid item xs={6}>
<Checkbox
{...register("isClpProject")}


+ 1
- 1
src/components/CreateProject/TaskSetup.tsx Ver arquivo

@@ -137,7 +137,7 @@ const TaskSetup: React.FC<Props> = ({
disableClearable
// disablePortal
noOptionsText={t("No Task List Source")}
value={taskTemplates.find(taskTemplate => taskTemplate.id === selectedTaskTemplateId)}
value={taskTemplates.find(taskTemplate => taskTemplate.id === selectedTaskTemplateId) ?? {id: "All", name: t("All tasks")}}
options={[{id: "All", name: t("All tasks")}, ...taskTemplates.map(taskTemplate => ({id: taskTemplate.id, name: taskTemplate.name}))]}
getOptionLabel={(taskTemplate) => taskTemplate.name}
isOptionEqualToValue={(option, value) => option?.id === value?.id}


Carregando…
Cancelar
Salvar