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

Timestamp:

06/26/15 18:02:03 (10 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.WebApp.Statistics-3.3:

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

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

Location:

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

Files:

• clients.cshtml (modified) (3 diffs)
• details/clientDetails.cshtml (modified) (5 diffs)

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

@@ -14 +14 @@
     <li class="active">
         <a ng-href="#/statistics/clients">Clients</a>
+    </li>
+    <li>
+        <a ng-href="#/statistics/groups">Groups</a>
     </li>
     </ul>
@@ -31 +34 @@
                             <th>#</th>
                             <th>Client Name</th>
+                            <th>Group Name</th>
                             <th>Cores</th>
                             <th>Cpu Utilization</th>
@@ -40 +44 @@
                             <td>{{($index + 1)+((curClientsPage-1)*(clientsPageSize))}}</td>
                             <td>{{client.Name}}</td>
+                            <td>
+                                <a ng-show="client.GroupName" ng-href="#/statistics/groups/{{client.GroupId}}">{{client.GroupName}}</a>
+                                <span ng-hide="client.GroupName">No Group</span>
+                            </td>
                             <td>{{client.UsedCores}} / {{client.TotalCores}}</td>
                             <td>{{client.CpuUtilization | number: 2}} %</td>

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

@@ -14 +14 @@
             <a ng-href="#/statistics/clients">Clients</a>
         </li>
+        <li>
+            <a ng-href="#/statistics/groups">Groups</a>
+        </li>
     </ul>
 </header>
@@ -34 +37 @@
                                 <tr>
                                     <td class="text-left">Group:</td>
-                                    <td ng-show="client.GroupName">{{client.GroupName}}</td>
+                                    <td ng-show="client.GroupName"><a ng-href="#/statistics/groups/{{client.GroupId}}">{{client.GroupName}}</a></td>
                                     <td ng-hide="client.GroupName">None</td>
                                 </tr>
@@ -253 +256 @@
  <div class="default-filter-header text-center">
      <form class="form-inline">
-         <div class="form-group">
+         <div class="form-group" style="margin-left: 5px; margin-right: 5px;">
              <label for="fromDate">From:&nbsp;</label>
              <div class="input-group">
@@ -262 +265 @@
              </div>
          </div>
-         <div class="form-group">
-             <label for="fromDate">&nbsp;&nbsp;To:&nbsp;</label>
+         <div class="form-group" style="margin-left: 5px; margin-right: 5px;">
+             <label for="fromDate">To:&nbsp;</label>
              <div class="input-group">
-                 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="toDate" is-open="toIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close"/>
+                 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="toDate" is-open="toIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close" />
                  <span class="input-group-btn">
                      <button type="button" class="btn btn-default" ng-click="openToDateSelection($event)"><i class="glyphicon glyphicon-calendar"></i></button>
@@ -271 +274 @@
              </div>
          </div>
-         <div class="btn-group">
-             <label class="btn btn-default" ng-click="updateCharts()">
+         <div class="form-group" style="margin-left: 5px; margin-right: 5px;">
+             <button type="button" class="btn btn-default" ng-click="updateCharts()">
                  Apply
-             </label>
+             </button>
          </div>
      </form>