Commit f8c62ae2 authored by Corentin Mors's avatar Corentin Mors
Browse files

Fix checklist list

parent 5a27c534
......@@ -3,19 +3,9 @@
{% block content %}
<main role="main" class="container">
<<<<<<< HEAD
<div>
<!--Bouton Add -->
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#add-task-modal" data-whatever="@mdo">Add a new task</button>
=======
<h2>View of checklist #{{ checklist._id }}</h2>
{% include "../partials/modals/add-task.html" %}
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#add-task-modal">
Add new task
</button>
>>>>>>> feature/views
<div class="dropdown float-right">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
......@@ -31,7 +21,6 @@
{% include "partials/modals/add-task.html" %}
</div>
<<<<<<< HEAD
<hr>
<!--Liste task-->
......@@ -43,7 +32,7 @@
<div class="row sameHauteur"> <!--Ligne Nom de la task + checkbox -->
<div class="col-sm-9 col-md-9">
<p class="taskName">{{ task.name }}</p>
<p class="taskName">{{ task.title }}</p>
</div>
<div class="col-sm-1 col-md-1">
<input type="checkbox" name="do" value="">
......@@ -56,35 +45,6 @@
</div>
<div class="col-sm-1 col-md-1"> <!--colonne checkbox -->
<a data-toggle="collapse" href="#description1" role="button" aria-expanded="false" aria-controls="description1"><i class="far fa-caret-square-down"></i></a>
=======
<div class="list-group-item list-group-item-action align-items-start list-group-item-flex">
<div class="list-group-item-tools">
<a href="/checklists/{{ checklist._id }}/edit" title="Edit"><i class="fas fa-pencil-alt"></i></a>
<a href="/checklists/{{ checklist._id }}/delete" onclick="return confirm('Are you sure to delete this checklist?')" title="Delete"><i class="far fa-trash-alt"></i></a>
</div>
<div class="list-group-item-content">
<div class="d-flex w-90 justify-content-between">
<h5 class="mb-1">{{ checklist.title }}</h5>
</div>
<p class="mb-1">{{ checklist.description }}</p>
{% for task in tasks %}
<div style="border: solid 1px grey;">
<p>Tache:
<!-- <a href="/checklists/{{ checklist._id }}/tasks/{{ task._id }}" title="Edit"><i class="fas fa-pencil-alt"></i></a> -->
<!-- <a href="/checklists/{{ checklist._id }}/tasks/{{ task._id }}" onclick="return confirm('Are you sure to delete this task?')" title="Delete"><i class="far fa-trash-alt"></i></a> -->
</p>
<p class="mb-1">Title: {{ task.title }}</p>
<p class="mb-1">Description: {{ task.description }}</p>
{% if task.checked == "true" %}
<p class="mb-1">State: Done</p>
{% else %}
<p class="mb-1">State: Undone</p>
{% endif %}
</div>
{% endfor %}
</div>
>>>>>>> feature/views
</div>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment