public/coins-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor Done and Delete actions in list and detail views

Browse source
This commit is contained in:
Scot Hacker 2018-04-08 00:49:01 -07:00
parent 4fe3829b98
commit 9098e3f0d4
7 changed files with 108 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

2
todo/templates/todo/include/toggle_delete.html
View file

@ -4,7 +4,7 @@
<a href="{% url 'todo:list_detail' list_id list_slug %}" class="btn btn-sm btn-warning">View incomplete tasks</a>
{% else %}
<a href="{% url 'todo:list_detail_completed' list_id list_slug %}" class="btn btn-sm btn-info">View completed tasks</a>
<a href="{% url 'todo:list_detail_completed' list_id list_slug %}" class="btn btn-sm btn-warning">View completed tasks</a>
{% endif %}

95
todo/templates/todo/list_detail.html
View file

@ -22,63 +22,50 @@
<p><small><i>In workgroup "{{ task_list.group }}" - drag rows to set priorities.</i></small></p>
{% endif %}
<form action="" name="show_tasks" method="post">
{% csrf_token %}
<table class="table" id="tasktable">
<tr class="nodrop">
<th>Done</th>
<th>Task</th>
<th>Created</th>
<th>Due on</th>
<th>Owner</th>
<th>Assigned</th>
<th>Note</th>
<th>Comm</th>
<th>Del</th>
<table class="table" id="tasktable">
<tr class="nodrop">
<th>Task</th>
<th>Created</th>
<th>Due on</th>
<th>Owner</th>
<th>Assigned</th>
<th>Mark</th>
</tr>
{% for task in tasks %}
<tr id="{{ task.id }}">
<td>
<a href="{% url 'todo:task_detail' task.id %}">{{ task.title|truncatewords:10 }}</a>
</td>
<td>
{{ task.created_date|date:"m/d/Y" }}
</td>
<td>
<span {% if task.overdue_status %}class="overdue"{% endif %}>
{{ task.due_date|date:"m/d/Y" }}
</span>
</td>
<td>
{{ task.created_by }}
</td>
<td>
{% if task.assigned_to %}{{ task.assigned_to }}{% else %}Anyone{% endif %}
</td>
<td>
<a href="{% url "todo:task_toggle_done" task.id %}" class="btn btn-info btn-sm">
{% if view_completed %}
Not Done
{% else %}
Done
{% endif %}
</a>
</td>
</tr>
{% endfor %}
</table>
{% for task in tasks %}
<tr id="{{ task.id }}">
<td>
<input type="checkbox" name="toggle_done_tasks"
value="{{ task.id }}" id="{{ task.id }}"
{% if task.completed %}checked{% endif %}>
</td>
<td>
<a href="{% url 'todo:task_detail' task.id %}">{{ task.title|truncatewords:10 }}</a>
</td>
<td>
{{ task.created_date|date:"m/d/Y" }}
</td>
<td>
<span {% if task.overdue_status %}class="overdue"{% endif %}>
{{ task.due_date|date:"m/d/Y" }}
</span>
</td>
<td>
{{ task.created_by }}
</td>
<td>
{% if task.assigned_to %}{{ task.assigned_to }}{% else %}Anyone{% endif %}
</td>
<td>
{% if task.note %}&asymp;{% endif %}
</td>
<td>
{% if task.comment_set.all.count > 0 %}{{ task.comment_set.all.count }}{% endif %}
</td>
<td>
<input type="checkbox" name="toggle_deleted_tasks" value="{{ task.id }}" id="{{ task.id }}">
</td>
</tr>
{% endfor %}
</table>
{% include 'todo/include/toggle_delete.html' %}
<input type="submit" name="process_tasks" value="Process selection" class="btn btn-sm btn-success">
{% include 'todo/include/toggle_delete.html' %}
</form>
{% else %}
<h4>No tasks on this list yet (add one!)</h4>
{% include 'todo/include/toggle_delete.html' %}

7
todo/templates/todo/task_detail.html
View file

@ -20,8 +20,11 @@
<button class="btn btn-sm btn-primary" id="EditTaskButton" type="button"
data-toggle="collapse" data-target="#AddEditTask">Edit Task</button>
<input class="btn btn-sm btn-info" id="CompleteTaskButton" type="submit" name="toggle_done"
value="{% if task.completed %}Mark Incomplete{% else %}Mark Done{% endif %}">
<a href="{% url "todo:task_toggle_done" task.id %}" class="btn btn-info btn-sm">
{% if task.completed %} Mark Not Done {% else %} Mark Done {% endif %}
</a>
<a href="{% url "todo:delete_task" task.id %}" class="btn btn-danger btn-sm">Delete</a>
</form>
</li>
<li class="list-group-item">