wip

Author: point85

ShiftSharp/Break.cs

@@ -34,7 +34,6 @@ public class Break : TimePeriod
 	{
 		public Break(string name, string description, LocalTime start, Duration duration) : base(name, description, start, duration)
 		{
-
 		}
 
 		public override bool IsWorkingPeriod()

ShiftSharp/Named.cs

@@ -33,10 +33,10 @@ namespace Point85.ShiftSharp.Schedule
 	public abstract class Named
 	{
 		// name
-		private string name;
+		public string Name { get; set; }
 
 		// description
-		private string description;
+		public string Description { get; set; }
 
 		protected Named()
 		{
@@ -45,48 +45,8 @@ protected Named()
 
 		protected Named(string name, string description)
 		{
-			SetName(name);
-			SetDescription(description);
-		}
-
-		/// <summary>
-		/// Get name
-		/// </summary>
-		/// <returns>Name</returns>
-		public string GetName()
-		{
-			return name;
-		}
-
-		/// <summary>
-		/// Set name
-		/// </summary>
-		/// <param name="name">Name</param>
-		public void SetName(string name)
-		{
-			if (name == null)
-			{
-				throw new Exception(WorkSchedule.GetMessage("name.not.defined"));
-			}
-			this.name = name;
-		}
-
-		/// <summary>
-		/// Get description
-		/// </summary>
-		/// <returns>Description</returns>
-		public string GetDescription()
-		{
-			return description;
-		}
-
-		/// <summary>
-		/// Set description
-		/// </summary>
-		/// <param name="description"> Description</param>
-		public void SetDescription(string description)
-		{
-			this.description = description;
+			Name = name ?? throw new Exception(WorkSchedule.GetMessage("name.not.defined"));
+			Description = description;
 		}
 
 		/// <summary>
@@ -96,13 +56,12 @@ public void SetDescription(string description)
 		/// <returns>True if equal</returns>
 		public override bool Equals(Object other)
 		{
-
-			if (other == null || GetType() != other.GetType())
+			if (Name == null || other == null || GetType() != other.GetType())
 			{
 				return false;
 			}
 
-			return GetName().Equals(((Named)other).GetName());
+			return Name.Equals(((Named)other).Name);
 		}
 
 		/// <summary>
@@ -111,7 +70,7 @@ public override bool Equals(Object other)
 		/// <returns>Hash code</returns>
 		public override int GetHashCode()
 		{
-			return GetName().GetHashCode();
+			return Name.GetHashCode();
 		}
 
 		/// <summary>
@@ -120,7 +79,7 @@ public override int GetHashCode()
 		/// <returns>String value</returns>
 		public override string ToString()
 		{
-			return GetName() + " (" + GetDescription() + ")";
+			return Name + " (" + Description + ")";
 		}
 	}
 }

ShiftSharp/NonWorkingPeriod.cs

@@ -34,45 +34,32 @@ namespace Point85.ShiftSharp.Schedule
 	public class NonWorkingPeriod : Named, IComparable<NonWorkingPeriod>
 	{
 		// owning work schedule
-		private WorkSchedule workSchedule;
+		public WorkSchedule WorkSchedule { get; internal set; }
 
 		// starting date and time of day
-		private LocalDateTime startDateTime;
+		public LocalDateTime StartDateTime { get; set; }
 
 		// duration of period
-		private Duration duration;
+		public Duration Duration;
 
 		public NonWorkingPeriod() : base()
 		{
 		}
 
 		internal NonWorkingPeriod(string name, string description, LocalDateTime startDateTime, Duration duration) : base(name, description)
-		{
-			SetStartDateTime(startDateTime);
-			SetDuration(duration);
-		}
-
-		/// <summary>
-		/// Get period start date and time
-		/// </summary>
-		/// <returns>Start date and time</returns>
-		public LocalDateTime GetStartDateTime()
-		{
-			return startDateTime;
-		}
-
-		/// <summary>
-		/// Set period start date and time
-		/// </summary>
-		/// <param name="startDateTime">Period start</param>
-		public void SetStartDateTime(LocalDateTime startDateTime)
 		{
 			if (startDateTime == null)
 			{
 				throw new Exception(WorkSchedule.GetMessage("start.not.defined"));
 			}
 
-			this.startDateTime = startDateTime;
+			if (duration == null || duration.TotalSeconds == 0)
+			{
+				throw new Exception(WorkSchedule.GetMessage("duration.not.defined"));
+			}
+
+			StartDateTime = startDateTime;
+			Duration = duration;
 		}
 
 		/// <summary>
@@ -81,30 +68,7 @@ public void SetStartDateTime(LocalDateTime startDateTime)
 		/// <returns>Period end</returns>
 		public LocalDateTime GetEndDateTime()
 		{
-			return startDateTime.PlusSeconds((long)duration.TotalSeconds);
-		}
-
-		/// <summary>
-		/// Get period duration
-		/// </summary>
-		/// <returns>Duration</returns>
-		public Duration GetDuration()
-		{
-			return duration;
-		}
-
-		/// <summary>
-		/// Set 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"));
-			}
-
-			this.duration = duration;
+			return StartDateTime.PlusSeconds((long)Duration.TotalSeconds);
 		}
 
 		/// <summary>
@@ -119,7 +83,7 @@ public override string ToString()
 
 			try
 			{
-				text = base.ToString() + ", " + start + ": " + GetStartDateTime() + " (" + GetDuration() + ")" + ", " + end
+				text = base.ToString() + ", " + start + ": " + StartDateTime + " (" + Duration + ")" + ", " + end
 						+ ": " + GetEndDateTime();
 			}
 			catch (Exception)
@@ -136,21 +100,7 @@ public override string ToString()
 		/// <returns>negative if less than, 0 if equal and positive if greater than</returns>
 		public int CompareTo(NonWorkingPeriod other)
 		{
-			return GetStartDateTime().CompareTo(other.GetStartDateTime());
-		}
-
-		/// <summary>
-		/// Get the work schedule that owns this non-working period
-		/// </summary>
-		/// <returns></returns>
-		public WorkSchedule GetWorkSchedule()
-		{
-			return workSchedule;
-		}
-
-		internal void SetWorkSchedule(WorkSchedule workSchedule)
-		{
-			this.workSchedule = workSchedule;
+			return StartDateTime.CompareTo(other.StartDateTime);
 		}
 
 		/// <summary>
@@ -162,7 +112,7 @@ public bool IsInPeriod(LocalDate day)
 		{
 			bool isInPeriod = false;
 
-			LocalDate periodStart = GetStartDateTime().Date;
+			LocalDate periodStart = StartDateTime.Date;
 			LocalDate periodEnd = GetEndDateTime().Date;
 
 			if (day.CompareTo(periodStart) >= 0 && day.CompareTo(periodEnd) <= 0)

ShiftSharp/Rotation.cs

@@ -35,7 +35,7 @@ namespace Point85.ShiftSharp.Schedule
 	public class Rotation : Named, IComparable<Rotation>
 	{
 		// working periods in the rotation
-		private List<RotationSegment> rotationSegments = new List<RotationSegment>();
+		public List<RotationSegment> RotationSegments { get; private set; } = new List<RotationSegment>();
 
 		// list of working and non-working days
 		private List<TimePeriod> periods;
@@ -44,7 +44,7 @@ public class Rotation : Named, IComparable<Rotation>
 		private const string DAY_OFF_NAME = "DAY_OFF";
 
 		// 24-hour day off period
-		private static DayOff DAY_OFF;// = InitializeDayOff();
+		private static DayOff DAY_OFF;
 
 		static Rotation()
 		{
@@ -94,21 +94,21 @@ public List<TimePeriod> GetPeriods()
 				periods = new List<TimePeriod>();
 
 				// sort by sequence number
-				rotationSegments.Sort();
+				RotationSegments.Sort();
 
-				foreach (RotationSegment segment in rotationSegments)
+				foreach (RotationSegment segment in RotationSegments)
 				{
 					// add the on days
-					if (segment.GetStartingShift() != null)
+					if (segment.StartingShift != null)
 					{
-						for (int i = 0; i < segment.GetDaysOn(); i++)
+						for (int i = 0; i < segment.DaysOn; i++)
 						{
-							periods.Add(segment.GetStartingShift());
+							periods.Add(segment.StartingShift);
 						}
 					}
 
 					// add the off days
-					for (int i = 0; i < segment.GetDaysOff(); i++)
+					for (int i = 0; i < segment.DaysOff; i++)
 					{
 						periods.Add(Rotation.DAY_OFF);
 					}
@@ -158,16 +158,6 @@ public Duration GetWorkingTime()
 			return sum;
 		}
 
-		/**
-		 * Get the rotation's working periods
-		 * 
-		 * @return List of {@link RotationSegment}
-		 */
-		public List<RotationSegment> GetRotationSegments()
-		{
-			return rotationSegments;
-		}
-
 		/**
 		 * Add a working period to this rotation. A working period starts with a
 		 * shift and specifies the number of days on and days off
@@ -189,14 +179,14 @@ public RotationSegment AddSegment(Shift startingShift, int daysOn, int daysOff)
 				throw new Exception("The starting shift must be specified.");
 			}
 			RotationSegment segment = new RotationSegment(startingShift, daysOn, daysOff, this);
-			rotationSegments.Add(segment);
-			segment.SetSequence(rotationSegments.Count);
+			RotationSegments.Add(segment);
+			segment.Sequence = RotationSegments.Count;
 			return segment;
 		}
 
 		public int CompareTo(Rotation other)
 		{
-			return GetName().CompareTo(other.GetName());
+			return Name.CompareTo(other.Name);
 		}
 
 		/**
@@ -222,7 +212,7 @@ public override string ToString()
 				}
 
 				string onOff = period.IsWorkingPeriod() ? on : off;
-				periodsString += period.GetName() + " (" + onOff + ")";
+				periodsString += period.Name + " (" + onOff + ")";
 			}
 
 			string text = named + "\n" + rper + ": [" + periodsString + "], " + rd + ": " + GetDuration() + ", " + rda