From cdd265d3bf28c7428be373e85fe13f98a2d088c5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 7 Jun 2013 14:52:53 +0530 Subject: [PATCH] [project] added patch --- .../june_2013/p02_update_project_completed.py | 5 +++++ patches/patch_list.py | 1 + projects/doctype/project/project.py | 9 +++++---- projects/doctype/task/task_calendar.js | 19 +++++++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 patches/june_2013/p02_update_project_completed.py create mode 100644 projects/doctype/task/task_calendar.js diff --git a/patches/june_2013/p02_update_project_completed.py b/patches/june_2013/p02_update_project_completed.py new file mode 100644 index 0000000000..dff1f331fa --- /dev/null +++ b/patches/june_2013/p02_update_project_completed.py @@ -0,0 +1,5 @@ +import webnotes + +def execute(): + for p in webnotes.conn.sql_list("""select name from tabProject"""): + webnotes.bean("Project", p).controller.update_percent_complete() \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index c15e0c6a7d..cd3e9e7353 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -258,4 +258,5 @@ patch_list = [ "patches.may_2013.p07_move_update_stock_to_pos", "patches.may_2013.p08_change_item_wise_tax", "patches.june_2013.p01_update_bom_exploded_items", + "patches.june_2013.p02_update_project_completed", ] \ No newline at end of file diff --git a/projects/doctype/project/project.py b/projects/doctype/project/project.py index 9455a989c2..773cd4011c 100644 --- a/projects/doctype/project/project.py +++ b/projects/doctype/project/project.py @@ -63,8 +63,9 @@ class DocType: def update_percent_complete(self): total = webnotes.conn.sql("""select count(*) from tabTask where project=%s""", self.doc.name)[0][0] - completed = webnotes.conn.sql("""select count(*) from tabTask where - project=%s and status='Closed'""", self.doc.name)[0][0] - webnotes.conn.set_value("Project", self.doc.name, "percent_complete", - int(float(completed) / total * 100)) + if total: + completed = webnotes.conn.sql("""select count(*) from tabTask where + project=%s and status='Closed'""", self.doc.name)[0][0] + webnotes.conn.set_value("Project", self.doc.name, "percent_complete", + int(float(completed) / total * 100)) diff --git a/projects/doctype/task/task_calendar.js b/projects/doctype/task/task_calendar.js new file mode 100644 index 0000000000..94d7cc509f --- /dev/null +++ b/projects/doctype/task/task_calendar.js @@ -0,0 +1,19 @@ +wn.views.calendar["Task"] = { + field_map: { + "start": "exp_start_date", + "end": "exp_end_date", + "id": "name", + "title": "subject", + "allDay": "allDay" + }, + gantt: true, + filters: [ + { + "fieldtype": "Link", + "fieldname": "project", + "options": "Project", + "label": "Project" + } + ], + get_events_method: "projects.doctype.task.task.get_events" +} \ No newline at end of file