Context Navigation

← Previous Change
Next Change →

HeuristicLab.Services.WebApp.Statistics

Timestamp:

03/18/19 17:24:30 (6 years ago)

Author:

abeham

Message:

#2521: merged trunk changes up to r15681 into branch (removal of trunk/sources)

Location:

branches/2521_ProblemRefactoring

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/2521_ProblemRefactoring

Property svn:ignore

old	new
24	24	protoc.exe
25	25	obj
	26	.vs

Property svn:mergeinfo changed

/branches/Async (added)	merged: 13329,13349,13354-13355,13401,15065,15190,15204,15212,15215-15216,15232,15280-15281,15284,15286
/branches/symbreg-factors-2650 (added)	merged: 14232-14233,14237-14243,14248-14249,14251,14259,14266,14276-14277,14330-14331,14339,14351,14399,14401-14403,14421,14449,14497-14499,14501-14502,14534-14535,14539-14542,14554,14560,14589,14591-14592,14615,14693,14701,14715-14717,14719-14720,14751-14756,14758-14766,14812-14815,14823-14825
/stable	merged: 14190,15587-15588
/trunk/sources (added)	merged: 13392-13393,13395,13397,13402,13406,13411,13413-13415,13419-13420,13425,13427-13430,13433-13434,13438-13442,13445-13447,13450,13458,13471,13473-13474,13484,13491,13494,13498-13504,13507-13514,13516-13517,13525-13526,13529,13534-13535,13539-13540,13549-13550,13552,13560,13566-13567,13570-13573,13579-13582,13584-13586,13592-13593,13597,13614,13616,13621,13626-13629,13635,13644-13646,13648,13650-13655,13657-13662,13666,13669-13671,13675-13684,13690-13693,13695,13697-13705,13707-13709,13711,13715,13721,13724,13746,13760-13761,13764-13766,13779,13784-13786,13796,13800-13802,13807,13813,13826,13838,13863,13869,13889-13891,13895,13898-13901,13916-13917,13921-13922,13925,13932-13935,13938-13939,13941-13942,13958,13963-13964,13975,13978,13983-13987,13992-13993,13998,14000-14001,14007-14008,14011,14015-14017,14024-14026,14032,14034,14036-14037,14056-14057,14071,14078,14082-14083,14094-14096,14098-14100,14102-14103,14106-14107,14109-14110,14118,14120-14122,14124-14127,14129-14132,14135-14137,14140,14142,14144,14150,14152,14155-14160,14162-14164,14167-14169,14171,14174-14175,14177-14179,14181,14185,14187,14189,14191,14195-14196,14198,14200,14202-14209,14221-14224,14226-14230,14234-14236,14244-14247,14250,14255-14258,14260,14267-14268,14270-14273,14282,14284-14300,14307,14314-14316,14319,14322,14332,14340-14350,14352-14358,14367-14369,14371-14372,14376,14378,14381-14382,14384,14388,14390-14391,14393-14394,14396,14400,14405,14407-14408,14412,14418,14422-14423,14425,14432-14439,14443,14457-14458,14463-14465,14468-14469,14475-14476,14478-14479,14481-14483,14486,14493-14494,14504,14506-14509,14516-14517,14519,14522-14523,14527-14529,14531-14533,14548,14553,14561,14582,14597,14623,14630,14636-14638,14640-14641,14647,14651-14652,14654,14656,14659-14660,14662-14663,14672,14685,14687,14692,14697,14706,14708-14709,14718,14721-14722,14726,14732,14734,14737-14738,14740,14748-14750,14769-14770,14772-14775,14779-14781,14786,14789-14791,14793,14805,14809-14810,14817,14819-14820,14826-14832,14839-14843,14845-14847,14851-14854,14857,14860-14865,14871,14877,14882,14886,14889-14890,14899,14901,14904,14911-14912,14916,14918,14936-14938,14943-14951,14955,14971,14978-14979,14982,14984,14987,14992,14995,15002-15010,15013,15015-15016,15023-15024,15026,15029,15040,15042,15044,15046-15054,15058,15067-15077,15079-15080,15083-15088,15091-15096,15098-15099,15102-15107,15110-15114,15119-15126,15129,15135,15139,15156-15158,15160,15162-15169,15172-15173,15178-15181,15184-15185,15187,15191-15192,15194,15198,15201,15203,15205-15211,15213-15214,15221-15228,15230,15233-15236,15240-15241,15246-15248,15264-15266,15271,15276,15287-15288,15295,15299-15302,15312,15325-15327,15329,15335-15336,15339,15357-15358,15361,15367-15368,15370-15372,15376,15383,15388,15390,15395-15398,15400,15402,15408-15409,15419,15427,15447-15448,15452,15461,15464,15478,15480-15481,15483,15486,15498-15499,15502,15505,15513,15517-15518,15532,15534,15545,15548,15551,15556,15560,15566,15581,15583,15589-15591,15594,15596,15598,15607,15610-15611,15619,15621-15623,15626,15637-15638,15645,15665,15667,15672-15674

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/Properties/AssemblyInfo.cs.frame

-                      r13321
+                      r16692
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.13.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.15.$WCREV$")]

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/Web.config

r12477	r16692
1		<?xml version="1.0"?>
	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<configuration>
3	3	<system.web>

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs

r12858	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Client.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientDetails.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientPage.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ClientStatus.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Exception.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/ExceptionPage.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Group.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/GroupDetails.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/GroupPage.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Job.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/JobDetails.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/JobPage.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/Task.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/TaskPage.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/TaskStateCount.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/User.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/DataTransfer/UserDetails.cs

r12562	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ExceptionController.cs

r12858	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/GroupController.cs

r12858	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/JavascriptUtils.cs

r12584	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/JobController.cs

r12858	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/TaskController.cs

r12858	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/UserController.cs

r12858	r16692
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/clients.cshtml

-                      r12780
+                      r16692
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                         <tr>
                             <th>#</th>
                             <th>Client Name</th>
                             <th>Group Name</th>
                             <th>Cores</th>
                             <th>Cpu Utilization</th>
                             <th>Memory</th>
                             <th>State</th>
+                            <th ts-criteria="Name">Client Name</th>
+                            <th ts-criteria="GroupName">Group Name</th>
+                            <th ts-criteria="UsedCores">Cores</th>
+                            <th ts-criteria="CpuUtilization">Cpu Utilization</th>
+                            <th ts-criteria="UsedMemory">Memory</th>
+                            <th ts-criteria="State">State</th>
                             <th></th>
                         </tr>
                         </thead>
                         <tr ng-repeat="client in clientPage.Clients">
+                        <tr ng-repeat="client in clientPage.Clients" ts-repeat>
                             <td>{{($index + 1)+((curClientsPage-1)*(clientsPageSize))}}</td>
                             <td>{{client.Name}}</td>
 …
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                             <tr>
                                 <th>#</th>
                                 <th>Client Name</th>
                                 <th>Group Name</th>
                                 <th>Cores</th>
                                 <th>Cpu Utilization</th>
                                 <th>Memory</th>
                                 <th>State</th>
+                                <th ts-criteria="Name">Client Name</th>
+                                <th ts-criteria="GroupName">Group Name</th>
+                                <th ts-criteria="UsedCores">Cores</th>
+                                <th ts-criteria="CpuUtilization">Cpu Utilization</th>
+                                <th ts-criteria="UsedMemory">Memory</th>
+                                <th ts-criteria="State">State</th>
                                 <th></th>
                             </tr>
                         </thead>
                         <tr ng-repeat="client in expiredClientPage.Clients">
+                        <tr ng-repeat="client in expiredClientPage.Clients" ts-repeat>
                             <td>{{($index + 1)+((curExpiredClientsPage-1)*(expiredClientsPageSize))}}</td>
                             <td>{{client.Name}}</td>

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/exceptions/exceptions.cshtml

-                      r12778
+                      r16692
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                         <tr>
                             <th>#</th>
                             <th>Job</th>
                             <th>Task</th>
                             <th>Username</th>
                             <th>Client</th>
                             <th>Date</th>
+                            <th ts-criteria="JobName">Job</th>
+                            <th ts-criteria="TaskId">Task</th>
+                            <th ts-criteria="UserName">Username</th>
+                            <th ts-criteria="ClientName">Client</th>
+                            <th ts-criteria="Date">Date</th>
                             <th></th>
                         </tr>
                         </thead>
                         <tr ng-repeat="exception in exceptionPage.Exceptions">
+                        <tr ng-repeat="exception in exceptionPage.Exceptions" ts-repeat>
                             <td>{{($index + 1)+((curExceptionsPage-1)*(exceptionsPageSize))}}</td>
                             <td><a ng-href="#/statistics/jobs/{{exception.JobId}}">{{exception.JobName}}</a></td>

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/details/groupDetails.cshtml

-                      r12780
+                      r16692
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                             <tr>
                                 <th>#</th>
                                 <th>Client Name</th>
                                 <th>Cores</th>
                                 <th>Cpu Utilization</th>
                                 <th>Memory</th>
                                 <th>State</th>
+                                <th ts-criteria="Name">Client Name</th>
+                                <th ts-criteria="UsedCores">Cores</th>
+                                <th ts-criteria="CpuUtilization">Cpu Utilization</th>
+                                <th ts-criteria="UsedMemory">Memory</th>
+                                <th ts-criteria="State">State</th>
                                 <th></th>
                             </tr>
                         </thead>
                         <tr ng-repeat="client in clientPage.Clients">
+                        <tr ng-repeat="client in clientPage.Clients" ts-repeat>
                             <td>{{($index + 1)+((curClientsPage-1)*(clientsPageSize))}}</td>
                             <td>{{client.Name}}</td>

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/groups.cshtml

-                      r12551
+                      r16692
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                         <tr>
                             <th>#</th>
                             <th>Group Name</th>
                             <th>Cores</th>
                             <th>Cpu Utilization</th>
                             <th>Memory</th>
                             <th>Clients</th>
+                            <th ts-criteria="Name">Group Name</th>
+                            <th ts-criteria="UsedCores">Cores</th>
+                            <th ts-criteria="CpuUtilization">Cpu Utilization</th>
+                            <th ts-criteria="UsedMemory">Memory</th>
+                            <th ts-criteria="OnlineClients">Clients</th>
                             <th></th>
                         </tr>
                         </thead>
                         <tr ng-repeat="group in groupPage.Groups">
+                        <tr ng-repeat="group in groupPage.Groups" ts-repeat>
                             <td>{{($index + 1)+((curGroupsPage-1)*(groupsPageSize))}}</td>
                             <td>{{group.Name}}</td>

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobs.cshtml

-                      r12778
+                      r16692
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                         <tr>
                             <th>#</th>
                             <th>Job Name</th>
+                            <th ts-criteria="Name">Job Name</th>
                             @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) {
                                 <th>Username</th>
+                                <th ts-criteria="UserName">Username</th>
+                            }
                             <th>Date Created</th>
                             <th>Progress</th>
+                            <th ts-criteria="DateCreated">Date Created</th>
+                            <th ts-criteria="CompletedTasks / TotalTasks">Progress</th>
                             <th></th>
                         </tr>
                         </thead>
                         @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) {
                             <tr ng-repeat="job in allUsersJobs">
+                            <tr ng-repeat="job in allUsersJobs" ts-repeat>
                                 <td>{{$index + 1}}</td>
                                 <td>{{job.Name}}</td>
 …
                             </tr>
                         } else {
                             <tr ng-repeat="job in jobs">
+                            <tr ng-repeat="job in jobs" ts-repeat>
                                 <td>{{$index + 1}}</td>
                                 <td>{{job.Name}}</td>
 …
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                         <tr>
                             <th>#</th>
                             <th>Job Name</th>
                             <th>Date Created</th>
                             <th>Date Completed</th>
                             <th>Tasks</th>
+                            <th ts-criteria="Name">Job Name</th>
+                            <th ts-criteria="DateCreated">Date Created</th>
+                            <th ts-criteria="DateCompleted">Date Completed</th>
+                            <th ts-criteria="TotalTasks|parseInt">Tasks</th>
                             <th></th>
                         </tr>
                         </thead>
                         <tr ng-repeat="job in completedJobPage.Jobs">
+                        <tr ng-repeat="job in completedJobPage.Jobs" ts-repeat>
                             <td>{{($index + 1)+((completedJobCurPage-1)*(completedJobPageSize))}}</td>
                             <td>{{job.Name}}</td>

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml

-                      r12584
+                      r16692
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                             <tr>
                                 <th>#</th>
                                 <th>Job Name</th>
                                 <th>Date Created</th>
+                                <th ts-criteria="Name">Job Name</th>
+                                <th ts-criteria="DateCreated">Date Created</th>
                                 <th>Progress</th>
                                 <th></th>
                             </tr>
                         </thead>
                         <tr ng-repeat="job in jobs">
+                        <tr ng-repeat="job in jobs" ts-repeat>
                             <td>{{$index + 1}}</td>
                             <td>{{job.Name}}</td>
 …
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                             <tr>
                                 <th>#</th>
                                 <th>Job Name</th>
                                 <th>Date Created</th>
                                 <th>Date Completed</th>
                                 <th>Tasks</th>
+                                <th ts-criteria="Name">Job Name</th>
+                                <th ts-criteria="DateCreated">Date Created</th>
+                                <th ts-criteria="DateCompleted">Date Completed</th>
+                                <th ts-criteria="TotalTasks">Tasks</th>
                                 <th></th>
                             </tr>
                         </thead>
                         <tr ng-repeat="job in completedJobPage.Jobs">
+                        <tr ng-repeat="job in completedJobPage.Jobs" ts-repeat>
                             <td>{{($index + 1)+((completedJobCurPage-1)*(completedJobPageSize))}}</td>
                             <td>{{job.Name}}</td>

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml

-                      r12584
+                      r16692
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
+                    <table class="table table-hover table-condensed" ts-wrapper>
                         <thead>
                             <tr>
                                 <th>#</th>
                                 <th>Username</th>
+                                <th ts-criteria="Name">Username</th>
                                 <th></th>
                             </tr>
                         </thead>
                         <tr ng-repeat="user in users">
+                        <tr ng-repeat="user in users" ts-repeat>
                             <td>{{$index + 1}}</td>
                             <td>{{user.Name}}</td>

branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics/3.3/statistics.js

r12560	r16692
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.

Context Navigation

Changeset 16692 for branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp.Statistics

Legend:

Download in other formats: