This commit is contained in:
Vincent Fiduccia 2017-01-19 23:00:20 -07:00
parent 22dd704fdc
commit f8ada903b2
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
6 changed files with 31 additions and 13 deletions

View File

@ -33,7 +33,7 @@ export default Ember.Controller.extend({
{
displayName: 'Resource',
name: 'resource',
sort: ['typeAndId','id:desc'],
sort: ['resourceType','id:desc'],
searchField: ['typeAndId', 'resourceType','resourceId'],
}
];
@ -42,7 +42,7 @@ export default Ember.Controller.extend({
out.push({
displayName: 'Exit Reason',
name: 'exitReason',
sort: ['exitReason','id'],
sort: ['exitReason','id:desc'],
width: '150px',
});
}
@ -50,7 +50,7 @@ export default Ember.Controller.extend({
out.push({
displayName: 'Start Time',
name: 'startTime',
sort: ['startTime','id:desc'],
sort: ['startTime:desc','id:desc'],
width: '150px',
searchField: false,
});
@ -68,7 +68,7 @@ export default Ember.Controller.extend({
out.push({
displayName: 'Run Time',
name: 'runTime',
sort: ['runTime:desc','id'],
sort: ['runTime:desc','id:desc'],
width: '100px',
searchField: false,
});

View File

@ -33,7 +33,7 @@
<td data-title="{{dt.startTime}}">
{{#if row.startTime}}
{{date-from-now row.startTime}}
{{date-calendar row.startTime}}
{{else}}
<span class="text-muted">&mdash;</span>
{{/if}}
@ -42,7 +42,7 @@
{{#if (eq which "completed")}}
<td data-title="{{dt.endTime}}">
{{#if row.endTime}}
{{date-from-now row.endTime}}
{{date-calendar row.endTime}}
{{else}}
<span class="text-muted">&mdash;</span>
{{/if}}

View File

@ -1,7 +1,12 @@
import Ember from 'ember';
export function dateCalendar(params) {
return moment(params[0]).calendar();
export function dateCalendar(params, options) {
let out = moment(params[0]).calendar();
if ( options && options.withToday !== true ) {
out = out.replace('Today at ','');
}
return out;
}
export default Ember.Helper.helper(dateCalendar);

View File

@ -0,0 +1,16 @@
import Ember from 'ember';
export function dateCalendar(params) {
let date = moment(params[0]);
let now = moment();
let diff = now.diff(date);
if ( Math.abs(diff) > 44*60*1000 ) {
return date.calendar();
} else if ( diff > 0 ) {
return date.fromNow();
} else {
return date.toNow();
}
}
export default Ember.Helper.helper(dateCalendar);

View File

@ -157,9 +157,6 @@ $singleCountWidth : 120px;
&:last-of-type {
border-right: none;
}
&.state {
padding: 0;
}
}
TH {

View File

@ -1,6 +1,6 @@
{
"name": "ui",
"version": "1.4.0",
"version": "1.4.1",
"private": true,
"directories": {
"doc": "doc",
@ -55,7 +55,7 @@
"forever-agent": "^0.6.1",
"glob": "^5.0.3",
"http-proxy": "^1.11.1",
"lacsso": "0.0.53",
"lacsso": "0.0.54",
"liquid-fire": "0.26.4",
"loader.js": "^4.0.10",
"semver": "^5.3.0",