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

Styling

Browse Source
This commit is contained in:
James Kolpack
2015-09-22 23:13:20 -04:00
parent 829d84d73e
commit 5e90c6d330
2 changed files with 95 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/Content/Site.css
+34 -11
View File
@@ -157,22 +157,45 @@ dl.inline {
padding-left: 10px; padding-left: 10px;
} }
td.nomatch { #fuellog th,
background-color: #f89406 !IMPORTANT;
color: white !IMPORTANT;
}
td.match {
background-color: #468847 !IMPORTANT;
color: white !IMPORTANT;
}
#fuellogs th,
#currentlymatchedlog th, #currentlymatchedlog th,
#matchedlogs th { #matchedlogs th {
width: 16.6% width: 16.6%
} }
#fuellog th{
background-color: black !IMPORTANT;
color: white !IMPORTANT;
}
#fuellog tbody td{
background-color: rgb(63, 63, 63) !IMPORTANT;
color: white !IMPORTANT;
}
td.nomatch {
background-color: #f8ba62 !IMPORTANT;
color: #64410f !IMPORTANT;
}
td.match {
background-color: #3a87ad !IMPORTANT;
color: white !IMPORTANT;
}
#currentlymatchedlog th{
background-color: #3a713b !IMPORTANT;
color: white !IMPORTANT;
}
#currentlymatchedlog td.match {
background-color: #468847 !IMPORTANT;
}
#matchedlogs th{
background-color: #2b6481 !IMPORTANT;
color: white !IMPORTANT;
}
@media print { @media print {
header, header,
footer, footer,
Web/Views/FuelLog/Match.cshtml
+61 -71
View File
@@ -7,7 +7,6 @@
var matchedLogs = Model.MatchedLogs; var matchedLogs = Model.MatchedLogs;
var currentlyMatchedLog = Model.CurrentlyMatchedLog; var currentlyMatchedLog = Model.CurrentlyMatchedLog;
var logViewModel = fuelLog.GetLogViewModel(); var logViewModel = fuelLog.GetLogViewModel();
//logViewModel.LogType = MileageLogType.GasPurchase;
} }
@section Styles @section Styles
{ {
@@ -18,9 +17,9 @@
<h2>@ViewBag.Title</h2> <h2>@ViewBag.Title</h2>
<p id="page-match-status"></p> <h4>Fuel Log</h4>
<table id="fuellogs" class="table table-striped table-bordered table-hover table-condensed"> <table id="fuellog" class="table table-striped table-bordered table-hover table-condensed">
<thead> <thead>
<tr> <tr>
<th>Date</th> <th>Date</th>
@@ -43,95 +42,86 @@
</tbody> </tbody>
</table> </table>
@if (currentlyMatchedLog != null)
{
<h5>Currently Matched Mileage Log</h5>
<table id="currentlymatchedlog" class="table table-striped table-bordered table-hover table-condensed"> <h4>Currently Matched Mileage Log</h4>
<thead>
<tr> <table id="currentlymatchedlog" class="table table-striped table-bordered table-hover table-condensed">
<th>Date</th> <thead>
<th>Driver</th> <tr>
<th>Tag Number</th> <th>Date</th>
<th>Odometer</th> <th>Driver</th>
<th>Gas Purchased</th> <th>Tag Number</th>
<th></th> <th>Odometer</th>
</tr> <th>Gas Purchased</th>
</thead> <th></th>
<tbody> </tr>
</thead>
<tbody>
@if (currentlyMatchedLog == null) {
<tr><td colspan="6"><span class="label label-important">Not Currently Matched</span></td></tr>
}
else {
<tr> <tr>
<td class="@if (!currentlyMatchedLog.DateMatch) <td class="@if (!currentlyMatchedLog.DateMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.Date, "{0:d}")</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.Date, "{0:d}")</td>
<td class="@if (!currentlyMatchedLog.UserFullNameMatch) <td class="@if (!currentlyMatchedLog.UserFullNameMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.UserFullName)</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.UserFullName)</td>
<td class="@if (!currentlyMatchedLog.VehicleTagMatch) <td class="@if (!currentlyMatchedLog.VehicleTagMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.VehicleTagNumber)</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.VehicleTagNumber)</td>
<td class="@if (!currentlyMatchedLog.OdometerMatch) <td class="@if (!currentlyMatchedLog.OdometerMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.EndOdometer)</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.EndOdometer)</td>
<td class="@if (!currentlyMatchedLog.GasPurchasedMatch) <td class="@if (!currentlyMatchedLog.GasPurchasedMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.GasPurchased, "{0:0.000}")</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => currentlyMatchedLog.GasPurchased, "{0:0.000}")</td>
<td>@Html.ActionLink("Details", "Details", "Log", new { id = currentlyMatchedLog.LogId }, new { @class = "btn btn-mini", target="_blank" })</td> <td>@Html.ActionLink("Details", "Details", "Log", new { id = currentlyMatchedLog.LogId }, new { @class = "btn btn-mini", target="_blank" })</td>
</tr> </tr>
</tbody> }
</table> </tbody>
} </table>
<hr/>
<h4>Similiar Mileage Log entries</h4>
@if (!matchedLogs.Any()) <table id="matchedlogs" class="table table-striped table-bordered table-hover table-condensed">
{ <thead>
if (currentlyMatchedLog == null) <tr>
{ <th>Date</th>
<p> <th>Driver</th>
No matches. <th>Tag Number</th>
</p> <th>Odometer</th>
} <th>Gas Purchased</th>
else <th>Match</th>
{ </tr>
<p> </thead>
No additional matches. <tbody>
</p> @if (!matchedLogs.Any())
} {
}
else
{
<h5>Matching Mileage Logs based on Date, Vehicle, and Gas Purchased</h5>
<table id="matchedlogs" class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr> <tr>
<th>Date</th> <td colspan="6"><span class="label @if (currentlyMatchedLog == null){<text>label-important</text>}">No Results</span></td>
<th>Driver</th>
<th>Tag Number</th>
<th>Odometer</th>
<th>Gas Purchased</th>
<th>Match</th>
</tr> </tr>
</thead> }
<tbody> else {
@foreach (var matchedLog in matchedLogs) foreach (var matchedLog in matchedLogs)
{ {
<tr> <tr>
<td class="@if (!matchedLog.DateMatch) <td class="@if (!matchedLog.DateMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.Date, "{0:d}")</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.Date, "{0:d}")</td>
<td class="@if (!matchedLog.UserFullNameMatch) <td class="@if (!matchedLog.UserFullNameMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.UserFullName)</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.UserFullName)</td>
<td class="@if (!matchedLog.VehicleTagMatch) <td class="@if (!matchedLog.VehicleTagMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.VehicleTagNumber)</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.VehicleTagNumber)</td>
<td class="@if (!matchedLog.OdometerMatch) <td class="@if (!matchedLog.OdometerMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.EndOdometer)</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.EndOdometer)</td>
<td class="@if (!matchedLog.GasPurchasedMatch) <td class="@if (!matchedLog.GasPurchasedMatch)
{<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.GasPurchased, "{0:0.000}")</td> {<text>nomatch</text>}else{<text>match</text>}">@Html.ValueFor(x => matchedLog.GasPurchased, "{0:0.000}")</td>
<td>@using (Html.BeginForm("Match", "FuelLog", FormMethod.Post)) <td>@using (Html.BeginForm("Match", "FuelLog", FormMethod.Post))
{ {
<input type="hidden" name="fuelLogId" value="@fuelLog.FuelLogId"/> <input type="hidden" name="fuelLogId" value="@fuelLog.FuelLogId"/>
<input type="hidden" name="logId" value="@matchedLog.LogId"/> <input type="hidden" name="logId" value="@matchedLog.LogId"/>
<input type="submit" class="btn btn-mini" value="Match"/> <input type="submit" class="btn btn-mini" value="Match"/>
} }
</td> </td>
</tr> </tr>
} }
</tbody> }
</table> </tbody>
} </table>
@Html.Partial("MatchLogViewModelPartial", logViewModel) @Html.Partial("MatchLogViewModelPartial", logViewModel)