Changeset 12551 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users
- Timestamp:
- 06/30/15 13:12:07 (9 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
-
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml
r12525 r12551 16 16 <a ng-href="#/statistics/groups">Groups</a> 17 17 </li> 18 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 19 <li> 20 <a ng-href="#/statistics/exceptions">Exceptions</a> 21 </li> 22 } 18 23 </ul> 19 24 </header> … … 46 51 <tr> 47 52 <td class="text-left">Total:</td> 48 <td class="text-right">{{total JobTasks}}</td>53 <td class="text-right">{{totalUserTasks}}</td> 49 54 </tr> 50 <tr ng-repeat="state in states">55 <tr ng-repeat="state in user.TasksStates"> 51 56 <td class="text-left">{{state.State}}:</td> 52 57 <td class="text-right">{{state.Count}}</td> … … 78 83 <td>{{$index + 1}}</td> 79 84 <td>{{job.Name}}</td> 80 <td>{{job.DateCreated }}</td>85 <td>{{job.DateCreated | toDate}}</td> 81 86 <td> 82 87 <progressbar class="progress active" max="job.TotalTasks" value="job.CompletedTasks" type="success"><i style="color:black; white-space:nowrap;">{{job.CompletedTasks}} / {{job.TotalTasks}}</i></progressbar> … … 116 121 <td>{{($index + 1)+((completedJobCurPage-1)*(completedJobPageSize))}}</td> 117 122 <td>{{job.Name}}</td> 118 <td>{{job.DateCreated }}</td>119 <td>{{job.DateCompleted }}</td>123 <td>{{job.DateCreated | toDate}}</td> 124 <td>{{job.DateCompleted | toDate}}</td> 120 125 <td>{{job.TotalTasks}}</td> 121 126 <td><a ng-href="#/statistics/jobs/{{job.Id}}">Details</a></td> … … 135 140 </div> 136 141 </div> 137 138 142 </div> 139 143 } -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetailsCtrl.js
r12516 r12551 12 12 userService.getUser({ id: $stateParams.id }, function(user) { 13 13 $scope.user = user; 14 15 var length = user.TasksStates.length; 16 var total = 0; 17 for (var i = 0; i < length; ++i) { 18 total += user.TasksStates[i].Count; 19 } 20 $scope.totalUserTasks = total; 14 21 }); 15 22 }; … … 18 25 jobService.getAllJobsByUserId({ id: $stateParams.id, completed: false }, function (jobs) { 19 26 $scope.jobs = jobs; 20 var length = $scope.jobs.length;21 for (var i = 0; i < length; ++i) {22 $scope.jobs[i].DateCreated = CSharpDateToString($scope.jobs[i].DateCreated);23 }24 27 }); 25 28 }; … … 29 32 function (jobPage) { 30 33 $scope.completedJobPage = jobPage; 31 var length = $scope.completedJobPage.Jobs.length;32 for (var i = 0; i < length; ++i) {33 $scope.completedJobPage.Jobs[i].DateCreated = CSharpDateToString($scope.completedJobPage.Jobs[i].DateCreated);34 $scope.completedJobPage.Jobs[i].DateCompleted = CSharpDateToString($scope.completedJobPage.Jobs[i].DateCompleted);35 }36 34 } 37 35 ); -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml
r12525 r12551 16 16 <a ng-href="#/statistics/groups">Groups</a> 17 17 </li> 18 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 19 <li> 20 <a ng-href="#/statistics/exceptions">Exceptions</a> 21 </li> 22 } 18 23 </ul> 19 24 </header>
Note: See TracChangeset
for help on using the changeset viewer.