Changeset 12551 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/HeuristicLab.Services.WebApp.Statistics-3.3.csproj

Timestamp:

06/30/15 13:12:07 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

• updated database schema
• updated sql scripts
• updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

HeuristicLab.Services.WebApp.Status-3.3:

• updated data api controller

HeuristicLab.Services.WebApp.Statistics-3.3:

• added exception page
• improved jobs, clients, users and groups page

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Statistics/3.3/HeuristicLab.Services.WebApp.Statistics-3.3.csproj (modified) (6 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/HeuristicLab.Services.WebApp.Statistics-3.3.csproj

@@ -79 +79 @@
       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -146 +145 @@
     <Compile Include="WebApi\DataTransfer\ClientPage.cs" />
     <Compile Include="WebApi\DataTransfer\ClientStatus.cs" />
+    <Compile Include="WebApi\DataTransfer\ExceptionPage.cs" />
     <Compile Include="WebApi\DataTransfer\Group.cs" />
     <Compile Include="WebApi\DataTransfer\GroupDetails.cs" />
@@ -154 +154 @@
     <Compile Include="WebApi\DataTransfer\JobPage.cs" />
     <Compile Include="WebApi\DataTransfer\Task.cs" />
+    <Compile Include="WebApi\DataTransfer\Exception.cs" />
     <Compile Include="WebApi\DataTransfer\TaskPage.cs" />
     <Compile Include="WebApi\DataTransfer\TaskStateCount.cs" />
     <Compile Include="WebApi\DataTransfer\User.cs" />
+    <Compile Include="WebApi\DataTransfer\UserDetails.cs" />
+    <Compile Include="WebApi\ExceptionController.cs" />
     <Compile Include="WebApi\GroupController.cs" />
     <Compile Include="WebApi\JavascriptUtils.cs" />
@@ -176 +179 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="WebApp\exceptions\exceptionsCtrl.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="WebApp\exceptions\exceptionDetailsDialogCtrl.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="WebApp\groups\details\groupDetailsCtrl.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -192 +201 @@
     </Content>
     <Content Include="WebApp\services\clientService.js">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="WebApp\services\exceptionService.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -242 +254 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="WebApp\exceptions\exceptions.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="WebApp\exceptions\exceptionDetailsDialog.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="WebApp\groups\details\groupDetails.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>