From f23c7136c05df952ffc9533073af25d2afd39cf5 Mon Sep 17 00:00:00 2001 From: Daniel Wathen Date: Wed, 11 Jan 2023 12:36:28 -0700 Subject: [PATCH] Migrated to using free library of icons for images and fixed button layout for index pages. --- .../Controllers/ProductionReportController.cs | 2 - ReportingServices.UI/Views/Home/Index.cshtml | 4 +- .../Views/PlanningReport/Index.cshtml | 2 +- .../Views/ProductionReport/DailyReport.cshtml | 36 +- .../Views/ProductionReport/Index.cshtml | 2 +- .../Views/Shared/_DailyReportPartial.cshtml | 2 +- .../Views/Shared/_Layout.cshtml | 2 + ReportingServices.UI/libman.json | 39 + .../wwwroot/Assets/DailyReportInfo.json | 2 +- .../wwwroot/Images/Directory.png | Bin 886 -> 0 bytes .../wwwroot/Images/ReportFile.png | Bin 721 -> 0 bytes .../wwwroot/Images/minusIcon.png | Bin 428 -> 0 bytes .../wwwroot/Images/plusIcon.png | Bin 571 -> 0 bytes ReportingServices.UI/wwwroot/js/site.js | 13 +- .../fortawesome/fontawesome-free/css/all.css | 7946 +++++++++++++++++ .../fontawesome-free/css/all.min.css | 6 + .../fontawesome-free/css/brands.css | 1516 ++++ .../fontawesome-free/css/brands.min.css | 6 + .../fontawesome-free/css/fontawesome.css | 6369 +++++++++++++ .../fontawesome-free/css/fontawesome.min.css | 6 + .../fontawesome-free/css/regular.css | 19 + .../fontawesome-free/css/regular.min.css | 6 + .../fontawesome-free/css/solid.css | 19 + .../fontawesome-free/css/solid.min.css | 6 + .../fontawesome-free/css/svg-with-js.css | 635 ++ .../fontawesome-free/css/svg-with-js.min.css | 6 + .../fontawesome-free/css/v4-font-face.css | 26 + .../fontawesome-free/css/v4-font-face.min.css | 6 + .../fontawesome-free/css/v4-shims.css | 2194 +++++ .../fontawesome-free/css/v4-shims.min.css | 6 + .../fontawesome-free/css/v5-font-face.css | 22 + .../fontawesome-free/css/v5-font-face.min.css | 6 + .../webfonts/fa-brands-400.ttf | Bin 0 -> 186124 bytes .../webfonts/fa-brands-400.woff2 | Bin 0 -> 107656 bytes .../webfonts/fa-regular-400.ttf | Bin 0 -> 62320 bytes .../webfonts/fa-regular-400.woff2 | Bin 0 -> 25236 bytes .../webfonts/fa-solid-900.ttf | Bin 0 -> 397420 bytes .../webfonts/fa-solid-900.woff2 | Bin 0 -> 150516 bytes .../webfonts/fa-v4compatibility.ttf | Bin 0 -> 10140 bytes .../webfonts/fa-v4compatibility.woff2 | Bin 0 -> 4568 bytes 40 files changed, 18886 insertions(+), 18 deletions(-) create mode 100644 ReportingServices.UI/libman.json delete mode 100644 ReportingServices.UI/wwwroot/Images/Directory.png delete mode 100644 ReportingServices.UI/wwwroot/Images/ReportFile.png delete mode 100644 ReportingServices.UI/wwwroot/Images/minusIcon.png delete mode 100644 ReportingServices.UI/wwwroot/Images/plusIcon.png create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/all.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/all.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/brands.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/brands.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/fontawesome.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/fontawesome.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/regular.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/regular.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/solid.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/solid.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/svg-with-js.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/svg-with-js.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/v4-font-face.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/v4-font-face.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/v4-shims.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/v4-shims.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/v5-font-face.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/css/v5-font-face.min.css create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/webfonts/fa-brands-400.ttf create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/webfonts/fa-brands-400.woff2 create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2 create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2 create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/webfonts/fa-v4compatibility.ttf create mode 100644 ReportingServices.UI/wwwroot/lib/fortawesome/fontawesome-free/webfonts/fa-v4compatibility.woff2 diff --git a/ReportingServices.UI/Controllers/ProductionReportController.cs b/ReportingServices.UI/Controllers/ProductionReportController.cs index c0782d6..fa3a908 100644 --- a/ReportingServices.UI/Controllers/ProductionReportController.cs +++ b/ReportingServices.UI/Controllers/ProductionReportController.cs @@ -10,7 +10,6 @@ namespace ReportingServices.UI.Controllers private readonly ILogger _logger; private readonly string _dailyRptFilePath = "wwwroot/Assets/DailyReportInfo.json"; private readonly string _toolStateOwnerFilePath = "wwwroot/Assets/ToolStates.json"; - private readonly string _baseFTUrl; private readonly string _baseDBUrl; public ProductionReportController(ILogger logger) @@ -29,7 +28,6 @@ namespace ReportingServices.UI.Controllers public IActionResult DailyReport() { - string baseFabTimeUrl = _baseFTUrl + "FabTime/"; string baseScrapeDbUrl = _baseDBUrl + "ScrapeDB/"; try diff --git a/ReportingServices.UI/Views/Home/Index.cshtml b/ReportingServices.UI/Views/Home/Index.cshtml index 86d59b9..89e3f69 100644 --- a/ReportingServices.UI/Views/Home/Index.cshtml +++ b/ReportingServices.UI/Views/Home/Index.cshtml @@ -11,9 +11,9 @@ \ No newline at end of file diff --git a/ReportingServices.UI/Views/PlanningReport/Index.cshtml b/ReportingServices.UI/Views/PlanningReport/Index.cshtml index a905434..d621956 100644 --- a/ReportingServices.UI/Views/PlanningReport/Index.cshtml +++ b/ReportingServices.UI/Views/PlanningReport/Index.cshtml @@ -12,7 +12,7 @@
- +
diff --git a/ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml b/ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml index cb04acb..147ef1e 100644 --- a/ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml +++ b/ReportingServices.UI/Views/ProductionReport/DailyReport.cshtml @@ -63,9 +63,39 @@
    -
  • Bottle Change (@rpt.BottleChanges.Split(',').Length): @string.Join(", ", rpt.BottleChanges.Split(','))
  • -
  • Daily Part Changes (@rpt.DailyPartChanges.Split(',').Length): @string.Join(", ", rpt.DailyPartChanges.Split(','))
  • -
  • Weekly Part Changes (@rpt.WeeklyPartChanges.Split(',').Length): @string.Join(", ", rpt.WeeklyPartChanges.Split(','))
  • + @{ + 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; + } + + + } +
  • Bottle Change (@bottleChanges): @bottle
  • +
  • Daily Part Changes (@dailyPartChanges): @daily
  • +
  • Weekly Part Changes (@weeklyPartChanges): @weekly

Edit diff --git a/ReportingServices.UI/Views/ProductionReport/Index.cshtml b/ReportingServices.UI/Views/ProductionReport/Index.cshtml index 14983e4..4c80c4d 100644 --- a/ReportingServices.UI/Views/ProductionReport/Index.cshtml +++ b/ReportingServices.UI/Views/ProductionReport/Index.cshtml @@ -12,7 +12,7 @@ diff --git a/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml b/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml index 0a48acf..f77975c 100644 --- a/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml +++ b/ReportingServices.UI/Views/Shared/_DailyReportPartial.cshtml @@ -76,7 +76,7 @@ Actual Yielded Wafers Out     @for (int i = 0; i < 7; i++) diff --git a/ReportingServices.UI/Views/Shared/_Layout.cshtml b/ReportingServices.UI/Views/Shared/_Layout.cshtml index 63ebc80..175e39b 100644 --- a/ReportingServices.UI/Views/Shared/_Layout.cshtml +++ b/ReportingServices.UI/Views/Shared/_Layout.cshtml @@ -8,6 +8,8 @@ + +