Changeset 12584 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp

Timestamp:

07/03/15 16:35:17 (9 years ago)

Author:

dglaser

Message:

#2388: Changed all files to connect to localhost / sqlexpress

HeuristicLab.Services.Hive-3.3:

• Added Converter.cs and NewHiveService.cs, both will be integrated into existing HiveService.cs and Convert.cs when all methods are successfully implemented

HeuristicLab.Services.Hive.Web.Hive-3.3:

• Added publish profiles

HeuristicLab.Services.WebApp.Statistics-3.3:

• Added functionality to download TaskData as .hl file

Location:

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

Files:

• clients/clients.cshtml (modified) (1 diff)
• clients/details/clientDetails.cshtml (modified) (2 diffs)
• clients/details/clientDetailsCtrl.js (modified) (1 diff)
• clients/details/clientTaskDetailsDialogCtrl.js (modified) (1 diff)
• jobs/details/jobTaskDetailsDialogCtrl.js (modified) (1 diff)
• jobs/jobsCtrl.js (modified) (1 diff)
• users/details/userDetails.cshtml (modified) (1 diff)
• users/details/userDetailsCtrl.js (modified) (1 diff)
• users/users.cshtml (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/clients.cshtml

@@ -6 +6 @@
             <a ng-href="#/statistics/jobs">Jobs</a>
         </li>
-        @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator))
-        {
+        @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) {
             <li>
                 <a ng-href="#/statistics/users">Users</a>

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetails.cshtml

@@ -236 +236 @@
                  <div class="panel-body">
                      <table class="table table-condensed table-no-border table-auto-width">
-                         @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator))
-                         {
+                         @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) {
                              <tr>
                                  <td colspan="2"><span data-fittext="0.99">{{task.Id}}</span></td>
@@ -256 +255 @@
                              <td class="text-right">{{task.CalculatingTime | toTimespan}}</td>
                          </tr>
-                         @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator))
-                         {
+                         @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) {
                              <tr>
                                  <td>User:</td>

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetailsCtrl.js

@@ -100 +100 @@
                 $scope.curUserId = id;
                 $scope.curUserName = name;
+                $scope.curTaskPage = 1;
                 getClientDetails();
             };

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientTaskDetailsDialogCtrl.js

@@ -5 +5 @@
             $scope.taskNo = taskNo;
             $scope.task = task;
-
             $scope.close = function () {
                 $modalInstance.dismiss('cancel');
             };
-
         }]
     );

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialogCtrl.js

@@ -5 +5 @@
             $scope.taskNo = taskNo;
             $scope.task = task;
-
             $scope.close = function () {
                 $modalInstance.dismiss('cancel');
             };
-
         }]
     );

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobsCtrl.js

@@ -42 +42 @@
             };
 
-
             $scope.updateInterval = $interval(update, $scope.interval);
             var cancelInterval = $scope.$on('$locationChangeSuccess', function () {

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml

@@ -16 +16 @@
             <a ng-href="#/statistics/groups">Groups</a>
         </li>
-        @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) {
-            <li>
-                <a ng-href="#/statistics/exceptions">Exceptions</a>
-            </li>
-        }
+        <li>
+            <a ng-href="#/statistics/exceptions">Exceptions</a>
+        </li>
     </ul>
 </header>

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetailsCtrl.js

@@ -7 +7 @@
             $scope.completedJobCurPage = 1;
             $scope.completedJobPageSize = 20;
-
 
             var getUserDetails = function () {

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml

@@ -16 +16 @@
             <a ng-href="#/statistics/groups">Groups</a>
         </li>
-        @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) {
-            <li>
-                <a ng-href="#/statistics/exceptions">Exceptions</a>
-            </li>
-        }
+        <li>
+            <a ng-href="#/statistics/exceptions">Exceptions</a>
+        </li>
     </ul>
 </header>