Changeset 12546 for trunk/sources/HeuristicLab.Services.WebApp.Status/3.3
- Timestamp:
- 06/30/15 12:31:15 (9 years ago)
- Location:
- trunk/sources/HeuristicLab.Services.WebApp.Status/3.3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/HeuristicLab.Services.WebApp.Status-3.3.csproj
r12428 r12546 73 73 </PropertyGroup> 74 74 <ItemGroup> 75 <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">76 <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>77 <Private>False</Private>78 </Reference>79 75 <Reference Include="System" /> 80 76 <Reference Include="System.Core" /> -
trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml
r12521 r12546 80 80 <tr data-toggle="tooltip" data-placement="bottom" title="All online slaves"> 81 81 <td class="text-left">Total:</td> 82 <td class="text-right">{{status.MemoryStatus.TotalMemory | toGB}}</td>82 <td class="text-right">{{status.MemoryStatus.TotalMemory | kbToGB}} GB</td> 83 83 </tr> 84 84 <tr data-toggle="tooltip" data-placement="bottom" title="All calculating and idle slaves that are allowed to calculate"> 85 85 <td class="text-left">Active:</td> 86 <td class="text-right">{{status.MemoryStatus.ActiveMemory | toGB}}</td>86 <td class="text-right">{{status.MemoryStatus.ActiveMemory | kbToGB}} GB</td> 87 87 </tr> 88 88 <tr data-toggle="tooltip" data-placement="bottom" title="All calculating slaves that are allowed to calculate"> 89 89 <td class="text-left">Calculating:</td> 90 <td class="text-right">{{status.MemoryStatus.UsedMemory | toGB}}</td>90 <td class="text-right">{{status.MemoryStatus.UsedMemory | kbToGB}} GB</td> 91 91 </tr> 92 92 </table> … … 233 233 <td>{{slave.Slave.Name}}</td> 234 234 <td>{{slave.CpuUtilization | number: 2}} %</td> 235 <td>{{slave.Cores | number}}</td>236 <td>{{slave.Memory | toGB}}</td>235 <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td> 236 <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td> 237 237 </tr> 238 238 <tr ng-hide="activeCalculatingSlaves.length"> … … 291 291 <td>{{slave.Slave.Name}}</td> 292 292 <td>{{slave.CpuUtilization | number: 2}} %</td> 293 <td>{{slave.Cores | number}}</td>294 <td>{{slave.Memory | toGB}}</td>293 <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td> 294 <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td> 295 295 </tr> 296 296 <tr ng-hide="activeIdleSlaves.length"> … … 348 348 <td>{{slave.Slave.Name}}</td> 349 349 <td>{{slave.CpuUtilization | number: 2}} %</td> 350 <td>{{slave.Cores | number}}</td>351 <td>{{slave.Memory | toGB}}</td>350 <td>{{slave.Cores - slave.FreeCores | number}} / {{slave.Cores | number}}</td> 351 <td>{{slave.Memory - slave.FreeMemory | kbToGB}} / {{slave.Memory | kbToGB}} GB</td> 352 352 </tr> 353 353 <tr ng-hide="inactiveSlaves.length"> -
trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js
r12521 r12546 202 202 }] 203 203 ); 204 205 module.filter('toGB', function () {206 return function (text, length, end) {207 if (text == null || text == '') text = '0';208 text = Math.round(parseInt(text) / 1024);209 return text + ' GB';210 };211 });212 213 204 })(); -
trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/packages.config
r12429 r12546 5 5 <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" /> 6 6 <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" /> 7 <package id="Newtonsoft.Json" version=" 6.0.4" targetFramework="net45" />7 <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" /> 8 8 </packages>
Note: See TracChangeset
for help on using the changeset viewer.