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

fix WebsiteAjaxTemplateMixin, added ajax 'sujets:update' form

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-14 12:50:49 +02:00
parent 9e86e3eda5
commit 5dc5dae210
15 changed files with 176 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sujets/templates/sujets/sujet_details.html
View File

@@ -1 +1,52 @@
{% include 'sujets/sujet_details_inner.html' %}
<div class="panel panel-primary">
<div class="panel-heading" role="tab" id="ficheInfoHeading">
<div class="row">
<div class="col-md-9">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapseFicheInfo" aria-expanded="true" aria-controls="collapseOne">
Fiche informations</a>
</h4>
</div>
<div class="col-md-3 text-right">
<a href="#" class="btn btn-sm btn-primary" id="updateButton">Mettre à jour</a>
</div>
</div>
</div>
<div id="collapseFicheInfo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="ficheInfoHeading">
{% include 'sujets/sujet_details_inner.html' %}
</div>
</div>
<script type="text/javascript">
$(function() {
var formAjaxSubmit = function(form, panel) {
$(form).submit(function (e) {
e.preventDefault();
$.ajax({
type: $(this).attr('method'),
url: $(this).attr('action'),
data: $(this).serialize(),
success: function (xhr, ajaxOptions, thrownError) {
if ( $(xhr).find('.has-error').length > 0 || $(xhr).find('.alert-danger').length > 0) {
$(panel).html(xhr);
formAjaxSubmit(form, panel);
} else {
$(panel).load("{% url "sujets:details" pk=sujet.id %}")
}
},
error: function (xhr, ajaxOptions, thrownError) {
// handle response errors here
}
});
});
};
/* TODO: Use formAjaxSubmit above, but reload page on form success */
$('#updateButton').click(function() {
var panel = $('#collapseFicheInfo')
panel.load('{% url "sujets:update" pk=sujet.pk %}?next={% url "suivi:details" pk=sujet.id %}', function () {
formAjaxSubmit(panel.find("form"), panel);
panel.collapse('show');
});
});
});
</script>

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

@@ -1,16 +1,3 @@
<div class="panel panel-primary">
<div class="panel-heading" role="tab" id="ficheInfoHeading">
<div class="row">
<div class="col-md-9">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapseFicheInfo" aria-expanded="true" aria-controls="collapseOne">
Fiche informations</a></h4></div>
<div class="col-md-3 text-right">
<a href="{% url "sujets:update" pk=sujet.id %}" class="btn btn-sm btn-primary">Mettre à jour</a>
</div>
</div>
</div>
<div id="collapseFicheInfo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="ficheInfoHeading">
<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="active">État-civil</th></tr>
@@ -26,8 +13,3 @@
<tr><th colspan="4" class="active">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>
</div>

58
sujets/templates/sujets/sujet_liste.html
View File

@@ -1,19 +1,43 @@
<div class="panel panel-default">
<!-- Default panel contents -->
<div class="panel-heading">Sujets connus</div>
<div class="panel-body">
<p>Voici la liste des sujets rencontrés dans le cadre des maraudes</p>
{% load bootstrap3 %}
<div class="col-md-12 col-lg-6">
<div class="panel panel-primary">
<!-- Default panel contents -->
<div class="panel-heading text-center">
<h3 class="panel-title">Sujets rencontrés</h3>
</div>
<!-- Table -->
<table class="table table-striped table-hover">
{% for sujet in object_list %}
<tr>
<td><a href="{% url 'suivi:details' sujet.pk %}" class="btn btn-link">{{sujet}}</a></td>
<td><span class="label label-info">{{ sujet.notes.count }} notes</span></td>
</tr>
{% endfor %}
</table>
{% if is_paginated %}
<div class="panel-footer text-center">
<ul class="pagination">
{% for num in page_obj.paginator.page_range %}
<li {% if page_obj.number == num %} class="active" {%endif%}><a href="?page={{num}}">{{num}}</a></li>
{%endfor%}
</ul>
</div>
{% endif %}
</div>
</div>
<div class="col-lg-3 col-md-3">
<div class="panel panel-default">
<!-- Default panel contents -->
<div class="panel-heading text-center">
<h3 class="panel-title">Filtres</h3>
</div>
<div class="list-group">
<a href="#" class="list-group-item disabled">Rencontrés ce mois-ci</a></li>
<a href="#" class="list-group-item disabled"><strong>Mes accompagnements</strong></a></li>
<a href="#" class="list-group-item disabled">Hébérgé en urgence</a></li>
<a href="#" class="list-group-item disabled">Sans logement</a></li>
</div>
</div>
<table class="table table-striped">
<tr>
<th>Nom</th>
<th>Vu le</th>
</tr>
{% for sujet in object_list %}
<tr>
<td><a href="{% url 'suivi:details' sujet.pk %}">{{sujet}}</a></td>
<td>ToDo</td>
</tr>
{% endfor %}
</table>
</div>

7
sujets/templates/sujets/sujet_update.html
View File

@@ -1,2 +1,7 @@
{% include 'sujets/sujet_update_inner.html' %}
<div class="col-md-6 col-sd-6">
<div class="panel panel-primary">
<div class="panel-heading"><h4 class="panel-title">Données</h4></div>
{% include 'sujets/sujet_update_inner.html' %}
</div>
</div>

81
sujets/templates/sujets/sujet_update_inner.html
View File

@@ -1,60 +1,27 @@
{% load bootstrap3 %}
<form action="" method="post">{% csrf_token %}
<div class="row">
<div class="col-md-6 col-sd-6">
<div class="well text-center">
<div class="form-inline">
{% bootstrap_field form.nom layout="inline" %}
{% bootstrap_field form.surnom layout="inline" %}
{% bootstrap_field form.prenom layout="inline" %}
</div><div class="form-inline"><hr />
{% bootstrap_field form.genre layout="inline" %}
{% bootstrap_field form.age layout="inline" %}
</div>
</div>
</div>
<div class="col-md-6 col-sd-6">
<div class="well well-sm">
{% bootstrap_field form.premiere_rencontre %}
</div>
</div>
</div>
<div class="row">
<div class="col-md-4 col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Situation sociale</div>
<div class="panel-body">
<div class="form-horizontal">
{% bootstrap_field form.habitation layout="horizontal" label_class="col-md-6" field_class="col-md-6" %}
{% bootstrap_field form.connu_siao layout="horizontal" label_class="col-md-6" field_class="col-md-6" %}
{% bootstrap_field form.ressources layout="horizontal" label_class="col-md-6" field_class="col-md-6" %}
</div>
</div>
</div>
</div>
<div class="col-md-4 col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Problématiques</div>
<div class="panel-body">
<div class="form-horizontal">
{% bootstrap_field form.prob_addiction layout="horizontal" label_class="col-md-4" field_class="col-md-6" %}
{% bootstrap_field form.prob_psychiatrie layout="horizontal" label_class="col-md-4" field_class="col-md-6" %}
{% bootstrap_field form.prob_administratif layout="horizontal" label_class="col-md-4" field_class="col-md-6" %}
{% bootstrap_field form.prob_somatique layout="horizontal" label_class="col-md-4" field_class="col-md-6" %}
</div>
</div>
</div>
</div>
<div class="col-md-4 col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Parcours de vie</div>
<div class="panel-body">
{% bootstrap_field form.parcours_de_vie %}
{% bootstrap_field form.lien_familial %}
</div>
</div>
</div>
</div>
<form action="{% url 'sujets:update' pk=form.instance.pk %}" method="post">{% csrf_token %}
<div class="panel-body">{% bootstrap_field form.premiere_rencontre %}</div>
<table class="table">
<tr><th colspan="4" class="active">État-civil</th></tr>
<tr><th>Nom</th><td>{% bootstrap_field form.nom layout="inline" %}</td>
<th>Prénom</th><td>{% bootstrap_field form.prenom layout="inline" %}{% bootstrap_field form.surnom layout="inline" %}</td></tr>
<tr><th>Sexe</th><td>{% bootstrap_field form.genre layout="inline" %}</td>
<th>Âge</th><td>{% bootstrap_field form.age layout="inline" %}</td></tr>
<tr><th colspan="4" class="active">Problématiques</th></tr>
<tr><th>Psychiatrique</th><td>{% bootstrap_field form.prob_psychiatrie layout="inline" %}</td>
<th>Addiction</th><td>{% bootstrap_field form.prob_addiction layout="inline" %}</td></tr>
<tr><th>Administratif</th><td>{% bootstrap_field form.prob_administratif layout="inline" %}</td>
<th>Somatique</th><td>{% bootstrap_field form.prob_somatique layout="inline" %}</td></tr>
<tr><th colspan="4" class="active">Habitation</th></tr></td></tr>
<tr><th>Type</th><td>{% bootstrap_field form.habitation layout="inline" %}</td>
<th>Connu du SIAO</th><td>{% bootstrap_field form.connu_siao layout="inline" %}</td></tr>
<tr><th colspan="4" class="active">Ressources</th></tr></td></tr>
<tr><td colspan="4">{% bootstrap_field form.ressources layout="inline" %}</td></tr>
<tr><th colspan="4" class="active">Parcours de vie</th></tr></td></tr>
<tr><td colspan="2">{% bootstrap_field form.parcours_de_vie layout="inline" %}</td>
<th>Lien familial</th><td>{% bootstrap_field form.lien_familial layout="inline" %}</td></tr>
</table>
<div class="panel-footer text-right">
{% bootstrap_button "Enregistrer" button_type="submit" %}
</div>
</form>