* Attempt to get date picker components setup

* Output ex nicer
* Add log level colours to badges
* Output date in friendlier format
This commit is contained in:
Warren
2018-08-30 16:26:11 +01:00
parent c3fa12be6e
commit b15e8a13db
2 changed files with 73 additions and 5 deletions
@@ -26,6 +26,33 @@
}
};
vm.fromDatePickerConfig = {
pickDate: true,
pickTime: true,
useSeconds: false,
useCurrent: false,
format: "YYYY-MM-DD HH:mm",
icons: {
time: "icon-time",
date: "icon-calendar",
up: "icon-chevron-up",
down: "icon-chevron-down"
}
};
vm.toDatePickerConfig = {
pickDate: true,
pickTime: true,
useSeconds: false,
format: "YYYY-MM-DD HH:mm",
icons: {
time: "icon-time",
date: "icon-calendar",
up: "icon-chevron-up",
down: "icon-chevron-down"
}
};
//Functions
vm.getLogs = getLogs;
vm.changePageNumber = changePageNumber;
@@ -91,6 +118,30 @@
function getLogs(){
logViewerResource.getLogs(vm.logOptions).then(function (data) {
vm.logItems = data;
setLogTypeColor( vm.logItems.items);
});
}
function setLogTypeColor(logItems) {
angular.forEach(logItems, function (log) {
switch (log.Level) {
case "Information":
log.logTypeColor = "primary";
break;
case "Debug":
log.logTypeColor = "secondary";
break;
case "Warning":
log.logTypeColor = "warning";
break;
case "Fatal":
case "Error":
log.logTypeColor = "danger";
break;
default:
log.logTypeColor = "gray";
}
});
}
@@ -31,6 +31,24 @@
</umb-editor-sub-header-content-left>
<umb-editor-sub-header-content-right>
<span>From</span>
<umb-date-time-picker
options="vm.fromDatePickerConfig"
on-change="vm.datePickerChange(event)"
on-error="vm.datePickerError(event)">
</umb-date-time-picker>
<span>To</span>
<umb-date-time-picker
options="vm.toDatePickerConfig"
on-change="vm.datePickerChange(event)"
on-error="vm.datePickerError(event)">
</umb-date-time-picker>
</umb-editor-sub-header-content-right>
</umb-editor-sub-header>
@@ -60,17 +78,16 @@
</thead>
<tbody>
<tr ng-repeat-start="log in vm.logItems.items" ng-click="log.open = !log.open">
<td>{{ log.Timestamp }}</td>
<td>{{ log.Level }}</td>
<td>{{ log.Timestamp | date:'medium' }}</td>
<td><umb-badge size="s" color="{{ log.logTypeColor }}">{{ log.Level }}</umb-badge></td>
<td>{{ log.Properties.MachineName.Value }}</td>
<td>{{ log.RenderedMessage }}</td>
</tr>
<tr ng-repeat-end ng-if="log.open">
<td colspan="4">
<div ng-if="log.Exception">
<div ng-if="log.Exception" style="background-color:#fe6561; color:#94100b; padding:10px;">
<h3>Exception</h3>
<strong>TODO: Make this a red box or something?!</strong>
{{ log.Exception }}
<p style="white-space: pre-wrap;">{{ log.Exception }}</p>
</div>
<h3>Properties</h3>