From deb617e863a240ddb02c4670c5c1bd207502e276 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Mon, 20 Feb 2012 16:35:14 +0530
Subject: [PATCH] assign to notifications

---
 js/legacy/utils/msgprint.js            |  5 ++--
 js/legacy/wn/widgets/form/assign_to.js |  6 +++--
 js/wn/ui/toolbar.min.js                | 14 +++++++----
 js/wn/ui/toolbar/toolbar.js            | 28 ++++++++++-----------
 py/core/doctype/doclayer/doclayer.js   |  4 ++-
 py/webnotes/widgets/form/assign_to.py  | 35 +++++++++++++++++++++++++-
 6 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/js/legacy/utils/msgprint.js b/js/legacy/utils/msgprint.js
index b9011bd05b..19c330db31 100644
--- a/js/legacy/utils/msgprint.js
+++ b/js/legacy/utils/msgprint.js
@@ -59,7 +59,7 @@ function msgprint(msg, issmall, callback) {
 
 // Floating Message
 var growl_area;
-function show_alert(txt) {
+function show_alert(txt, id) {
 	if(!growl_area) {
 		growl_area = $a(popup_cont, 'div', '', {position:'fixed', bottom:'8px', right:'8px', width: '320px', zIndex:10});
 	}
@@ -74,5 +74,6 @@ function show_alert(txt) {
 	// text
 	var t = $a(body, 'div', '', { color:'#FFF' });
 	$(t).html(txt);
+	if(id) { $(t).attr('id', id); }
 	$(wrapper).hide().fadeIn(1000);
-}
\ No newline at end of file
+}
diff --git a/js/legacy/wn/widgets/form/assign_to.js b/js/legacy/wn/widgets/form/assign_to.js
index 5dfb78fe4f..6813b1d748 100644
--- a/js/legacy/wn/widgets/form/assign_to.js
+++ b/js/legacy/wn/widgets/form/assign_to.js
@@ -61,7 +61,8 @@ wn.widgets.form.sidebar.AssignTo = Class.extend({
 						'default': 'Assigned by ' + user}, 
 					{fieldtype:'Date', fieldname:'date', label:'Complete By'}, 
 					{fieldtype:'Select', fieldname:'priority', label:'Priority',
-						options:'Low\nMedium\nHigh', 'default':'Medium'}, 
+						options:'Low\nMedium\nHigh', 'default':'Medium'},
+					{fieldtype:'Check', fieldname:'notify', label:'Notify By Email'},
 					{fieldtype:'Button', label:'Add', fieldname:'add_btn'}
 				]
 			});
@@ -75,7 +76,8 @@ wn.widgets.form.sidebar.AssignTo = Class.extend({
 						assign_to: assign_to,
 						description: me.dialog.fields_dict.description.get_value(),
 						priority: me.dialog.fields_dict.priority.get_value(),
-						date: me.dialog.fields_dict.date.get_value()
+						date: me.dialog.fields_dict.date.get_value(),
+						notify: me.dialog.fields_dict.notify.get_value()
 					}, function(r,rt) {me.render(r.message);});
 				}
 			}
diff --git a/js/wn/ui/toolbar.min.js b/js/wn/ui/toolbar.min.js
index 8cfa32b27b..2b86339caa 100644
--- a/js/wn/ui/toolbar.min.js
+++ b/js/wn/ui/toolbar.min.js
@@ -33,7 +33,7 @@ if(rd[1]){var dt=rd[0];var dn=rd[1];this.add(dt,dn,0);}}}});
 /*
  *	lib/js/wn/ui/toolbar/toolbar.js
  */
-wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home();this.make_new();this.make_search();this.make_report();wn.ui.toolbar.recent=new wn.ui.toolbar.RecentDocs();if(in_list(user_roles,'Administrator'))
+wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home();this.make_document();wn.ui.toolbar.recent=new wn.ui.toolbar.RecentDocs();if(in_list(user_roles,'Administrator'))
 this.make_options();this.make_tools();this.set_user_name();this.make_logout();$('.topbar').dropdown();$(document).trigger('toolbar_setup');},make:function(){$('header').append('<div class="topbar">\
    <div class="topbar-inner">\
    <div class="container">\
@@ -50,10 +50,14 @@ this.make_options();this.make_tools();this.set_user_name();this.make_logout();$(
     </ul>\
    </div>\
    </div>\
-   </div>');},make_home:function(){$('.topbar .nav:first').append('<li><a href="#'+home_page+'">Home</a></li>')},make_new:function(){wn.ui.toolbar.new_dialog=new wn.ui.toolbar.NewDialog();$('.topbar .nav:first').append('<li><a href="#" \
-   onclick="return wn.ui.toolbar.new_dialog.show();">New</a></li>');},make_search:function(){wn.ui.toolbar.search=new wn.ui.toolbar.Search();$('.topbar .nav:first').append('<li><a href="#" \
-   onclick="return wn.ui.toolbar.search.show();">Search</a></li>');},make_report:function(){wn.ui.toolbar.report=new wn.ui.toolbar.Report();$('.topbar .nav:first').append('<li><a href="#" \
-   onclick="return wn.ui.toolbar.report.show();">Report</a></li>');},make_tools:function(){$('.topbar .nav:first').append('<li class="dropdown">\
+   </div>');},make_home:function(){$('.topbar .nav:first').append('<li><a href="#'+home_page+'">Home</a></li>')},make_document:function(){wn.ui.toolbar.new_dialog=new wn.ui.toolbar.NewDialog();wn.ui.toolbar.search=new wn.ui.toolbar.Search();wn.ui.toolbar.report=new wn.ui.toolbar.Report();$('.topbar .nav:first').append('<li class="dropdown">\
+   <a class="dropdown-toggle" href="#" onclick="return false;">Document</a>\
+   <ul class="dropdown-menu" id="toolbar-document">\
+    <li><a href="#" onclick="return wn.ui.toolbar.new_dialog.show();">New</a></li>\
+    <li><a href="#" onclick="return wn.ui.toolbar.search.show();">Search</a></li>\
+    <li><a href="#" onclick="return wn.ui.toolbar.report.show();">Report</a></li>\
+   </ul>\
+  </li>');},make_tools:function(){$('.topbar .nav:first').append('<li class="dropdown">\
    <a class="dropdown-toggle" href="#" onclick="return false;">Tools</a>\
    <ul class="dropdown-menu" id="toolbar-tools">\
     <li><a href="#" onclick="return err_console.show();">Error Console</a></li>\
diff --git a/js/wn/ui/toolbar/toolbar.js b/js/wn/ui/toolbar/toolbar.js
index 6d1da4d183..f767b13638 100644
--- a/js/wn/ui/toolbar/toolbar.js
+++ b/js/wn/ui/toolbar/toolbar.js
@@ -3,16 +3,14 @@ wn.ui.toolbar.Toolbar = Class.extend({
 	init: function() {
 		this.make();
 		this.make_home();
-		this.make_new();
-		this.make_search();
-		this.make_report();
+		this.make_document();
 		wn.ui.toolbar.recent = new wn.ui.toolbar.RecentDocs();
 		if(in_list(user_roles, 'Administrator'))
 			this.make_options();
 		this.make_tools();
 		this.set_user_name();
 		this.make_logout();
-		
+
 		$('.topbar').dropdown();
 		
 		$(document).trigger('toolbar_setup');
@@ -39,21 +37,21 @@ wn.ui.toolbar.Toolbar = Class.extend({
 	make_home: function() {
 		$('.topbar .nav:first').append('<li><a href="#'+home_page+'">Home</a></li>')
 	},
-	make_new: function() {
+
+	make_document: function() {
 		wn.ui.toolbar.new_dialog = new wn.ui.toolbar.NewDialog();
-		$('.topbar .nav:first').append('<li><a href="#" \
-			onclick="return wn.ui.toolbar.new_dialog.show();">New</a></li>');
-	},
-	make_search: function() {
 		wn.ui.toolbar.search = new wn.ui.toolbar.Search();
-		$('.topbar .nav:first').append('<li><a href="#" \
-			onclick="return wn.ui.toolbar.search.show();">Search</a></li>');
-	},
-	make_report: function() {
 		wn.ui.toolbar.report = new wn.ui.toolbar.Report();
-		$('.topbar .nav:first').append('<li><a href="#" \
-			onclick="return wn.ui.toolbar.report.show();">Report</a></li>');
+		$('.topbar .nav:first').append('<li class="dropdown">\
+			<a class="dropdown-toggle" href="#" onclick="return false;">Document</a>\
+			<ul class="dropdown-menu" id="toolbar-document">\
+				<li><a href="#" onclick="return wn.ui.toolbar.new_dialog.show();">New</a></li>\
+				<li><a href="#" onclick="return wn.ui.toolbar.search.show();">Search</a></li>\
+				<li><a href="#" onclick="return wn.ui.toolbar.report.show();">Report</a></li>\
+			</ul>\
+		</li>');
 	},
+
 	make_tools: function() {
 		$('.topbar .nav:first').append('<li class="dropdown">\
 			<a class="dropdown-toggle" href="#" onclick="return false;">Tools</a>\
diff --git a/py/core/doctype/doclayer/doclayer.js b/py/core/doctype/doclayer/doclayer.js
index 1f26c40e0d..9088105775 100644
--- a/py/core/doctype/doclayer/doclayer.js
+++ b/py/core/doctype/doclayer/doclayer.js
@@ -63,7 +63,9 @@ cur_frm.load_doclabel_options = function(doc, dt, dn) {
 
 cur_frm.refresh_doctype_select = function(doc, dt, dn) {
 	var doc_type = cur_frm.fields_dict['doc_type'];
-	doc_type.refresh_options(cur_frm.doctype_list);
+	if(doc_type) {
+		doc_type.refresh_options(cur_frm.doctype_list);
+	}
 	if(doc.doc_type) {
 		doc_type.set_input(doc.doc_type);
 	} else {
diff --git a/py/webnotes/widgets/form/assign_to.py b/py/webnotes/widgets/form/assign_to.py
index 49887fabed..4302642ba9 100644
--- a/py/webnotes/widgets/form/assign_to.py
+++ b/py/webnotes/widgets/form/assign_to.py
@@ -28,7 +28,11 @@ def add():
 		d.description = webnotes.form_dict['description']
 		d.priority = webnotes.form_dict.get('priority', 'Medium')
 		d.date = webnotes.form_dict.get('date', nowdate())
+		d.assigned_by = webnotes.user.name
 		d.save(1)
+
+	# notify
+	notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN', notify=webnotes.form_dict.get('notify'))
 		
 	# update feeed
 	try:
@@ -45,8 +49,37 @@ def add():
 @webnotes.whitelist()
 def remove():
 	"""remove from todo"""
+	res = webnotes.conn.sql("""\
+		select assigned_by, owner, reference_type, reference_name from `tabToDo Item`
+		where reference_type=%(doctype)s and reference_name=%(name)s
+		and owner=%(assign_to)s""", webnotes.form_dict)
+
 	webnotes.conn.sql("""delete from `tabToDo Item`
 		where reference_type=%(doctype)s and reference_name=%(name)s
 		and owner=%(assign_to)s""", webnotes.form_dict)
-		
+
+	if res and res[0]: notify_assignment(res[0][0], res[0][1], res[0][2], res[0][3])
+
 	return get()
+
+
+def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE', notify=0):
+	"""
+		Notify assignee that there is a change in assignment
+	"""
+	if not (assigned_by and owner and doc_type and doc_name): return
+	# Search for email address in description -- i.e. assignee
+	assignment = """<a href="#!Form/%s/%s">%s</a>""" % (doc_type, doc_name, doc_name)
+	if action=='CLOSE':
+		arg = {
+			'uid': assigned_by,
+			'comment': "The task %s, assigned to %s, has been closed by %s" % (assignment, owner, webnotes.user.name)
+		}
+	else:
+		arg = {
+			'uid': owner,
+			'comment': "A new task, %s, has been assigned to you by %s" % (assignment, webnotes.user.name),
+			'notify': notify
+		}
+	from home.page.my_company import my_company
+	my_company.post_comment(arg)