From c5bf642c7d113306bd8a38fb8f7e929fe028d8ee Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 23 Jan 2012 16:18:34 +0530 Subject: [PATCH] version --- .../home/doctype/home_control/home_control.py | 5 ++- .../home/page/event_updates/event_updates.js | 42 ++++++++++--------- erpnext/home/page/my_company/my_company.js | 2 +- erpnext/hr/doctype/appraisal/appraisal.js | 2 - index.html | 2 +- version.num | 2 +- 6 files changed, 29 insertions(+), 26 deletions(-) diff --git a/erpnext/home/doctype/home_control/home_control.py b/erpnext/home/doctype/home_control/home_control.py index ce15bfd57a..9d821532cd 100644 --- a/erpnext/home/doctype/home_control/home_control.py +++ b/erpnext/home/doctype/home_control/home_control.py @@ -197,7 +197,10 @@ class DocType: return count def get_todo_list(self): - return convert_to_lists(sql("select name, description, date, priority,checked from `tabToDo Item` where owner=%s order by field(priority,'High','Medium','Low') asc, date asc", session['user'])) + return sql("""select name, description, date, + priority, checked, reference_type, reference_name from `tabToDo Item` + where owner=%s order by field(priority,'High','Medium','Low') asc, date asc""", \ + session['user'], as_dict=1) def add_todo_item(self,args): args = json.loads(args) diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js index 6e09cca971..9e8302e3bf 100644 --- a/erpnext/home/page/event_updates/event_updates.js +++ b/erpnext/home/page/event_updates/event_updates.js @@ -346,21 +346,32 @@ HomeToDo.prototype.render_item = function(item, det) { $y(tab, {tableLayout:'fixed'}); var span = $a($td(tab, 0, 0), 'span', '', {padding:'2px',color:'#FFF',fontSize:'10px' - ,backgroundColor:(det[3]=='Low' ? '#888' : (det[3]=='High' ? '#EDA857' : '#687FD3'))}); + , backgroundColor:(det.priority=='Low' ? '#888' : + (det.priority=='High' ? '#EDA857' : '#687FD3'))}); $(span).css('-moz-border-radius','3px').css('-webkit-border-radius','3px'); - span.innerHTML = det[3]; + span.innerHTML = det.priority; // text - var span = $a($td(tab, 0, 1), 'span', 'social', {lineHeight:'1.5em'}, replace_newlines(det[1])); - if(det[4]) $y(span,{textDecoration:'line-through'}); + var span = $a($td(tab, 0, 1), 'div', 'social', {lineHeight:'1.5em'}, + replace_newlines(det.description)); + if(det.checked) $y(span,{textDecoration:'line-through'}); + + // reference link + if(det.reference_name) { + $a($td(tab, 0, 1), 'div', 'social', '', + repl('%(reference_name)s', + det)) + } // if expired & open, then in red - if(!det[4] && dateutil.str_to_obj(det[2]) < new Date()) { + if(!det.checked && dateutil.str_to_obj(det.date) < new Date()) { $y(span,{color:'RED'}); - $a($td(tab, 0, 1), 'div', '', {fontSize:'10px', color:'#666'}, dateutil.str_to_user(det[2]) + ' (Overdue)'); + $a($td(tab, 0, 1), 'div', '', {fontSize:'10px', color:'#666'}, + dateutil.str_to_user(det.date) + ' (Overdue)'); } else { - $a($td(tab, 0, 1), 'div', '', {fontSize:'10px', color:'#666'}, dateutil.str_to_user(det[2])); + $a($td(tab, 0, 1), 'div', '', {fontSize:'10px', color:'#666'}, + dateutil.str_to_user(det.date)); } } @@ -371,10 +382,10 @@ HomeToDo.prototype.clear_dialog = function() { HomeToDo.prototype.set_dialog_values = function(det) { var d = this.widget.dialog; d.set_values({ - date: det[2], - priority: det[3], - description: det[1], - checked: det[4] + date: det.date, + priority: det.priority, + description: det.description, + checked: det.checked }); d.det = det; } @@ -389,8 +400,6 @@ HomeToDo.prototype.save = function(btn) { return; } - det.name = d.det ? d.det[0] : ''; - var callback = function(r,rt) { btn.done_working(); me.widget.dialog.hide(); @@ -420,9 +429,6 @@ FeedList.prototype.make_head = function() { // head $a(this.head,'h1','', {display:'inline'}, 'Home'); - $a(this.head,'span','link_type', {marginLeft:'7px', fontSize:'11px'}, 'help', function() { - msgprint('What appears here? This is where you get updates of everything you are permitted to follow') - }) // refresh $a(this.head,'span','link_type', @@ -583,10 +589,6 @@ HomeStatusBar = function() { this.render = function(r) { this.wrapper.innerHTML = ''; - this.profile_settings = $a($a(this.wrapper, 'p'), 'span', 'link_type', {fontWeight:'bold'}); - this.profile_settings.innerHTML = user_fullname + ' (Profile Settings)'; - this.profile_settings.onclick = function() { loadpage('profile-settings'); } - this.span = $a($a(this.wrapper, 'p'), 'span', 'link_type', {fontWeight:'bold'}); this.span.onclick = function() { loadpage('My Company') } diff --git a/erpnext/home/page/my_company/my_company.js b/erpnext/home/page/my_company/my_company.js index a057ac3e7f..0aea99b3a7 100644 --- a/erpnext/home/page/my_company/my_company.js +++ b/erpnext/home/page/my_company/my_company.js @@ -579,7 +579,7 @@ MemberProfile = function(parent, uid, member_item) { $ds(this.member_item.working_img); $dh(this.wrapper); this.loading = 1; - $c('webnotes.widgets.form.getdoc', {'name':this.uid, 'doctype':'Profile', 'user':user}, callback); // onload + $c('webnotes.widgets.form.load.getdoc', {'name':this.uid, 'doctype':'Profile', 'user':user}, callback); // onload } // show / hide diff --git a/erpnext/hr/doctype/appraisal/appraisal.js b/erpnext/hr/doctype/appraisal/appraisal.js index d040c5353d..78b5fd3a09 100644 --- a/erpnext/hr/doctype/appraisal/appraisal.js +++ b/erpnext/hr/doctype/appraisal/appraisal.js @@ -90,8 +90,6 @@ cur_frm.cscript['Declare Completed'] = function(doc,cdt,cdn){ declare_completed_dialog.refresh_dt = function(){ cur_frm.cscript.refresh(this.doc, this.cdt, this.cdn); - msgprint("refersh done"); - $c('webnotes.widgets.form.form_header.refresh_labels',this.doc,function(r,rt){}); } declare_completed_dialog.add = function() { diff --git a/index.html b/index.html index 25f47d65fb..371a7126bf 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ ERPNext -