phares3757/mesareportingservices
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrated to using free library of icons for images and fixed button layout for index pages.

Browse Source
This commit is contained in:
Daniel Wathen
2023-01-11 12:36:28 -07:00
parent 7fbbca61b8
commit f23c7136c0
40 changed files with 18886 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReportingServices.UI/Views/Home/Index.cshtml
View File

@ -11,9 +11,9 @@
<div class="row">
<div class="col-3 d-grid">
<a class="btn btn-outline-secondary text-start" asp-area="" asp-controller="ProductionReport" asp-action="Index"><img src="~/Images/Directory.png" class="buttonImage" />Production</a>
<a class="btn btn-outline-secondary" asp-area="" asp-controller="ProductionReport" asp-action="Index"><span class="float-start"><i class="fa-regular fa-folder-open fa-4x buttonImage align-middle"></i> Production</span></a>
</div>
<div class="col-3 d-grid">
<a class="btn btn-outline-secondary text-start" asp-area="" asp-controller="PlanningReport" asp-action="Index"><img src="~/Images/Directory.png" class="buttonImage" />Planning</a>
<a class="btn btn-outline-secondary" asp-area="" asp-controller="PlanningReport" asp-action="Index"><span class="float-start"><i class="fa-regular fa-folder-open fa-4x buttonImage align-middle"></i> Planning</span></a>
</div>
</div>

2
ReportingServices.UI/Views/PlanningReport/Index.cshtml
View File

@ -12,7 +12,7 @@
<div class="row">
<div class="col-3 d-grid">
<button class="btn btn-outline-secondary text-start" data-bs-toggle="modal" data-bs-target="#chooseDateRange"><img src="~/Images/ReportFile.png" class="float-start buttonImage align-middle" />Weekly Part Changes Report</button>
<button class="btn btn-outline-secondary text-start" data-bs-toggle="modal" data-bs-target="#chooseDateRange"><span class="float-start"><i class="fa-regular fa-file-alt fa-4x buttonImage align-middle"></i> Weekly Part Changes Report</span></button>
</div>
</div>

36
ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml
View File

@ -63,9 +63,39 @@
</ul>
<br />
<ul>
<li>Bottle Change (@rpt.BottleChanges.Split(',').Length): @string.Join(", ", rpt.BottleChanges.Split(','))</li>
<li>Daily Part Changes (@rpt.DailyPartChanges.Split(',').Length): @string.Join(", ", rpt.DailyPartChanges.Split(','))</li>
<li>Weekly Part Changes (@rpt.WeeklyPartChanges.Split(',').Length): @string.Join(", ", rpt.WeeklyPartChanges.Split(','))</li>
@{
int bottleChanges = 0;
int dailyPartChanges = 0;
int weeklyPartChanges = 0;
string bottle = "";
string daily = "";
string weekly = "";
if (!string.IsNullOrEmpty(rpt.BottleChanges))
{
bottle = string.Join(", ", rpt.BottleChanges.Split(','));
bottleChanges = @rpt.BottleChanges.Split(',').Length;
}
if (!string.IsNullOrEmpty(rpt.DailyPartChanges))
{
daily = string.Join(", ", rpt.DailyPartChanges.Split(','));
dailyPartChanges = @rpt.DailyPartChanges.Split(',').Length;
}
if (!string.IsNullOrEmpty(rpt.WeeklyPartChanges))
{
weekly = string.Join(", ", rpt.WeeklyPartChanges.Split(','));
weeklyPartChanges = @rpt.WeeklyPartChanges.Split(',').Length;
}
}
<li>Bottle Change (@bottleChanges): @bottle</li>
<li>Daily Part Changes (@dailyPartChanges): @daily</li>
<li>Weekly Part Changes (@weeklyPartChanges): @weekly</li>
</ul>
<br />
<a class="btn btn-light" asp-controller="ProductionReport" asp-action="EditDailyReport">Edit</a>

2
ReportingServices.UI/Views/ProductionReport/Index.cshtml
View File

@ -12,7 +12,7 @@
<div class="row">
<div class="col-3 d-grid">
<a class="btn btn-outline-secondary text-start" asp-area="" asp-controller="ProductionReport" asp-action="DailyReport" onclick="displayBusyIndicator()"><img src="~/Images/ReportFile.png" class="buttonImage float-start" />Production Passdown Report</a>
<a class="btn btn-outline-secondary text-start" asp-area="" asp-controller="ProductionReport" asp-action="DailyReport" onclick="displayBusyIndicator()"><span class="float-start"><i class="fa-regular fa-file-alt fa-4x buttonImage align-middle"></i> Production Passdown Report</span></a>
</div>
</div>

2
ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml
View File

@ -76,7 +76,7 @@
<td scope="row" id="expandYield">
Actual Yielded Wafers Out &nbsp;&nbsp;&nbsp;
<button class="btn btn-default" onclick="expandYield()">
<img src="~/Images/plusIcon.png" width="20" style="padding-bottom: 3px" id="yieldImage" />
<i class="fa-solid fa-plus-circle" id="yieldIcon"></i>
</button>
</td>
@for (int i = 0; i < 7; i++)

2
ReportingServices.UI/Views/Shared/_Layout.cshtml
View File

@ -8,6 +8,8 @@
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
<link href="https://code.jquery.com/ui/1.13.2/themes/ui-lightness/jquery-ui.css"
rel="stylesheet">
<link href="~/lib/fortawesome/fontawesome-free/css/all.css" rel="stylesheet" />
<link href="~/lib/fortawesome/fontawesome-free/css/all.min.css" rel="stylesheet" />
<script src="https://code.jquery.com/jquery-3.6.1.js"></script>
<script src="https://code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
<script>