diff --git a/apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.controller.js b/apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.controller.js
index dad5d8348..551b9c2ff 100644
--- a/apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.controller.js
+++ b/apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.controller.js
@@ -1,237 +1,232 @@
(function () {
'use strict';
// -- register controller with angular -- //
angular.module('shrine-tools', ['ui.bootstrap', 'ui.bootstrap.datepicker'])
.controller('ProblemsController', ProblemsController)
.directive('myPagination', function () {
return {
restrict: 'A',
replace: true,
templateUrl: 'src/app/diagnostic/templates/my-pagination-template.html'
}
})
.directive('myPages', function() {
function rangeGen(max) {
var result = [];
for (var i = 1; i < max - 1; i++) {
result[i] = i + 1;
}
return result;
}
function checkPage(value, activePage, maxPage, minPage) {
if (maxPage == minPage) {
return false;
} else if (maxPage - minPage <= 5) {
return isFinite(value) && value <= maxPage && value >= minPage;
} else if (value == maxPage || value == minPage || value == activePage) {
return true;
} else if (value == '‹') {
return activePage != minPage;
} else if (value == '›') {
return activePage != maxPage;
} else if (value == "..") {
return activePage > 5;
} else if (value == "...") {
return maxPage - activePage > 4;
} else if (value < activePage) {
return activePage <= 5 || activePage - value <= 2;
} else if (value > activePage) {
return maxPage - activePage <= 4 || value - activePage <= 2;
}
}
return {
restrict: 'E',
templateUrl: 'src/app/diagnostic/templates/paginator-template.html',
scope: {
maxPage: '=',
minPage: '=',
handleButton: '=',
activePage: '='
},
link: function(scope) {
scope.rangeGen = rangeGen;
scope.checkPage = checkPage;
}
}
});
ProblemsController.$inject = ['$app', '$log', '$sce', '$scope'];
function ProblemsController ($app, $log, $sce, $scope) {
var vm = this;
init();
/**
*
*/
function init () {
- $scope.isOpen = false;
- $scope.date = new Date();
- $scope.open = function() {$scope.isOpen = ! $scope.isOpen};
- $scope.checkDate = function() { return $scope.date != undefined };
+ vm.isOpen = false;
+ vm.date = new Date();
- vm.dateOptions = {maxDate: new Date()};
+ vm.dateOptions = {max: new Date()};
vm.pageSizes = [5, 10, 20];
vm.format = "dd/MM/yyyy";
vm.url = "https://open.med.harvard.edu/wiki/display/SHRINE/";
vm.submitDate = submitDate;
vm.newPage = newPage;
vm.floor = Math.floor;
vm.handleButton = handleButton;
- vm.showP = function(target) { return vm.probsSize > target};
+ vm.open = function() { vm.isOpen = !vm.isOpen };
+ vm.checkDate = function() { return vm.date != undefined };
+ vm.showP = function(target) { return vm.probsSize > target};
vm.pageSizeCheck = function(n) { return n < vm.probsSize };
- vm.parseDetails = function(details) { return $sce.trustAsHtml(parseDetails(details)) };
- vm.numCheck = function(any) { return isFinite(any)? (any - 1) * vm.probsN: vm.probsOffset };
- vm.changePage = function() { vm.newPage(vm.probsOffset, vm.pageSize > 20? 20: vm.pageSize < 0? 0: vm.pageSize) };
-
- $scope.$watch("vm.date.dateObject", function(newValue, oldValue) {
- var valueOf = function(value) { return value == null? "null": JSON.stringify(value)};
- $log.warn("date changed from " + valueOf(newValue) + " to " + valueOf(oldValue));
- });
+ vm.parseDetails = function(details) { return $sce.trustAsHtml(parseDetails(details)) };
+ vm.numCheck = function(any) { return isFinite(any)? (any - 1) * vm.probsN: vm.probsOffset };
+ vm.changePage = function() { vm.newPage(vm.probsOffset, vm.pageSize > 20? 20: vm.pageSize < 0? 0: vm.pageSize) };
vm.formatDate = function(dateObject) {
var split = dateObject.toString().split(" ");
return split[1] + " " + split[2] + ", " + split[3];
};
//todo: Get rid of this and figure out something less hacky
vm.formatCodec = function(word) {
var index = word.lastIndexOf('.');
var arr = word.trim().split("");
arr[index] = '\n';
return arr.join("");
};
$app.model.getProblems().then(setProblems)
}
function handleButton(value) {
var page = function(offset) { newPage(offset, vm.probsN) };
switch(value) {
case '..':
break;
case '‹':
page(vm.probsOffset - vm.probsN);
break;
case '›':
page(vm.probsOffset + vm.probsN);
break;
case '...':
break;
default:
page((value - 1) * vm.probsN);
}
}
function floorMod(num1, num2) {
if (!(num1 && num2)) {
// can't mod without real numbers
return num1;
} else {
var n1 = Math.floor(num1);
var n2 = Math.floor(num2);
return n1 - (n1 % n2);
}
}
function submitDate() {
- var epoch = $scope.date.getTime() + 86400000; // + a day
+ var epoch = vm.date.getTime() + 86400000; // + a day
vm.showDateError = false;
newPage(vm.probsOffset, vm.probsN, epoch);
}
function newPage(offset, n, epoch) {
if (!(n && isFinite(n))) {
n = 20;
}
if (!(offset && isFinite(offset))) {
offset = 0;
}
var clamp = function(num1) {
if (!vm.probsSize) {
// Can't clamp, since probsSize isn't set yet.
return num1;
} else {
return Math.max(0, Math.min(vm.probsSize - 1, num1));
}
};
var num = floorMod(clamp(offset), vm.probsN);
$app.model.getProblems(num, n, epoch)
.then(setProblems)
}
function setProblems(probs) {
vm.problems = probs.problems;
vm.probsSize = probs.size;
vm.probsOffset = probs.offset;
vm.probsN = probs.n;
vm.pageSize = vm.probsN;
}
function parseDetails(detailsObject) {
var detailsTag = '<h3>details</h3>';
var detailsField = detailsObject['details'];
if (detailsField === '') {
return '<h3>No details associated with this problem</h3>'
} else if (typeof(detailsField) === 'string') {
return detailsTag + '<p>'+sanitizeString(detailsField)+'</p>';
} else if (typeof(detailsField) === 'object' && detailsField.hasOwnProperty('exception')) {
return detailsTag + parseException(detailsField['exception']);
} else {
return detailsTag + '<pre>'+sanitizeString(JSON.stringify(detailsField))+'</pre>'
}
}
function parseException(exceptionObject) {
var exceptionTag = '<h4>exception</h4>';
var nameTag = '<h5>'+sanitizeString(exceptionObject['name'])+'</h5>';
var messageTag = '<p>'+sanitizeString(exceptionObject['message'])+'</p>';
var stackTrace = exceptionObject['stacktrace'];
return exceptionTag + nameTag + messageTag + (stackTrace == null? '': parseStackTrace(stackTrace));
}
function parseStackTrace(stackTraceObject) {
if (stackTraceObject.hasOwnProperty('exception')) {
return '<p>'+sanitizeString(stackTraceObject['line'])+'</p>' + parseException(stackTraceObject['exception']);
} else if (stackTraceObject.hasOwnProperty('line')) {
return '<h4>stack trace</h4>' + parseLines(stackTraceObject['line']);
} else {
return JSON.stringify(stackTraceObject);
}
}
function parseLines(lineArray) {
var result = '<p>';
for (var i =0; i < lineArray.length; i++) {
result += sanitizeString(lineArray[i]) + '<br>';
}
result += '</p>';
return result;
}
function sanitizeString(str) {
var chars = str.split('');
var escapes = {
'<': '<', '>': '>', '&': '&', '"': '"',
"'": ''', ' ': ' ', '!': '!', '@': '@',
'$': '$', '%': '%', '(': '(', ')': ')',
'=': '=', '+': '+', '{': '{', '}': '}',
'[': '[', ']': ']'
};
for (var i = 0; i < chars.length; i++) {
var c = chars[i];
if (escapes.hasOwnProperty(c)) {
chars[i] = escapes[c]
}
}
return chars.join('');
}
}
})();
diff --git a/apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.tpl.html b/apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.tpl.html
index 5b73c21a9..18ecac25e 100644
--- a/apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.tpl.html
+++ b/apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.tpl.html
@@ -1,92 +1,91 @@
<div>
<div style="display:flex;justify-content: space-between;vertical-align: text-top">
- <form ng-submit="vm.submitDate(date)" style="width:18.5%;white-space:nowrap;">
+ <form ng-submit="vm.submitDate(vm.date)" style="width:18.5%;white-space:nowrap;">
<button datepicker-popup="{{vm.format}}"
type="button"
class="btn btn-primary active"
- ng-model="date"
- is-open='isOpen'
- ng-click="open()"
+ ng-model="vm.date"
+ is-open='vm.isOpen'
+ ng-click="vm.open()"
close-text="Close"
- placeholder="{{vm.format}}"
- datepicker-options="vm.dateOptions">
- {{vm.formatDate(date)}}
+ max-date="vm.date">
+ {{vm.formatDate(vm.date)}}
</button>
- <button type="submit" class="glyphicon glyphicon-search" ng-show="checkDate()">
+ <button type="submit" class="glyphicon glyphicon-search" ng-show="vm.checkDate()">
</button>
- <button class="glyphicon glyphicon-search" ng-hide="checkDate()"
+ <button class="glyphicon glyphicon-search" ng-hide="vm.checkDate()"
style="opacity:.25;cursor:default" disabled></button>
</form>
<div my-pagination ng-show="vm.showP(vm.probsN)"></div>
<form style="width:20%;font-size:large;white-space: nowrap" ng-show="vm.showP(5)">
<label for="pageSize">Problems Per Page: </label>
<select id="pageSize"
ng-options="x for x in vm.pageSizes | filter: vm.pageSizeCheck"
ng-model="vm.pageSize"
ng-change="vm.changePage()"></select>
</form>
</div>
<table class="table table-striped">
<colgroup>
<col style="width:27%">
<col>
<col>
<col>
</colgroup>
<thead>
<tr>
<td colspan="4">
<span style="float:left">Problems Total: {{vm.probsSize}}</span>
<span style="float:right" ng-show="vm.showP(vm.probsN)">
Pages Total: {{vm.probsSize <= 0? 1: vm.floor((vm.probsSize - 1) / vm.probsN) + 1}}
</span>
</td>
</tr>
<tr>
<td data-width="25%">
Codec
</td>
<td data-width="15%">
Time Logged
</td>
<td data-width="25%">
Summary
</td>
<td data-width="25%">
Description
</td>
</tr>
</thead>
<tbody>
<tr ng-repeat-start="problem in vm.problems track by $index"
ng-click="problem.showDetails = !problem.showDetails"
style="cursor: pointer;">
<td><pre style="background: inherit;border: none;text-decoration: underline;"
><a href="{{vm.url + problem.codec}}" target="_blank" rel="noopener noreferrer" ng-click="$event.stopPropagation()"
>{{vm.formatCodec(problem.codec)}}</a></pre>
</td>
<td>
{{problem.stampText}}
</td>
<td>
{{problem.summary}}
</td>
<td>
{{problem.description}}
</td>
</tr>
<tr ng-repeat-end>
<td colspan="4" ng-show="problem.showDetails" ng-bind-html="vm.parseDetails(problem.detailsXml)">
</td>
</tr>
</tbody>
</table>
<div style="display:flex;justify-content: center">
<div style="width:18.5%"></div>
<div my-pagination ng-show="vm.showP(vm.probsN)"></div>
<div style="width:20%"></div>
</div>
</div>
\ No newline at end of file