- NonWorkingPeriod: added getter and setter for Duration

- Rotation: invalidated periods cache on AddSegment()
- Team: renamed removeMember() to RemoveMember()
- TimePeriod: fixed GetEnd()
- WorkSchedule: fixed DeleteShift()
- removed unused imports
- Published to NuGet

Author: point85

ShiftSharp/Documentation/html_docs.zip

@@ -46,7 +46,7 @@ public class NonWorkingPeriod : Named, IComparable<NonWorkingPeriod>
 		/// <summary>
 		/// duration of period
 		/// </summary>
-		public Duration Duration;
+		public Duration Duration { get; set; }
 
 		/// <summary>
 		/// Constructor

ShiftSharp/NonWorkingPeriod.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Point85")]
 [assembly: AssemblyProduct("ShiftSharp")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyCopyright("Copyright ©  2017-2025")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]

ShiftSharp/Properties/AssemblyInfo.cs

@@ -171,6 +171,8 @@ public RotationSegment AddSegment(Shift startingShift, int daysOn, int daysOff)
 			RotationSegment segment = new RotationSegment(startingShift, daysOn, daysOff, this);
 			RotationSegments.Add(segment);
 			segment.Sequence = RotationSegments.Count;
+			// invalidate cache
+			periods = null;
 			return segment;
 		}
 

ShiftSharp/Rotation.cs

@@ -8,12 +8,12 @@
     <Description>C# work schedule library</Description>
     <Company>Point85</Company>
     <Product>ShiftSharp</Product>
-    <Copyright>Copyright ©  2017-2024</Copyright>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <FileVersion>2.1.0.0</FileVersion>
+    <Copyright>Copyright ©  2017-2025</Copyright>
+    <AssemblyVersion>2.1.1.0</AssemblyVersion>
+    <FileVersion>2.1.1.0</FileVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Title>Work schedule library</Title>
-    <Version>2.1.0</Version>
+    <Version>2.1.1</Version>
     <Authors>Kent Randall</Authors>
     <PackageId>ShiftSharp</PackageId>
     <PackageProjectUrl>https://github.com/point85/ShiftSharp</PackageProjectUrl>

ShiftSharp/ShiftSharp.csproj

@@ -26,7 +26,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Point85.ShiftSharp.Schedule
 {
@@ -328,7 +327,7 @@ public void AddMember(TeamMember member)
 		/// Remove a member from this team
 		/// </summary>
 		/// <param name="member">Team member</param>
-		public void removeMember(TeamMember member)
+		public void RemoveMember(TeamMember member)
 		{
 			if (this.AssignedMembers.Contains(member))
 			{

ShiftSharp/Team.cs

@@ -25,7 +25,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Intrinsics.X86;
 using System.Text;
 using System.Threading.Tasks;
 

ShiftSharp/TeamMember.cs

@@ -22,12 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 using NodaTime;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Point85.ShiftSharp.Schedule
 {

ShiftSharp/TeamMemberException.cs

@@ -77,7 +77,9 @@ protected TimePeriod(string name, string description, LocalTime startTime, Durat
 		/// <returns>Period end time</returns>
 		public LocalTime GetEnd()
 		{
-			return StartTime.PlusSeconds((long)Duration.TotalSeconds);
+			long totalSeconds = (long)Duration.TotalSeconds;
+			long secondsInDay = totalSeconds % SECONDS_PER_DAY;
+			return StartTime.PlusSeconds(secondsInDay);
 		}
 
 		/// <summary>
@@ -93,7 +95,7 @@ public LocalTime GetEnd()
 		/// <returns>Second in day</returns>
 		public static int SecondOfDay(LocalTime time)
 		{
-			return (int)(time.NanosecondOfDay / 1E+09);
+			return (int)(time.NanosecondOfDay / 1_000_000_000L);
 		}
 
 		/// <summary>

ShiftSharp/TimePeriod.cs

@@ -279,23 +279,18 @@ public void DeleteShift(Shift shift)
 			}
 
 			// can't be in use
-			foreach (Shift inUseShift in Shifts)
+			foreach (Team team in Teams)
 			{
-				foreach (Team team in Teams)
+				Rotation rotation = team.Rotation;
+				foreach (TimePeriod period in rotation.GetPeriods())
 				{
-					Rotation rotation = team.Rotation;
-
-					foreach (TimePeriod period in rotation.GetPeriods())
+					if (period.Equals(shift))
 					{
-						if (period.Equals(inUseShift))
-						{
-							string msg = String.Format(WorkSchedule.GetMessage("shift.in.use"), shift.Name);
-							throw new Exception(msg);
-						}
+						string msg = String.Format(WorkSchedule.GetMessage("shift.in.use"), shift.Name);
+						throw new Exception(msg);
 					}
 				}
 			}
-
 			Shifts.Remove(shift);
 		}
 
@@ -305,7 +300,7 @@ public void DeleteShift(Shift shift)
 		/// <param name="name">Name</param>
 		/// <param name="description">Description</param>
 		/// <param name="startDateTime">Starting date and time of day</param>
-		/// <param name="duration">Durtation of period</param>
+		/// <param name="duration">Duration of period</param>
 		/// <returns>NonWorkingPeriod</returns>
 		public NonWorkingPeriod CreateNonWorkingPeriod(string name, string description, LocalDateTime startDateTime,
 				Duration duration)