Develop

.gitignore

@@ -271,3 +271,4 @@ Web/Resgrid.WebCore/wwwroot/js/ng/styles.css
 Web/Resgrid.WebCore/wwwroot/js/ng/*
 Web/Resgrid.WebCore/wwwroot/lib/*
 /Web/Resgrid.Web/wwwroot/lib
+.dual-graph/

Core/Resgrid.Model/AuditLogTypes.cs

@@ -110,6 +110,20 @@ public enum AuditLogTypes
 		UdfFieldAdded,
 		UdfFieldUpdated,
 		UdfFieldRemoved,
-		UdfFieldValueSaved
+		UdfFieldValueSaved,
+		// Route Planning
+		RouteCreated,
+		RouteUpdated,
+		RouteDeleted,
+		RouteStarted,
+		RouteCompleted,
+		RouteCancelled,
+		RoutePaused,
+		RouteResumed,
+		RouteStopCheckedIn,
+		RouteStopCheckedOut,
+		RouteStopSkipped,
+		RouteDeviationDetected,
+		RouteDeviationAcknowledged
 	}
 }

Core/Resgrid.Model/Call.cs

@@ -175,6 +175,10 @@ public class Call : IEntity
 
 		public DateTime? DeletedOn { get; set; }
 
+		public string IndoorMapZoneId { get; set; }
+
+		public string IndoorMapFloorId { get; set; }
+
 		[NotMapped]
 		[JsonIgnore]
 		public object IdValue

Core/Resgrid.Model/CustomMapImport.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
+
+namespace Resgrid.Model
+{
+	public class CustomMapImport : IEntity
+	{
+		public string CustomMapImportId { get; set; }
+
+		public string CustomMapId { get; set; }
+
+		public string CustomMapLayerId { get; set; }
+
+		public string SourceFileName { get; set; }
+
+		public int SourceFileType { get; set; }
+
+		public int Status { get; set; }
+
+		public string ErrorMessage { get; set; }
+
+		public string ImportedById { get; set; }
+
+		public DateTime ImportedOn { get; set; }
+
+		[NotMapped]
+		public string TableName => "CustomMapImports";
+
+		[NotMapped]
+		public string IdName => "CustomMapImportId";
+
+		[NotMapped]
+		public int IdType => 1;
+
+		[NotMapped]
+		[JsonIgnore]
+		public object IdValue
+		{
+			get { return CustomMapImportId; }
+			set { CustomMapImportId = (string)value; }
+		}
+
+		[NotMapped]
+		public IEnumerable<string> IgnoredProperties => new string[] { "IdValue", "IdType", "TableName", "IdName" };
+	}
+}

Core/Resgrid.Model/CustomMapImportFileType.cs

@@ -0,0 +1,12 @@
+namespace Resgrid.Model
+{
+	public enum CustomMapImportFileType
+	{
+		GeoJSON = 0,
+		Shapefile = 1,
+		KML = 2,
+		KMZ = 3,
+		WMS = 4,
+		WFS = 5
+	}
+}

Core/Resgrid.Model/CustomMapImportStatus.cs

@@ -0,0 +1,10 @@
+namespace Resgrid.Model
+{
+	public enum CustomMapImportStatus
+	{
+		Pending = 0,
+		Processing = 1,
+		Complete = 2,
+		Failed = 3
+	}
+}

Core/Resgrid.Model/CustomMapLayerType.cs

@@ -0,0 +1,10 @@
+namespace Resgrid.Model
+{
+	public enum CustomMapLayerType
+	{
+		FloorPlan = 0,
+		Overlay = 1,
+		DataLayer = 2,
+		Infrastructure = 3
+	}
+}

Core/Resgrid.Model/CustomMapTile.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
+
+namespace Resgrid.Model
+{
+	public class CustomMapTile : IEntity
+	{
+		public string CustomMapTileId { get; set; }
+
+		public string CustomMapLayerId { get; set; }
+
+		public int ZoomLevel { get; set; }
+
+		public int TileX { get; set; }
+
+		public int TileY { get; set; }
+
+		public byte[] TileData { get; set; }
+
+		public string TileContentType { get; set; }
+
+		public DateTime AddedOn { get; set; }
+
+		[NotMapped]
+		public string TableName => "CustomMapTiles";
+
+		[NotMapped]
+		public string IdName => "CustomMapTileId";
+
+		[NotMapped]
+		public int IdType => 1;
+
+		[NotMapped]
+		[JsonIgnore]
+		public object IdValue
+		{
+			get { return CustomMapTileId; }
+			set { CustomMapTileId = (string)value; }
+		}
+
+		[NotMapped]
+		public IEnumerable<string> IgnoredProperties => new string[] { "IdValue", "IdType", "TableName", "IdName" };
+	}
+}

Core/Resgrid.Model/CustomMapType.cs

@@ -0,0 +1,10 @@
+namespace Resgrid.Model
+{
+	public enum CustomMapType
+	{
+		Indoor = 0,
+		Outdoor = 1,
+		Event = 2,
+		Custom = 3
+	}
+}

Core/Resgrid.Model/DepartmentNotification.cs

@@ -147,7 +147,7 @@ public string TranslateBefore(List<CustomState> customStates = null)
 					break;
 				case EventTypes.PersonnelStatusChanged:
 					if (string.IsNullOrWhiteSpace(BeforeData))
-						return "None";
+						return "Any";
 					if (BeforeData == "-1")
 						return "Any";
 					else
@@ -209,7 +209,7 @@ public string TranslateCurrent(List<CustomState> customStates = null)
 			{
 				case EventTypes.UnitStatusChanged:
 					if (string.IsNullOrWhiteSpace(CurrentData))
-						return "None";
+						return "Any";
 					if (CurrentData == "-1")
 						return "Any";
 					else
@@ -238,7 +238,7 @@ public string TranslateCurrent(List<CustomState> customStates = null)
 					break;
 				case EventTypes.PersonnelStaffingChanged:
 					if (string.IsNullOrWhiteSpace(CurrentData))
-						return "None";
+						return "Any";
 					if (CurrentData == "-1")
 						return "Any";
 					else
@@ -267,7 +267,7 @@ public string TranslateCurrent(List<CustomState> customStates = null)
 					break;
 				case EventTypes.PersonnelStatusChanged:
 					if (string.IsNullOrWhiteSpace(CurrentData))
-						return "None";
+						return "Any";
 					if (CurrentData == "-1")
 						return "Any";
 					else

Core/Resgrid.Model/IndoorMap.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
+
+namespace Resgrid.Model
+{
+	public class IndoorMap : IEntity
+	{
+		public string IndoorMapId { get; set; }
+
+		public int DepartmentId { get; set; }
+
+		public string Name { get; set; }
+
+		public string Description { get; set; }
+
+		public decimal CenterLatitude { get; set; }
+
+		public decimal CenterLongitude { get; set; }
+
+		public decimal BoundsNELat { get; set; }
+
+		public decimal BoundsNELon { get; set; }
+
+		public decimal BoundsSWLat { get; set; }
+
+		public decimal BoundsSWLon { get; set; }
+
+		public string DefaultFloorId { get; set; }
+
+		public bool IsDeleted { get; set; }
+
+		public string AddedById { get; set; }
+
+		public DateTime AddedOn { get; set; }
+
+		public string UpdatedById { get; set; }
+
+		public DateTime? UpdatedOn { get; set; }
+
+		public int MapType { get; set; }
+
+		public string BoundsGeoJson { get; set; }
+
+		public byte[] ThumbnailData { get; set; }
+
+		public string ThumbnailContentType { get; set; }
+
+		[NotMapped]
+		public string TableName => "IndoorMaps";
+
+		[NotMapped]
+		public string IdName => "IndoorMapId";
+
+		[NotMapped]
+		public int IdType => 1;
+
+		[NotMapped]
+		[JsonIgnore]
+		public object IdValue
+		{
+			get { return IndoorMapId; }
+			set { IndoorMapId = (string)value; }
+		}
+
+		[NotMapped]
+		public IEnumerable<string> IgnoredProperties => new string[] { "IdValue", "IdType", "TableName", "IdName" };
+	}
+}

Core/Resgrid.Model/IndoorMapFloor.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using Newtonsoft.Json;
+
+namespace Resgrid.Model
+{
+	public class IndoorMapFloor : IEntity
+	{
+		public string IndoorMapFloorId { get; set; }
+
+		public string IndoorMapId { get; set; }
+
+		public string Name { get; set; }
+
+		public int FloorOrder { get; set; }
+
+		public byte[] ImageData { get; set; }
+
+		public string ImageContentType { get; set; }
+
+		public decimal? BoundsNELat { get; set; }
+
+		public decimal? BoundsNELon { get; set; }
+
+		public decimal? BoundsSWLat { get; set; }
+
+		public decimal? BoundsSWLon { get; set; }
+
+		public decimal Opacity { get; set; }
+
+		public int LayerType { get; set; }
+
+		public bool IsTiled { get; set; }
+
+		public int? TileMinZoom { get; set; }
+
+		public int? TileMaxZoom { get; set; }
+
+		public long? SourceFileSize { get; set; }
+
+		public string GeoJsonData { get; set; }
+
+		public bool IsDeleted { get; set; }
+
+		public DateTime AddedOn { get; set; }
+
+		[NotMapped]
+		public string TableName => "IndoorMapFloors";
+
+		[NotMapped]
+		public string IdName => "IndoorMapFloorId";
+
+		[NotMapped]
+		public int IdType => 1;
+
+		[NotMapped]
+		[JsonIgnore]
+		public object IdValue
+		{
+			get { return IndoorMapFloorId; }
+			set { IndoorMapFloorId = (string)value; }
+		}
+
+		[NotMapped]
+		public IEnumerable<string> IgnoredProperties => new string[] { "IdValue", "IdType", "TableName", "IdName" };
+	}
+}