From a6acdda09496b85a48ea00a1a96dc3243730f51c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 1 Mar 2013 14:41:32 +0530 Subject: [PATCH] fixes in calendar event display on desktop --- home/page/desktop/desktop.js | 5 +++-- startup/startup.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home/page/desktop/desktop.js b/home/page/desktop/desktop.js index c298b68218..87181d8a98 100644 --- a/home/page/desktop/desktop.js +++ b/home/page/desktop/desktop.js @@ -23,9 +23,10 @@ erpnext.desktop.render = function() { module.name = m; module.label = wn._(module.label); module.gradient_css = wn.get_gradient_css(module.color, 45); + module._link = module.link.toLowerCase().replace("/", "-"); $module_icon = $(repl('\ -
\
\ \ @@ -84,7 +85,7 @@ erpnext.desktop.show_pending_notifications = function() { add_circle('module-icon-messages', 'unread_messages', 'Unread Messages'); add_circle('module-icon-support-home', 'open_support_tickets', 'Open Support Tickets'); add_circle('module-icon-todo', 'things_todo', 'Things To Do'); - add_circle('module-icon-calendar', 'todays_events', 'Todays Events'); + add_circle('module-icon-calendar-event', 'todays_events', 'Todays Events'); add_circle('module-icon-projects-home', 'open_tasks', 'Open Tasks'); add_circle('module-icon-questions', 'unanswered_questions', 'Unanswered Questions'); add_circle('module-icon-selling-home', 'open_leads', 'Open Leads'); diff --git a/startup/startup.py b/startup/startup.py index c74c596235..89c0336d17 100644 --- a/startup/startup.py +++ b/startup/startup.py @@ -55,7 +55,7 @@ def get_todays_events(): SELECT COUNT(*) FROM `tabEvent` WHERE owner = %s AND event_type != 'Cancel' - AND event_date = %s""", ( + AND %s between date(starts_on) and date(ends_on)""", ( webnotes.session.user, nowdate())) return todays_events[0][0]