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

multiple fixes in compterendu and related scripts

Browse Source
This commit is contained in:
artus
2018-10-13 14:15:31 +02:00
parent 87b0b218a1
commit a7858d22b0
9 changed files with 72 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,9 +12,9 @@
{{ block.super }} {{ block.super }}
<hr /> <hr />
<h4 class="sidebar-heading px-3 mt-4 mb-1">Création</h4> <h4 class="sidebar-heading px-3 mt-4 mb-1">Création</h4>
<div class="btn-group px-3" role="group" aria-label="..."> <div class="btn-group px-3" role="group" aria-label="Creation">
<button id="new-sujet" class="btn btn-light">Sujet</button> <button id="new-sujet" class="btn btn-dark">Sujet</button>
<button id="new-lieu" class="btn btn-light">Lieu</button> <button id="new-lieu" class="btn btn-dark">Lieu</button>
</div> </div>
<h4 class="sidebar-heading px-3 mt-4 mb-1">Finaliser</h4> <h4 class="sidebar-heading px-3 mt-4 mb-1">Finaliser</h4>
<div class="px-3"> <div class="px-3">
@@ -23,6 +23,23 @@
{% endblock %} {% endblock %}
{% block page_content %} {% block page_content %}
<!-- Modal and button linking -->
<div class="modal fade" id="form-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Modal title</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div id="form-modal-body" class="modal-body">
<div class="alert alert-warning">Content should be there...</div>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="{% static 'scripts/bootstrap-modal.js' %}"></script>
<script type="text/javascript" src="{% static "scripts/jquery.formset.js" %}"></script> <script type="text/javascript" src="{% static "scripts/jquery.formset.js" %}"></script>
<script type="text/javascript"> <script type="text/javascript">
/* Dynamic Formsets */ /* Dynamic Formsets */
@@ -58,7 +75,7 @@
}); });
</script> </script>
<div class="card mx-auto border-dark shadow"> <div class="d-flex flex-fill card mx-auto border-dark shadow">
<div class="card-header py-2 bg-dark text-white"> <div class="card-header py-2 bg-dark text-white">
Nouvelle rencontre Nouvelle rencontre
</div> </div>
@@ -76,20 +93,16 @@
<div class="row"> <div class="row">
<div class="container-fluid"> <div class="container-fluid">
<div class="card-columns m-4"> <div class="card-columns m-4">
{% for rencontre in rencontres %} {% for rencontre in rencontres %}<div class="card">
<div class="card">
<div class="card-header py-2 bg-dark text-white">{{ rencontre }}</div> <div class="card-header py-2 bg-dark text-white">{{ rencontre }}</div>
<div class="card-body"> <div class="card-body">{% for observation in rencontre.observations.all %}
{% for observation in rencontre.observations.all %}<tr> <a class="card-link btn-sm my-0" href="{% url "notes:details-sujet" observation.sujet.pk %}" id="sujet-name-{{observation.sujet.pk}}">{{observation.sujet}}</a>
<a class="card-link" href="{% url "notes:details-sujet" observation.sujet.pk %}" id="sujet-name-{{observation.sujet.pk}}">{{observation.sujet}}</a> <a class="card-link my-0 show-stats-btn" href="#" value="{{observation.sujet.pk}}">
<a class="card-link show-stats-btn" href="#" value="{{observation.sujet.pk}}">
Mise à jour</a> Mise à jour</a>
<hr /> <hr />
<p>{{observation.text | linebreaks }}</p> <span class="text-justify">{{observation.text | linebreaks }}</span>
{% endfor %} {% endfor %}</div>
</div> </div>{% endfor %}
</div>
{% endfor %}
</div> </div>
<div class="card" id="update-stats"> <div class="card" id="update-stats">
@@ -102,21 +115,6 @@
</div> </div>
</div> </div>
</div> <!-- Container --> </div> <!-- Container -->
<!-- Modal and button linking -->
<div class="modal fade" id="form-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">Modal title</h4>
</div>
<div id="form-modal-body" class="modal-body">
<div class="alert alert-warning">Content should be there...</div>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="{% static 'scripts/bootstrap-modal.js' %}"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){

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

@@ -3,19 +3,23 @@
{% if form.id %}{% bootstrap_field form.id %}{% endif %} {% if form.id %}{% bootstrap_field form.id %}{% endif %}
{% with lyt="inline" grp="col" sz="small" %} {% with lyt="inline" grp="col" sz="small" %}
{% bootstrap_field form.lieu layout=lyt form_group_class=grp size=sz %} {% bootstrap_field form.lieu layout=lyt form_group_class=grp size=sz %}
{% bootstrap_field form.heure_debut form_group_class=grp layout=lyt size=sz %} <div class="col">
<span class="btn-group pr-1"> {% bootstrap_field form.heure_debut form_group_class="my-0" layout=lyt size=sz %}
<button id="minus-5" class="btn btn-outline-secondary btn-sm" type="button"><strong>-5</strong></button> <span class="btn-group d-flex justify-content-center my-0">
<button id="plus-5" class="btn btn-outline-secondary btn-sm" type="button"><strong>+5</strong></button> <button id="minus-10" class="btn btn-link btn-sm px-1" type="button"><strong>-10</strong></button>
<button id="minus-5" class="btn btn-link btn-sm px-1" type="button"><strong>-5</strong></button>
<button id="plus-5" class="btn btn-link btn-sm px-1" type="button"><strong>+5</strong></button>
<button id="plus-10" class="btn btn-link btn-sm px-1" type="button"><strong>+10</strong></button>
</span> </span>
</div>
{% bootstrap_field form.duree layout=lyt size=sz form_group_class=grp %} {% bootstrap_field form.duree layout=lyt size=sz form_group_class=grp %}
{% endwith %} {% endwith %}
</div> </div>
<hr />
<div class="form"> <div class="form">
{{ 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">
<hr />
{% if form.id %}{% bootstrap_field form.id %}{% endif %} {% if form.id %}{% bootstrap_field form.id %}{% endif %}
{% bootstrap_field form.sujet size="small" show_label=False %} {% bootstrap_field form.sujet size="small" show_label=False %}
{% bootstrap_field form.text size="small" show_label=False %} {% bootstrap_field form.text size="small" show_label=False %}

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

@@ -27,6 +27,7 @@
{% endif %} {% endif %}
</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>
<a href="{% url 'notes:liste-maraude' %}" class="card-link text-primary">Toutes les maraudes</a>
</div> </div>
</div> </div>
{% if derniers_sujets_rencontres %} {% if derniers_sujets_rencontres %}
@@ -61,13 +62,13 @@
<li class="nav-item my-2"><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" role="tab" data-toggle="tab" href="#noteAppel" aria-expanded="false" aria-controls="noteAppel">Appel</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="#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" id="noteAppel" role="tabpanel"> <div class="tab-pane fade show active" 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">

9
maraudes/templates/maraudes/lieu_create.html
View File

@@ -1,8 +1,7 @@
{% load bootstrap3 %} {% load bootstrap4 %}
<form class="form form-horizontal" action="{% url "maraudes:lieu-create" %}" method="post">{% csrf_token %} <form class="form form-horizontal" action="{% url "maraudes:lieu-create" %}" method="post">
{% csrf_token %}
{% bootstrap_form form layout="horizontal"%} {% bootstrap_form form layout="horizontal"%}
<div class="pull-right"> {% bootstrap_button "Ajouter un lieu" button_type="submit" button_class="btn btn-block btn-success" %}
{% bootstrap_button "Ajouter un lieu" button_type="submit" button_class="btn btn-primary" icon="plus" %}
</div>
<input type="text" hidden=True name="next" value="{{ next }}" /> <input type="text" hidden=True name="next" value="{{ next }}" />
</form> </form>

6
notes/templates/notes/sujet_create_inner.html
View File

@@ -1,8 +1,6 @@
{% load bootstrap3 %} {% load bootstrap4 %}
<form class="form-horizontal" action="{% url "notes:create-sujet" %}" method="post">{% csrf_token %} <form class="form-horizontal" action="{% url "notes:create-sujet" %}" method="post">{% csrf_token %}
{% bootstrap_form form layout="horizontal"%} {% bootstrap_form form layout="horizontal"%}
<div class="pull-right"> {% bootstrap_button "Ajouter un sujet" button_type="submit" button_class="btn btn-block btn-success" %}
{% bootstrap_button "Ajouter un sujet" button_type="submit" button_class="btn btn-primary" icon="plus" %}
</div>
{% if next %}<input type="text" hidden=True name="next" value="{{ next }}" />{%endif%} {% if next %}<input type="text" hidden=True name="next" value="{{ next }}" />{%endif%}
</form> </form>

2
website/static/scripts/bootstrap-modal.js vendored
View File

@@ -16,7 +16,7 @@
$(modal).find('.modal-body').html(xhr); $(modal).find('.modal-body').html(xhr);
formAjaxSubmit(form, modal); formAjaxSubmit(form, modal);
} else { } else {
$(modal).modal('toggle'); $(modal).modal('hide');
// Reload page ? // Reload page ?
location.reload() location.reload()
} }

13
website/static/scripts/update_time.js
View File

@@ -25,12 +25,9 @@
}; };
$('#minus-5').click(function() { $('#minus-10').click(function() { $.fn.editHeureValue(-10) });
$.fn.editHeureValue(-5) $('#minus-5').click(function() { $.fn.editHeureValue(-5) });
//console.log('minus 5') $('#plus-5').click(function() { $.fn.editHeureValue(5) });
}); $('#plus-10').click(function() { $.fn.editHeureValue(10) });
$('#plus-5').click(function() {
$.fn.editHeureValue(5)
//console.log('plus 5')
});
}); });

17
website/templates/base.html
View File

@@ -15,7 +15,7 @@
<body {% block extra_body_attrs %}{% endblock %}> <body {% block extra_body_attrs %}{% endblock %}>
<!-- START: Navigation Bar --> <!-- START: Navigation Bar -->
<nav class="navbar fixed-top navbar-dark bg-dark navbar-expand-md shadow p-0"> <nav class="navbar fixed-top navbar-dark bg-dark navbar-expand-md shadow p-0">
<a class="navbar-brand" href="/">Maraude ALSA</a> <a class="navbar-brand ml-3" href="/">Maraude ALSA</a>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item"> <li class="nav-item">
@@ -31,24 +31,18 @@
</nav> </nav>
<!-- END: Navigation Bar --> <!-- END: Navigation Bar -->
<div class="container-fluid"> <div class="container-fluid">
<!-- BEGIN: Sidebar -->
<div class="row"> <div class="row">
<nav class="col-md-2 d-none d-md-block bg-light sidebar"> <nav class="col-md-2 d-none d-md-block bg-light sidebar">
<div class="sidebar-sticky"> <div class="sidebar-sticky">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<h6 class="sidebar-heading px-3 mt-4 text-muted">Menu</h6>
<ul class="nav flex-column"> <ul class="nav flex-column">
<li class="nav-item pt-3"> <li class="nav-item">
<a href="{% url 'maraudes:index' %}" class="nav-link {% active namespace="maraudes" append=True %}">Maraudes</a> <a href="{% url 'maraudes:index' %}" class="nav-link {% active namespace="maraudes" append=True %}">Maraudes</a>
</li> </li>
</ul>
<h6 class="sidebar-heading px-3 mt-4 mb-1 text-muted">
<span>Notes</span>
</h6>
<ul class="nav flex-column">
<li class="nav-item"> <li class="nav-item">
<a href="{% url 'notes:liste-maraude' %}" class="nav-link {% active namespace="notes" append=True %}">Par maraudes</a> <a href="{% url 'notes:liste-sujet' %}" class="nav-link {% active namespace="notes" append=True %}">Suivi</a>
</li>
<li class="nav-item">
<a href="{% url 'notes:liste-sujet' %}" class="nav-link {% active namespace="notes" append=True %}">Par sujets</a>
</li> </li>
</ul> </ul>
{% else %} {% else %}
@@ -64,6 +58,7 @@
{% block sidebar %}{% endblock %} {% block sidebar %}{% endblock %}
</div> </div>
</nav> </nav>
<!-- END: Sidebar -->
<main role="main" class="col-md-10 ml-sm-auto px-4"> <main role="main" class="col-md-10 ml-sm-auto px-4">
<div class="container-fluid"> <div class="container-fluid">
<div class="row pt-4 d-flex justify-content-center"> <div class="row pt-4 d-flex justify-content-center">

28
website/templates/login.html
View File

@@ -1,23 +1,11 @@
<div class="panel panel-default"> <h6 class="sidebar-heading px-3 mt-4 mb-2 text-muted">Connexion</h6>
<div class="panel-heading">
<h3 class="panel-title">Connexion</h3>
</div>
<div class="panel-body text-center">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<p>{{ user.first_name|default:user.username }}, vous êtes connecté !</p> <p class="px-3">{{ user.first_name|default:user.username }}, vous êtes connecté !</p>
{% if next %} {% if next %}
<div class="alert alert-warning"> <div class="alert alert-warning">
<p>Votre compte ne donne pas accès à cette page. Veuillez vous connecter avec un autre compte.</p> <p>Votre compte ne donne pas accès à cette page. Veuillez vous connecter avec un autre compte.</p>
</div> </div>
<a href="{% url 'logout' %}" class="btn btn-danger">Déconnexion</a> <a href="{% url 'logout' %}" class="btn btn-danger">Déconnexion</a>
{% else %}
<div class="btn-group-vertical">
<a href="{% url 'maraudes:index' %}" class="btn btn-sm btn-primary">Entrer</a>
{% if user.is_superuser %}
<a href="admin/" class="btn btn-sm btn-default">Administration</a>
{% endif %}
<a href="{% url 'logout' %}" class="btn btn-sm btn-default">Déconnexion</a>
</div>
{% endif %} {% endif %}
{% else %} {% else %}
<form class="form" method="post" action="{% url "login" %}"> <form class="form" method="post" action="{% url "login" %}">
@@ -28,24 +16,16 @@
</div> </div>
<input name="next" value="{{next}}" hidden /> <input name="next" value="{{next}}" hidden />
{% endif %} {% endif %}
<div class="form-group form-horizontal"> <div class="form-group form-horizontal px-3">
<div class="form-group"> <div class="form-group">
<label class="col-md-2 sr-only control-label" for="id_username">Username</label> <label class="col-md-2 sr-only control-label" for="id_username">Username</label>
<div class="input-group col-md-9">
<span class="input-group-addon"><span class="glyphicon glyphicon-user"></span></span>
<input autofocus="" class="form-control" id="id_username" maxlength="254" name="username" placeholder="Username" title="" type="text" required /> <input autofocus="" class="form-control" id="id_username" maxlength="254" name="username" placeholder="Username" title="" type="text" required />
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 sr-only control-label" for="id_password">Password</label> <label class="col-md-2 sr-only control-label" for="id_password">Password</label>
<div class="input-group col-md-9">
<span class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></span>
<input class="form-control" id="id_password" name="password" placeholder="Password" title="" type="password" required /> <input class="form-control" id="id_password" name="password" placeholder="Password" title="" type="password" required />
</div> </div>
</div> <button class="btn btn-primary btn-block" type="submit">Connexion</button>
</div>
<div class="text-center">
<button class="btn btn-primary navbar-button" type="submit">Connexion</button>
</div> </div>
</form> </form>
{% endif %} {% endif %}