wip

Author: point85

ShiftSharp/Rotation.cs

@@ -152,7 +152,7 @@ public Duration GetWorkingTime()
 			{
 				if (period.IsWorkingPeriod())
 				{
-					sum = sum.Plus(period.GetDuration());
+					sum = sum.Plus(period.Duration);
 				}
 			}
 			return sum;

ShiftSharp/Shift.cs

@@ -144,7 +144,7 @@ public Duration CalculateWorkingTime(LocalTime from, LocalTime to)
 		 */
 		public bool SpansMidnight()
 		{
-			int startSecond = ToRoundedSecond(GetStart());
+			int startSecond = ToRoundedSecond(StartTime);
 			int endSecond = ToRoundedSecond(GetEnd());
 			return endSecond <= startSecond ? true : false;
 		}
@@ -167,15 +167,15 @@ public Duration CalculateWorkingTime(LocalTime from, LocalTime to, bool beforeMi
 		{
 			Duration duration = Duration.Zero;
 
-			int startSecond = ToRoundedSecond(GetStart());
+			int startSecond = ToRoundedSecond(StartTime);
 			int endSecond = ToRoundedSecond(GetEnd());
 			int fromSecond = ToRoundedSecond(from);
 			int toSecond = ToRoundedSecond(to);
 
 			int delta = toSecond - fromSecond;
 
 			// check for 24 hour shift
-			if (delta == 0 && fromSecond == startSecond && GetDuration().TotalHours == 24)
+			if (delta == 0 && fromSecond == startSecond && Duration.TotalHours == 24)
 			{
 				delta = 86400;
 			}
@@ -238,7 +238,7 @@ public bool IsInShift(LocalTime time)
 		{
 			bool answer = false;
 
-			LocalTime start = GetStart();
+			LocalTime start = StartTime;
 			LocalTime end = GetEnd();
 
 			int onStart = time.CompareTo(start);
@@ -287,7 +287,7 @@ public Duration CalculateBreakTime()
 
 			foreach (Break b in breaks)
 			{
-				sum = sum.Plus(b.GetDuration());
+				sum = sum.Plus(b.Duration);
 			}
 
 			return sum;

ShiftSharp/ShiftInstance.cs

@@ -55,7 +55,7 @@ internal ShiftInstance(Shift shift, LocalDateTime startDateTime, Team team)
 		 */
 		public LocalDateTime GetEndTime()
 		{
-			Duration duration = Shift.GetDuration();
+			Duration duration = Shift.Duration;
 			return StartDateTime.PlusSeconds((long)duration.TotalSeconds);
 		}
 

ShiftSharp/Team.cs

@@ -33,13 +33,13 @@ namespace Point85.ShiftSharp.Schedule
 	public class Team : Named, IComparable<Team>
 	{
 		// owning work schedule
-		private WorkSchedule workSchedule;
+		public WorkSchedule WorkSchedule { get; set; }
 
 		// reference date for starting the rotations
-		private LocalDate rotationStart;
+		public LocalDate RotationStart { get; set; }
 
 		// shift rotation days
-		private Rotation rotation;
+		public Rotation Rotation { get; set; }
 
 		/**
 		 * Default constructor
@@ -50,68 +50,8 @@ public Team() : base()
 
 		internal Team(string name, string description, Rotation rotation, LocalDate rotationStart) : base(name, description)
 		{
-			this.rotation = rotation;
-			this.SetRotationStart(rotationStart);
-		}
-
-		/**
-		 * Get rotation start
-		 * 
-		 * @return Rotation start date
-		 */
-		public LocalDate GetRotationStart()
-		{
-			return rotationStart;
-		}
-
-		/**
-		 * Get rotation start
-		 * 
-		 * @param rotationStart
-		 *            Starting date of rotation
-		 */
-		public void SetRotationStart(LocalDate rotationStart)
-		{
-			this.rotationStart = rotationStart;
-		}
-
-		/*
-		private long GetDayFrom()
-		{
-			LocalDate localDate;
-			int eraYear = localDate.YearOfEra;
-			//NodaTime.Calendars.Era era = rotationStart.Era;
-			//LocalDateTime now;
-			Instant unixStart = Instant.FromUnixTimeSeconds(0);
-			Instant.FromUtc(2017, 10, 23, 0, 0, 0);
-			Instant now = SystemClock.Instance.GetCurrentInstant();
-
-			Instant unixEpoch = NodaConstants.UnixEpoch;
-			Duration duration = now.Minus(unixEpoch);
-
-			return rotationStart.toEpochDay();
-		}
-		*/
-
-		/**
-		 * Get the shift rotation for this team
-		 * 
-		 * @return {@link Rotation}
-		 */
-		public Rotation GetRotation()
-		{
-			return rotation;
-		}
-
-		/**
-		 * Set the shift rotation for this team
-		 * 
-		 * @param rotation
-		 *            {@link Rotation}
-		 */
-		public void SetRotation(Rotation rotation)
-		{
-			this.rotation = rotation;
+			this.Rotation = rotation;
+			this.RotationStart = rotationStart;
 		}
 
 		/**
@@ -123,7 +63,7 @@ public void SetRotation(Rotation rotation)
 		 */
 		public Duration GetRotationDuration()
 		{
-			return GetRotation().GetDuration();
+			return Rotation.GetDuration();
 		}
 
 		/**
@@ -136,7 +76,7 @@ public Duration GetRotationDuration()
 		 */
 		public float GetPercentageWorked()
 		{
-			double ratio = GetRotation().GetWorkingTime().TotalSeconds / GetRotationDuration().TotalSeconds;
+			double ratio = Rotation.GetWorkingTime().TotalSeconds / GetRotationDuration().TotalSeconds;
 			return (float)ratio * 100.0f;
 		}
 
@@ -147,8 +87,8 @@ public float GetPercentageWorked()
 		 */
 		public Duration GetHoursWorkedPerWeek()
 		{
-			double days = GetRotation().GetDuration().TotalDays;
-			double secPerWeek = GetRotation().GetWorkingTime().TotalSeconds * (7.0f / days);
+			double days = Rotation.GetDuration().TotalDays;
+			double secPerWeek = Rotation.GetWorkingTime().TotalSeconds * (7.0f / days);
 			return Duration.FromSeconds(secPerWeek);
 		}
 
@@ -164,15 +104,15 @@ public Duration GetHoursWorkedPerWeek()
 		public int GetDayInRotation(LocalDate date)
 		{
 			// calculate total number of days from start of rotation
-			long deltaDays = TimePeriod.DeltaDays(rotationStart, date);
+			long deltaDays = TimePeriod.DeltaDays(RotationStart, date);
 
 			if (deltaDays < 0)
 			{
-				string msg = string.Format(WorkSchedule.GetMessage("end.earlier.than.start"), rotationStart, date);
+				string msg = string.Format(WorkSchedule.GetMessage("end.earlier.than.start"), RotationStart, date);
 				throw new Exception(msg);
 			}
 
-			int dayInRotation = (int)(deltaDays % GetRotation().GetDuration().Days) + 1;
+			int dayInRotation = (int)(deltaDays % Rotation.GetDuration().Days) + 1;
 			return dayInRotation;
 		}
 
@@ -189,15 +129,15 @@ public ShiftInstance GetShiftInstanceForDay(LocalDate day)
 		{
 			ShiftInstance instance = null;
 
-			Rotation shiftRotation = GetRotation();
+			Rotation shiftRotation = Rotation;
 			int dayInRotation = GetDayInRotation(day);
 
 			// shift or off shift
 			TimePeriod period = shiftRotation.GetPeriods()[dayInRotation - 1];
 
 			if (period.IsWorkingPeriod())
 			{
-				LocalDateTime startDateTime = day.At(period.GetStart());
+				LocalDateTime startDateTime = day.At(period.StartTime);
 				instance = new ShiftInstance((Shift)period, startDateTime, this);
 			}
 
@@ -218,7 +158,7 @@ public bool IsDayOff(LocalDate day)
 
 			bool dayOff = false;
 
-			Rotation shiftRotation = GetRotation();
+			Rotation shiftRotation = Rotation;
 			int dayInRotation = GetDayInRotation(day);
 
 			// shift or off shift
@@ -258,7 +198,7 @@ public Duration CalculateWorkingTime(LocalDateTime from, LocalDateTime to)
 			LocalTime thisTime = from.TimeOfDay;
 			LocalDate toDate = to.Date;
 			LocalTime toTime = to.TimeOfDay;
-			int dayCount = GetRotation().GetDayCount();
+			int dayCount = Rotation.GetDayCount();
 
 			// get the working shift from yesterday
 			Shift lastShift = null;
@@ -326,7 +266,7 @@ public Duration CalculateWorkingTime(LocalDateTime from, LocalDateTime to)
 					if (rotationEndDate.CompareTo(toDate) < 0)
 					{
 						n = dayCount;
-						sum = sum.Plus(GetRotation().GetWorkingTime());
+						sum = sum.Plus(Rotation.GetWorkingTime());
 					}
 				}
 
@@ -338,21 +278,6 @@ public Duration CalculateWorkingTime(LocalDateTime from, LocalDateTime to)
 			return sum;
 		}
 
-		/**
-		 * Get the work schedule that owns this team
-		 * 
-		 * @return {@link WorkSchedule}
-		 */
-		public WorkSchedule GetWorkSchedule()
-		{
-			return workSchedule;
-		}
-
-		internal void SetWorkSchedule(WorkSchedule workSchedule)
-		{
-			this.workSchedule = workSchedule;
-		}
-
 		/**
 		 * Compare one team to another
 		 */
@@ -374,12 +299,11 @@ public override string ToString()
 			string text = "";
 			try
 			{
-				text = base.ToString() + ", " + rs + ": " + GetRotationStart() + ", " + GetRotation() + ", " + rpct + ": "
+				text = base.ToString() + ", " + rs + ": " + RotationStart + ", " + Rotation + ", " + rpct + ": "
 						+ GetPercentageWorked().ToString("0.00") + "%" + ", " + avg + ": " + GetHoursWorkedPerWeek();
 			}
 			catch (Exception)
 			{
-				// ignore
 			}
 
 			return text;

ShiftSharp/TimePeriod.cs

@@ -36,36 +36,22 @@ public abstract class TimePeriod : Named
 		private const int SECONDS_PER_DAY = 24 * 60 * 60;
 
 		// starting time of day from midnight 
-		private LocalTime startTime;
+		public LocalTime StartTime { get; set; }
 
 		// length of time period
-		private Duration duration;
+		public Duration Duration { get; set; }
 
 		protected TimePeriod() : base()
 		{
 		}
 
 		protected TimePeriod(string name, string description, LocalTime startTime, Duration duration) : base(name, description)
 		{
-			SetStart(startTime);
-			SetDuration(duration);
-		}
-
-		/// <summary>
-		/// Get the period duration
-		/// </summary>
-		/// <returns></returns>
-		public Duration GetDuration()
-		{
-			return duration;
-		}
+			if (startTime == null)
+			{
+				throw new Exception(WorkSchedule.GetMessage("start.not.defined"));
+			}
 
-		/// <summary>
-		/// Set the duration
-		/// </summary>
-		/// <param name="duration">Duration</param>
-		public void SetDuration(Duration duration)
-		{
 			if (duration == null || duration.TotalSeconds == 0)
 			{
 				throw new Exception(WorkSchedule.GetMessage("duration.not.defined"));
@@ -75,29 +61,9 @@ public void SetDuration(Duration duration)
 			{
 				throw new Exception(WorkSchedule.GetMessage("duration.not.allowed"));
 			}
-			this.duration = duration;
-		}
 
-		/// <summary>
-		/// Get period start time
-		/// </summary>
-		/// <returns></returns>
-		public LocalTime GetStart()
-		{
-			return startTime;
-		}
-
-		/// <summary>
-		/// Set period start time
-		/// </summary>
-		/// <param name="startTime">Start time</param>
-		public void SetStart(LocalTime startTime)
-		{
-			if (startTime == null)
-			{
-				throw new Exception(WorkSchedule.GetMessage("start.not.defined"));
-			}
-			this.startTime = startTime;
+			this.StartTime = startTime;
+			this.Duration = duration;
 		}
 
 		/// <summary>
@@ -106,7 +72,7 @@ public void SetStart(LocalTime startTime)
 		/// <returns>Period end time</returns>
 		public LocalTime GetEnd()
 		{
-			return startTime.PlusSeconds((long)duration.TotalSeconds);
+			return StartTime.PlusSeconds((long)Duration.TotalSeconds);
 		}
 
 		// breaks are considered to be in the shift's working period
@@ -134,14 +100,12 @@ public override string ToString()
 
 			try
 			{
-				text = base.ToString() + ", " + start + ": " + GetStart() + " (" + GetDuration() + ")" + ", " + end + ": "
+				text = base.ToString() + ", " + start + ": " + StartTime + " (" + Duration + ")" + ", " + end + ": "
 						+ GetEnd();
 			}
 			catch (Exception)
 			{
-				// ignore
 			}
-
 			return text;
 		}
 	}