Paused Goals are no longer shown in Graph

Author: BitTim

VexTrack/Core/GoalDataCalc.cs

@@ -101,6 +101,20 @@ public static GoalEntryData CalcUserGoal(string groupUUID, Goal goalData)
 			return ret;
 		}
 
+		public static bool checkPaused(GoalGroup gg, Goal g)
+		{
+			if (g.Dependency != "")
+			{
+				int index = gg.Goals.FindIndex(x => x.UUID == g.Dependency);
+				if (index < 0) return true; // Has invalid Dependency = Dont show
+
+				Goal nextG = gg.Goals[index];
+				return checkPaused(gg, nextG);
+			}
+
+			return g.Paused;
+		}
+
 		public static (List<LineSeries>, List<TextAnnotation>) CalcGraphGoals(string sUUID)
 		{
 			List<LineSeries> lsret = new();
@@ -119,6 +133,7 @@ public static (List<LineSeries>, List<TextAnnotation>) CalcGraphGoals(string sUU
 					int val = totalCollected - ge.Collected + ge.Total;
 
 					if (val <= 0) continue;
+					if (checkPaused(gg, g)) continue;
 
 					ls.Points.Add(new DataPoint(0, val));
 					ls.Points.Add(new DataPoint(TrackingDataHelper.GetDuration(sUUID), val));

VexTrack/Core/GraphCalc.cs

@@ -100,7 +100,7 @@ public static RectangleAnnotation CalcBufferZone(string sUUID, bool epilogue)
 			ret.MinimumX = duration - bufferDays;
 			ret.MaximumX = duration;
 			ret.MinimumY = 0;
-			ret.MaximumY = total;
+			ret.MaximumY = total * 3;
 
 			ret.Fill = OxyColor.FromAColor(64, OxyColors.Red);
 			return ret;