Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/26/15 11:35:20 (9 years ago)
Author:
dglaser
Message:

#2388: Merged trunk into HiveStatistics branch

Location:
branches/HiveStatistics/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources

  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml

    r12435 r12522  
    8080                    <tr data-toggle="tooltip" data-placement="bottom" title="All online slaves">
    8181                        <td class="text-left">Total:</td>
    82                         <td class="text-right">{{status.MemoryStatus.TotalMemory | number}} GB</td>
     82                        <td class="text-right">{{status.MemoryStatus.TotalMemory | toGB}}</td>
    8383                    </tr>
    8484                    <tr data-toggle="tooltip" data-placement="bottom" title="All calculating and idle slaves that are allowed to calculate">
    8585                        <td class="text-left">Active:</td>
    86                         <td class="text-right">{{status.MemoryStatus.ActiveMemory | number}} GB</td>
     86                        <td class="text-right">{{status.MemoryStatus.ActiveMemory | toGB}}</td>
    8787                    </tr>
    8888                    <tr data-toggle="tooltip" data-placement="bottom" title="All calculating slaves that are allowed to calculate">
    8989                        <td class="text-left">Calculating:</td>
    90                         <td class="text-right">{{status.MemoryStatus.UsedMemory | number}} GB</td>
     90                        <td class="text-right">{{status.MemoryStatus.UsedMemory | toGB}}</td>
    9191                    </tr>
    9292                </table>
    … …  
    234234                            <td>{{slave.CpuUtilization | number: 2}} %</td>
    235235                            <td>{{slave.Cores | number}}</td>
    236                             <td>{{slave.Memory | number}} GB</td>
     236                            <td>{{slave.Memory | toGB}}</td>
    237237                        </tr>
    238238                        <tr ng-hide="activeCalculatingSlaves.length">
    … …  
    292292                            <td>{{slave.CpuUtilization | number: 2}} %</td>
    293293                            <td>{{slave.Cores | number}}</td>
    294                             <td>{{slave.Memory | number}} GB</td>
     294                            <td>{{slave.Memory | toGB}}</td>
    295295                        </tr>
    296296                        <tr ng-hide="activeIdleSlaves.length">
    … …  
    349349                            <td>{{slave.CpuUtilization | number: 2}} %</td>
    350350                            <td>{{slave.Cores | number}}</td>
    351                             <td>{{slave.Memory | number}} GB</td>
     351                            <td>{{slave.Memory | toGB}}</td>
    352352                        </tr>
    353353                        <tr ng-hide="inactiveSlaves.length">
Note: See TracChangeset for help on using the changeset viewer.