taxtank-core 0.33.55 → 0.33.56
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -19,11 +19,14 @@ export class HomeOfficeCalculatorForm extends AbstractForm {
|
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
submit() {
|
|
22
|
-
let occupancyPercent =
|
|
23
|
-
if (
|
|
24
|
-
occupancyPercent
|
|
22
|
+
let occupancyPercent = 0;
|
|
23
|
+
if (this.value.officeArea && this.value.homeArea) {
|
|
24
|
+
occupancyPercent = this.value.officeArea * 100 / this.value.homeArea;
|
|
25
|
+
if (!this.value.dedicatedOffice) {
|
|
26
|
+
occupancyPercent *= this.value.workUsage / 100;
|
|
27
|
+
}
|
|
25
28
|
}
|
|
26
29
|
return super.submit({ occupancyPercent: round(occupancyPercent, 2) });
|
|
27
30
|
}
|
|
28
31
|
}
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZS1vZmZpY2UtY2FsY3VsYXRvci5mb3JtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2Zvcm1zL2hvbWUtb2ZmaWNlL2hvbWUtb2ZmaWNlLWNhbGN1bGF0b3IuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDaEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMvQyxPQUFPLEtBQUssTUFBTSxjQUFjLENBQUM7QUFHakMsTUFBTSxPQUFPLHdCQUF5QixTQUFRLFlBQTZCO0lBQ3pFLFlBQVksS0FBSyxHQUFHLFlBQVksQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDO1FBQ25ELEtBQUssQ0FBQztZQUNKLFFBQVEsRUFBRSxJQUFJLFdBQVcsQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ2hFLFVBQVUsRUFBRSxJQUFJLFdBQVcsQ0FBQyxLQUFLLENBQUMsVUFBVSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3BFLGVBQWUsRUFBRSxJQUFJLFdBQVcsQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzlFLFNBQVMsRUFBRSxJQUFJLFdBQVcsQ0FBQyxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsU0FBUyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztTQUM5RixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBRVYsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQ3RELElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDakQsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsTUFBTTtRQUNKLElBQUksZ0JBQWdCLEdBQUcsQ0FBQyxDQUFBO1FBQ3hCLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUU7WUFDaEQsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDO1lBQ3JFLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGVBQWUsRUFBRTtnQkFDL0IsZ0JBQWdCLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLEdBQUcsR0FBRyxDQUFDO2FBQ2hEO1NBQ0Y7UUFFRCxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3hFLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEZvcm1Db250cm9sLCBWYWxpZGF0b3JzIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgQWJzdHJhY3RGb3JtIH0gZnJvbSAnLi4vYWJzdHJhY3QuZm9ybSc7XG5pbXBvcnQgeyBIb21lT2ZmaWNlQ2xhaW0gfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHJvdW5kIGZyb20gJ2xvZGFzaC9yb3VuZCc7XG5pbXBvcnQgeyBJRXZlbnRMaXN0ZW5lciB9IGZyb20gJy4uLy4uL2ludGVyZmFjZXMnO1xuXG5leHBvcnQgY2xhc3MgSG9tZU9mZmljZUNhbGN1bGF0b3JGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPEhvbWVPZmZpY2VDbGFpbT4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIGNvbnN0cnVjdG9yKGNsYWltID0gcGxhaW5Ub0NsYXNzKEhvbWVPZmZpY2VDbGFpbSwge30pKSB7XG4gICAgc3VwZXIoe1xuICAgICAgaG9tZUFyZWE6IG5ldyBGb3JtQ29udHJvbChjbGFpbS5ob21lQXJlYSwgW1ZhbGlkYXRvcnMucmVxdWlyZWRdKSxcbiAgICAgIG9mZmljZUFyZWE6IG5ldyBGb3JtQ29udHJvbChjbGFpbS5vZmZpY2VBcmVhLCBbVmFsaWRhdG9ycy5yZXF1aXJlZF0pLFxuICAgICAgZGVkaWNhdGVkT2ZmaWNlOiBuZXcgRm9ybUNvbnRyb2woY2xhaW0uZGVkaWNhdGVkT2ZmaWNlLCBbVmFsaWRhdG9ycy5yZXF1aXJlZF0pLFxuICAgICAgd29ya1VzYWdlOiBuZXcgRm9ybUNvbnRyb2woeyB2YWx1ZTogY2xhaW0ud29ya1VzYWdlLCBkaXNhYmxlZDogdHJ1ZSB9LCBbVmFsaWRhdG9ycy5yZXF1aXJlZF0pXG4gICAgfSwgY2xhaW0pO1xuXG4gICAgdGhpcy5saXN0ZW5FdmVudHMoKTtcbiAgfVxuXG4gIGxpc3RlbkV2ZW50cygpIHtcbiAgICB0aGlzLmdldCgnZGVkaWNhdGVkT2ZmaWNlJykudmFsdWVDaGFuZ2VzLnN1YnNjcmliZSgoKSA9PiB7XG4gICAgICB0aGlzLnRvZ2dsZUVuYWJsZWRTdGF0ZSh0aGlzLmdldCgnd29ya1VzYWdlJykpO1xuICAgIH0pO1xuICB9XG5cbiAgc3VibWl0KCk6IEhvbWVPZmZpY2VDbGFpbSB7XG4gICAgbGV0IG9jY3VwYW5jeVBlcmNlbnQgPSAwXG4gICAgaWYgKHRoaXMudmFsdWUub2ZmaWNlQXJlYSAmJiB0aGlzLnZhbHVlLmhvbWVBcmVhKSB7XG4gICAgICBvY2N1cGFuY3lQZXJjZW50ID0gdGhpcy52YWx1ZS5vZmZpY2VBcmVhICogMTAwIC8gdGhpcy52YWx1ZS5ob21lQXJlYTtcbiAgICAgIGlmICghdGhpcy52YWx1ZS5kZWRpY2F0ZWRPZmZpY2UpIHtcbiAgICAgICAgb2NjdXBhbmN5UGVyY2VudCAqPSB0aGlzLnZhbHVlLndvcmtVc2FnZSAvIDEwMDtcbiAgICAgIH1cbiAgICB9XG5cbiAgICByZXR1cm4gc3VwZXIuc3VibWl0KHsgb2NjdXBhbmN5UGVyY2VudDogcm91bmQob2NjdXBhbmN5UGVyY2VudCwgMikgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -24665,9 +24665,12 @@ class HomeOfficeCalculatorForm extends AbstractForm {
|
|
|
24665
24665
|
});
|
|
24666
24666
|
}
|
|
24667
24667
|
submit() {
|
|
24668
|
-
let occupancyPercent =
|
|
24669
|
-
if (
|
|
24670
|
-
occupancyPercent
|
|
24668
|
+
let occupancyPercent = 0;
|
|
24669
|
+
if (this.value.officeArea && this.value.homeArea) {
|
|
24670
|
+
occupancyPercent = this.value.officeArea * 100 / this.value.homeArea;
|
|
24671
|
+
if (!this.value.dedicatedOffice) {
|
|
24672
|
+
occupancyPercent *= this.value.workUsage / 100;
|
|
24673
|
+
}
|
|
24671
24674
|
}
|
|
24672
24675
|
return super.submit({ occupancyPercent: round(occupancyPercent, 2) });
|
|
24673
24676
|
}
|