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

[enhancement] activity summary in projects

Browse Source
This commit is contained in:
Rushabh Mehta 2016-05-02 14:13:16 +05:30
parent 863cb12426
commit 360b05f0f5
3 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/projects/doctype/project/project.js
View File

@ -43,11 +43,32 @@ frappe.ui.form.on("Project", {
}); });
} }
frm.dashboard.show_heatmap = true; frm.trigger('show_dashboard');
frm.dashboard.heatmap_message = __('This is based on the Time Logs created against this project');
frm.dashboard.show_dashboard();
} }
},
show_dashboard: function(frm) {
frm.dashboard.show_heatmap = true;
frm.dashboard.heatmap_message = __('This is based on the Time Logs created against this project');
frm.dashboard.show_dashboard();
if(frm.doc.__onload.activity_summary.length) {
var hours = $.map(frm.doc.__onload.activity_summary, function(d) { return d.total_hours });
var max_count = Math.max.apply(null, hours);
var sum = hours.reduce(function(a, b) { return a + b; }, 0);
var section = frm.dashboard.add_section(
frappe.render_template('project_dashboard',
{
data: frm.doc.__onload.activity_summary,
max_count: max_count,
sum: sum
}));
section.on('click', '.time-log-link', function() {
var activity_type = $(this).attr('data-activity_type');
frappe.set_route('List', 'Time Log',
{'activity_type': activity_type, 'project': frm.doc.name});
});
}
} }
}); });

2
erpnext/projects/doctype/project/project.py
View File

@ -27,6 +27,8 @@ class Project(Document):
}) })
self.set_onload('links', self.meta.get_links_setup()) self.set_onload('links', self.meta.get_links_setup())
self.set_onload('activity_summary', frappe.db.sql('''select activity_type, sum(hours) as total_hours
from `tabTime Log` where project=%s group by activity_type order by total_hours desc''', self.name, as_dict=True))
def __setup__(self): def __setup__(self):
self.onload() self.onload()

36
erpnext/projects/doctype/project/project_dashboard.html
View File

@ -1,10 +1,26 @@
<h5 style="margin-top: 0px;">Tasks</h5> <h5 style="margin-top: 0px;">Activity Summary</h5>
{% if(project.tasks.length) { %} <h6 style="margin-bottom: 25px;">{{ __("Total hours: {0}", [flt(sum, 2) ]) }}</h6>
{% project.tasks.forEach(function(d) { %} {% for d in data %}
<p><span class="indicator {{ <div class="row">
{"Open": "red", "Closed": "green", "Cancelled": "darkgrey"}[d.status] || "orange" }}"><a style="font-weight: normal" <div class="col-xs-4">
href="#Form/Task/{{ d.task_id }}">{{ d.title }}</a></span></p> <a class="small time-log-link" data-activity_type="{{ d.activity_type || "" }}">
{% }); %} {{ d.activity_type || __("Unknown") }}</a>
{% } else { %} </div>
<p class="text-muted small">No Tasks Defined</p> <div class="col-xs-8">
{% } %} <span class="inline-graph">
<span class="inline-graph-half">
</span>
<span class="inline-graph-half" title="{{ __("hours") }}">
<span class="inline-graph-count">
{{ __("{0} hours", [flt(d.total_hours, 2)]) }}
</span>
<span class="inline-graph-bar">
<span class="inline-graph-bar-inner dark"
style="width: {{ cint(d.total_hours/max_count * 100) }}%">
</span>
</span>
</span>
</span>
</div>
</div>
{% endfor %}