Bladeren bron

bug fix

tags/Baseline_30082024_FRONTEND_UAT
leoho2fi 1 jaar geleden
bovenliggende
commit
5036661743
7 gewijzigde bestanden met toevoegingen van 20 en 9 verwijderingen
  1. BIN
      public/temp/AR01_Late Start Report.xlsx
  2. BIN
      public/temp/AR02_Delay Report.xlsx
  3. BIN
      public/temp/AR03_Resource Overconsumption.xlsx
  4. +2
    -2
      src/components/NavigationContent/NavigationContent.tsx
  5. +2
    -2
      src/components/Report/DelayReportGen/DelayReportGen.tsx
  6. +14
    -3
      src/components/Report/LateStartReportGen/LateStartReportGen.tsx
  7. +2
    -2
      src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx

BIN
public/temp/AR01_Late Start Report.xlsx Bestand weergeven


BIN
public/temp/AR02_Delay Report.xlsx Bestand weergeven


BIN
public/temp/AR03_Resource Overconsumption.xlsx Bestand weergeven


+ 2
- 2
src/components/NavigationContent/NavigationContent.tsx Bestand weergeven

@@ -103,8 +103,8 @@ const navigationItems: NavigationItem[] = [
{icon: <Analytics />, label:"Delay Report", path: "/analytics/DelayReport"},
{icon: <Analytics />, label:"Resource Overconsumption Report", path: "/analytics/ResourceOverconsumptionReport"},
{icon: <Analytics />, label:"Cost and Expense Report", path: "/analytics/CostandExpenseReport"},
{icon: <Analytics />, label:"Completion Report", path: "/analytics/CompletionReport"},
{icon: <Analytics />, label:"Completion Report with Outstanding Un-billed Hours Report", path: "/analytics/CompletionReportWO"},
{icon: <Analytics />, label:"Completion Report", path: "/analytics/ProjectCompletionReport"},
{icon: <Analytics />, label:"Completion Report with Outstanding Un-billed Hours Report", path: "/analytics/ProjectCompletionReportWO"},
],
},
{


+ 2
- 2
src/components/Report/DelayReportGen/DelayReportGen.tsx Bestand weergeven

@@ -16,8 +16,8 @@ const ProgressByClientSearch: React.FC<Props> = ({ projects }) => {

const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
() => [
{ label: "Team", paramName: "team", type: "text" },
{ label: "Client", paramName: "client", type: "text" },
{ label: "Team", paramName: "team", type: "select", options: ["AAA", "BBB", "CCC"] },
{ label: "Client", paramName: "client", type: "select", options: ["Cust A", "Cust B", "Cust C"] },
{ label: "Status", paramName: "status", type: "select", options: ["Delayed", "Potential Delay"] },
// {
// label: "Status",


+ 14
- 3
src/components/Report/LateStartReportGen/LateStartReportGen.tsx Bestand weergeven

@@ -5,6 +5,9 @@ import SearchBox, { Criterion } from "../../ReportSearchBox";
import { useTranslation } from "react-i18next";
import { LateStart } from "@/app/api/report";
//import { DownloadReportButton } from './DownloadReportButton';
import axios from 'axios';
import { apiPath } from '../../../auth/utils';
//import { GET_QC_CATEGORY_COMBO } from 'utils/ApiPathConst';
interface Props {
projects: LateStart[];
}
@@ -13,11 +16,19 @@ type SearchParamNames = keyof SearchQuery;

const ProgressByClientSearch: React.FC<Props> = ({ projects }) => {
const { t } = useTranslation("projects");

// const [teamCombo, setteamCombo] = useState([]);
// const getteamCombo = () => {
// axios.get(`${apiPath}${GET_QC_CATEGORY_COMBO}`)
// .then(response => {
// setteamCombo(response.data.records)})
// .catch(error => {
// console.error('Error fetching data: ', error);
// });
// }
const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
() => [
{ label: "Team", paramName: "team", type: "text" },
{ label: "Client", paramName: "client", type: "text" },
{ label: "Team", paramName: "team", type: "select", options: ["AAA", "BBB", "CCC"] },
{ label: "Client", paramName: "client", type: "select", options: ["Cust A", "Cust B", "Cust C"] },
{
label: "Remained Date From",
label2: "Remained Date To",


+ 2
- 2
src/components/Report/ResourceOverconsumptionReportGen/ResourceOverconsumptionReportGen.tsx Bestand weergeven

@@ -16,8 +16,8 @@ const ProgressByClientSearch: React.FC<Props> = ({ projects }) => {

const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
() => [
{ label: "Team", paramName: "team", type: "text" },
{ label: "Client", paramName: "client", type: "text" },
{ label: "Team", paramName: "team", type: "select", options: ["AAA", "BBB", "CCC"] },
{ label: "Client", paramName: "client", type: "select", options: ["Cust A", "Cust B", "Cust C"] },
{ label: "Status", paramName: "status", type: "select", options: ["Overconsumption", "Potential Overconsumption"] },
// {
// label: "Status",


Laden…
Annuleren
Opslaan