소스 검색

update

tags/Baseline_30082024_FRONTEND_UAT
cyril.tsui 1 년 전
부모
커밋
a104982649
6개의 변경된 파일11개의 추가작업 그리고 11개의 파일을 삭제
  1. +1
    -1
      src/components/CostAndExpenseReport/CostAndExpenseReportWrapper.tsx
  2. +1
    -1
      src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReportWrapper.tsx
  3. +1
    -1
      src/components/GenerateProjectCashFlowReport/GenerateProjectCashFlowReportWrapper.tsx
  4. +5
    -5
      src/components/NavigationContent/NavigationContent.tsx
  5. +1
    -1
      src/components/ProjectCompletionReport/ProjectCompletionReportWrapper.tsx
  6. +2
    -2
      src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReportWrapper.tsx

+ 1
- 1
src/components/CostAndExpenseReport/CostAndExpenseReportWrapper.tsx 파일 보기

@@ -14,7 +14,7 @@ interface SubComponents {

const CostAndExpenseReportWrapper: React.FC & SubComponents = async () => {
const session: any = await getServerSession(authOptions)
const teamId = session.staff?.team.id
const teamId = session.staff?.teamId
const role = session.role
let customers = await fetchAllCustomers()
let subsidiaries = await fetchAllSubsidiaries()


+ 1
- 1
src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReportWrapper.tsx 파일 보기

@@ -12,7 +12,7 @@ interface SubComponents {
const GenerateMonthlyWorkHoursReportWrapper: React.FC &
SubComponents = async () => {
const session: any = await getServerSession(authOptions);
const teamId = session.staff?.team.id;
const teamId = session.staff?.teamId;
const role = session.role;
let staffs = await fetchStaff();



+ 1
- 1
src/components/GenerateProjectCashFlowReport/GenerateProjectCashFlowReportWrapper.tsx 파일 보기

@@ -12,7 +12,7 @@ const GenerateProjectCashFlowReportWrapper: React.FC & SubComponents = async ()
const projects = await fetchProjects();
const staff = await getUserStaff()

return <GenerateProjectCashFlowReport projects={projects.filter(project => project.teamId === staff.teamId)} />;
return <GenerateProjectCashFlowReport projects={staff?.teamId ? projects.filter(project => project.teamId === staff.teamId) : projects} />;
};

GenerateProjectCashFlowReportWrapper.Loading = GenerateProjectCashFlowReportLoading;


+ 5
- 5
src/components/NavigationContent/NavigationContent.tsx 파일 보기

@@ -182,11 +182,11 @@ const NavigationContent: React.FC<Props> = ({ abilities }) => {
// label: "Completion Report with Outstanding Un-billed Hours Report",
// path: "/analytics/ProjectCompletionReportWO",
// },
{
icon: <Analytics />,
label: "Project Claims Report",
path: "/analytics/ProjectClaimsReport",
},
// {
// icon: <Analytics />,
// label: "Project Claims Report",
// path: "/analytics/ProjectClaimsReport",
// },
{
icon: <Analytics />,
label: "Project P&L Report",


+ 1
- 1
src/components/ProjectCompletionReport/ProjectCompletionReportWrapper.tsx 파일 보기

@@ -13,7 +13,7 @@ interface SubComponents {

const ProjectCompletionReportWrapper: React.FC & SubComponents = async () => {
const session: any = await getServerSession(authOptions)
const teamId = session.staff?.team.id
const teamId = session.staff?.teamId
const role = session.role

return <ProjectCompletionReport teamId={role === TEAM_LEAD && session.staff?.team ? teamId : null}/>


+ 2
- 2
src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReportWrapper.tsx 파일 보기

@@ -15,9 +15,9 @@ interface SubComponents {
const ResourceOvercomsumptionReportWrapper: React.FC &
SubComponents = async () => {
const session: any = await getServerSession(authOptions);
const teamId = session.staff?.team.id;
const teamId = session.staff?.teamId;
const role = session.role;
let needAll = true;
let needAll = true;
let teams = await fetchTeam();
const [customers, subsidiaries] = await Promise.all([
fetchAllCustomers(),


불러오는 중...
취소
저장