fixes to mobile emissions conversions in calanderization

src/app/calculations/calanderization/calanderizationHelpers.ts

@@ -62,7 +62,7 @@ export function getConsumptionUnit(meter: IdbUtilityMeter, accountOrFacility: Id
 }
 
 export function getUnitFromMeter(accountMeter: IdbUtilityMeter, accountOrFacility: IdbAccount | IdbFacility): string {
-    if (accountMeter.source == 'Electricity' || getIsEnergyUnit(accountMeter.startingUnit)) {
+    if (accountMeter.source == 'Electricity' || (getIsEnergyUnit(accountMeter.startingUnit) && accountMeter.scope != 2)) {
         return accountOrFacility.energyUnit;
     } else if (accountMeter.source == 'Natural Gas') {
         return accountOrFacility.volumeGasUnit;

src/app/calculations/calanderization/calanderizeMeters.ts

@@ -311,12 +311,6 @@ function getBillPeriodTotal(previousReading: IdbUtilityMeterData, currentReading
         meter.vehicleDistanceUnit,
         hhvOrFuelEfficiencyCurrent);
 
-    if (isNaN(emissionsForCurrent.mobileCarbonEmissions)) {
-        console.log(currentReading);
-        console.log(meter);
-        console.log('===')
-    }
-
     let costForCurrent: number = (currentReading.totalCost / daysFromPrevious) * daysFromCurrent;
 
     //days from next bill to current bill reading
@@ -410,7 +404,7 @@ function calanderizeMeterDataFullMonth(meter: IdbUtilityMeter, meterData: Array<
             let readingSummaries: Array<CalanderizedReadingSummary> = new Array();
             currentMonthsReadings.forEach(reading => {
                 let totalMonthEnergyUse: number = 0;
-                let totalMonthEnergyConsumption: number = 0;
+                let totalConsumption: number = 0;
                 let totalMonthCost: number = Number(reading.totalCost);
                 //energy use
                 let isEnergyMeter: boolean = getIsEnergyMeter(meter.source);
@@ -419,10 +413,10 @@ function calanderizeMeterDataFullMonth(meter: IdbUtilityMeter, meterData: Array<
                 }
                 //energy consumption (data input not as energy)
                 let isEnergyUnit: boolean = getIsEnergyUnit(meter.startingUnit);
-                if (!isEnergyUnit) {
-                    totalMonthEnergyConsumption = Number(reading.totalVolume);
+                if (!isEnergyUnit || meter.scope == 2) {
+                    totalConsumption = Number(reading.totalVolume);
                 } else {
-                    totalMonthEnergyConsumption = totalMonthEnergyUse;
+                    totalConsumption = totalMonthEnergyUse;
                 }
                 let hhvOrFuelEfficiency: number = reading.heatCapacity;
                 if (meter.scope == 2) {
@@ -433,12 +427,12 @@ function calanderizeMeterDataFullMonth(meter: IdbUtilityMeter, meterData: Array<
                     facilities,
                     co2Emissions,
                     customFuels,
-                    totalMonthEnergyConsumption,
+                    totalConsumption,
                     meter.vehicleCollectionUnit,
                     meter.vehicleDistanceUnit,
                     hhvOrFuelEfficiency);
                 readingSummaries.push({
-                    consumption: totalMonthEnergyConsumption,
+                    consumption: totalConsumption,
                     energyUse: totalMonthEnergyUse,
                     cost: totalMonthCost,
                     emissionsResults: emissions,

src/app/calculations/conversions/convertMeterData.ts

@@ -32,8 +32,14 @@ export function convertMeterData(meter: IdbUtilityMeter, meterData: Array<IdbUti
         if (meter.source == 'Other Fuels' && meter.scope == 2) {
             startingUnit = meter.vehicleCollectionUnit;
         }
-        for (let index: number = 0; index < copyMeterData.length; index++) {
-            copyMeterData[index].totalVolume = new ConvertValue(copyMeterData[index].totalVolume, startingUnit, facilityUnit).convertedValue;
+        if (meter.scope != 2) {
+            for (let index: number = 0; index < copyMeterData.length; index++) {
+                copyMeterData[index].totalVolume = new ConvertValue(copyMeterData[index].totalVolume, startingUnit, facilityUnit).convertedValue;
+            }
+        } else if (meter.vehicleCollectionType == 1) {
+            for (let index: number = 0; index < copyMeterData.length; index++) {
+                copyMeterData[index].totalVolume = new ConvertValue(copyMeterData[index].totalVolume, startingUnit, facilityUnit).convertedValue;
+            }
         }
     }
     return copyMeterData;

src/app/facility/utility-data/calanderization/calanderization.component.html

@@ -117,7 +117,7 @@ <h4>{{selectedMeter.name}} Calanderized Data
 
                 <div>
                     <app-calanderized-meter-data-table *ngIf="dataDisplay == 'table'" [itemsPerPage]="itemsPerPage"
-                        [calanderizedMeter]="calanderizedMeter">
+                            [calanderizedMeter]="calanderizedMeter" [consumptionLabel]="consumptionLabel">
                     </app-calanderized-meter-data-table>
                     <app-calanderization-chart *ngIf="dataDisplay == 'graph'" [meterData]="calanderizedMeter"
                         [displayGraphEnergy]="displayGraphEnergy" [displayGraphCost]="displayGraphCost">

src/app/facility/utility-data/calanderization/calanderization.component.ts

@@ -43,6 +43,7 @@ export class CalanderizationComponent implements OnInit {
   selectedFacility: IdbFacility;
   displayDataApplicationModal: boolean = false;
   hasMeterData: boolean;
+  consumptionLabel: 'Consumption' | 'Distance';
   constructor(private calanderizationService: CalanderizationService, private utilityMeterDbService: UtilityMeterdbService,
     private facilityDbService: FacilitydbService,
     private dbChangesService: DbChangesService, private accountDbService: AccountdbService,
@@ -107,6 +108,11 @@ export class CalanderizationComponent implements OnInit {
       let calanderizedMeterData: Array<CalanderizedMeter> = getCalanderizedMeterData([this.selectedMeter], facilityMeterData, this.selectedFacility, false, undefined, this.eGridService.co2Emissions, customFuels, [this.selectedFacility]);
       calanderizedMeterData = this.filterMeterDataDateRanges(calanderizedMeterData);
       this.calanderizedMeter = calanderizedMeterData[0];
+      if(this.selectedMeter.scope != 2){
+        this.consumptionLabel = 'Consumption';
+      }else{
+        this.consumptionLabel = 'Distance';
+      }
     }
   }
 

src/app/facility/utility-data/calanderization/calanderized-meter-data-table/calanderized-meter-data-table.component.html

@@ -11,7 +11,7 @@
                 Month</th>
             <th (click)="setOrderDataField('energyConsumption')"
                 [ngClass]="{'active': orderDataField == 'energyConsumption'}" *ngIf="calanderizedMeter.showConsumption">
-                Total Consumption<br> (<span [innerHTML]="calanderizedMeter.consumptionUnit | settingsLabel"></span>)
+                Total {{consumptionLabel}}<br> (<span [innerHTML]="calanderizedMeter.consumptionUnit | settingsLabel"></span>)
             </th>
             <th (click)="setOrderDataField('energyUse')" [ngClass]="{'active': orderDataField == 'energyUse'}"
                 *ngIf="calanderizedMeter.showEnergyUse">

src/app/facility/utility-data/calanderization/calanderized-meter-data-table/calanderized-meter-data-table.component.ts

@@ -12,6 +12,8 @@ export class CalanderizedMeterDataTableComponent implements OnInit {
   calanderizedMeter: CalanderizedMeter;
   @Input()
   itemsPerPage: number;
+  @Input()
+  consumptionLabel: 'Consumption' | 'Distance';
 
   @ViewChild('meterDataTable', { static: false }) meterDataTable: ElementRef;
   orderDataField: string = 'date';

src/app/facility/utility-data/energy-consumption/utility-meter-data/utility-meter-data-table/vehicle-data-table/vehicle-data-table.component.html

@@ -23,7 +23,7 @@
             <th (click)="setOrderDataField('readDate')" [ngClass]="{'active': orderDataField == 'readDate'}"
                 class="row-year">Meter Read Date</th>
             <th (click)="setOrderDataField('totalVolume')" [ngClass]="{'active': orderDataField == 'totalVolume'}">
-                Total Consumption<br> (<span [innerHTML]="volumeUnit | settingsLabel"></span>)
+                Total {{consumptionLabel}}<br> (<span [innerHTML]="volumeUnit | settingsLabel"></span>)
             </th>
             <th (click)="setOrderDataField('totalEnergyUse')" [ngClass]="{'active': orderDataField == 'totalEnergyUse'}"
                 *ngIf="vehicleDataFilters.totalEnergy">Total Energy<br> (<span [innerHTML]="energyUnit | settingsLabel"></span>)</th>

src/app/facility/utility-data/energy-consumption/utility-meter-data/utility-meter-data-table/vehicle-data-table/vehicle-data-table.component.ts

@@ -46,6 +46,7 @@ export class VehicleDataTableComponent {
   showDetailedCharges: boolean;
   volumeUnit: string;
   energyUnit: string
+  consumptionLabel: 'Consumption' | 'Distance';
   constructor(private utilityMeterDataService: UtilityMeterDataService,
     private copyTableService: CopyTableService,
     private customFuelDbService: CustomFuelDbService,
@@ -72,6 +73,11 @@ export class VehicleDataTableComponent {
 
   ngOnChanges() {
     this.setData();
+    if(this.selectedMeter.scope != 2){
+      this.consumptionLabel = 'Consumption';
+    }else{
+      this.consumptionLabel = 'Distance';
+    }
   }
 
   setData() {