Kolpack-Software-Consulting/MileageTraker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
poprhythm
2013-02-17 14:30:25 -05:00
parent 07a7577d2d
commit 84e460bb51
7 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/Views/Log/MonthlyDriverMileage.cshtml
+22 -7
View File
@@ -56,10 +56,10 @@
<td style="border-top: 0"></td>
<td>
@Html.DisplayTextFor(i => vehicleItem.VehicleId)
@Html.DisplayTextFor(i => vehicleItem.Prog)
(@Html.DisplayTextFor(i => vehicleItem.Prog))
</td>
<td>
@Html.DisplayTextFor(i => vehicleItem.TripCount)
</td>
<td @if (vehicleItem.LogPairs.Any(lp => lp.Item1 == null)){
@:class="ui-state-error"
@@ -76,18 +76,33 @@
<tr>
<td style="border-top: 0"></td>
<td style="text-align: right">
Total:
<strong>
Total:
</strong>
</td>
<td>
@Html.DisplayTextFor(i => item.TripCount)
<strong>
@Html.DisplayTextFor(i => item.TripCount)
</strong>
</td>
<td>
@Html.DisplayTextFor(i => item.Miles)
<strong>
@Html.DisplayTextFor(i => item.Miles)
</strong>
</td>
<td>
@Html.DisplayTextFor(i => item.GasPurchased)
<strong>
@Html.DisplayTextFor(i => item.GasPurchased)
</strong>
</td>
</tr>
}
<tfoot><tr><td colspan="3" style="text-align: right">Grand Total:</td><td>@Html.DisplayTextFor(m => m.TotalMiles)</td><td>@Html.DisplayTextFor(m => m.TotalGasPurchased)</td></tr></tfoot>
<tfoot>
<tr>
<td colspan="2" style="text-align: right"><strong>Grand Total:</strong></td>
<td><strong>@Html.DisplayTextFor(m => m.TotalTrips)</strong></td>
<td><strong>@Html.DisplayTextFor(m => m.TotalMiles)</strong></td>
<td><strong>@Html.DisplayTextFor(m => m.TotalGasPurchased)</strong></td>
</tr>
</tfoot>
</table>
Web/Views/Log/MonthlyVehicleMileage.cshtml
+12 -1
View File
@@ -41,6 +41,9 @@
<th>
Total Gas Purchased
</th>
<th>
Miles Per Gallon
</th>
</tr>
@foreach (var item in Model.Items)
{
@@ -60,7 +63,15 @@
<td>
@Html.DisplayTextFor(i => item.GasPurchased)
</td>
<td>@(item.MilesPerGallon > 0 ? string.Format("{0:0.000}", item.MilesPerGallon) : "")</td>
</tr>
}
<tfoot><tr><td colspan="2">Total:</td><td>@Html.DisplayTextFor(m => m.TotalMiles)</td><td>@Html.DisplayTextFor(m => m.TotalGasPurchased)</td></tr></tfoot>
<tfoot>
<tr>
<td colspan="2" style="text-align: right"><strong>Total:</strong></td>
<td><strong>@Html.DisplayTextFor(m => m.TotalMiles)</strong></td>
<td><strong>@Html.DisplayTextFor(m => m.TotalGasPurchased)</strong></td>
<td></td>
</tr>
</tfoot>
</table>