- Timestamp:
- 07/20/15 16:29:08 (9 years ago)
- Location:
- branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml
r12768 r12780 32 32 <div class="form-group" style="margin-left: 5px; margin-right: 5px;"> 33 33 <div class="btn-group" dropdown dropdown-append-to-body> 34 <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle style="width: 1 30px; text-align: left;">35 <span class="text-left" style="display: inline-block; width: 85px;">{{curQuickSelection.name}}</span>34 <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle style="width: 145px; text-align: left;"> 35 <span class="text-left" style="display: inline-block; width: 100px;">{{curQuickSelection.name}}</span> 36 36 <span class="glyphicon glyphicon-chevron-down" style="margin-top: 3px;"></span> 37 37 </button> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js
r12584 r12780 51 51 { id: 2, name: 'Yesterday' }, 52 52 { id: 3, name: 'Last 7 Days' }, 53 { id: 4, name: 'Last 30 Days' } 53 { id: 4, name: 'Last 30 Days' }, 54 { id: 5, name: 'Last 6 Months' }, 55 { id: 6, name: 'Last Year' } 54 56 ]; 55 57 $scope.changeQuickSelection = function (quickSelection) { … … 71 73 case 4: 72 74 $scope.fromDate = new Date(today.valueOf() - (30 * oneDayInMs)); 75 $scope.toDate = new Date(today.valueOf()); 76 break; 77 case 5: 78 var month = today.getMonth() - 6; 79 if (month < 0) { 80 month += 12; 81 } 82 $scope.fromDate = new Date(today.valueOf()); 83 $scope.fromDate.setMonth(month); 84 $scope.toDate = new Date(today.valueOf()); 85 break; 86 case 6: 87 $scope.fromDate = new Date(today.valueOf()); 88 $scope.fromDate.setFullYear(today.getFullYear()-1); 73 89 $scope.toDate = new Date(today.valueOf()); 74 90 break;
Note: See TracChangeset
for help on using the changeset viewer.