opendev/gerrit
Code Issues Proposed changes

Merge "Update gr-date-formatter to suport showing time and date"

Browse Source
This commit is contained in:
Viktar Donich
2018-01-05 21:30:25 +00:00
committed by Gerrit Code Review
parent 4c8be85fcf c0a6f7c001
commit a66a680804
4 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
polygerrit-ui/app/elements/change/gr-message/gr-message.html
View File

@@ -195,6 +195,7 @@ limitations under the License.
<span class="date">
<gr-date-formatter
has-tooltip
show-date-and-time
date-str="[[message.date]]"></gr-date-formatter>
</span>
</template>
@@ -202,6 +203,7 @@ limitations under the License.
<a class="date" href$="[[_computeMessageHash(message)]]" on-tap="_handleLinkTap">
<gr-date-formatter
has-tooltip
show-date-and-time
date-str="[[message.date]]"></gr-date-formatter>
</a>
</template>

2
polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter.html
View File

@@ -30,7 +30,7 @@ limitations under the License.
}
</style>
<span>
[[_computeDateStr(dateStr, _timeFormat, _relative)]]
[[_computeDateStr(dateStr, _timeFormat, _relative, showDateAndTime)]]
</span>
<gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
</template>

15
polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter.js
View File

@@ -37,6 +37,10 @@
value: null,
notify: true,
},
showDateAndTime: {
type: Boolean,
value: false,
},
/**
* When true, the detailed date appears in a GR-TOOLTIP rather than in the
@@ -131,7 +135,7 @@
diff < 180 * Duration.DAY;
},
_computeDateStr(dateStr, timeFormat, relative) {
_computeDateStr(dateStr, timeFormat, relative, showDateAndTime) {
if (!dateStr) { return ''; }
const date = moment(util.parseDate(dateStr));
if (!date.isValid()) { return ''; }
@@ -147,8 +151,13 @@
let format = TimeFormats.MONTH_DAY_YEAR;
if (this._isWithinDay(now, date)) {
format = timeFormat;
} else if (this._isWithinHalfYear(now, date)) {
format = TimeFormats.MONTH_DAY;
} else {
if (this._isWithinHalfYear(now, date)) {
format = TimeFormats.MONTH_DAY;
}
if (this.showDateAndTime) {
format = `${format} ${timeFormat}`;
}
}
return date.format(format);
},

34
polygerrit-ui/app/elements/shared/gr-date-formatter/gr-date-formatter_test.html
View File

@@ -55,7 +55,8 @@ limitations under the License.
return d;
}
function testDates(nowStr, dateStr, expected, expectedTooltip, done) {
function testDates(nowStr, dateStr, expected, expectedWithDateAndTime,
expectedTooltip, done) {
// Normalize and convert the date to mimic server response.
dateStr = normalizedDate(dateStr)
.toJSON().replace('T', ' ').slice(0, -1);
@@ -65,6 +66,9 @@ limitations under the License.
const span = element.$$('span');
assert.equal(span.textContent.trim(), expected);
assert.equal(element.title, expectedTooltip);
element.showDateAndTime = true;
flushAsynchronousOperations();
assert.equal(span.textContent.trim(), expectedWithDateAndTime);
done();
});
}
@@ -98,25 +102,33 @@ limitations under the License.
test('Within 24 hours on same day', done => {
testDates('2015-07-29 20:34:14.985000000',
'2015-07-29 15:34:14.985000000',
'15:34', 'Jul 29, 2015, 15:34:14', done);
'15:34',
'15:34',
'Jul 29, 2015, 15:34:14', done);
});
test('Within 24 hours on different days', done => {
testDates('2015-07-29 03:34:14.985000000',
'2015-07-28 20:25:14.985000000',
'Jul 28', 'Jul 28, 2015, 20:25:14', done);
'Jul 28',
'Jul 28 20:25',
'Jul 28, 2015, 20:25:14', done);
});
test('More than 24 hours but less than six months', done => {
testDates('2015-07-29 20:34:14.985000000',
'2015-06-15 03:25:14.985000000',
'Jun 15', 'Jun 15, 2015, 03:25:14', done);
'Jun 15',
'Jun 15 03:25',
'Jun 15, 2015, 03:25:14', done);
});
test('More than six months', done => {
testDates('2015-09-15 20:34:00.000000000',
'2015-01-15 03:25:00.000000000',
'Jan 15, 2015', 'Jan 15, 2015, 03:25:00', done);
'Jan 15, 2015',
'Jan 15, 2015 03:25',
'Jan 15, 2015, 03:25:00', done);
});
});
@@ -135,7 +147,9 @@ limitations under the License.
test('Within 24 hours on same day', done => {
testDates('2015-07-29 20:34:14.985000000',
'2015-07-29 15:34:14.985000000',
'3:34 PM', 'Jul 29, 2015, 3:34:14 PM', done);
'3:34 PM',
'3:34 PM',
'Jul 29, 2015, 3:34:14 PM', done);
});
});
@@ -153,13 +167,17 @@ limitations under the License.
test('Within 24 hours on same day', done => {
testDates('2015-07-29 20:34:14.985000000',
'2015-07-29 15:34:14.985000000',
'5 hours ago', 'Jul 29, 2015, 3:34:14 PM', done);
'5 hours ago',
'5 hours ago',
'Jul 29, 2015, 3:34:14 PM', done);
});
test('More than six months', done => {
testDates('2015-09-15 20:34:00.000000000',
'2015-01-15 03:25:00.000000000',
'8 months ago', 'Jan 15, 2015, 3:25:00 AM', done);
'8 months ago',
'8 months ago',
'Jan 15, 2015, 3:25:00 AM', done);
});
});