Skip to content

Commit 341af52

Browse files
authored
[Fleet Management] Remove exporter from toolbar (#111)
1 parent 8fcefa7 commit 341af52

2 files changed

Lines changed: 95 additions & 133 deletions

File tree

projects/fleet-management-grid/src/app/fleet-management-grid/fleet-management-grid.component.html

Lines changed: 65 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<igx-grid class="main-grid" [data]="vehicleData$ | async" [isLoading]="isLoading" #grid height="100%" width="100%">
22
<igx-grid-toolbar>
33
<igx-grid-toolbar-title>Fleet Management</igx-grid-toolbar-title>
4-
<igx-grid-toolbar-actions>
5-
<button igxButton="flat" *ngIf="grid.sortingExpressions.length > 0"
6-
(buttonClick)="grid.sortingExpressions=[]">
7-
<igx-icon>clear</igx-icon>
8-
<label>Clear Sort</label>
9-
</button>
10-
<igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>
11-
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
12-
<igx-grid-toolbar-exporter></igx-grid-toolbar-exporter>
13-
<igx-grid-toolbar-advanced-filtering></igx-grid-toolbar-advanced-filtering>
14-
</igx-grid-toolbar-actions>
4+
<igx-grid-toolbar-actions>
5+
<button igxButton="flat" *ngIf="grid.sortingExpressions.length > 0" (buttonClick)="grid.sortingExpressions=[]">
6+
<igx-icon>clear</igx-icon>
7+
<label>Clear Sort</label>
8+
</button>
9+
<igx-grid-toolbar-hiding></igx-grid-toolbar-hiding>
10+
<igx-grid-toolbar-pinning></igx-grid-toolbar-pinning>
11+
<igx-grid-toolbar-advanced-filtering></igx-grid-toolbar-advanced-filtering>
12+
</igx-grid-toolbar-actions>
1513
</igx-grid-toolbar>
1614

1715
<igx-column field="vehicleId" header="Vehicle ID" [sortable]="true" width="9%"></igx-column>
@@ -36,7 +34,8 @@
3634
<igx-column field="locationCity" header="Location (City)" [sortable]="true" width="11%"></igx-column>
3735
<igx-column field="locationGps" header="Location (GPS)" width="14%">
3836
<ng-template igxCell let-cell="cell">
39-
<a class="link-style" #coordinates href="#" (click)="showLocationOverlay($event, cell); $event.preventDefault();">{{ cell.value }}</a>
37+
<a class="link-style" #coordinates href="#"
38+
(click)="showLocationOverlay($event, cell); $event.preventDefault();">{{ cell.value }}</a>
4039
</ng-template>
4140
</igx-column>
4241

@@ -53,15 +52,16 @@
5352
<div class="carousel-container">
5453
<igx-carousel #carousel>
5554
<igx-slide *ngFor="let slide of getPathToCarImage(dataItem.vehicleId)">
56-
<div class="image-container">
57-
<img [src]="slide"/>
58-
</div>
55+
<div class="image-container">
56+
<img [src]="slide" />
57+
</div>
5958
</igx-slide>
6059
</igx-carousel>
6160
</div>
6261

6362
<div class="details-table">
64-
<div class="detail-block-container" *ngFor="let categorySet of [VEHICLE_DETAILS.detailsCategories, VEHICLE_DETAILS.engineCategories]">
63+
<div class="detail-block-container"
64+
*ngFor="let categorySet of [VEHICLE_DETAILS.detailsCategories, VEHICLE_DETAILS.engineCategories]">
6565
<div class="detail-category-container">
6666
<div class="detail-item" *ngFor="let category of categorySet">
6767
<span class="detail-category">{{ category.label }}: </span>
@@ -87,7 +87,8 @@
8787

8888
<igx-tab-content>
8989
<div class="grid-container">
90-
<ng-container *ngTemplateOutlet="tripHistory; context: { $implicit: dataService.findTripHistoryById(dataItem.vehicleId) }"></ng-container>
90+
<ng-container
91+
*ngTemplateOutlet="tripHistory; context: { $implicit: dataService.findTripHistoryById(dataItem.vehicleId) }"></ng-container>
9192
</div>
9293
</igx-tab-content>
9394
</igx-tab-item>
@@ -99,7 +100,8 @@
99100

100101
<igx-tab-content>
101102
<div class="grid-container">
102-
<ng-container *ngTemplateOutlet="maintenance; context: { $implicit: dataService.findMaintenanceDataById(dataItem.vehicleId)}"></ng-container>
103+
<ng-container
104+
*ngTemplateOutlet="maintenance; context: { $implicit: dataService.findMaintenanceDataById(dataItem.vehicleId)}"></ng-container>
103105
</div>
104106
</igx-tab-content>
105107
</igx-tab-item>
@@ -114,8 +116,9 @@
114116
<div class="chart-container pie-chart-container">
115117
<div class="chart-header">
116118
<span class="chart-title">Costs per Type</span>
117-
<igx-select #select class="chart-select" [value]="periods[dataItem.vehicleId]?.costPerTypePeriod || Period.YTD"
118-
(selectionChanging)="onPeriodChange($event, 'costsPerType', dataItem.vehicleId)">
119+
<igx-select #select class="chart-select"
120+
[value]="periods[dataItem.vehicleId]?.costPerTypePeriod || Period.YTD"
121+
(selectionChanging)="onPeriodChange($event, 'costsPerType', dataItem.vehicleId)">
119122
<label igxLabel>Period</label>
120123
<igx-select-item [value]="Period.YTD">YTD</igx-select-item>
121124
<igx-select-item [value]="Period.ThreeMonths">Last 3 Months</igx-select-item>
@@ -124,27 +127,20 @@
124127
</igx-select>
125128
</div>
126129
<div class="chart-content">
127-
<igx-pie-chart
128-
name="chart"
129-
class="chart-canvas"
130-
#chart
131-
legendLabelMemberPath="category"
132-
labelMemberPath="summary"
133-
valueMemberPath="value"
134-
labelsPosition="OutsideEnd"
135-
radiusFactor="0.7"
130+
<igx-pie-chart name="chart" class="chart-canvas" #chart legendLabelMemberPath="category"
131+
labelMemberPath="summary" valueMemberPath="value" labelsPosition="OutsideEnd" radiusFactor="0.7"
136132
[dataSource]="dataService.findCostsPerTypeData(dataItem.vehicleId, periods[dataItem.vehicleId]?.costPerTypePeriod || Period.YTD)"
137-
actualLabelOuterColor="#ededed"
138-
>
133+
actualLabelOuterColor="#ededed">
139134
</igx-pie-chart>
140135
</div>
141136
</div>
142137

143138
<div class="chart-container area-chart-container">
144139
<div class="chart-header">
145140
<span class="chart-title">Costs per Meter, per Quarter</span>
146-
<igx-select #select class="chart-select" [value]="periods[dataItem.vehicleId]?.costPerMeterPeriod || Period.YTD"
147-
(selectionChanging)="onPeriodChange($event, 'costsPerMeter', dataItem.vehicleId)">
141+
<igx-select #select class="chart-select"
142+
[value]="periods[dataItem.vehicleId]?.costPerMeterPeriod || Period.YTD"
143+
(selectionChanging)="onPeriodChange($event, 'costsPerMeter', dataItem.vehicleId)">
148144
<label igxLabel>Period</label>
149145
<igx-select-item value="ytd">YTD</igx-select-item>
150146
<igx-select-item value="'2023'">2023</igx-select-item>
@@ -154,31 +150,22 @@
154150
</igx-select>
155151
</div>
156152
<div class="chart-content">
157-
<igx-category-chart
158-
name="chart"
159-
class="chart-canvas"
153+
<igx-category-chart name="chart" class="chart-canvas"
160154
[dataSource]="dataService.findCostsPerMeterData(dataItem.vehicleId, periods[dataItem.vehicleId]?.costPerMeterPeriod || Period.YTD)"
161-
chartType="Area"
162-
isHorizontalZoomEnabled="false"
163-
isVerticalZoomEnabled="false"
164-
computedPlotAreaMarginMode="Series"
165-
xAxisLabelTextColor="#ededed"
166-
yAxisLabelTextColor="#ededed"
167-
yAxisInterval="20"
168-
yAxisMinimumValue="0"
169-
yAxisMaximumValue="80"
170-
yAxisLabelRightMargin="15"
171-
areaFillOpacity="100"
172-
>
155+
chartType="Area" isHorizontalZoomEnabled="false" isVerticalZoomEnabled="false"
156+
computedPlotAreaMarginMode="Series" xAxisLabelTextColor="#ededed" yAxisLabelTextColor="#ededed"
157+
yAxisInterval="20" yAxisMinimumValue="0" yAxisMaximumValue="80" yAxisLabelRightMargin="15"
158+
areaFillOpacity="100">
173159
</igx-category-chart>
174160
</div>
175161
</div>
176162

177163
<div class="chart-container column-chart-container">
178164
<div class="chart-header">
179165
<span class="chart-title">Fuel Costs per Month</span>
180-
<igx-select #select class="chart-select" [value]="periods[dataItem.vehicleId]?.fuelCostPeriod || Period.YTD"
181-
(selectionChanging)="onPeriodChange($event, 'fuelCosts', dataItem.vehicleId)">
166+
<igx-select #select class="chart-select"
167+
[value]="periods[dataItem.vehicleId]?.fuelCostPeriod || Period.YTD"
168+
(selectionChanging)="onPeriodChange($event, 'fuelCosts', dataItem.vehicleId)">
182169
<label igxLabel>Period</label>
183170
<igx-select-item [value]="Period.YTD">YTD</igx-select-item>
184171
<igx-select-item [value]="Period.ThreeMonths">Last 3 Months</igx-select-item>
@@ -187,22 +174,11 @@
187174
</igx-select>
188175
</div>
189176
<div class="chart-content">
190-
<igx-category-chart
191-
name="chart"
192-
class="column-chart"
193-
#chart
194-
chartType="Column"
177+
<igx-category-chart name="chart" class="column-chart" #chart chartType="Column"
195178
[dataSource]="dataService.getFuelCostsData(dataItem.vehicleId, periods[dataItem.vehicleId]?.fuelCostPeriod || Period.YTD)"
196-
yAxisTitle="Costs in USD"
197-
isHorizontalZoomEnabled="false"
198-
isVerticalZoomEnabled="false"
199-
xAxisLabelTextColor="#ededed"
200-
yAxisLabelTextColor="#ededed"
201-
yAxisTitleTextColor="#ededed"
202-
yAxisMinimumValue="0"
203-
xAxisMinimumGapSize="30"
204-
yAxisLabelRightMargin="7.5"
205-
>
179+
yAxisTitle="Costs in USD" isHorizontalZoomEnabled="false" isVerticalZoomEnabled="false"
180+
xAxisLabelTextColor="#ededed" yAxisLabelTextColor="#ededed" yAxisTitleTextColor="#ededed"
181+
yAxisMinimumValue="0" xAxisMinimumGapSize="30" yAxisLabelRightMargin="7.5">
206182
</igx-category-chart>
207183
</div>
208184
</div>
@@ -220,29 +196,13 @@
220196
<div class="content-wrapper">
221197
<div class="chart-content utilization-chart-container">
222198
<h6>Utilization per Month</h6>
223-
<igx-legend
224-
name="Legend"
225-
#legend
226-
orientation="Horizontal">
199+
<igx-legend name="Legend" #legend orientation="Horizontal">
227200
</igx-legend>
228-
<igx-category-chart
229-
name="chart"
230-
class="column-chart-two-series"
231-
#chart
232-
chartType="Column"
233-
[dataSource]="dataService.findUtilizationDataById(dataItem.vehicleId)"
234-
[legend]="legend"
235-
yAxisTitle="Miles"
236-
isHorizontalZoomEnabled="false"
237-
isVerticalZoomEnabled="false"
238-
xAxisLabelTextColor="#ededed"
239-
yAxisLabelTextColor="#ededed"
240-
yAxisTitleTextColor="#ededed"
241-
yAxisMinimumValue="0"
242-
yAxisInterval="200"
243-
xAxisMinimumGapSize="20"
244-
yAxisLabelRightMargin="7.5"
245-
>
201+
<igx-category-chart name="chart" class="column-chart-two-series" #chart chartType="Column"
202+
[dataSource]="dataService.findUtilizationDataById(dataItem.vehicleId)" [legend]="legend"
203+
yAxisTitle="Miles" isHorizontalZoomEnabled="false" isVerticalZoomEnabled="false"
204+
xAxisLabelTextColor="#ededed" yAxisLabelTextColor="#ededed" yAxisTitleTextColor="#ededed"
205+
yAxisMinimumValue="0" yAxisInterval="200" xAxisMinimumGapSize="20" yAxisLabelRightMargin="7.5">
246206
</igx-category-chart>
247207
</div>
248208
</div>
@@ -254,11 +214,13 @@ <h6>Utilization per Month</h6>
254214

255215
<ng-template #tripHistory let-tripHistoryData>
256216
<igx-grid class="child-grid" [data]="tripHistoryData" height="null" width="100%">
257-
<igx-column field="id" header="ID" width="5%" [cellStyles]="rightAlignedCellStyles" [headerStyles]="rightAlignedHeaderStyles"></igx-column>
217+
<igx-column field="id" header="ID" width="5%" [cellStyles]="rightAlignedCellStyles"
218+
[headerStyles]="rightAlignedHeaderStyles"></igx-column>
258219
<igx-column field="driverName" header="Driver" width="18%">
259220
<ng-template igxCell let-cell="cell">
260221
<igx-avatar shape="circle" size="small" [src]="getPathToDriverPhoto(cell)" class="driver-avatar"></igx-avatar>
261-
<a class="status-value" #coordinates href="#" (click)="showDriverOverlay($event, cell); $event.preventDefault();">{{ cell.value }}</a>
222+
<a class="status-value" #coordinates href="#"
223+
(click)="showDriverOverlay($event, cell); $event.preventDefault();">{{ cell.value }}</a>
262224
<igx-badge class="driver-badge" type="success" *ngIf="cell.row.index === 0 && cell.row.data.end === 'N/A'">
263225
Current
264226
</igx-badge>
@@ -268,16 +230,21 @@ <h6>Utilization per Month</h6>
268230
<igx-column field="end" header="End" width="9%"></igx-column>
269231
<igx-column field="startLocation" header="Start Location" width="10%"></igx-column>
270232
<igx-column field="endLocation" header="End Location" width="10%"></igx-column>
271-
<igx-column field="startMeter" header="Start Meter" width="9.5%" [cellStyles]="rightAlignedCellStyles" [headerStyles]="rightAlignedHeaderStyles"></igx-column>
272-
<igx-column field="endMeter" header="End Meter" width="9.5%" [cellStyles]="rightAlignedCellStyles" [headerStyles]="rightAlignedHeaderStyles"></igx-column>
273-
<igx-column field="distance" header="Distance" width="9%" [cellStyles]="rightAlignedCellStyles" [headerStyles]="rightAlignedHeaderStyles"></igx-column>
274-
<igx-column field="totalTime" header="Total Time" width="9%" [cellStyles]="rightAlignedCellStyles" [headerStyles]="rightAlignedHeaderStyles"></igx-column>
233+
<igx-column field="startMeter" header="Start Meter" width="9.5%" [cellStyles]="rightAlignedCellStyles"
234+
[headerStyles]="rightAlignedHeaderStyles"></igx-column>
235+
<igx-column field="endMeter" header="End Meter" width="9.5%" [cellStyles]="rightAlignedCellStyles"
236+
[headerStyles]="rightAlignedHeaderStyles"></igx-column>
237+
<igx-column field="distance" header="Distance" width="9%" [cellStyles]="rightAlignedCellStyles"
238+
[headerStyles]="rightAlignedHeaderStyles"></igx-column>
239+
<igx-column field="totalTime" header="Total Time" width="9%" [cellStyles]="rightAlignedCellStyles"
240+
[headerStyles]="rightAlignedHeaderStyles"></igx-column>
275241
</igx-grid>
276242
</ng-template>
277243

278244
<ng-template #maintenance let-maintenanceData>
279245
<igx-grid class="child-grid" [data]="maintenanceData" height="100%" width="100%">
280-
<igx-column field="id" header="ID" width="5%" [cellStyles]="rightAlignedCellStyles" [headerStyles]="rightAlignedHeaderStyles"></igx-column>
246+
<igx-column field="id" header="ID" width="5%" [cellStyles]="rightAlignedCellStyles"
247+
[headerStyles]="rightAlignedHeaderStyles"></igx-column>
281248
<igx-column field="event" header="Event" width="23%"></igx-column>
282249
<igx-column field="date" header="Date" width="10%"></igx-column>
283250
<igx-column field="location" header="Location" width="10%"></igx-column>
@@ -304,13 +271,9 @@ <h6 class="overlay-title">{{ vehicleDetails.make }} {{ vehicleDetails.model }}</
304271
<span class="overlay-text">Mileage: {{ vehicleDetails.mileage }}</span>
305272
</igx-card-header>
306273
<igx-card-content class="overlay-location-content">
307-
<igx-geographic-map #map [width]="'100%'" [height]="'100%'"
308-
zoomable="false"
309-
draggable="false"
310-
[dataSource]="vehicleDetails.markerLocations"
311-
latitudeMemberPath="latitude"
312-
longitudeMemberPath="longitude">
313-
</igx-geographic-map>
274+
<igx-geographic-map #map [width]="'100%'" [height]="'100%'" zoomable="false" draggable="false"
275+
[dataSource]="vehicleDetails.markerLocations" latitudeMemberPath="latitude" longitudeMemberPath="longitude">
276+
</igx-geographic-map>
314277
</igx-card-content>
315278
<igx-card-actions class="overlay-location-actions">
316279
<button igxButton="flat" (click)="closeLocationOverlay()">Close</button>
@@ -344,4 +307,4 @@ <h6 class="overlay-title">{{ driverDetails.name }}</h6>
344307
<button igxButton="flat" (click)="closeDriverOverlay()">Close</button>
345308
</igx-card-actions>
346309
</igx-card>
347-
</div>
310+
</div>

0 commit comments

Comments
 (0)