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

rewrite 'suivi:details' template

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-06 19:55:57 +02:00
parent aefeb2e349
commit e593981696
5 changed files with 34 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
suivi/templates/suivi/details.html
View File

@@ -1,10 +1,2 @@
<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 "suivi/sujet_suivi.html" %}</div>
<div role="tabpanel" class="tab-pane" id="fiche">{% include "sujets/sujet_details_inner.html" %}</div>
</div>
Notes : {{ notes }}
<div class="col-md-6">{% include "suivi/sujet_suivi.html" %}</div>
<div class="col-md-6">{% include "sujets/sujet_details_inner.html" %}</div>

19
suivi/templates/suivi/sujet_suivi.html
View File

@@ -1,13 +1,12 @@
{% load notes %}
<div class="col-md-6">
<div class="panel panel-primary">
<div class="panel-heading"><h3 class="panel-title">Notes
<span class="pull-right"><span class="label">Total : {{ notes.count }}</span></span></h3>
</div>
<table class="table table-striped table-bordered">
{% for note in notes %}
{% inline_table note %}
{% endfor %}
</table>
<div class="panel panel-primary">
<div class="panel-heading"><h3 class="panel-title">Notes
<span class="pull-right"><span class="label">Total : {{ notes.count }}</span></span></h3>
</div>
<table class="table table-striped table-bordered">
{% for note in notes %}
{% inline_table note header="date" %}
{% endfor %}
</table>
</div>

2
suivi/views.py
View File

@@ -28,5 +28,5 @@ class SuiviSujetView(SuivisView, generic.DetailView):
def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs)
context['notes'] = self.object.notes.all()
context['notes'] = self.object.notes.all().order_by('created_date')
return context

2
sujets/models.py
View File

@@ -121,4 +121,4 @@ class Sujet(Personne):
)
def get_absolute_url(self):
return reverse('suivis:details', kwargs={'pk': self.id})
return reverse('suivi:details', kwargs={'pk': self.id})

94
sujets/templates/sujets/sujet_details_inner.html
View File

@@ -1,76 +1,24 @@
<div class="row">
<div class="col-md-4 text-center">
<div class="alert alert-info">
<p>Première rencontre le {{sujet.premiere_rencontre}}</p>
</div>
</div>
<div class="col-md-4 col-md-offset-4">
<a href="{% url "sujets:update" pk=sujet.id %}" class="btn btn-primary">Mettre à jour</a>
</div>
<div class="panel panel-primary">
<div class="panel-heading"><h3 class="panel-title">Fiche informations</h3></div>
<div class="panel-body"><p class="label label-info">Première rencontre : {{ sujet.premiere_rencontre }}</p></div>
<table class="table">
<tr><th colspan="4" class="bg-info">État-civil</th></tr>
<tr><th>Nom</th><td>{{ sujet.nom|default:'?' }}</td><th>Prénom</th><td>{{ sujet.prenom|default:'?' }}</td></tr>
<tr><th>Sexe</th><td>{{ sujet.genre }}</td><th>Âge</th><td>{{ sujet.age|default:'?' }}</td></tr>
<tr><th colspan="4" class="bg-info">Problématiques</th></tr>
<tr><th>Psychiatrique</th><td>{{ sujet.prob_psychiatrie }}</td><th>Addiction</th><td>{{ sujet.prob_addiction }}</td></tr>
<tr><th>Administratif</th><td>{{ sujet.prob_administratif }}</td><th>Somatique</th><td>{{ sujet.prob_somatique }}</td></tr>
<tr><th colspan="4" class="bg-info">Habitation</th></tr></td></tr>
<tr><th>Type</th><td>{{ sujet.habitation }}</td><th>Connu du SIAO</th><td>{{ sujet.connu_siao }}</td></tr>
<tr><th colspan="4" class="bg-info">Ressources</th></tr></td></tr>
<tr><td colspan="4">{{ sujet.ressources }}</td></tr>
<tr><th colspan="4" class="bg-info">Parcours de vie</th></tr></td></tr>
<tr><td colspan="2">{{ sujet.parcours_de_vie }}</td><th>Lien familial</th><td>{{ sujet.lien_familial }}</td></tr>
</table>
<div class="panel-footer text-right">
<a href="{% url "sujets:update" pk=sujet.id %}" class="btn btn-primary">Mettre à jour</a>
</div>
<div class="row">
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
État-civil
</div>
<div class="panel-body">
<p>Nom : {{ sujet.nom|default:'?' }}</p>
<p>Prénom : {{ sujet.prenom|default:'?' }}</p>
<p>Sexe : {{ sujet.genre }}</p>
<p>Âge : {{ sujet.age|default:'?' }}</p>
</div>
</div>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
Problématiques
</div>
<div class="panel-body">
<p>Psychiatrique : {{ sujet.prob_psychiatrie }}</p>
<p>Administratif : {{ sujet.prob_administratif }}</p>
<p>Addiction : {{ sujet.prob_addiction }}</p>
<p>Somatique : {{ sujet.prob_somatique }}</p>
</div>
</div>
</div>
<!- Hébergement ->
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
Habitation
</div>
<div class="panel-body">
<h4></h4>
<p>Type : {{ sujet.habitation }}</p>
<p>Connu du SIAO : {{ sujet.connu_siao }}</p>
</div>
</div>
</div>
<!- Ressources ->
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
Ressources
</div>
<div class="panel-body">
<p>{{ sujet.ressources }}</p>
</div>
</div>
</div>
<!- Parcours de vie ->
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
Parcours de vie
</div>
<div class="panel-body">
<p>Parcours : {{ sujet.parcours_de_vie }}</p>
<p>Lien familial : {{ sujet.lien_familial }}</p>
</div>
</div>
</div>
</div><!- row ->
</div>