Fixed add edit mileage

fylein · Mar 4, 2024 · fd76c62 · fd76c62
1 parent b13046c
commit fd76c62
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts b/src/app/fyle/add-edit-mileage/add-edit-mileage.page.ts
@@ -1,6 +1,6 @@
 // TODO: Very hard to fix this file without making massive changes
 /* eslint-disable complexity */
-import { Component, ElementRef, EventEmitter, HostListener, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, ElementRef, EventEmitter, HostListener, OnInit, ViewChild } from '@angular/core';
 import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -342,7 +342,8 @@ export class AddEditMileagePage implements OnInit {
     private platformHandlerService: PlatformHandlerService,
     private storageService: StorageService,
     private expenseService: ExpensesService,
-    private employeesService: EmployeesService
+    private employeesService: EmployeesService,
+    private changeDetectorRef: ChangeDetectorRef
   ) {}
 
   get showSaveAndNext(): boolean {
@@ -1319,14 +1320,15 @@ export class AddEditMileagePage implements OnInit {
       console.log(commuteDeductedDistance);
       if (commuteDeductedDistance < 0) {
         this.previousCommuteDeductionType = null;
-        this.fg.controls.route.patchValue({ distance: 0 }, { emitEvent: false });
+        this.fg.controls.route.patchValue({ ...this.fg.controls.route.value, distance: 0 }, { emitEvent: false });
       } else {
         this.previousCommuteDeductionType = commuteDeductionType;
-        this.fg.controls.route.patchValue({ distance: 1 }, { emitEvent: false });
+        this.fg.controls.route.patchValue({ ...this.fg.controls.route.value, distance: 1 }, { emitEvent: false });
         console.log(this.fg.value);
         console.log(commuteDeductedDistance);
       }
     }
+    this.changeDetectorRef.detectChanges();
   }
 
   getCommuteDeductionOptions(distance: number): { label: string; value: string; distance: number }[] {

diff --git a/src/app/shared/components/route-selector/route-selector.component.ts b/src/app/shared/components/route-selector/route-selector.component.ts
@@ -12,7 +12,7 @@ import {
 } from '@angular/forms';
 import { ModalController } from '@ionic/angular';
 import { intersection, isEqual } from 'lodash';
-import { Subscription } from 'rxjs';
+import { distinctUntilChanged, Subscription } from 'rxjs';
 import { RouteSelectorModalComponent } from './route-selector-modal/route-selector-modal.component';
 
 @Component({
@@ -181,7 +181,7 @@ export class RouteSelectorComponent implements OnInit, ControlValueAccessor, OnD
   }
 
   ngOnInit() {
-    this.form.controls.roundTrip.valueChanges.subscribe((roundTrip) => {
+    this.form.controls.roundTrip.valueChanges.pipe(distinctUntilChanged()).subscribe((roundTrip) => {
       if (!this.skipRoundTripUpdate) {
         if (this.formInitialized) {
           if (this.form.value.distance) {