Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

employee list -- show status

Browse Source
This commit is contained in:
Anand Doshi 2012-06-28 18:38:38 +05:30
parent 2c2a17f138
commit cbf181c390
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/hr/doctype/employee/listview.js
View File

@ -12,8 +12,9 @@ wn.doclistviews['Employee'] = wn.views.ListView.extend({
"`tabEmployee`.company",
"`tabEmployee`.reports_to",
"`tabEmployee`.date_of_joining",
"`tabEmployee`.status",
]);
this.stats = this.stats.concat(['company']);
this.stats = this.stats.concat(['status', 'company']);
},
prepare_data: function(data) {
@ -32,14 +33,22 @@ wn.doclistviews['Employee'] = wn.views.ListView.extend({
data.company && concat_list.push(data.company);
data.branch && concat_list.push(data.branch);
data.description = concat_list.join(", ");
if(data.status=='Left') {
data.label_type = 'important';
} else if(data.status=='Active') {
data.label_type = 'success';
}
data.status_html = repl('<span class="label label-%(label_type)s" \
support_list_status="%(status)s">%(status)s</span>', data);
},
columns: [
{width: '3%', content: 'check'},
{width: '3%', content: 'docstatus'},
{width: '12%', content: 'name'},
{width: '25%', content: 'employee_name'},
{width: '45%', content: 'description+tags',
{width: '10%', content: 'status_html'},
{width: '38%', content: 'description+tags',
css: {'color': '#aaa'}},
{width: '12%', content:'date_of_joining',
css: {'text-align': 'right', 'color': '#777'}},

5
erpnext/support/doctype/support_ticket/listview.js
View File

@ -29,10 +29,7 @@ wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({
data.status = 'Waiting'
}
data.status_html = repl('<span class="label label-%(label_type)s">%(status)s</span>', data);
var a = $(data.status_html).click(function() {
me.set_filter('status', $(this).text());
});
// escape double quotes
data.description = cstr(data.subject).replace(/"/gi, '\"')
+ " | " + cstr(data.description).replace(/"/gi, '\"');