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

works on compterendu template

Browse Source
This commit is contained in:
artus
2018-10-12 12:39:57 +02:00
parent b09aa6b692
commit e4d3404f26
3 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
maraudes/templates/maraudes/compterendu.html
View File

@@ -1,5 +1,5 @@
{% extends "maraudes/base.html" %} {% extends "maraudes/base.html" %}
{% load bootstrap3 staticfiles %} {% load bootstrap4 staticfiles %}
{% block title %} {{ block.super }} Compte-rendu du {{ object.date }} {% endblock %} {% block title %} {{ block.super }} Compte-rendu du {{ object.date }} {% endblock %}
@@ -10,25 +10,15 @@
{% block sidebar %} {% block sidebar %}
{{ block.super }} {{ block.super }}
<div class="panel panel-primary">
<div class="panel-body text-right">
<h4>{% bootstrap_icon "plus" %} Création</h4>
<div class="btn-group" role="group" aria-label="...">
<button id="new-sujet" class="btn btn-default">{% bootstrap_icon "user" %} Sujet</button>
<button id="new-lieu" class="btn btn-default">{% bootstrap_icon "globe" %} Lieu</button>
</div>
<hr /> <hr />
<h4>Finaliser</h4> <h4 class="sidebar-heading px-3 mt-4 mb-1">Création</h4>
<div class="pull-right"><a class="btn btn-primary" href="{% url 'maraudes:finalize' maraude.pk %}"> <div class="btn-group px-3" role="group" aria-label="...">
{% bootstrap_icon "ok-circle" %} Finaliser</a></div> <button id="new-sujet" class="btn btn-light">Sujet</button>
</div> <button id="new-lieu" class="btn btn-light">Lieu</button>
</div>
<div class="panel panel-danger">
<div class="panel-body text-right">
<h4>{% bootstrap_icon "warning-sign" %} Attention</h4>
<p>Si vous devez créer un nouveau sujet ou lieu, pensez à le faire avant de rentrer des données ! (ou pensez à copier les notes pour les reproduire ensuite)</p>
<p>En effet, la page sera rafraîchie après la création, effaçant toutes les données de formulaire qui n'ont pas été enregistrées</p>
</div> </div>
<h4 class="sidebar-heading px-3 mt-4 mb-1">Finaliser</h4>
<div class="px-3">
<a class="btn btn-success btn-block" href="{% url 'maraudes:finalize' maraude.pk %}">Terminer</a>
</div> </div>
{% endblock %} {% endblock %}
@@ -56,38 +46,37 @@
prefix: '{{ inline_formset.prefix }}', prefix: '{{ inline_formset.prefix }}',
addText: 'Ajouter une personne', addText: 'Ajouter une personne',
deleteText: 'Supprimer', deleteText: 'Supprimer',
addCssClass: 'btn btn-link btn-add', addCssClass: 'card-link btn-sm btn-add',
deleteCssClass: 'btn btn-link btn-delete', deleteCssClass: 'card-link btn-sm btn-delete',
added: $.fn.onAddForm, added: $.fn.onAddForm,
removed: $.fn.onDeleteForm removed: $.fn.onDeleteForm
}); });
var text = $('a.btn-add').text() var text = $('a.btn-add').text()
$('a.btn-add').html('<span class="glyphicon glyphicon-plus"></span> ' + text) $('a.btn-add').html('(+) ' + text)
text = $('a.btn-delete:first').text() text = $('a.btn-delete:first').text()
$('a.btn-delete').html('<span class="glyphicon glyphicon-minus"></span> ' + text); $('a.btn-delete').html('(-) ' + text);
}); });
</script> </script>
<div class="row"> <div class="col-lg-8 col-md-12">
<div class="col-lg-7 col-md-12">
<form method="post" action="{% url 'maraudes:create' maraude.pk %}"> <form method="post" action="{% url 'maraudes:create' maraude.pk %}">
{% csrf_token %} {% csrf_token %}
<div class="panel panel-primary panel-collapse"> <div class="card border-dark shadow">
<div class="panel-heading"> <div class="card-header bg-dark text-white">
<h4 class="panel-title">Nouvelle rencontre</h4> Nouvelle rencontre
</div> </div>
<div class="panel-body"> <div class="card-body">
{% include "maraudes/compterendu_form.html" %} {% include "maraudes/compterendu_form.html" %}
</div> </div>
<div class="panel-footer text-right"> <div class="card-footer text-right">
{% bootstrap_button "Enregistrer" icon="save" button_type="submit" button_class="btn btn-success btn-sm" %} {% bootstrap_button "Enregistrer" button_type="submit" button_class="btn btn-success btn-sm" %}
</div> </div>
</div> </div>
</form> </form>
{{ form.media.js }}{{ form.media.css }} {{ form.media.js }}{{ form.media.css }}
</div> </div>
<div class="col-lg-5 col-md-12"> <div class="col-lg-4 col-md-12">
<div id="saved-rencontres"> <div id="saved-rencontres">
<h4 class="page-header">Enregistrées</h4> <h4 class="page-header">Enregistrées</h4>
<table class="table table-bordered"> <table class="table table-bordered">
@@ -96,7 +85,7 @@
<td> <td>
<a href="{% url "notes:details-sujet" observation.sujet.pk %}" id="sujet-name-{{observation.sujet.pk}}">{{observation.sujet}}</a> <a href="{% url "notes:details-sujet" observation.sujet.pk %}" id="sujet-name-{{observation.sujet.pk}}">{{observation.sujet}}</a>
<a class="btn btn-link btn-xs show-stats-btn" href="#" value="{{observation.sujet.pk}}"> <a class="btn btn-link btn-xs show-stats-btn" href="#" value="{{observation.sujet.pk}}">
{% bootstrap_icon "stats" %} Mise à jour</a> Mise à jour</a>
</td></tr> </td></tr>
<tr><td>{{observation.text | linebreaks }}</td></tr>{% endfor %}{% endfor %} <tr><td>{{observation.text | linebreaks }}</td></tr>{% endfor %}{% endfor %}
</table> </table>
@@ -104,15 +93,14 @@
<div id="update-stats"> <div id="update-stats">
<h4 class="page-header"><span id="sujet-name"></span> <small>Fiche statistiques</small> <h4 class="page-header"><span id="sujet-name"></span> <small>Fiche statistiques</small>
<div class="pull-right" id="update-buttons"> <div class="pull-right" id="update-buttons">
<label for="submit-form" class="btn btn-primary" id="update-stats-btn" pk="">{% bootstrap_icon "floppy-save" %} Enregistrer</label> <label for="submit-form" class="btn btn-primary" id="update-stats-btn" pk="">Enregistrer</label>
<span class="btn btn-primary btn-sm" id="cancel">{% bootstrap_icon "remove" %}Annuler</span> <span class="btn btn-primary btn-sm" id="cancel">Annuler</span>
</div></h4> </div></h4>
<div id="fiche-stats" class="well well-sm"> <div id="fiche-stats" class="well well-sm">
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- Modal and button linking --> <!-- Modal and button linking -->
<div class="modal fade" id="form-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="form-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">

27
maraudes/templates/maraudes/compterendu_form.html
View File

@@ -1,23 +1,24 @@
{% load bootstrap3 %}{% load staticfiles %} {% load bootstrap4 %}{% load staticfiles %}
<div class="form-inline well well-sm text-center"> <div class="form-row mb-3">
{% if form.id %}{% bootstrap_field form.id %}{% endif %} {% if form.id %}{% bootstrap_field form.id %}{% endif %}
{% bootstrap_field form.lieu layout="inline" size="small" %} {% with lyt="inline" grp="col" sz="small" %}
<div class="input-group">{% bootstrap_field form.heure_debut layout="inline" size="small" %} {% bootstrap_field form.lieu layout=lyt form_group_class=grp size=sz %}
<span class="input-group-btn"> {% bootstrap_field form.heure_debut form_group_class=grp layout=lyt size=sz %}
<button id="minus-5" class="btn btn-default btn-sm" type="button"><strong>-5</strong></button> <span class="btn-group pr-1">
<button id="plus-5" class="btn btn-default btn-sm" type="button"><strong>+5</strong></button> <button id="minus-5" class="btn btn-outline-secondary btn-sm" type="button"><strong>-5</strong></button>
<button id="plus-5" class="btn btn-outline-secondary btn-sm" type="button"><strong>+5</strong></button>
</span> </span>
{% bootstrap_field form.duree layout=lyt size=sz form_group_class=grp %}
{% endwith %}
</div> </div>
{% bootstrap_field form.duree layout="inline" size="small" %} <hr />
</div> <div class="form">
<div class="form-horizontal">
{{ inline_formset.management_form }} {{ inline_formset.management_form }}
{% for form in inline_formset %} {% for form in inline_formset %}
<div class="dynamic-formset"> <div class="dynamic-formset">
{% if form.id %}{% bootstrap_field form.id %}{% endif %} {% if form.id %}{% bootstrap_field form.id %}{% endif %}
{% bootstrap_field form.sujet size="small" layout="horizontal" %} {% bootstrap_field form.sujet size="small" show_label=False %}
{% bootstrap_field form.text size="small" layout="horizontal" %} {% bootstrap_field form.text size="small" show_label=False %}
{% if form.instance.pk %} {% if form.instance.pk %}
{% bootstrap_field form.note_ptr %} {% bootstrap_field form.note_ptr %}
{% bootstrap_field form.DELETE layout="horizontal" %} {% bootstrap_field form.DELETE layout="horizontal" %}

23
maraudes/templates/maraudes/index.html
View File

@@ -28,13 +28,22 @@
</p> </p>
<a href="{% url 'maraudes:planning' %}" class="card-link text-primary">Voir le planning</a> <a href="{% url 'maraudes:planning' %}" class="card-link text-primary">Voir le planning</a>
</div> </div>
</div>
{% if derniers_sujets_rencontres %} {% if derniers_sujets_rencontres %}
<div class="card card-body">
{% table derniers_sujets_rencontres cols=3 cell_template="maraudes/table_cell_derniers_sujets.html" header="Ces derniers temps..." %} {% table derniers_sujets_rencontres cols=3 cell_template="maraudes/table_cell_derniers_sujets.html" header="Ces derniers temps..." %}
</div>
{% endif %} {% endif %}
{% if derniers_sujets_signales %} {% if derniers_sujets_signales %}
{% table derniers_sujets_signales cols=3 cell_template="maraudes/table_cell_derniers_signalements.html" header="Signalements récents" %} <div class="card rounded-bottom my-3">
{% endif %} <div class="card-header rounded-0 py-1 text-white bg-dark">Signalements récents</div>
<div class="card-body">
{% for sjt in derniers_sujets_signales %}
{{ sjt }}
{% endfor %}
</div> </div>
</div>
{% endif %}
{% if user.is_superuser and missing_cr %} {% if user.is_superuser and missing_cr %}
<div class="card border-warning rounded-bottom my-3"> <div class="card border-warning rounded-bottom my-3">
@@ -46,19 +55,19 @@
{% endif %} {% endif %}
</div> </div>
<div class="col-md-12 col-lg-6"> <div class="col-md-12 col-lg-6">
<div class="card rounded-bottom"> <div class="card shadow">
<div class="card-header rounded-0 bg-dark text-white"> <div class="card-header bg-dark text-white">
<ul class="nav nav-tabs card-header-tabs" id="addNote" role="tablist"> <ul class="nav nav-tabs card-header-tabs" id="addNote" role="tablist">
<li class="nav-item"><strong class="nav-text pr-2">Ajouter </strong></li> <li class="nav-item my-2"><strong class="nav-text pr-2">Ajouter </strong></li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" role="tab" data-toggle="tab" href="#noteNote" aria-expanded="false" aria-controls="noteNote">Note</a></li> <a class="nav-link" role="tab" data-toggle="tab" href="#noteNote" aria-expanded="false" aria-controls="noteNote">Note</a></li>
<li class="nav-item"><a class="nav-link active" role="tab" data-toggle="tab" href="#noteAppel" aria-expanded="false" aria-controls="noteAppel">Appel</a></li> <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#noteAppel" aria-expanded="false" aria-controls="noteAppel">Appel</a></li>
<li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#noteSignalement" aria-expanded="false" aria-controls="noteSignalement">Signalement</a></li> <li class="nav-item"><a class="nav-link" role="tab" data-toggle="tab" href="#noteSignalement" aria-expanded="false" aria-controls="noteSignalement">Signalement</a></li>
</ul> </ul>
</div> </div>
<div class="card-body tab-content"> <div class="card-body tab-content">
<div class="tab-pane fade" id="noteNote"><div class="card card-body">Note</div></div> <div class="tab-pane fade" id="noteNote"><div class="card card-body">Note</div></div>
<div class="tab-pane fade show active" id="noteAppel" role="tabpanel"> <div class="tab-pane fade" id="noteAppel" role="tabpanel">
{% include "notes/form_appel_inner.html" with form=appel_form %} {% include "notes/form_appel_inner.html" with form=appel_form %}
</div> </div>
<div class="tab-pane fade" id="noteSignalement"> <div class="tab-pane fade" id="noteSignalement">