Ver código fonte

update create/edit project team combo, title changes

tags/Baseline_180220205_Frontend
MSI\derek 11 meses atrás
pai
commit
6b121a3824
2 arquivos alterados com 11 adições e 4 exclusões
  1. +5
    -1
      src/components/CreateProject/CreateProject.tsx
  2. +6
    -3
      src/components/CreateProject/CreateProjectWrapper.tsx

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

@@ -16,6 +16,7 @@ import TaskSetup from "./TaskSetup";
import StaffAllocation from "./StaffAllocation"; import StaffAllocation from "./StaffAllocation";
import Milestone from "./Milestone"; import Milestone from "./Milestone";
import { Task, TaskTemplate } from "@/app/api/tasks"; import { Task, TaskTemplate } from "@/app/api/tasks";
import AssignIcon from '@mui/icons-material/AssignmentIndOutlined';
import { import {
FieldErrors, FieldErrors,
FormProvider, FormProvider,
@@ -40,7 +41,7 @@ import {
WorkNature, WorkNature,
} from "@/app/api/projects"; } from "@/app/api/projects";
import { StaffResult } from "@/app/api/staff"; import { StaffResult } from "@/app/api/staff";
import { Typography } from "@mui/material";
import { Grid, Typography } from "@mui/material";
import { Grade } from "@/app/api/grades"; import { Grade } from "@/app/api/grades";
import { Customer, CustomerType, Subsidiary } from "@/app/api/customer"; import { Customer, CustomerType, Subsidiary } from "@/app/api/customer";
import { isEmpty } from "lodash"; import { isEmpty } from "lodash";
@@ -512,6 +513,8 @@ const CreateProject: React.FC<Props> = ({
onSubmit={formProps.handleSubmit(onSubmit, onSubmitError)} onSubmit={formProps.handleSubmit(onSubmit, onSubmitError)}
> >
{isEditMode && !(formProps.getValues("projectDeleted") === true) && !loading && ( {isEditMode && !(formProps.getValues("projectDeleted") === true) && !loading && (
<Grid>
<Typography mb={2} variant="h4">{t("Edit Project")}: {`<${defaultInputs?.projectCode}>`}</Typography>
<Stack direction="row" gap={1}> <Stack direction="row" gap={1}>
{/* {!formProps.getValues("projectActualStart") && ( */} {/* {!formProps.getValues("projectActualStart") && ( */}
<Button <Button
@@ -544,6 +547,7 @@ const CreateProject: React.FC<Props> = ({
</Button> </Button>
)} )}
</Stack> </Stack>
</Grid>
)} )}
<Tabs <Tabs
value={tabIndex} value={tabIndex}


+ 6
- 3
src/components/CreateProject/CreateProjectWrapper.tsx Ver arquivo

@@ -18,7 +18,7 @@ import {
fetchCustomerTypes, fetchCustomerTypes,
} from "@/app/api/customer"; } from "@/app/api/customer";
import { fetchGrades } from "@/app/api/grades"; import { fetchGrades } from "@/app/api/grades";
import { fetchUserAbilities } from "@/app/utils/fetchUtil";
import { fetchUserAbilities, fetchUserStaff } from "@/app/utils/fetchUtil";


type CreateProjectProps = { type CreateProjectProps = {
isEditMode: false; isEditMode: false;
@@ -68,7 +68,9 @@ const CreateProjectWrapper: React.FC<Props> = async (props) => {
fetchCustomerTypes(), fetchCustomerTypes(),
fetchUserAbilities(), fetchUserAbilities(),
]); ]);

const userStaff = await fetchUserStaff()
const teamId = userStaff?.teamId
const filteredTeamLeads = teamLeads.filter(teamLead => teamLead.teamId === teamId)
const projectInfo = props.isEditMode const projectInfo = props.isEditMode
? await fetchProjectDetails(props.projectId!) ? await fetchProjectDetails(props.projectId!)
: undefined; : undefined;
@@ -77,6 +79,7 @@ const CreateProjectWrapper: React.FC<Props> = async (props) => {
? await fetchMainProjects() ? await fetchMainProjects()
: undefined; : undefined;


console.log(projectInfo)
return ( return (
<CreateProject <CreateProject
isEditMode={props.isEditMode} isEditMode={props.isEditMode}
@@ -85,7 +88,7 @@ const CreateProjectWrapper: React.FC<Props> = async (props) => {
allTasks={tasks} allTasks={tasks}
projectCategories={projectCategories} projectCategories={projectCategories}
taskTemplates={taskTemplates} taskTemplates={taskTemplates}
teamLeads={teamLeads}
teamLeads={filteredTeamLeads}
allSubsidiaries={allSubsidiaries} allSubsidiaries={allSubsidiaries}
allCustomers={allCustomers} allCustomers={allCustomers}
contractTypes={contractTypes} contractTypes={contractTypes}


Carregando…
Cancelar
Salvar