Changeset 15281 for branches/Async/HeuristicLab.Services.WebApp.Statistics
- Timestamp:
- 07/23/17 11:17:18 (7 years ago)
- Location:
- branches/Async
- Files:
-
- 35 edited
-
. (modified) (2 props)
-
HeuristicLab.Services.WebApp.Statistics/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/Web.config (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Client.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientDetails.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientPage.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientStatus.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Exception.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ExceptionPage.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Group.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/GroupDetails.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/GroupPage.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Job.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/JobDetails.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/JobPage.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Task.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/TaskPage.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/TaskStateCount.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/User.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/UserDetails.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ExceptionController.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/GroupController.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/JavascriptUtils.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/JobController.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/TaskController.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/UserController.cs (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/clients.cshtml (modified) (2 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/exceptions/exceptions.cshtml (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/details/groupDetails.cshtml (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/groups.cshtml (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobs.cshtml (modified) (3 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml (modified) (2 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/statistics.js (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/Async
- Property svn:ignore
-
old new 24 24 protoc.exe 25 25 obj 26 .vs
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/Properties/AssemblyInfo.cs.frame
r13321 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 5HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2016 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3.1 3.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.14.$WCREV$")] -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/Web.config
r12477 r15281 1 <?xml version="1.0" ?>1 <?xml version="1.0" encoding="utf-8"?> 2 2 <configuration> 3 3 <system.web> -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs
r12858 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Client.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientDetails.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientPage.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientStatus.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Exception.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ExceptionPage.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Group.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/GroupDetails.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/GroupPage.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Job.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/JobDetails.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/JobPage.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Task.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/TaskPage.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/TaskStateCount.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/User.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/UserDetails.cs
r12562 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ExceptionController.cs
r12858 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/GroupController.cs
r12858 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/JavascriptUtils.cs
r12584 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/JobController.cs
r12858 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/TaskController.cs
r12858 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/UserController.cs
r12858 r15281 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/clients.cshtml
r12780 r15281 33 33 </div> 34 34 <div class="panel-body"> 35 <table class="table table-hover table-condensed" >35 <table class="table table-hover table-condensed" ts-wrapper> 36 36 <thead> 37 37 <tr> 38 38 <th>#</th> 39 <th >Client Name</th>40 <th >Group Name</th>41 <th >Cores</th>42 <th >Cpu Utilization</th>43 <th >Memory</th>44 <th >State</th>39 <th ts-criteria="Name">Client Name</th> 40 <th ts-criteria="GroupName">Group Name</th> 41 <th ts-criteria="UsedCores">Cores</th> 42 <th ts-criteria="CpuUtilization">Cpu Utilization</th> 43 <th ts-criteria="UsedMemory">Memory</th> 44 <th ts-criteria="State">State</th> 45 45 <th></th> 46 46 </tr> 47 47 </thead> 48 <tr ng-repeat="client in clientPage.Clients" >48 <tr ng-repeat="client in clientPage.Clients" ts-repeat> 49 49 <td>{{($index + 1)+((curClientsPage-1)*(clientsPageSize))}}</td> 50 50 <td>{{client.Name}}</td> … … 81 81 </div> 82 82 <div class="panel-body"> 83 <table class="table table-hover table-condensed" >83 <table class="table table-hover table-condensed" ts-wrapper> 84 84 <thead> 85 85 <tr> 86 86 <th>#</th> 87 <th >Client Name</th>88 <th >Group Name</th>89 <th >Cores</th>90 <th >Cpu Utilization</th>91 <th >Memory</th>92 <th >State</th>87 <th ts-criteria="Name">Client Name</th> 88 <th ts-criteria="GroupName">Group Name</th> 89 <th ts-criteria="UsedCores">Cores</th> 90 <th ts-criteria="CpuUtilization">Cpu Utilization</th> 91 <th ts-criteria="UsedMemory">Memory</th> 92 <th ts-criteria="State">State</th> 93 93 <th></th> 94 94 </tr> 95 95 </thead> 96 <tr ng-repeat="client in expiredClientPage.Clients" >96 <tr ng-repeat="client in expiredClientPage.Clients" ts-repeat> 97 97 <td>{{($index + 1)+((curExpiredClientsPage-1)*(expiredClientsPageSize))}}</td> 98 98 <td>{{client.Name}}</td> -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/exceptions/exceptions.cshtml
r12778 r15281 30 30 </div> 31 31 <div class="panel-body"> 32 <table class="table table-hover table-condensed" >32 <table class="table table-hover table-condensed" ts-wrapper> 33 33 <thead> 34 34 <tr> 35 35 <th>#</th> 36 <th >Job</th>37 <th >Task</th>38 <th >Username</th>39 <th >Client</th>40 <th >Date</th>36 <th ts-criteria="JobName">Job</th> 37 <th ts-criteria="TaskId">Task</th> 38 <th ts-criteria="UserName">Username</th> 39 <th ts-criteria="ClientName">Client</th> 40 <th ts-criteria="Date">Date</th> 41 41 <th></th> 42 42 </tr> 43 43 </thead> 44 <tr ng-repeat="exception in exceptionPage.Exceptions" >44 <tr ng-repeat="exception in exceptionPage.Exceptions" ts-repeat> 45 45 <td>{{($index + 1)+((curExceptionsPage-1)*(exceptionsPageSize))}}</td> 46 46 <td><a ng-href="#/statistics/jobs/{{exception.JobId}}">{{exception.JobName}}</a></td> -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/details/groupDetails.cshtml
r12780 r15281 173 173 </div> 174 174 <div class="panel-body"> 175 <table class="table table-hover table-condensed" >175 <table class="table table-hover table-condensed" ts-wrapper> 176 176 <thead> 177 177 <tr> 178 178 <th>#</th> 179 <th >Client Name</th>180 <th >Cores</th>181 <th >Cpu Utilization</th>182 <th >Memory</th>183 <th >State</th>179 <th ts-criteria="Name">Client Name</th> 180 <th ts-criteria="UsedCores">Cores</th> 181 <th ts-criteria="CpuUtilization">Cpu Utilization</th> 182 <th ts-criteria="UsedMemory">Memory</th> 183 <th ts-criteria="State">State</th> 184 184 <th></th> 185 185 </tr> 186 186 </thead> 187 <tr ng-repeat="client in clientPage.Clients" >187 <tr ng-repeat="client in clientPage.Clients" ts-repeat> 188 188 <td>{{($index + 1)+((curClientsPage-1)*(clientsPageSize))}}</td> 189 189 <td>{{client.Name}}</td> -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/groups.cshtml
r12551 r15281 33 33 </div> 34 34 <div class="panel-body"> 35 <table class="table table-hover table-condensed" >35 <table class="table table-hover table-condensed" ts-wrapper> 36 36 <thead> 37 37 <tr> 38 38 <th>#</th> 39 <th >Group Name</th>40 <th >Cores</th>41 <th >Cpu Utilization</th>42 <th >Memory</th>43 <th >Clients</th>39 <th ts-criteria="Name">Group Name</th> 40 <th ts-criteria="UsedCores">Cores</th> 41 <th ts-criteria="CpuUtilization">Cpu Utilization</th> 42 <th ts-criteria="UsedMemory">Memory</th> 43 <th ts-criteria="OnlineClients">Clients</th> 44 44 <th></th> 45 45 </tr> 46 46 </thead> 47 <tr ng-repeat="group in groupPage.Groups" >47 <tr ng-repeat="group in groupPage.Groups" ts-repeat> 48 48 <td>{{($index + 1)+((curGroupsPage-1)*(groupsPageSize))}}</td> 49 49 <td>{{group.Name}}</td> -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobs.cshtml
r12778 r15281 33 33 </div> 34 34 <div class="panel-body"> 35 <table class="table table-hover table-condensed" >35 <table class="table table-hover table-condensed" ts-wrapper> 36 36 <thead> 37 37 <tr> 38 38 <th>#</th> 39 <th >Job Name</th>39 <th ts-criteria="Name">Job Name</th> 40 40 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 41 <th >Username</th>41 <th ts-criteria="UserName">Username</th> 42 42 } 43 <th >Date Created</th>44 <th >Progress</th>43 <th ts-criteria="DateCreated">Date Created</th> 44 <th ts-criteria="CompletedTasks / TotalTasks">Progress</th> 45 45 <th></th> 46 46 </tr> 47 47 </thead> 48 48 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 49 <tr ng-repeat="job in allUsersJobs" >49 <tr ng-repeat="job in allUsersJobs" ts-repeat> 50 50 <td>{{$index + 1}}</td> 51 51 <td>{{job.Name}}</td> … … 65 65 </tr> 66 66 } else { 67 <tr ng-repeat="job in jobs" >67 <tr ng-repeat="job in jobs" ts-repeat> 68 68 <td>{{$index + 1}}</td> 69 69 <td>{{job.Name}}</td> … … 93 93 </div> 94 94 <div class="panel-body"> 95 <table class="table table-hover table-condensed" >95 <table class="table table-hover table-condensed" ts-wrapper> 96 96 <thead> 97 97 <tr> 98 98 <th>#</th> 99 <th >Job Name</th>100 <th >Date Created</th>101 <th >Date Completed</th>102 <th >Tasks</th>99 <th ts-criteria="Name">Job Name</th> 100 <th ts-criteria="DateCreated">Date Created</th> 101 <th ts-criteria="DateCompleted">Date Completed</th> 102 <th ts-criteria="TotalTasks|parseInt">Tasks</th> 103 103 <th></th> 104 104 </tr> 105 105 </thead> 106 <tr ng-repeat="job in completedJobPage.Jobs" >106 <tr ng-repeat="job in completedJobPage.Jobs" ts-repeat> 107 107 <td>{{($index + 1)+((completedJobCurPage-1)*(completedJobPageSize))}}</td> 108 108 <td>{{job.Name}}</td> -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml
r12584 r15281 68 68 </div> 69 69 <div class="panel-body"> 70 <table class="table table-hover table-condensed" >70 <table class="table table-hover table-condensed" ts-wrapper> 71 71 <thead> 72 72 <tr> 73 73 <th>#</th> 74 <th >Job Name</th>75 <th >Date Created</th>74 <th ts-criteria="Name">Job Name</th> 75 <th ts-criteria="DateCreated">Date Created</th> 76 76 <th>Progress</th> 77 77 <th></th> 78 78 </tr> 79 79 </thead> 80 <tr ng-repeat="job in jobs" >80 <tr ng-repeat="job in jobs" ts-repeat> 81 81 <td>{{$index + 1}}</td> 82 82 <td>{{job.Name}}</td> … … 105 105 </div> 106 106 <div class="panel-body"> 107 <table class="table table-hover table-condensed" >107 <table class="table table-hover table-condensed" ts-wrapper> 108 108 <thead> 109 109 <tr> 110 110 <th>#</th> 111 <th >Job Name</th>112 <th >Date Created</th>113 <th >Date Completed</th>114 <th >Tasks</th>111 <th ts-criteria="Name">Job Name</th> 112 <th ts-criteria="DateCreated">Date Created</th> 113 <th ts-criteria="DateCompleted">Date Completed</th> 114 <th ts-criteria="TotalTasks">Tasks</th> 115 115 <th></th> 116 116 </tr> 117 117 </thead> 118 <tr ng-repeat="job in completedJobPage.Jobs" >118 <tr ng-repeat="job in completedJobPage.Jobs" ts-repeat> 119 119 <td>{{($index + 1)+((completedJobCurPage-1)*(completedJobPageSize))}}</td> 120 120 <td>{{job.Name}}</td> -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml
r12584 r15281 30 30 </div> 31 31 <div class="panel-body"> 32 <table class="table table-hover table-condensed" >32 <table class="table table-hover table-condensed" ts-wrapper> 33 33 <thead> 34 34 <tr> 35 35 <th>#</th> 36 <th >Username</th>36 <th ts-criteria="Name">Username</th> 37 37 <th></th> 38 38 </tr> 39 39 </thead> 40 <tr ng-repeat="user in users" >40 <tr ng-repeat="user in users" ts-repeat> 41 41 <td>{{$index + 1}}</td> 42 42 <td>{{user.Name}}</td> -
branches/Async/HeuristicLab.Services.WebApp.Statistics/3.3/statistics.js
r12560 r15281 2 2 (function () { 3 3 var plugin = appStatisticsPlugin; 4 plugin.dependencies = ['ngResource', 'ui.knob', 'ui.bootstrap', 'ngFitText' ];4 plugin.dependencies = ['ngResource', 'ui.knob', 'ui.bootstrap', 'ngFitText', 'tableSort']; 5 5 plugin.files = [ 6 6 'WebApp/statistics.css',
Note: See TracChangeset
for help on using the changeset viewer.
