Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

currencyPipe fixed

Browse source
This commit is contained in:
piratefinn 2017-11-15 13:46:34 +00:00
parent 3bde7aed3f
commit 840d0aabb1
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/app/dashboard/dashboard-customer.component.html
View file

@ -21,11 +21,11 @@
<ul> <ul>
<li> <li>
<div class="text-muted">My Total Spend</div> <div class="text-muted">My Total Spend</div>
<strong>{{ basicStats.user_sum | currency:'GBP':true:'1.2-2' }}</strong> <strong>{{ basicStats.user_sum | currency:'GBP':'symbol':'1.2-2' }}</strong>
</li> </li>
<li> <li>
<div class="text-muted">Value to Local Economy</div> <div class="text-muted">Value to Local Economy</div>
<strong>{{ basicStats.user_sum * 2.3 | currency:'GBP':true:'1.2-2' }}</strong> <strong>{{ basicStats.user_sum * 2.3 | currency:'GBP':'symbol':'1.2-2' }}</strong>
</li> </li>
</ul> </ul>
</div> </div>
@ -34,7 +34,7 @@
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block"> <div class="card-block">
<div class="h4 mb-0">{{ basicStats.today_sum | currency:'GBP':true:'1.2-2' }}</div> <div class="h4 mb-0">{{ basicStats.today_sum | currency:'GBP':'symbol':'1.2-2' }}</div>
<div>Total Today</div> <div>Total Today</div>
<!-- <div class="progress progress-white progress-xs mt-3"> <!-- <div class="progress progress-white progress-xs mt-3">
<div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div> <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@ -46,7 +46,7 @@
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block"> <div class="card-block">
<div class="h4 mb-0">{{ basicStats.today_sum / (basicStats.today_count ? basicStats.today_count : 1) | currency:'GBP':true:'1.2-2' }}</div> <div class="h4 mb-0">{{ basicStats.today_sum / (basicStats.today_count ? basicStats.today_count : 1) | currency:'GBP':'symbol':'1.2-2' }}</div>
<div>Avg. Spend Today</div> <div>Avg. Spend Today</div>
<!-- <div class="progress progress-white progress-xs mt-3"> <!-- <div class="progress progress-white progress-xs mt-3">
<div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div> <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@ -58,7 +58,7 @@
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block"> <div class="card-block">
<div class="h4 mb-0">{{ basicStats.week_sum | currency:'GBP':true:'1.2-2' }}</div> <div class="h4 mb-0">{{ basicStats.week_sum | currency:'GBP':'symbol':'1.2-2' }}</div>
<div>Last Week Total</div> <div>Last Week Total</div>
<!-- <div class="progress progress-white progress-xs mt-3"> <!-- <div class="progress progress-white progress-xs mt-3">
<div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div> <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@ -70,7 +70,7 @@
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block"> <div class="card-block">
<div class="h4 mb-0">{{ basicStats.week_sum / (basicStats.week_count ? basicStats.week_count : 1) | currency:'GBP':true:'1.2-2' }}</div> <div class="h4 mb-0">{{ basicStats.week_sum / (basicStats.week_count ? basicStats.week_count : 1) | currency:'GBP':'symbol':'1.2-2' }}</div>
<div>Last Week Avg. Spend</div> <div>Last Week Avg. Spend</div>
<!-- <div class="progress progress-white progress-xs mt-3"> <!-- <div class="progress progress-white progress-xs mt-3">
<div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div> <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@ -82,7 +82,7 @@
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block"> <div class="card-block">
<div class="h4 mb-0">{{ basicStats.month_sum | currency:'GBP':true:'1.2-2' }}</div> <div class="h4 mb-0">{{ basicStats.month_sum | currency:'GBP':'symbol':'1.2-2' }}</div>
<div>Last Month Total</div> <div>Last Month Total</div>
<!-- <div class="progress progress-white progress-xs mt-3"> <!-- <div class="progress progress-white progress-xs mt-3">
<div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div> <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@ -94,7 +94,7 @@
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block"> <div class="card-block">
<div class="h4 mb-0">{{ basicStats.month_sum / (basicStats.month_count ? basicStats.month_count : 1) | currency:'GBP':true:'1.2-2' }}</div> <div class="h4 mb-0">{{ basicStats.month_sum / (basicStats.month_count ? basicStats.month_count : 1) | currency:'GBP':'symbol':'1.2-2' }}</div>
<div>Last Month Avg. Spend</div> <div>Last Month Avg. Spend</div>
<!-- <div class="progress progress-white progress-xs mt-3"> <!-- <div class="progress progress-white progress-xs mt-3">
<div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div> <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@ -106,7 +106,7 @@
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block"> <div class="card-block">
<div class="h4 mb-0">{{ basicStats.user_sum | currency:'GBP':true:'1.2-2' }}</div> <div class="h4 mb-0">{{ basicStats.user_sum | currency:'GBP':'symbol':'1.2-2' }}</div>
<div>User Total</div> <div>User Total</div>
<!-- <div class="progress progress-white progress-xs mt-3"> <!-- <div class="progress progress-white progress-xs mt-3">
<div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div> <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>
@ -118,7 +118,7 @@
<div class="col-sm-6 col-lg-3"> <div class="col-sm-6 col-lg-3">
<div class="card card-inverse card-primary"> <div class="card card-inverse card-primary">
<div class="card-block"> <div class="card-block">
<div class="h4 mb-0">{{ basicStats.user_sum / (basicStats.user_count ? basicStats.user_count : 1) | currency:'GBP':true:'1.2-2' }}</div> <div class="h4 mb-0">{{ basicStats.user_sum / (basicStats.user_count ? basicStats.user_count : 1) | currency:'GBP':'symbol':'1.2-2' }}</div>
<div>User Avg. Spend</div> <div>User Avg. Spend</div>
<!-- <div class="progress progress-white progress-xs mt-3"> <!-- <div class="progress progress-white progress-xs mt-3">
<div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div> <div class="progress-bar" role="progressbar" style="width: 100%" attr.aria-valuenow="100" aria-valuemin="0" aria-valuemax="100"></div>

2
src/app/shared/leaderboard-result.component.html
View file

@ -1,3 +1,3 @@
<td>{{ leaderboard.position }}</td> <td>{{ leaderboard.position }}</td>
<td class="text-truncate">{{ leaderboard.display_name }}</td> <td class="text-truncate">{{ leaderboard.display_name }}</td>
<td>{{ listType.includes('total') ? (leaderboard.value | currency:'GBP':true:'1.2-2') : (leaderboard.value | number:'1.0-0') }}</td> <td>{{ listType.includes('total') ? (leaderboard.value | currency:'GBP':'symbol':'1.2-2') : (leaderboard.value | number:'1.0-0') }}</td>

2
src/app/shared/payroll-result.component.html
View file

@ -1,3 +1,3 @@
<td>{{payrollDate}}</td> <td>{{payrollDate}}</td>
<td>{{payroll.gross_payroll | currency:'GBP':true:'1.2-2' }}</td> <td>{{payroll.gross_payroll | currency:'GBP':'symbol':'1.2-2' }}</td>
<td>{{payroll.employee_amount}}</td> <td>{{payroll.employee_amount}}</td>

2
src/app/shared/transaction-result.component.html
View file

@ -1,3 +1,3 @@
<td>{{transaction.seller}}</td> <td>{{transaction.seller}}</td>
<td>{{transaction.value | currency:'GBP':true:'1.2-2' }}</td> <td>{{transaction.value | currency:'GBP':'symbol':'1.2-2' }}</td>
<td>{{transactionDate}}</td> <td>{{transactionDate}}</td>

4
src/app/snippets/org-snippet-bar.component.html
View file

@ -7,7 +7,7 @@
</li> </li>
<li class="hidden-sm-down"> <li class="hidden-sm-down">
<div class="text-muted">Money Spent This Month</div> <div class="text-muted">Money Spent This Month</div>
<strong>{{ thisMonthPurchasesTotal | currency:'GBP':true:'1.2-2'}}</strong> <strong>{{ thisMonthPurchasesTotal | currency:'GBP':'symbol':'1.2-2'}}</strong>
</li> </li>
<li class="hidden-sm-down"> <li class="hidden-sm-down">
<div class="text-muted">Customers Today</div> <div class="text-muted">Customers Today</div>
@ -15,7 +15,7 @@
</li> </li>
<li class="hidden-sm-down"> <li class="hidden-sm-down">
<div class="text-muted">Average Transaction Today</div> <div class="text-muted">Average Transaction Today</div>
<strong>{{ ( todaySalesTotal / todaySalesCount ) || 0 | currency:'GBP':true:'1.2-2'}}</strong> <strong>{{ ( todaySalesTotal / todaySalesCount ) || 0 | currency:'GBP':'symbol':'1.2-2'}}</strong>
</li> </li>
</ul> </ul>
</div> </div>

2
src/app/widgets/graph-widget.component.html
View file

@ -4,7 +4,7 @@
<i [ngClass]="graphIcon"></i> <i [ngClass]="graphIcon"></i>
</button> </button>
<h4 *ngIf="dataType == availableDataTypes.number" class="mb-0">{{ graphSum }}</h4> <h4 *ngIf="dataType == availableDataTypes.number" class="mb-0">{{ graphSum }}</h4>
<h4 *ngIf="dataType == availableDataTypes.currency" class="mb-0">{{ graphSum | currency:'GBP':true:'1.2-2' }}</h4> <h4 *ngIf="dataType == availableDataTypes.currency" class="mb-0">{{ graphSum | currency:'GBP':'symbol':'1.2-2' }}</h4>
<p>{{ graphTitle }}</p> <p>{{ graphTitle }}</p>
</div> </div>
<div class="chart-wrapper px-3" style="height:70px;"> <div class="chart-wrapper px-3" style="height:70px;">

2
src/app/widgets/graph-widget.component.ts
View file

@ -137,7 +137,7 @@ export class GraphWidget implements OnInit {
private tooltipLabelCallback(tooltipItem: any, data: any) { private tooltipLabelCallback(tooltipItem: any, data: any) {
const value = tooltipItem.yLabel; const value = tooltipItem.yLabel;
if ( this.dataType === DataType.currency ) { if ( this.dataType === DataType.currency ) {
return this.currencyPipe.transform(value, 'GBP', true, '1.2-2'); return this.currencyPipe.transform(value, 'GBP', 'symbol', '1.2-2');
} }
return value || '0'; return value || '0';
} }