Bladeren bron

reports update

tags/Baseline_30082024_FRONTEND_UAT
MSI\derek 1 jaar geleden
bovenliggende
commit
1bb42074bf
2 gewijzigde bestanden met toevoegingen van 8 en 12 verwijderingen
  1. +7
    -10
      src/components/ProjectCompletionReport/ProjectCompletionReport.tsx
  2. +1
    -2
      src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx

+ 7
- 10
src/components/ProjectCompletionReport/ProjectCompletionReport.tsx Bestand weergeven

@@ -53,7 +53,7 @@ const ProjectCompletionReport: React.FC<Props> = (
criteria={searchCriteria}
onSearch={async (query: any) => {
let postData: ProjectCompletionReportRequest = {
startDate: "",
startDate: "1900-01-01",
endDate: dayjs().format(INPUT_DATE_FORMAT).toString(),
outstanding: query.outstanding && query.outstanding === "Outstanding Accounts Receivable"
};
@@ -63,16 +63,13 @@ const ProjectCompletionReport: React.FC<Props> = (
if (teamId) {
postData.teamId = teamId
}
// check if start date exist
if (query.startDate.length === 0) {
setError(t("Start Date cant be empty"));
} else {
if (query.startDateFrom && query.startDateFrom.length > 0) {
postData.startDate = query.startDate;
console.log(postData)
const response = await fetchProjectCompletionReport(postData);
if (response) {
downloadFile(new Uint8Array(response.blobValue), response.filename!!);
}
}
console.log(postData)
const response = await fetchProjectCompletionReport(postData);
if (response) {
downloadFile(new Uint8Array(response.blobValue), response.filename!!);
}
}}
/>


+ 1
- 2
src/components/ResourceOverconsumptionReport/ResourceOverconsumptionReport.tsx Bestand weergeven

@@ -24,8 +24,7 @@ type SearchParamNames = keyof SearchQuery;

const ResourceOverconsumptionReport: React.FC<Props> = ({ team, customer, subsidiaries, needAll }) => {
const { t } = useTranslation("report");
console.log(customer)
const statusCombo = ["Overconsumption", "Potential Overconsumption"]
const statusCombo = ["Potential Overconsumption"]
const teamCombo = team.map(t => `${t.name} - ${t.code}`)
const custCombo = customer.map(c => ({
value: `custId-${c.id}`,


Laden…
Annuleren
Opslaan