BP 645: Changed the default values for the validTo date
diff --git a/src/app/reporting/components/standby-reporting/standby-reporting.component.html b/src/app/reporting/components/standby-reporting/standby-reporting.component.html
index 4267cbb..ea6609c 100644
--- a/src/app/reporting/components/standby-reporting/standby-reporting.component.html
+++ b/src/app/reporting/components/standby-reporting/standby-reporting.component.html
@@ -108,7 +108,7 @@
</button>
</div>
<div class="input-group-append">
- <button class="btn btn-outline-secondary" (click)="setReportDefaultDays()" type="button" id="dateToDefault"
+ <button class="btn btn-outline-secondary" (click)="setReportDefaultDays(true)" type="button" id="dateToDefault"
data-toggle="tooltip" data-placement="bottom" title="Auf Standardwert setzen">
<i class="fa fa-clock-o" aria-hidden="true"></i>
</button>
diff --git a/src/app/reporting/components/standby-reporting/standby-reporting.component.ts b/src/app/reporting/components/standby-reporting/standby-reporting.component.ts
index 197ea4e..7051a1b 100644
--- a/src/app/reporting/components/standby-reporting/standby-reporting.component.ts
+++ b/src/app/reporting/components/standby-reporting/standby-reporting.component.ts
@@ -117,10 +117,10 @@
}
- setReportDefaultDays() {
+ setReportDefaultDays(clicked: boolean) {
const formValue = this.form.getRawValue();
- if (formValue.reportName === 'Wochenübersicht') {
+ /*if (formValue.reportName === 'Wochenübersicht') {
const days = 6;
const validFromDate: Date = new Date(formValue.validFrom.year, formValue.validFrom.month - 1, formValue.validFrom.day);
FormUtil.setDefaultReportDate(this.form, 'validTo', days, validFromDate);
@@ -130,6 +130,15 @@
FormUtil.setDefaultReportDate(this.form, 'validTo', days, validFromDate);
} else {
FormUtil.setDefaultDate(this.form, 'validTo');
+ }*/
+ if (clicked) {
+ const days = 7;
+ const validFromDate: Date = new Date(formValue.validFrom.year, formValue.validFrom.month - 1, formValue.validFrom.day);
+ FormUtil.setDefaultReportDate(this.form, 'validTo', days, validFromDate);
+ } else {
+ const days = 1;
+ const validFromDate: Date = new Date(formValue.validFrom.year, formValue.validFrom.month - 1, formValue.validFrom.day);
+ FormUtil.setDefaultReportDate(this.form, 'validTo', days, validFromDate);
}
}
@@ -161,6 +170,7 @@
});
this.getFormData();
this.setDefaultDate('validFrom');
+ this.setReportDefaultDays(false);
}
downLoadFile(data: any, type: string, reportName: String, printFormat: String) {
