Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Show date after 7 days, not 14 days.

Browse source
This commit is contained in:
Martin Edenhofer 2015-12-10 10:32:52 +01:00
parent 0e0ce4b6b1
commit 0ec02aaace
2 changed files with 71 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/lib/app_post/pretty_date.coffee
View file

@ -29,7 +29,7 @@ class App.PrettyDate
if diff < 60 if diff < 60
return App.i18n.translateInline('just now') return App.i18n.translateInline('just now')
if direction is 'past' && !escalation && diff > ( 60 * 60 * 24 * 14 ) if direction is 'past' && !escalation && diff > ( 60 * 60 * 24 * 7 )
return App.i18n.translateDate(time) return App.i18n.translateDate(time)
# days # days

129
public/assets/tests/ui.js
View file

@ -1,101 +1,112 @@
// pretty date // pretty date
test( "check pretty date", function() { test("check pretty date", function() {
var current = new Date() var current = new Date()
// past // past
var result = App.PrettyDate.humanTime( current ); var result = App.PrettyDate.humanTime(current);
equal( result, 'just now', 'just now') equal(result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current - 15000 ); result = App.PrettyDate.humanTime(current - 15000);
equal( result, 'just now', 'just now') equal(result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current - 60000 ); result = App.PrettyDate.humanTime(current - 60000);
equal( result, '1 minute ago', '1 min ago') equal(result, '1 minute ago', '1 min ago')
result = App.PrettyDate.humanTime( current - ( 2 * 60000 ) ); result = App.PrettyDate.humanTime(current - (2 * 60000));
equal( result, '2 minutes ago', '2 min ago') equal(result, '2 minutes ago', '2 min ago')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 ) ) ; result = App.PrettyDate.humanTime(current - (60000 * 60)) ;
equal( result, '1 hour ago', '1 hour') equal(result, '1 hour ago', '1 hour')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 2 ) ); result = App.PrettyDate.humanTime(current - (60000 * 60 * 2));
equal( result, '2 hours ago', '2 hours') equal(result, '2 hours ago', '2 hours')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 2.5 ) ); result = App.PrettyDate.humanTime(current - (60000 * 60 * 2.5));
equal( result, '2 hours 30 minutes ago', '2.5 hours') equal(result, '2 hours 30 minutes ago', '2.5 hours')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 12.5 ) ); result = App.PrettyDate.humanTime(current - (60000 * 60 * 12.5));
equal( result, '12 hours ago', '12.5 hours') equal(result, '12 hours ago', '12.5 hours')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 ) ) ; result = App.PrettyDate.humanTime(current - (60000 * 60 * 24)) ;
equal( result, '1 day ago', '1 day') equal(result, '1 day ago', '1 day')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 2 ) ); result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 2));
equal( result, '2 days ago', '2 days') equal(result, '2 days ago', '2 days')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 2 ) - ( 60000 * 5 ) ); result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 2) - (60000 * 5));
equal( result, '2 days ago', '2 days') equal(result, '2 days ago', '2 days')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 2.5 ) ); result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 2.5));
equal( result, '2 days 12 hours ago', '2.5 days') equal(result, '2 days 12 hours ago', '2.5 days')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 2.5 ) - ( 60000 * 5 ) ); result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 2.5) - (60000 * 5));
equal( result, '2 days 12 hours ago', '2.5 days') equal(result, '2 days 12 hours ago', '2.5 days')
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 10.5 ) ); result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 10.5));
equal( result, '10 days ago', '10.5 days') var pastDate = new Date(current - (60000 * 60 * 24 * 10.5))
result = App.PrettyDate.humanTime( current - ( 60000 * 60 * 24 * 30 ) );
var pastDate = new Date(current - ( 60000 * 60 * 24 * 30 ))
var dd = pastDate.getDate(); var dd = pastDate.getDate();
if( dd<10 ) { if(dd<10) {
dd = '0' + dd dd = '0' + dd
} }
var mm = pastDate.getMonth() + 1; var mm = pastDate.getMonth() + 1;
if( mm<10 ) { if(mm<10) {
mm = '0' + mm mm = '0' + mm
} }
var yyyy = pastDate.getFullYear(); var yyyy = pastDate.getFullYear();
// mm/dd/yyyy // mm/dd/yyyy
equal( result, mm+'/'+dd+'/'+yyyy, '30 days') equal(result, mm+'/'+dd+'/'+yyyy, '10.5 days')
result = App.PrettyDate.humanTime(current - (60000 * 60 * 24 * 30));
var pastDate = new Date(current - (60000 * 60 * 24 * 30))
var dd = pastDate.getDate();
if(dd<10) {
dd = '0' + dd
}
var mm = pastDate.getMonth() + 1;
if(mm<10) {
mm = '0' + mm
}
var yyyy = pastDate.getFullYear();
// mm/dd/yyyy
equal(result, mm+'/'+dd+'/'+yyyy, '30 days')
// future // future
current = new Date() current = new Date()
result = App.PrettyDate.humanTime( current ); result = App.PrettyDate.humanTime(current);
equal( result, 'just now', 'just now') equal(result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current.getTime() + 55000 ); result = App.PrettyDate.humanTime(current.getTime() + 55000);
equal( result, 'just now', 'just now') equal(result, 'just now', 'just now')
result = App.PrettyDate.humanTime( current.getTime() + 65000 ); result = App.PrettyDate.humanTime(current.getTime() + 65000);
equal( result, 'in 1 minute', 'in 1 min') equal(result, 'in 1 minute', 'in 1 min')
result = App.PrettyDate.humanTime( current.getTime() + ( 2 * 65000 ) ); result = App.PrettyDate.humanTime(current.getTime() + (2 * 65000));
equal( result, 'in 2 minutes', 'in 2 min') equal(result, 'in 2 minutes', 'in 2 min')
result = App.PrettyDate.humanTime( current.getTime() + ( 60500 * 60 ) ) ; result = App.PrettyDate.humanTime(current.getTime() + (60500 * 60)) ;
equal( result, 'in 1 hour', 'in 1 hour') equal(result, 'in 1 hour', 'in 1 hour')
result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 2 ) ); result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 2));
equal( result, 'in 2 hours', 'in 2 hours') equal(result, 'in 2 hours', 'in 2 hours')
result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 2.5 ) ); result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 2.5));
equal( result, 'in 2 hours 30 minutes', 'in 2.5 hours') equal(result, 'in 2 hours 30 minutes', 'in 2.5 hours')
result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 ) ) ; result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24)) ;
equal( result, 'in 1 day', 'in 1 day') equal(result, 'in 1 day', 'in 1 day')
result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 * 2 ) ); result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24 * 2));
equal( result, 'in 2 days', 'in 2 days') equal(result, 'in 2 days', 'in 2 days')
result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 * 2.5 ) ); result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24 * 2.5));
equal( result, 'in 2 days 12 hours', 'in 2.5 days') equal(result, 'in 2 days 12 hours', 'in 2.5 days')
result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 * 5.5 ) ); result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24 * 5.5));
equal( result, 'in 5 days 12 hours', 'in 30.5 days') equal(result, 'in 5 days 12 hours', 'in 30.5 days')
result = App.PrettyDate.humanTime( current.getTime() + ( 60050 * 60 * 24 * 30.5 ) ); result = App.PrettyDate.humanTime(current.getTime() + (60050 * 60 * 24 * 30.5));
equal( result, 'in 30 days', 'in 30.5 days') equal(result, 'in 30 days', 'in 30.5 days')
}); });