TT#52974 Call history shows wrong call log time

Change-Id: I78de755a2c7ffb4b3fe627af41ced3bf7ad9cdb7
changes/25/27325/1
raxelsen 7 years ago
parent 1f051f4ba0
commit 769b2fdf49

@ -16,6 +16,7 @@ export function getConversations(options) {
order_by: _.get(options, 'order_by', 'timestamp'), order_by: _.get(options, 'order_by', 'timestamp'),
order_by_direction: 'desc', order_by_direction: 'desc',
no_count: true, no_count: true,
tz: 'UTC',
page: _.get(options, 'page', 1), page: _.get(options, 'page', 1),
rows: _.get(options, 'rows', 25) rows: _.get(options, 'rows', 25)
}; };

@ -9,31 +9,31 @@ export default function(value) {
return `${formatDate(timeStamp, 'MMMM D, YYYY')} at ${formatDate(timeStamp, 'h:mm a')}`; return `${formatDate(timeStamp, 'MMMM D, YYYY')} at ${formatDate(timeStamp, 'h:mm a')}`;
} }
export function smartTime($date, $today) { export function smartTime($date) {
let today = $today || new Date(); let today = new Date();
let date = moment($date, 'YYYY-MM-DD HH:mm:SS').toDate(); let date = moment.utc($date, 'YYYY-MM-DD HH:mm:SS').toDate();
let diffSeconds = Math.floor((today.getTime() - date.getTime()) / 1000); let diffSeconds = Math.floor((today.getTime() - date.getTime()) / 1000);
let diffMinutes = Math.floor(diffSeconds / 60); let diffMinutes = Math.floor(diffSeconds / 60);
let momentDate = moment(date); let momentDate = moment(date);
let seconds = 'second'; let seconds = 'second';
if(diffSeconds > 1) { if (diffSeconds > 1) {
seconds = seconds + "s"; seconds = seconds + "s";
} }
let minutes = 'minute'; let minutes = 'minute';
if(diffSeconds > 120) { if (diffSeconds > 120) {
minutes = minutes + "s"; minutes = minutes + "s";
} }
if(diffSeconds < 60) { if (diffSeconds < 60) {
return diffSeconds + ' ' + seconds + ' ago'; return diffSeconds + ' ' + seconds + ' ago';
} }
else if (diffSeconds < 3600) { else if (diffSeconds < 3600) {
return diffMinutes + ' ' + minutes + ' ago'; return diffMinutes + ' ' + minutes + ' ago';
} }
else if(isToday(date)) { else if (isToday(date)) {
return 'Today, ' + momentDate.format('HH:mm'); return 'Today, ' + momentDate.format('HH:mm');
} }
else if (isYesterday(date)) { else if (isYesterday(date)) {

@ -24,18 +24,6 @@ export function addDay(date) {
return newDate; return newDate;
} }
export function addMonth(date) {
let newDate = new Date();
newDate.setUTCMonth(date.getUTCMonth() + 1);
return newDate;
}
export function addYear(date) {
let newDate = new Date();
newDate.setUTCFullYear(date.getUTCFullYear() + 1);
return newDate;
}
export function isToday(date, $today) { export function isToday(date, $today) {
let today = $today || new Date(); let today = $today || new Date();
let todayStart = new Date(today.getTime()); let todayStart = new Date(today.getTime());

Loading…
Cancel
Save