nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 13:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

activity date fix

Browse Source
This commit is contained in:
Rushabh Mehta
2012-03-02 16:25:22 +05:30
parent 5cc8cd7dc1
commit e45ffd6daf
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/home/page/activity/activity.js
View File

@@ -48,12 +48,13 @@ erpnext.ActivityFeed = Class.extend({
var date = dateutil.str_to_obj(data.modified);
var last = erpnext.last_feed_date;
if((last && dateutil.get_diff(last, date)>1) || (!last)) {
var pdate = dateutil.comment_when(date);
var diff = dateutil.get_diff(new Date(), date);
if((last && dateutil.obj_to_str(last) != dateutil.obj_to_str(date)) || (!last)) {
var diff = dateutil.get_day_diff(new Date(), date);
if(diff < 1) {
pdate = 'Today';
} else if(diff > 6) {
} else if(diff < 2) {
pdate = 'Yesterday';
} else {
pdate = dateutil.global_date_format(date);
}
$(row).html(repl('<div class="date-sep">%(date)s</div>', {date: pdate}));