Feature: Repository Monitor

Subscribe to be notified of database changes.

Disco.BI/BI/Interop/SignalRHandlers/RepositoryMonitorNotifications.cs

@@ -0,0 +1,37 @@
+using Disco.Data.Repository.Monitor;
+using SignalR;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.BI.Interop.SignalRHandlers
+{
+    public class RepositoryMonitorNotifications : PersistentConnection
+    {
+        public static void Initialize()
+        {
+            RepositoryMonitor.StreamAfterCommit.Subscribe(AfterCommit);
+        }
+
+        protected override System.Threading.Tasks.Task OnReceivedAsync(IRequest request, string connectionId, string data)
+        {
+            // Add to Group
+            if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13)
+            {
+                var groups = data.Substring(13).Split(',');
+                foreach (var g in groups)
+                {
+                    this.Groups.Add(connectionId, g);
+                }
+            }
+            return base.OnReceivedAsync(request, connectionId, data);
+        }
+
+        private static void AfterCommit(RepositoryMonitorEvent e)
+        {
+            GlobalHost.ConnectionManager.GetConnectionContext<RepositoryMonitorNotifications>().Groups.Send(e.EntityType.Name, e);
+        }
+    }
+}

Disco.BI/Disco.BI.csproj

@@ -78,6 +78,21 @@
     <Reference Include="System.DirectoryServices" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices">
+      <HintPath>..\packages\Rx-PlatformServices.2.1.30214.0\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
@@ -157,6 +172,7 @@
     <Compile Include="BI\Interop\Pdf\PdfImporter.cs" />
     <Compile Include="BI\Interop\PluginServices\IDiscoScheduledTask.cs" />
     <Compile Include="BI\Interop\PluginServices\Utilities.cs" />
+    <Compile Include="BI\Interop\SignalRHandlers\RepositoryMonitorNotifications.cs" />
     <Compile Include="BI\Interop\SignalRHandlers\UserHeldDevices.cs" />
     <Compile Include="BI\JobBI\Searching.cs" />
     <Compile Include="BI\JobBI\Statistics\DailyOpenedClosed.cs" />
@@ -220,7 +236,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
+      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

Disco.BI/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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("1.2.0405.1309")]
+[assembly: AssemblyVersion("1.2.0411.1608")]
-[assembly: AssemblyFileVersion("1.2.0405.1309")]
+[assembly: AssemblyFileVersion("1.2.0411.1608")]

Disco.BI/packages.config

@@ -3,6 +3,11 @@
   <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
   <package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net45" />
   <package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net45" />
   <package id="SignalR.Server" version="0.5.3" targetFramework="net45" />

Disco.Client/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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("1.2.0404.1414")]
+[assembly: AssemblyVersion("1.2.0411.1608")]
-[assembly: AssemblyFileVersion("1.2.0404.1414")]
+[assembly: AssemblyFileVersion("1.2.0411.1608")]

Disco.ClientBootstrapper/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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("1.2.0404.1358")]
+[assembly: AssemblyVersion("1.2.0411.1608")]
-[assembly: AssemblyFileVersion("1.2.0404.1358")]
+[assembly: AssemblyFileVersion("1.2.0411.1608")]

Disco.Data/Disco.Data.csproj

@@ -49,6 +49,18 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Reactive.Core">
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces">
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Linq">
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices">
+      <HintPath>..\packages\Rx-PlatformServices.2.1.30214.0\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -109,6 +121,9 @@
     <Compile Include="Repository\DiscoDataContext.cs" />
     <Compile Include="Repository\DiscoDataContextInitializer.cs" />
     <Compile Include="Repository\DiscoDataSeeder.cs" />
+    <Compile Include="Repository\Monitor\RepositoryMonitor.cs" />
+    <Compile Include="Repository\Monitor\RepositoryMonitorEvent.cs" />
+    <Compile Include="Repository\Monitor\RepositoryMonitorEventType.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">
@@ -144,7 +159,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" />
+      <UserProperties BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

Disco.Data/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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("1.2.0405.1309")]
+[assembly: AssemblyVersion("1.2.0411.1608")]
-[assembly: AssemblyFileVersion("1.2.0405.1309")]
+[assembly: AssemblyFileVersion("1.2.0411.1608")]

Disco.Data/Repository/DiscoDataContext.cs

@@ -68,5 +68,24 @@ namespace Disco.Data.Repository
             modelBuilder.Entity<DeviceProfile>().Property(DeviceProfile.PropertyAccessExpressions.DistributionTypeDb);
         }
 
+        // Hook for Repository Monitor
+        public override int SaveChanges()
+        {
+            int changeCount = 0;
+
+            // Notify before changes are committed
+            var changes = Monitor.RepositoryMonitor.BeforeSaveChanges(this);
+
+            if (changes.Length > 0)
+            {
+                changeCount = base.SaveChanges();
+
+                // Notify after changes are committed
+                Monitor.RepositoryMonitor.AfterSaveChanges(this, changes);
+            }
+
+            return changeCount;
+        }
+
     }
 }

Disco.Data/Repository/Monitor/RepositoryMonitor.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Reactive;
+using System.Reactive.Subjects;
+using System.Data.Entity.Infrastructure;
+using System.Collections.Concurrent;
+using System.Data.Objects;
+
+namespace Disco.Data.Repository.Monitor
+{
+    public static class RepositoryMonitor
+    {
+        private static Subject<RepositoryMonitorEvent> streamBefore = new Subject<RepositoryMonitorEvent>();
+        private static Subject<RepositoryMonitorEvent> streamAfter = new Subject<RepositoryMonitorEvent>();
+        private static ConcurrentDictionary<Type, Type> entityProxyTypeCache = new ConcurrentDictionary<Type, Type>();
+
+        public static Subject<RepositoryMonitorEvent> StreamBeforeCommit { get { return streamBefore; } }
+        public static Subject<RepositoryMonitorEvent> StreamAfterCommit { get { return streamAfter; } }
+
+        internal static RepositoryMonitorEvent[] BeforeSaveChanges(DiscoDataContext dbContext)
+        {
+            var contextStateManager = ((IObjectContextAdapter)dbContext).ObjectContext.ObjectStateManager;
+            var changes = contextStateManager.GetObjectStateEntries(System.Data.EntityState.Added).Concat(contextStateManager.GetObjectStateEntries(System.Data.EntityState.Deleted)).Concat(contextStateManager.GetObjectStateEntries(System.Data.EntityState.Modified));
+
+            var events = changes.Select(entryState =>
+            {
+                var monitorEvent = EventFromEntryState(entryState);
+
+                // Push to Stream
+                streamBefore.OnNext(monitorEvent);
+
+                return monitorEvent;
+            }).ToArray();
+
+            return events;
+        }
+        internal static void AfterSaveChanges(DiscoDataContext dbContext, IEnumerable<RepositoryMonitorEvent> changes)
+        {
+            var contextStateManager = ((IObjectContextAdapter)dbContext).ObjectContext.ObjectStateManager;
+
+            foreach (var change in changes)
+            {
+                UpdateAfterEventFromEntryState(change, contextStateManager);
+
+                streamAfter.OnNext(change);
+            }
+        }
+
+        private static Type EntityTypeFromProxy(Type EntityProxyType)
+        {
+            Type EntityType;
+
+            if (entityProxyTypeCache.TryGetValue(EntityProxyType, out EntityType))
+                return EntityType;
+
+            EntityType = EntityProxyType;
+            do
+            {
+                if (EntityType.Namespace.StartsWith("Disco.Models.Repository"))
+                {
+                    entityProxyTypeCache.TryAdd(EntityProxyType, EntityType);
+                    return EntityType;
+                }
+
+                EntityType = EntityType.BaseType;
+            } while (EntityType != null);
+
+            throw new ArgumentException("The EntryProxyType does not inherit from any Repository Models", "EntityProxyType");
+        }
+
+        internal static void UpdateAfterEventFromEntryState(RepositoryMonitorEvent monitorEvent, ObjectStateManager stateManager)
+        {
+            if (monitorEvent.EventType == RepositoryMonitorEventType.Added)
+            {
+                // Update Entity Key for Added Events
+                var entryState = stateManager.GetObjectStateEntry(monitorEvent.Entity);
+                monitorEvent.EntityKey = entryState.EntityKey.EntityKeyValues.Select(kv => kv.Value).ToArray();
+            }
+        }
+
+        internal static RepositoryMonitorEvent EventFromEntryState(ObjectStateEntry entryState)
+        {
+            RepositoryMonitorEventType eventType;
+            string[] modifiedProperties = null;
+            object[] entityKey = null;
+            Type entityType;
+
+            switch (entryState.State)
+            {
+                case System.Data.EntityState.Added:
+                    eventType = RepositoryMonitorEventType.Added;
+                    break;
+                case System.Data.EntityState.Deleted:
+                    eventType = RepositoryMonitorEventType.Deleted;
+                    break;
+                case System.Data.EntityState.Detached:
+                    eventType = RepositoryMonitorEventType.Detached;
+                    break;
+                case System.Data.EntityState.Modified:
+                    eventType = RepositoryMonitorEventType.Modified;
+                    break;
+                case System.Data.EntityState.Unchanged:
+                    eventType = RepositoryMonitorEventType.Unchanged;
+                    break;
+                default:
+                    throw new NotSupportedException(string.Format("Database Entry State not supported: {0}", entryState.State.ToString()));
+            }
+
+            entityType = EntityTypeFromProxy(entryState.Entity.GetType());
+
+            // Only pass modified properties on Modified Event (Ignore Added/Deleted)
+            if (eventType == RepositoryMonitorEventType.Modified)
+                modifiedProperties = entryState.GetModifiedProperties().ToArray();
+
+            // Don't pass entity key when entity newly added
+            if (eventType != RepositoryMonitorEventType.Added)
+                entityKey = entryState.EntityKey.EntityKeyValues.Select(kv => kv.Value).ToArray();
+
+            return new RepositoryMonitorEvent()
+            {
+                EventType = eventType,
+                Entity = entryState.Entity,
+                EntityKey = entityKey,
+                EntityType = entityType,
+                ModifiedProperties = modifiedProperties
+            };
+        }
+    }
+}

Disco.Data/Repository/Monitor/RepositoryMonitorEvent.cs

@@ -0,0 +1,32 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Data.Repository.Monitor
+{
+    public class RepositoryMonitorEvent
+    {
+        public RepositoryMonitorEventType EventType { get; set; }
+
+        [JsonIgnore]
+        public Type EntityType { get; set; }
+
+        public string EntityTypeName
+        {
+            get
+            {
+                return EntityType.Name;
+            }
+        }
+
+        [JsonIgnore]
+        public object Entity { get; set; }
+
+        public object[] EntityKey { get; set; }
+
+        public string[] ModifiedProperties { get; set; }
+    }
+}

Disco.Data/Repository/Monitor/RepositoryMonitorEventType.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Data.Repository.Monitor
+{
+    public enum RepositoryMonitorEventType
+    {
+        Added = 0,
+        Deleted = 1,
+        Modified = 2,
+        Detached = 3,
+        Unchanged = 4
+    }
+}

Disco.Data/packages.config

@@ -2,4 +2,9 @@
 <packages>
   <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
 </packages>

Disco.Models/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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("1.2.0405.1309")]
+[assembly: AssemblyVersion("1.2.0411.1608")]
-[assembly: AssemblyFileVersion("1.2.0405.1309")]
+[assembly: AssemblyFileVersion("1.2.0411.1608")]

Disco.Services/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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("1.2.0405.1309")]
+[assembly: AssemblyVersion("1.2.0411.1608")]
-[assembly: AssemblyFileVersion("1.2.0405.1309")]
+[assembly: AssemblyFileVersion("1.2.0411.1608")]

Disco.Web.Extensions/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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("1.2.0405.1309")]
+[assembly: AssemblyVersion("1.2.0411.1608")]
-[assembly: AssemblyFileVersion("1.2.0405.1309")]
+[assembly: AssemblyFileVersion("1.2.0411.1608")]

Disco.Web/App_Start/AppConfig.cs

@@ -63,6 +63,9 @@ namespace Disco.Web
             }
             DiscoApplication.DocumentDropBoxMonitor.StartWatching();
             DiscoApplication.DocumentDropBoxMonitor.ScheduleCurrentFiles(10);
+
+            // Enable SignalR-based Repository Notifications
+            Disco.BI.Interop.SignalRHandlers.RepositoryMonitorNotifications.Initialize();
         }
 
         public static void InitializeUpdateEnvironment()

Disco.Web/Areas/API/APIAreaRegistration.cs

@@ -22,6 +22,9 @@ namespace Disco.Web.Areas.API
             context.Routes.MapConnection<Disco.Services.Tasks.ScheduledTasksLiveStatusService>(
                 "API_Logging_TaskStatusNotifications", "API/Logging/TaskStatusNotifications/{*operation}");
 
+            context.Routes.MapConnection<Disco.BI.Interop.SignalRHandlers.RepositoryMonitorNotifications>(
+                "API_Repository_Notifications", "API/Repository/Notifications/{*operation}");
+
             context.MapRoute(
                 "API_Update",
                 "API/{controller}/Update/{id}/{key}",

Disco.Web/Areas/API/Controllers/JobController.cs

@@ -1731,6 +1731,17 @@ namespace Disco.Web.Areas.API.Controllers
             }
             return Json(new Models.Job.CommentsModel() { Result = "Invalid Job Number" }, JsonRequestBehavior.AllowGet);
         }
+        public virtual ActionResult Comment(int id)
+        {
+            var jl = dbContext.JobLogs.Include("TechUser").FirstOrDefault(l => l.Id == id);
+            if (jl != null)
+            {
+                var c = Models.Job._CommentModel.FromJobLog(jl);
+
+                return Json(c, JsonRequestBehavior.AllowGet);
+            }
+            return Json(new Models.Job.CommentsModel() { Result = "Invalid Comment Id" }, JsonRequestBehavior.AllowGet);
+        }
         public virtual ActionResult CommentPost(int id, string comment)
         {
             var j = dbContext.Jobs.Find(id);

Disco.Web/Areas/API/Models/Job/_CommentModel.cs

@@ -10,6 +10,7 @@ namespace Disco.Web.Areas.API.Models.Job
     public class _CommentModel
     {
         public int Id { get; set; }
+        public int JobId { get; set; }
         public string Author { get; set; }
         public DateTime Timestamp { get; set; }
         public string Comments { get; set; }
@@ -41,6 +42,7 @@ namespace Disco.Web.Areas.API.Models.Job
             return new _CommentModel
             {
                 Id = jl.Id,
+                JobId = jl.JobId,
                 Author = jl.TechUser.ToString(),
                 Timestamp = jl.Timestamp,
                 Comments = jl.Comments

Disco.Web/Disco.Web.csproj

@@ -83,6 +83,18 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Reactive.Core">
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces">
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Linq">
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.PlatformServices">
+      <HintPath>..\packages\Rx-PlatformServices.2.1.30214.0\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -1784,7 +1796,6 @@
   <ItemGroup>
     <Folder Include="Areas\API\Models\WirelessCertificate\" />
     <Folder Include="Areas\Services\Models\" />
-    <Folder Include="scripts\tinymce\" />
     <Folder Include="Views\Home\" />
   </ItemGroup>
   <ItemGroup>
@@ -1838,7 +1849,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
+      <UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

Disco.Web/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.0405.1309")]
+[assembly: AssemblyVersion("1.2.0411.1608")]
-[assembly: AssemblyFileVersion("1.2.0405.1309")]
+[assembly: AssemblyFileVersion("1.2.0411.1608")]

Disco.Web/T4MVC.cs

@@ -126,20 +126,6 @@ public class T4MVC_System_Web_Mvc_ActionResult : System.Web.Mvc.ActionResult, IT
 
 namespace Links
 {
-    [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
-    public static class scripts {
-        private const string URLPATH = "~/scripts";
-        public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
-        public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); }
-        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
-        public static class tinymce {
-            private const string URLPATH = "~/scripts/tinymce";
-            public static string Url() { return T4MVCHelpers.ProcessVirtualPath(URLPATH); }
-            public static string Url(string fileName) { return T4MVCHelpers.ProcessVirtualPath(URLPATH + "/" + fileName); }
-        }
-    
-    }
-
     [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
     public static class ClientSource {
         private const string URLPATH = "~/ClientSource";
@@ -5647,6 +5633,12 @@ namespace Disco.Web.Areas.API.Controllers
         }
         [NonAction]
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public virtual System.Web.Mvc.ActionResult Comment()
+        {
+            return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Comment);
+        }
+        [NonAction]
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public virtual System.Web.Mvc.ActionResult CommentPost()
         {
             return new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.CommentPost);
@@ -5791,6 +5783,7 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string Delete = "Delete";
             public readonly string ConvertHWarToHNWar = "ConvertHWarToHNWar";
             public readonly string Comments = "Comments";
+            public readonly string Comment = "Comment";
             public readonly string CommentPost = "CommentPost";
             public readonly string CommentRemove = "CommentRemove";
             public readonly string AttachmentDownload = "AttachmentDownload";
@@ -5862,6 +5855,7 @@ namespace Disco.Web.Areas.API.Controllers
             public const string Delete = "Delete";
             public const string ConvertHWarToHNWar = "ConvertHWarToHNWar";
             public const string Comments = "Comments";
+            public const string Comment = "Comment";
             public const string CommentPost = "CommentPost";
             public const string CommentRemove = "CommentRemove";
             public const string AttachmentDownload = "AttachmentDownload";
@@ -6394,6 +6388,14 @@ namespace Disco.Web.Areas.API.Controllers
         {
             public readonly string id = "id";
         }
+        static readonly ActionParamsClass_Comment s_params_Comment = new ActionParamsClass_Comment();
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public ActionParamsClass_Comment CommentParams { get { return s_params_Comment; } }
+        [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
+        public class ActionParamsClass_Comment
+        {
+            public readonly string id = "id";
+        }
         static readonly ActionParamsClass_CommentPost s_params_CommentPost = new ActionParamsClass_CommentPost();
         [GeneratedCode("T4MVC", "2.0"), DebuggerNonUserCode]
         public ActionParamsClass_CommentPost CommentPostParams { get { return s_params_CommentPost; } }
@@ -7143,6 +7145,16 @@ namespace Disco.Web.Areas.API.Controllers
             return callInfo;
         }
 
+        partial void CommentOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id);
+
+        public override System.Web.Mvc.ActionResult Comment(int id)
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.Comment);
+            ModelUnbinderHelpers.AddRouteValues(callInfo.RouteValueDictionary, "id", id);
+            CommentOverride(callInfo, id);
+            return callInfo;
+        }
+
         partial void CommentPostOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, int id, string comment);
 
         public override System.Web.Mvc.ActionResult CommentPost(int id, string comment)

Disco.Web/Views/Job/JobParts/Components.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18033
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -31,9 +31,9 @@ namespace Disco.Web.Views.Job.JobParts
     using Disco.Web;
     using Disco.Web.Extensions;
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.4.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Components.cshtml")]
-    public class Components : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Components : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Components()
         {

Disco.Web/Views/Job/JobParts/Resources.cshtml

@@ -2,6 +2,7 @@
 @{
     Html.BundleDeferred("~/Style/Shadowbox");
     Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
+    Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
 }
 <table id="jobShowResources">
     <tr>
@@ -21,6 +22,7 @@
             </div>
             <script type="text/javascript">
                 $(function () {
+                    var jobId = parseInt('@(Model.Job.Id)');
                     $Comments = $('#Comments');
                     $CommentOutput = $Comments.find('.commentOutput');
                     $CommentOutputContainer = $Comments.find('.commentOutputContainer');
@@ -62,7 +64,8 @@
                                 data: data,
                                 success: function (d) {
                                     if (d.Result == 'OK') {
-                                        addComment(d.Comment, false);
+                                        // Should be added via Repository Notifications
+                                        // addComment(d.Comment, false);
                                         $CommentInput.val('').attr('disabled', false).focus();
                                     } else {
                                         alert('Unable to post comment: ' + d.Result);
@@ -91,9 +94,10 @@
                                     data: data,
                                     success: function (d) {
                                         if (d == 'OK') {
-                                            $this.closest('div').slideUp(300).delay(300).queue(function () {
+                                            // Should be removed via Repository Notifications
-                                                $(this).remove();
+                                            //$this.closest('div').slideUp(300).delay(300).queue(function () {
-                                            });
+                                            //    $(this).remove();
+                                            //});
                                         } else {
                                             alert('Unable to remove comment: ' + d);
                                         }
@@ -114,6 +118,21 @@
 
                         return false;
                     }
+                    function loadLiveComment(id) {
+                        $.ajax({
+                            url: '@Url.Action(MVC.API.Job.Comment())',
+                            dataType: 'json',
+                            data: { id: id },
+                            success: function (d) {
+                                if (d && d.JobId == jobId) {
+                                    addComment(d, false);
+                                }
+                            },
+                            error: function (jqXHR, textStatus, errorThrown) {
+                                alert('Unable to load live comment ' + id + ': ' + textStatus);
+                            }
+                        });
+                    }
                     function addComment(c, quick) {
                         var e = $('<div><span class="author" /><span class="remove" /><span class="timestamp" /><span class="comment" /></div>');
                         e.attr('data-logid', c.Id);
@@ -134,6 +153,31 @@
                             $CommentOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)
                         }
                     }
+
+                    // Sign up for Live Events
+                    function liveMessageRecieved(d) {
+                        if (d) {
+                            switch (d.EventType) {
+                                case 0: // Added
+                                    loadLiveComment(d.EntityKey[0]);
+                                    break;
+                                case 1: // Removed
+                                    $CommentOutput.children('div[data-logid="' + d.EntityKey[0] + '"]').slideUp(300).delay(300).queue(function () {
+                                        $(this).remove();
+                                    });
+                                    break;
+                            }
+                        }
+                    }
+                    var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))')
+                    liveMessagesConnection.received(liveMessageRecieved);
+                    liveMessagesConnection.error(function (e) {
+                        alert('Error: ' + JSON.stringify(e));
+                    });
+                    liveMessagesConnection.start(function () {
+                        liveMessagesConnection.send('/addToGroups:JobLog');
+                    });
+
                 });
             </script>
         </td>

Disco.Web/Views/Job/JobParts/Resources.generated.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18033
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -31,9 +31,9 @@ namespace Disco.Web.Views.Job.JobParts
     using Disco.Web;
     using Disco.Web.Extensions;
     
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.0.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.4.0")]
     [System.Web.WebPages.PageVirtualPathAttribute("~/Views/Job/JobParts/Resources.cshtml")]
-    public class Resources : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
+    public partial class Resources : System.Web.Mvc.WebViewPage<Disco.Web.Models.Job.ShowModel>
     {
         public Resources()
         {
@@ -45,6 +45,7 @@ namespace Disco.Web.Views.Job.JobParts
   
     Html.BundleDeferred("~/Style/Shadowbox");
     Html.BundleDeferred("~/ClientScripts/Modules/Shadowbox");
+    Html.BundleDeferred("~/ClientScripts/Modules/jQuery-SignalR");
 
             
             #line default
@@ -64,13 +65,13 @@ WriteLiteral(" class=\"commentOutput\"");
 WriteLiteral(">\r\n");
 
             
-            #line 10 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 11 "..\..\Views\Job\JobParts\Resources.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 10 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 11 "..\..\Views\Job\JobParts\Resources.cshtml"
                  foreach (var jl in Model.Job.JobLogs.OrderBy(m => m.Timestamp))
                 {
 
@@ -82,7 +83,7 @@ WriteLiteral("                    <div");
 WriteLiteral(" data-logid=\"");
 
             
-            #line 12 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 13 "..\..\Views\Job\JobParts\Resources.cshtml"
                                 Write(jl.Id);
 
             
@@ -97,7 +98,7 @@ WriteLiteral(" class=\"author\"");
 WriteLiteral(">");
 
             
-            #line 13 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 14 "..\..\Views\Job\JobParts\Resources.cshtml"
                                         Write(jl.TechUser.ToString());
 
             
@@ -111,20 +112,20 @@ WriteLiteral("></span><span");
 
 WriteLiteral(" class=\"timestamp\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 540), Tuple.Create("\"", 578)
+WriteAttribute("title", Tuple.Create(" title=\"", 608), Tuple.Create("\"", 646)
             
-            #line 13 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 14 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                       , Tuple.Create(Tuple.Create("", 548), Tuple.Create<System.Object, System.Int32>(jl.Timestamp.ToFullDateTime()
+                                                       , Tuple.Create(Tuple.Create("", 616), Tuple.Create<System.Object, System.Int32>(jl.Timestamp.ToFullDateTime()
             
             #line default
             #line hidden
-, 548), false)
+, 616), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 13 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 14 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                                                                                                                  Write(jl.Timestamp.ToFuzzy());
 
             
@@ -137,7 +138,7 @@ WriteLiteral(" class=\"comment\"");
 WriteLiteral(">");
 
             
-            #line 14 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 15 "..\..\Views\Job\JobParts\Resources.cshtml"
                                          Write(jl.Comments.ToMultilineJobRefString());
 
             
@@ -146,7 +147,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n                    </div>\r\n");
 
             
-            #line 16 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 17 "..\..\Views\Job\JobParts\Resources.cshtml"
                 }
 
             
@@ -170,33 +171,41 @@ WriteLiteral("></span>\r\n            </div>\r\n            <script");
 
 WriteLiteral(" type=\"text/javascript\"");
 
-WriteLiteral(">\r\n                $(function () {\r\n                    $Comments = $(\'#Comments\'" +
+WriteLiteral(">\r\n                $(function () {\r\n                    var jobId = parseInt(\'");
-");\r\n                    $CommentOutput = $Comments.find(\'.commentOutput\');\r\n    " +
-"                $CommentOutputContainer = $Comments.find(\'.commentOutputContaine" +
-"r\');\r\n                    $CommentInput = $Comments.find(\'textarea.commentInput\'" +
-");\r\n\r\n                    window.setTimeout(function () {\r\n                     " +
-"   $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bo" +
-"ttom\r\n                    }, 0);\r\n                    $(\'#jobDetailTabs\').on(\'ta" +
-"bsactivate\', function (event, ui) {\r\n                        if (ui.newPanel && " +
-"ui.newPanel.is(\'#jobDetailTab-Resources\')) {\r\n                            $Comme" +
-"ntOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom\r\n   " +
-"                     }\r\n                    });\r\n\r\n                    $Comments" +
-".find(\'.commentInputPost\').click(postComment);\r\n                    $CommentInpu" +
-"t.keypress(function (e) {\r\n                        if (e.which == 13 && !e.shift" +
-"Key) {\r\n                            postComment();\r\n                            " +
-"return false;\r\n                        }\r\n                    });\r\n             " +
-"       $CommentOutput.find(\'span.remove\').click(removePost);\r\n\r\n                " +
-"    $dialogRemoveLog = $(\'#dialogRemoveLog\');\r\n                    $dialogRemove" +
-"Log.dialog({\r\n                        resizable: false,\r\n                       " +
-" height: 140,\r\n                        modal: true,\r\n                        aut" +
-"oOpen: false\r\n                    });\r\n\r\n                    function postCommen" +
-"t() {\r\n                        var comment = $CommentInput.val();\r\n             " +
-"           if (comment != \'\') {\r\n                            var data = { commen" +
-"t: comment }\r\n                            $.ajax({\r\n                            " +
-"    url: \'");
 
             
-            #line 60 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 25 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                      Write(Model.Job.Id);
+
+            
+            #line default
+            #line hidden
+WriteLiteral("\');\r\n                    $Comments = $(\'#Comments\');\r\n                    $Commen" +
+"tOutput = $Comments.find(\'.commentOutput\');\r\n                    $CommentOutputC" +
+"ontainer = $Comments.find(\'.commentOutputContainer\');\r\n                    $Comm" +
+"entInput = $Comments.find(\'textarea.commentInput\');\r\n\r\n                    windo" +
+"w.setTimeout(function () {\r\n                        $CommentOutput[0].scrollTop " +
+"= $CommentOutput[0].scrollHeight; // Scroll to Bottom\r\n                    }, 0)" +
+";\r\n                    $(\'#jobDetailTabs\').on(\'tabsactivate\', function (event, u" +
+"i) {\r\n                        if (ui.newPanel && ui.newPanel.is(\'#jobDetailTab-R" +
+"esources\')) {\r\n                            $CommentOutput[0].scrollTop = $Commen" +
+"tOutput[0].scrollHeight; // Scroll to Bottom\r\n                        }\r\n       " +
+"             });\r\n\r\n                    $Comments.find(\'.commentInputPost\').clic" +
+"k(postComment);\r\n                    $CommentInput.keypress(function (e) {\r\n    " +
+"                    if (e.which == 13 && !e.shiftKey) {\r\n                       " +
+"     postComment();\r\n                            return false;\r\n                " +
+"        }\r\n                    });\r\n                    $CommentOutput.find(\'spa" +
+"n.remove\').click(removePost);\r\n\r\n                    $dialogRemoveLog = $(\'#dial" +
+"ogRemoveLog\');\r\n                    $dialogRemoveLog.dialog({\r\n                 " +
+"       resizable: false,\r\n                        height: 140,\r\n                " +
+"        modal: true,\r\n                        autoOpen: false\r\n                 " +
+"   });\r\n\r\n                    function postComment() {\r\n                        " +
+"var comment = $CommentInput.val();\r\n                        if (comment != \'\') {" +
+"\r\n                            var data = { comment: comment }\r\n                 " +
+"           $.ajax({\r\n                                url: \'");
+
+            
+            #line 62 "..\..\Views\Job\JobParts\Resources.cshtml"
                                  Write(Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null)));
 
             
@@ -205,27 +214,28 @@ WriteLiteral(">\r\n                $(function () {\r\n                    $Comme
 WriteLiteral("\',\r\n                                dataType: \'json\',\r\n                          " +
 "      data: data,\r\n                                success: function (d) {\r\n    " +
 "                                if (d.Result == \'OK\') {\r\n                       " +
-"                 addComment(d.Comment, false);\r\n                                " +
+"                 // Should be added via Repository Notifications\r\n              " +
-"        $CommentInput.val(\'\').attr(\'disabled\', false).focus();\r\n                " +
+"                          // addComment(d.Comment, false);\r\n                    " +
-"                    } else {\r\n                                        alert(\'Una" +
+"                    $CommentInput.val(\'\').attr(\'disabled\', false).focus();\r\n    " +
-"ble to post comment: \' + d.Result);\r\n                                        $Co" +
+"                                } else {\r\n                                      " +
-"mmentInput.attr(\'disabled\', false);\r\n                                    }\r\n    " +
+"  alert(\'Unable to post comment: \' + d.Result);\r\n                               " +
-"                            },\r\n                                error: function " +
+"         $CommentInput.attr(\'disabled\', false);\r\n                               " +
-"(jqXHR, textStatus, errorThrown) {\r\n                                    alert(\'U" +
+"     }\r\n                                },\r\n                                erro" +
-"nable to post comment: \' + textStatus);\r\n                                    $Co" +
+"r: function (jqXHR, textStatus, errorThrown) {\r\n                                " +
-"mmentInput.attr(\'disabled\', false);\r\n                                }\r\n        " +
+"    alert(\'Unable to post comment: \' + textStatus);\r\n                           " +
-"                    });\r\n                        }\r\n                    }\r\n     " +
+"         $CommentInput.attr(\'disabled\', false);\r\n                               " +
-"               function removePost() {\r\n                        $this = $(this);" +
+" }\r\n                            });\r\n                        }\r\n                " +
-"\r\n                        var data = { id: $this.closest(\'div\').attr(\'data-logid" +
+"    }\r\n                    function removePost() {\r\n                        $thi" +
-"\') };\r\n\r\n                        $dialogRemoveLog.dialog(\"enable\");\r\n           " +
+"s = $(this);\r\n                        var data = { id: $this.closest(\'div\').attr" +
-"             $dialogRemoveLog.dialog(\'option\', \'buttons\', {\r\n                   " +
+"(\'data-logid\') };\r\n\r\n                        $dialogRemoveLog.dialog(\"enable\");\r" +
-"         \"Remove\": function () {\r\n                                $dialogRemoveL" +
+"\n                        $dialogRemoveLog.dialog(\'option\', \'buttons\', {\r\n       " +
-"og.dialog(\"disable\");\r\n                                $dialogRemoveLog.dialog(\"" +
+"                     \"Remove\": function () {\r\n                                $d" +
-"option\", \"buttons\", null);\r\n                                $.ajax({\r\n          " +
+"ialogRemoveLog.dialog(\"disable\");\r\n                                $dialogRemove" +
-"                          url: \'");
+"Log.dialog(\"option\", \"buttons\", null);\r\n                                $.ajax({" +
+"\r\n                                    url: \'");
 
             
-            #line 89 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 92 "..\..\Views\Job\JobParts\Resources.cshtml"
                                      Write(Url.Action(MVC.API.Job.CommentRemove()));
 
             
@@ -234,33 +244,57 @@ WriteLiteral("\',\r\n                                dataType: \'json\',\r\n
 WriteLiteral("\',\r\n                                    dataType: \'json\',\r\n                      " +
 "              data: data,\r\n                                    success: function" +
 " (d) {\r\n                                        if (d == \'OK\') {\r\n              " +
-"                              $this.closest(\'div\').slideUp(300).delay(300).queue" +
+"                              // Should be removed via Repository Notifications\r" +
-"(function () {\r\n                                                $(this).remove()" +
+"\n                                            //$this.closest(\'div\').slideUp(300)" +
-";\r\n                                            });\r\n                            " +
+".delay(300).queue(function () {\r\n                                            // " +
-"            } else {\r\n                                            alert(\'Unable " +
+"   $(this).remove();\r\n                                            //});\r\n       " +
-"to remove comment: \' + d);\r\n                                        }\r\n         " +
+"                                 } else {\r\n                                     " +
-"                               $dialogRemoveLog.dialog(\"close\");\r\n              " +
+"       alert(\'Unable to remove comment: \' + d);\r\n                               " +
-"                      },\r\n                                    error: function (j" +
+"         }\r\n                                        $dialogRemoveLog.dialog(\"clo" +
-"qXHR, textStatus, errorThrown) {\r\n                                        alert(" +
+"se\");\r\n                                    },\r\n                                 " +
-"\'Unable to remove comment: \' + textStatus);\r\n                                   " +
+"   error: function (jqXHR, textStatus, errorThrown) {\r\n                         " +
-"     $dialogRemoveLog.dialog(\"close\");\r\n                                    }\r\n " +
+"               alert(\'Unable to remove comment: \' + textStatus);\r\n              " +
-"                               });\r\n                            },\r\n            " +
+"                          $dialogRemoveLog.dialog(\"close\");\r\n                   " +
-"                \"Cancel\": function () {\r\n                                $dialog" +
+"                 }\r\n                                });\r\n                       " +
-"RemoveLog.dialog(\"close\");\r\n                            }\r\n                     " +
+"     },\r\n                            \"Cancel\": function () {\r\n                  " +
-"   });\r\n\r\n                        $dialogRemoveLog.dialog(\'open\');\r\n\r\n          " +
+"              $dialogRemoveLog.dialog(\"close\");\r\n                            }\r\n" +
-"              return false;\r\n                    }\r\n                    function" +
+"                        });\r\n\r\n                        $dialogRemoveLog.dialog(\'" +
-" addComment(c, quick) {\r\n                        var e = $(\'<div><span class=\"au" +
+"open\');\r\n\r\n                        return false;\r\n                    }\r\n       " +
-"thor\" /><span class=\"remove\" /><span class=\"timestamp\" /><span class=\"comment\" /" +
+"             function loadLiveComment(id) {\r\n                        $.ajax({\r\n " +
-"></div>\');\r\n                        e.attr(\'data-logid\', c.Id);\r\n               " +
+"                           url: \'");
-"         e.find(\'.author\').text(c.Author);\r\n                        e.find(\'.tim" +
-"estamp\').text(c.TimestampFuzzy).attr(\'title\', c.TimestampFull);\r\n               " +
-"         e.find(\'.remove\').click(removePost);\r\n                        var eComm" +
-"ent = e.find(\'.comment\').text(c.Comments);\r\n                        var commentH" +
-"tml = eComment.text().replace(/\\r\\n|\\r|\\n/g, \'<br />\');\r\n                       " +
-" commentHtml = commentHtml.replace(/\\#(\\d+)/g, \'<a href=\"");
 
             
-            #line 125 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 123 "..\..\Views\Job\JobParts\Resources.cshtml"
+                             Write(Url.Action(MVC.API.Job.Comment()));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"',
+                            dataType: 'json',
+                            data: { id: id },
+                            success: function (d) {
+                                if (d && d.JobId == jobId) {
+                                    addComment(d, false);
+                                }
+                            },
+                            error: function (jqXHR, textStatus, errorThrown) {
+                                alert('Unable to load live comment ' + id + ': ' + textStatus);
+                            }
+                        });
+                    }
+                    function addComment(c, quick) {
+                        var e = $('<div><span class=""author"" /><span class=""remove"" /><span class=""timestamp"" /><span class=""comment"" /></div>');
+                        e.attr('data-logid', c.Id);
+                        e.find('.author').text(c.Author);
+                        e.find('.timestamp').text(c.TimestampFuzzy).attr('title', c.TimestampFull);
+                        e.find('.remove').click(removePost);
+                        var eComment = e.find('.comment').text(c.Comments);
+                        var commentHtml = eComment.text().replace(/\r\n|\r|\n/g, '<br />');
+                        commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href=""");
+
+            
+            #line 144 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                            Write(Url.Action(MVC.Job.Show(null)));
 
             
@@ -278,6 +312,40 @@ WriteLiteral(@"?id=$1"">#$1</a>');
                             $CommentOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)
                         }
                     }
+
+                    // Sign up for Live Events
+                    function liveMessageRecieved(d) {
+                        if (d) {
+                            switch (d.EventType) {
+                                case 0: // Added
+                                    loadLiveComment(d.EntityKey[0]);
+                                    break;
+                                case 1: // Removed
+                                    $CommentOutput.children('div[data-logid=""' + d.EntityKey[0] + '""]').slideUp(300).delay(300).queue(function () {
+                                        $(this).remove();
+                                    });
+                                    break;
+                            }
+                        }
+                    }
+                    var liveMessagesConnection = $.connection('");
+
+            
+            #line 172 "..\..\Views\Job\JobParts\Resources.cshtml"
+                                                           Write(Url.Content("~/API/Repository/Notifications"));
+
+            
+            #line default
+            #line hidden
+WriteLiteral(@"')
+                    liveMessagesConnection.received(liveMessageRecieved);
+                    liveMessagesConnection.error(function (e) {
+                        alert('Error: ' + JSON.stringify(e));
+                    });
+                    liveMessagesConnection.start(function () {
+                        liveMessagesConnection.send('/addToGroups:JobLog');
+                    });
+
                 });
             </script>
         </td>
@@ -292,13 +360,13 @@ WriteLiteral(" class=\"attachmentOutput\"");
 WriteLiteral(">\r\n");
 
             
-            #line 142 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 186 "..\..\Views\Job\JobParts\Resources.cshtml"
                 
             
             #line default
             #line hidden
             
-            #line 142 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 186 "..\..\Views\Job\JobParts\Resources.cshtml"
                  foreach (var ja in Model.Job.JobAttachments)
                 {
 
@@ -307,20 +375,20 @@ WriteLiteral(">\r\n");
             #line hidden
 WriteLiteral("                    <a");
 
-WriteAttribute("href", Tuple.Create(" href=\"", 7537), Tuple.Create("\"", 7594)
+WriteAttribute("href", Tuple.Create(" href=\"", 9905), Tuple.Create("\"", 9962)
             
-            #line 144 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 188 "..\..\Views\Job\JobParts\Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 7544), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
+, Tuple.Create(Tuple.Create("", 9912), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentDownload(ja.Id))
             
             #line default
             #line hidden
-, 7544), false)
+, 9912), false)
 );
 
 WriteLiteral(" data-attachmentid=\"");
 
             
-            #line 144 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 188 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                                                Write(ja.Id);
 
             
@@ -331,7 +399,7 @@ WriteLiteral("\"");
 WriteLiteral(" data-mimetype=\"");
 
             
-            #line 144 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 188 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                                                                       Write(ja.MimeType);
 
             
@@ -343,68 +411,68 @@ WriteLiteral(">\r\n                        <span");
 
 WriteLiteral(" class=\"icon\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 7696), Tuple.Create("\"", 7716)
+WriteAttribute("title", Tuple.Create(" title=\"", 10064), Tuple.Create("\"", 10084)
             
-            #line 145 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 189 "..\..\Views\Job\JobParts\Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 7704), Tuple.Create<System.Object, System.Int32>(ja.Filename
+, Tuple.Create(Tuple.Create("", 10072), Tuple.Create<System.Object, System.Int32>(ja.Filename
             
             #line default
             #line hidden
-, 7704), false)
+, 10072), false)
 );
 
 WriteLiteral(">\r\n                            <img");
 
 WriteLiteral(" alt=\"Attachment Thumbnail\"");
 
-WriteAttribute("src", Tuple.Create(" src=\"", 7779), Tuple.Create("\"", 7838)
+WriteAttribute("src", Tuple.Create(" src=\"", 10147), Tuple.Create("\"", 10206)
             
-            #line 146 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 190 "..\..\Views\Job\JobParts\Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 7785), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
+, Tuple.Create(Tuple.Create("", 10153), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.AttachmentThumbnail(ja.Id))
             
             #line default
             #line hidden
-, 7785), false)
+, 10153), false)
 );
 
 WriteLiteral(" /></span>\r\n                        <span");
 
 WriteLiteral(" class=\"comments\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 7897), Tuple.Create("\"", 7917)
+WriteAttribute("title", Tuple.Create(" title=\"", 10265), Tuple.Create("\"", 10285)
             
-            #line 147 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 191 "..\..\Views\Job\JobParts\Resources.cshtml"
-, Tuple.Create(Tuple.Create("", 7905), Tuple.Create<System.Object, System.Int32>(ja.Comments
+, Tuple.Create(Tuple.Create("", 10273), Tuple.Create<System.Object, System.Int32>(ja.Comments
             
             #line default
             #line hidden
-, 7905), false)
+, 10273), false)
 );
 
 WriteLiteral(">\r\n");
 
             
-            #line 148 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 192 "..\..\Views\Job\JobParts\Resources.cshtml"
                             
             
             #line default
             #line hidden
             
-            #line 148 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 192 "..\..\Views\Job\JobParts\Resources.cshtml"
                               if (!string.IsNullOrEmpty(ja.DocumentTemplateId))
                               { 
             
             #line default
             #line hidden
             
-            #line 149 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 193 "..\..\Views\Job\JobParts\Resources.cshtml"
                            Write(ja.DocumentTemplate.Description);
 
             
             #line default
             #line hidden
             
-            #line 149 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 193 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                 }
                               else
                               { 
@@ -412,14 +480,14 @@ WriteLiteral(">\r\n");
             #line default
             #line hidden
             
-            #line 151 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 195 "..\..\Views\Job\JobParts\Resources.cshtml"
                            Write(ja.Comments);
 
             
             #line default
             #line hidden
             
-            #line 151 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 195 "..\..\Views\Job\JobParts\Resources.cshtml"
                                              }
             
             #line default
@@ -431,7 +499,7 @@ WriteLiteral(" class=\"author\"");
 WriteLiteral(">");
 
             
-            #line 152 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 196 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                Write(ja.TechUser.ToString());
 
             
@@ -445,20 +513,20 @@ WriteLiteral("></span><span");
 
 WriteLiteral(" class=\"timestamp\"");
 
-WriteAttribute("title", Tuple.Create(" title=\"", 8287), Tuple.Create("\"", 8325)
+WriteAttribute("title", Tuple.Create(" title=\"", 10655), Tuple.Create("\"", 10693)
             
-            #line 152 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 196 "..\..\Views\Job\JobParts\Resources.cshtml"
-                                                             , Tuple.Create(Tuple.Create("", 8295), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
+                                                            , Tuple.Create(Tuple.Create("", 10663), Tuple.Create<System.Object, System.Int32>(ja.Timestamp.ToFullDateTime()
             
             #line default
             #line hidden
-, 8295), false)
+, 10663), false)
 );
 
 WriteLiteral(">");
 
             
-            #line 152 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 196 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                                                                                                                         Write(ja.Timestamp.ToFuzzy());
 
             
@@ -467,7 +535,7 @@ WriteLiteral(">");
 WriteLiteral("</span>\r\n                    </a>   \r\n");
 
             
-            #line 154 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 198 "..\..\Views\Job\JobParts\Resources.cshtml"
                 }
 
             
@@ -530,7 +598,7 @@ WriteLiteral(@">
                             '");
 
             
-            #line 197 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 241 "..\..\Views\Job\JobParts\Resources.cshtml"
                          Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
 
             
@@ -551,7 +619,7 @@ WriteLiteral(@"',
                             'UploadUrl=");
 
             
-            #line 209 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 253 "..\..\Views\Job\JobParts\Resources.cshtml"
                                    Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)));
 
             
@@ -583,7 +651,7 @@ WriteLiteral(@"'
                             url: '");
 
             
-            #line 232 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 276 "..\..\Views\Job\JobParts\Resources.cshtml"
                              Write(Url.Action(MVC.API.Job.Attachment()));
 
             
@@ -601,7 +669,7 @@ WriteLiteral(@"',
                                     e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
 
             
-            #line 241 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 285 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                                                                   Write(Url.Action(MVC.API.Job.AttachmentDownload()));
 
             
@@ -611,7 +679,7 @@ WriteLiteral("/\' + a.Id);\r\n                                    e.find(\'.icon
 "\'");
 
             
-            #line 242 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 286 "..\..\Views\Job\JobParts\Resources.cshtml"
                                                                  Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
 
             
@@ -644,7 +712,7 @@ WriteLiteral("/\' + a.Id);\r\n                                    e.find(\'.comm
 "                    $.ajax({\r\n                                    url: \'");
 
             
-            #line 275 "..\..\Views\Job\JobParts\Resources.cshtml"
+            #line 319 "..\..\Views\Job\JobParts\Resources.cshtml"
                                      Write(Url.Action(MVC.API.Job.AttachmentRemove()));
 
             

Disco.Web/Web.config

@@ -1,89 +1,93 @@
-<?xml version="1.0" encoding="utf-8"?><configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
   <configSections>
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <appSettings>
-    <add key="webpages:Version" value="2.0.0.0"/>
+    <add key="webpages:Version" value="2.0.0.0" />
-    <add key="webpages:Enabled" value="false"/>
+    <add key="webpages:Enabled" value="false" />
-    <add key="PreserveLoginUrl" value="true"/>
+    <add key="PreserveLoginUrl" value="true" />
-    <add key="ClientValidationEnabled" value="true"/>
+    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
-    <add key="DiscoIgnoreVersionUpdate" value="true"/>
+    <add key="DiscoIgnoreVersionUpdate" value="true" />
-  
+    <add key="Microsoft.VisualStudio.Enterprise.AspNetHelper.VsInstrLocation" value="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Performance Tools\x64\vsinstr.exe" />
-	<add key="Microsoft.VisualStudio.Enterprise.AspNetHelper.VsInstrLocation" value="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Team Tools\Performance Tools\x64\vsinstr.exe"/>
+  </appSettings>
-	
-	</appSettings>
   <connectionStrings>
-    <add name="DiscoDataContext" connectionString="data source=(local);Initial Catalog=Disco;Integrated Security=True;MultipleActiveResultSets=True" providerName="System.Data.SqlClient"/>
+    <add name="DiscoDataContext" connectionString="data source=(local);Initial Catalog=Disco;Integrated Security=True;MultipleActiveResultSets=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <system.web>
-    <compilation debug="true" targetFramework="4.5" assemblyPostProcessorType="Microsoft.VisualStudio.Enterprise.Common.AspPerformanceInstrumenter, Microsoft.VisualStudio.Enterprise.AspNetHelper, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+    <compilation debug="true" targetFramework="4.5" assemblyPostProcessorType="Microsoft.VisualStudio.Enterprise.Common.AspPerformanceInstrumenter, Microsoft.VisualStudio.Enterprise.AspNetHelper, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <httpRuntime targetFramework="4.5"/>
+      <assemblies>
-    <authentication mode="Windows"/>
+        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <customErrors mode="Off"/>
+      </assemblies>
+    </compilation>
+    <httpRuntime targetFramework="4.5" />
+    <authentication mode="Windows" />
+    <customErrors mode="Off" />
     <pages controlRenderingCompatibilityVersion="4.0">
       <namespaces>
-        <add namespace="System.Web.Helpers"/>
+        <add namespace="System.Web.Helpers" />
-        <add namespace="System.Web.Mvc"/>
+        <add namespace="System.Web.Mvc" />
-        <add namespace="System.Web.Mvc.Ajax"/>
+        <add namespace="System.Web.Mvc.Ajax" />
-        <add namespace="System.Web.Mvc.Html"/>
+        <add namespace="System.Web.Mvc.Html" />
-        <add namespace="System.Web.Routing"/>
+        <add namespace="System.Web.Routing" />
-        <add namespace="System.Web.WebPages"/>
+        <add namespace="System.Web.WebPages" />
-        <add namespace="Disco.BI.Extensions"/>
+        <add namespace="Disco.BI.Extensions" />
-        <add namespace="Disco.Web.Extensions"/>
+        <add namespace="Disco.Web.Extensions" />
       </namespaces>
     </pages>
   </system.web>
   <system.webServer>
     <handlers>
-      <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit"/>
+      <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
-      <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit"/>
+      <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
       <!--<add name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
       <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />-->
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0-PluginResources" path="/Plugin/*" verb="GET" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
+      <add name="ExtensionlessUrlHandler-Integrated-4.0-PluginResources" path="/Plugin/*" verb="GET" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
+        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral"/>
+        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral"/>
+        <assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
-    
+      <dependentAssembly>
-			<dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.Enterprise.AspNetHelper" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-				<assemblyIdentity name="Microsoft.VisualStudio.Enterprise.AspNetHelper" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <codeBase version="11.0.0.0" href="file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%2011.0/Common7/IDE/PrivateAssemblies/Microsoft.VisualStudio.Enterprise.AspNetHelper.DLL" />
-				<codeBase version="11.0.0.0" href="file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%2011.0/Common7/IDE/PrivateAssemblies/Microsoft.VisualStudio.Enterprise.AspNetHelper.DLL"/></dependentAssembly></assemblyBinding>
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
       <parameters>
-        <parameter value="System.Data.SqlServerCe.4.0"/>
+        <parameter value="System.Data.SqlServerCe.4.0" />
       </parameters>
     </defaultConnectionFactory>
   </entityFramework>
   <system.data>
     <DbProviderFactories>
-      <remove invariant="System.Data.SqlServerCe.4.0"/>
+      <remove invariant="System.Data.SqlServerCe.4.0" />
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"/>
+      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
     </DbProviderFactories>
   </system.data>
 </configuration>

Disco.Web/packages.config

@@ -23,6 +23,11 @@
   <package id="Modernizr" version="2.6.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
   <package id="RazorGenerator.Mvc" version="1.5.4.0" targetFramework="net45" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
   <package id="SignalR" version="0.5.3" targetFramework="net45" />
   <package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net45" />
   <package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net45" />

Disco.sln

@@ -121,12 +121,12 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_UseGlobalSettings = False
-		BuildVersion_DetectChanges = True
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_UpdateAssemblyVersion = False
-		BuildVersion_BuildVersioningStyle = None.None.None.None
-		BuildVersion_StartDate = 2001/1/1
 		BuildVersion_BuildAction = Both
+		BuildVersion_StartDate = 2001/1/1
+		BuildVersion_BuildVersioningStyle = None.None.None.None
+		BuildVersion_UpdateAssemblyVersion = False
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_DetectChanges = True
+		BuildVersion_UseGlobalSettings = False
 	EndGlobalSection
 EndGlobal