nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 13:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added task and issue webforms and few fixes

Browse Source
This commit is contained in:
Kanchan Chauhan
2016-03-23 14:14:38 +05:30
parent 2d832bba70
commit e14389ec6e
5 changed files with 473 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/templates/pages/projects.html
View File

@@ -20,9 +20,9 @@
{% endblock %}
{% block style %}
<style>
{% include "templates/includes/projects.css" %}
</style>
<style>
{% include "templates/includes/projects.css" %}
</style>
{% endblock %}
@@ -50,15 +50,15 @@
href='/tasks?new=1&project={{ doc.project_name }}'>New</a>
<h3>{{ _("Tasks") }}</h3>
</div>
<div class="btn-group btn-toggle">
<button class="btn btn-xs btn-open-tasks" style="float:left;">Open</button>
<button class="btn btn-xs btn-closed-tasks">Close</button>
<div class="btn-group btn-toggle">
<button class="btn btn-link btn-open-tasks"><span class="indicator orange"></span>Open</button>
<button class="btn btn-link btn-closed-tasks"><span class="indicator green"></span>Closed</button>
</div>
<div class='project-tasks'>
{% include "erpnext/templates/includes/projects/project_tasks.html" %}
</div>
{% if doc.tasks|length > 4 %}
{% if doc.tasks|length > 9 %}
<p><a id= 'more-tasks' class='more-tasks small underline'>{{ _("More") }}</a><p>
{% endif %}
</div>
@@ -73,15 +73,15 @@
href='/issues?new=1&project={{ doc.project_name }}'>New</a>
<h3>{{ _("Issues") }}</h3>
</div>
<div class="btn-group btn-toggle">
<button class="btn btn-xs btn-open-issues" style="float:left;">Open</button>
<button class="btn btn-xs btn-closed-issues">Close</button>
<div class="btn-group btn-toggle">
<button class="btn btn-link btn-open-issues"><span class="indicator red"></span>Open</button>
<button class="btn btn-link btn-closed-issues"><span class="indicator green"></span>Closed</button>
</div>
<div class='project-issues'>
{% include "erpnext/templates/includes/projects/project_issues.html" %}
</div>
{% if doc.issues|length > 4 %}
{% if doc.issues|length > 9 %}
<p><a id='more-issues' class='more-issues small underline'>{{ _("More") }}</a><p>
{% endif %}
</div>
@@ -94,7 +94,7 @@
<div class='project-timelogs'>
{% include "erpnext/templates/includes/projects/project_timelogs.html" %}
</div>
{% if doc.timelogs|length > 1 %}
{% if doc.timelogs|length > 9 %}
<p><a class='more-timelogs small underline'>{{ _("More") }}</a><p>
{% endif %}
{% else %}
@@ -106,4 +106,4 @@
{% include "erpnext/templates/pages/projects.js" %}
</script>
{% endblock %}
{% endblock %}

6
erpnext/templates/pages/projects.js
View File

@@ -61,8 +61,8 @@ frappe.ready(function() {
success: function(data) {
$('.project-'+ item).html(data.message);
$('.project-'+ item +'-section .btn-group .btn-primary').removeClass('btn-primary');
$('.btn-'+ item_status +'-'+ item).addClass( "btn-primary" );
$('.project-'+ item +'-section .btn-group .bold').removeClass('bold');
$('.btn-'+ item_status +'-'+ item).addClass( "bold" );
$(".more-"+ item).toggle(true);
}
});
@@ -117,4 +117,4 @@ frappe.ready(function() {
})
return false;
}
});
});

4
erpnext/templates/pages/projects.py
View File

@@ -71,12 +71,14 @@ def get_tasks(project, start=0, search=None, item_status=None):
limit_start=start, limit_page_length=10)
for task in tasks:
print task._comments
task.todo = frappe.get_all('ToDo',filters={'reference_name':task.name, 'reference_type':'Task'},
fields=["assigned_by", "owner", "modified", "modified_by"])
if task.todo:
task.todo=task.todo[0]
task.todo.user_image = frappe.db.get_value('User', task.todo.owner, 'user_image')
if task._comments:
task.comment_count = len(json.loads(_comments or "[]"))
return tasks
@frappe.whitelist()