Merge pull request #2267 from ORNL-AMO/issue-2254-new-bill

Issue-2254: fix date setting in meter data form

Author: rmroot

src/app/shared/shared-meter-content/edit-bill/edit-bill.component.ts

@@ -61,7 +61,6 @@ export class EditBillComponent implements OnInit {
           this.addOrEdit = 'edit';
           let accountMeterData: Array<IdbUtilityMeterData> = this.utilityMeterDataDbService.accountMeterData.getValue();
           this.editMeterData = accountMeterData.find(data => { return data.guid == meterReadingId });
-          console.log(this.editMeterData);
         } else {
           //new Reading
           let accountMeterData: Array<IdbUtilityMeterData> = this.utilityMeterDataDbService.accountMeterData.getValue();

src/app/shared/shared-meter-content/edit-bill/edit-electricity-bill/edit-electricity-bill.component.ts

@@ -12,7 +12,6 @@ import { IdbUtilityMeter } from 'src/app/models/idbModels/utilityMeter';
 import { IdbCustomFuel } from 'src/app/models/idbModels/customFuel';
 import { AccountdbService } from 'src/app/indexedDB/account-db.service';
 import { IdbAccount } from 'src/app/models/idbModels/account';
-import { IdbCustomGWP } from 'src/app/models/idbModels/customGWP';
 
 @Component({
   selector: 'app-edit-electricity-bill',

src/app/shared/shared-meter-content/utility-meter-data.service.ts

@@ -137,10 +137,10 @@ export class UtilityMeterDataService {
 
 
   updateElectricityMeterDataFromForm(meterData: IdbUtilityMeterData, form: FormGroup, uploadedFilePath?: string): IdbUtilityMeterData {
-    let formDate: Date = new Date(form.controls.readDate.value)
-    meterData.year = formDate.getFullYear();
-    meterData.month = formDate.getMonth() + 1;
-    meterData.day = formDate.getDate();
+    let dateData: Array<string> = form.controls.readDate.value.split('-');
+    meterData.year = parseInt(dateData[0]);
+    meterData.month = parseInt(dateData[1]);
+    meterData.day = parseInt(dateData[2]);
     meterData.totalEnergyUse = form.controls.totalEnergyUse.value;
     meterData.totalCost = form.controls.totalCost.value;
     meterData.totalRealDemand = form.controls.totalRealDemand.value;
@@ -221,10 +221,10 @@ export class UtilityMeterDataService {
   }
 
   updateGeneralMeterDataFromForm(meterData: IdbUtilityMeterData, form: FormGroup, uploadedFilePath?: string): IdbUtilityMeterData {
-    let formDate: Date = new Date(form.controls.readDate.value)
-    meterData.year = formDate.getFullYear();
-    meterData.month = formDate.getMonth() + 1;
-    meterData.day = formDate.getDate();
+    let dateData: Array<string> = form.controls.readDate.value.split('-');
+    meterData.year = parseInt(dateData[0]);
+    meterData.month = parseInt(dateData[1]);
+    meterData.day = parseInt(dateData[2]);
     meterData.totalVolume = form.controls.totalVolume.value;
     meterData.totalEnergyUse = form.controls.totalEnergyUse.value;
     meterData.totalCost = form.controls.totalCost.value;