Skip to content

Commit 4e5a38b

Browse files
Add percentage info to the warning-box done and close #55
1 parent 5608838 commit 4e5a38b

4 files changed

Lines changed: 34 additions & 6 deletions

File tree

Content/main.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,6 @@ label.bx-disabled {
6969
float: left;
7070
height: 150px;
7171
overflow: auto;
72-
width: 20%;
72+
width: 50%;
7373
}
7474

Helper/DataAccess.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,20 @@ public static List<MissingComponentData> GetMissingComponentData(ServerInformati
217217
MissingComponentData missingComponentData = new MissingComponentData();
218218
missingComponentData.Year = i.Select(a => a.Field<DateTime>("Year")).FirstOrDefault().ToString("yyyy");
219219
List<string> availablePlots = compData.AsEnumerable().Where(x => x.Field<DateTime>("Year").ToString("yyyy") == missingComponentData.Year).Select(a => a.Field<string>("EP_PlotID")).ToList();
220+
221+
//
222+
int numberPlotsH = availablePlots.Where(a => a.Contains("H")).Count();
223+
int numberPlotsS = availablePlots.Where(a => a.Contains("S")).Count();
224+
int numberPlotsA = availablePlots.Where(a => a.Contains("A")).Count();
225+
226+
double pHai = (numberPlotsH * 100) / 50;
227+
double pSch = (numberPlotsS * 100) / 50;
228+
double pAlb = (numberPlotsA * 100) / 50;
229+
230+
missingComponentData.ExploPercentage.Add("ALB",pAlb.ToString() + "%");
231+
missingComponentData.ExploPercentage.Add("HAI", pHai.ToString() + "%");
232+
missingComponentData.ExploPercentage.Add("SCH", pSch.ToString() + "%");
233+
220234
missingComponentData.PlotIds = getAllGrasslandPlots(serverInformation).Except(availablePlots).ToList();
221235
data.Add(missingComponentData);
222236
}

Models/LUIQueryModel.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,14 @@ public class MissingComponentData
109109

110110
public List<string> PlotIds { get; set; }
111111

112+
public Dictionary<string, string> ExploPercentage { get; set; }
113+
114+
115+
112116
public MissingComponentData()
113117
{
114118
PlotIds = new List<string>();
119+
ExploPercentage = new Dictionary<string, string>();
115120
}
116121

117122
}

Views/LUICalculation/Index.cshtml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,23 @@
5050
<b>Year:</b> @missingCompData.Year<br />
5151
</div>
5252
<div class="box">
53-
<b>Missing plots:</b><br /><a class="plotClick">Click to show</a>
54-
</div>
55-
<div class="plots">
56-
@foreach (var plot in missingCompData.PlotIds)
53+
<b>Plot coverage:</b><br />
54+
@foreach(var percentage in missingCompData.ExploPercentage)
5755
{
58-
@plot<br />
56+
<div>@percentage.Key : @percentage.Value</div>
5957
}
58+
59+
</div>
60+
<div class="box">
61+
<b>Missing plots:</b><br /><a class="plotClick">Click to show</a><br />
62+
<div class="plots">
63+
@foreach (var plot in missingCompData.PlotIds)
64+
{
65+
@plot<br />
66+
}
67+
</div>
6068
</div>
69+
6170

6271
}
6372
}

0 commit comments

Comments
 (0)