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

Fixed bug that prevented week from showing if it is Monday.

Browse Source
This commit is contained in:
Daniel Wathen 2023-01-04 18:05:11 -07:00
parent 8bc7d7bdde
commit 03668e1335
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReportingServices.Shared/HelperClasses/APIHelperFunctions.cs
View File

@ -15,7 +15,7 @@ namespace ReportingServices.Shared.HelperClasses
date = dayOfWeek switch date = dayOfWeek switch
{ {
0 => date.AddDays(-6), 0 => date.AddDays(-6),
1 => date.AddDays(-7), 1 => date,
_ => date.AddDays(1 - dayOfWeek) _ => date.AddDays(1 - dayOfWeek)
}; };

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

@ -105,8 +105,10 @@
modifiedYieldedOuts = totalYieldedWafersOut - (Model.OutsByDay[index].TotalWafers - Model.ScrapByDay[index].TOT_REJ_WFRS - Model.ScrapByDay[index].TW_PROD); modifiedYieldedOuts = totalYieldedWafersOut - (Model.OutsByDay[index].TotalWafers - Model.ScrapByDay[index].TOT_REJ_WFRS - Model.ScrapByDay[index].TW_PROD);
else else
modifiedYieldedOuts = totalYieldedWafersOut; modifiedYieldedOuts = totalYieldedWafersOut;
int averageYieldedOuts = yieldOutDays == 0 ? 0 : modifiedYieldedOuts / yieldOutDays;
} }
<td scope="row" colspan="10" id="expandYield" class="text-center">Yielded Wafers Out Daily Average: @(modifiedYieldedOuts / yieldOutDays)</td> <td scope="row" colspan="10" id="expandYield" class="text-center">Yielded Wafers Out Daily Average: @(averageYieldedOuts)</td>
</tr> </tr>
<tr class="yield hidden"> <tr class="yield hidden">
<td scope="row">Customer Scrap</td> <td scope="row">Customer Scrap</td>