python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

repairs 'notes' in master before branching

Browse Source
This commit is contained in:
artus
2016-08-06 13:42:29 +02:00
parent f3dd74d367
commit ebb1c849e6
7 changed files with 54 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
suivi/templates/suivis/details.html
View File

@@ -1,9 +0,0 @@
<ul class="nav nav-pills nav-justified" role="tablist" style="padding-bottom:20px;float:bottom;">
<li role="presentation" class="active"><a href="#suivi" aria-controls="suivi" role="tab" data-toggle="tab">Suivi</a></li>
<li role="presentation"><a href="#fiche" aria-controls="fiche" role="tab" data-toggle="tab">Fiche</a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="suivi">{% include "suivis/sujet_suivi.html" %}</div>
<div role="tabpanel" class="tab-pane" id="fiche">{% include "sujets/sujet_details_inner.html" %}</div>
</div>

19
suivi/templates/suivis/index.html
View File

@@ -1,19 +0,0 @@
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">Sujets</div>
<div class="list-group">
<a href="{% url 'sujets:liste' %}" class="list-group-item">Liste complète</a>
</div>
</div>
</div>
{% if user.is_superuser %}
<div class="col-md-4">
<div class="panel panel-danger">
<div class="panel-heading">Administration</div>
<div class="list-group">
<a href="{% url 'sujets:create' %}" class="list-group-item">Nouveau sujet</a>
</div>
</div>
</div>
{% endif %}

14
suivi/templates/suivis/sujet_suivi.html
View File

@@ -1,14 +0,0 @@
<div class="col-md-6">
<table class="table table-striped table-bordered">
{% for note in notes %}
<tr><th>{{note.date}}
<div class="pull-right">
<span class="label label-primary">{{ note.header_label }}</span>
{% for info in note.header_infos %}<span class="label label-info">{{ info }}</span>
{%endfor%}
</div>
</th></tr>
<tr><td>{{note.note}}</td></tr>
{% endfor %}
</table>
</div>

8
suivi/views.py
View File

@@ -17,16 +17,16 @@ class SuivisView(views.WebsiteProtectedMixin):
class IndexView(SuivisView, generic.TemplateView):
template_name = "suivis/index.html"
template_name = "suivi/index.html"
header_small = "Tableau de bord"
class SuiviSujetView(SuivisView, generic.DetailView):
model = Sujet
template_name = "suivis/details.html"
template_name = "suivi/details.html"
context_object_name = "sujet"
def get_context_date(self, **kwargs):
context = super().get_context_data(**kwargs)
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
context['notes'] = self.object.notes.all()
return context