multiple fixes in compterendu and related scripts

maraudes/templates/maraudes/compterendu.html

@@ -12,9 +12,9 @@
     {{ block.super }}
     <hr />
     <h4 class="sidebar-heading px-3 mt-4 mb-1">Création</h4>
-    <div class="btn-group px-3" role="group" aria-label="...">
-      <button id="new-sujet" class="btn btn-light">Sujet</button>
-      <button id="new-lieu" class="btn btn-light">Lieu</button>
+    <div class="btn-group px-3" role="group" aria-label="Creation">
+      <button id="new-sujet" class="btn btn-dark">Sujet</button>
+      <button id="new-lieu" class="btn btn-dark">Lieu</button>
     </div>
     <h4 class="sidebar-heading px-3 mt-4 mb-1">Finaliser</h4>
     <div class="px-3">
@@ -23,6 +23,23 @@
 {% endblock %}
 
 {% 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">
   /* Dynamic Formsets */
@@ -58,7 +75,7 @@
   });
 </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">
           Nouvelle rencontre
         </div>
@@ -72,27 +89,23 @@
         </div>
       </div>
     </div>
-</div>
+  </div>
 <div class="row">
   <div class="container-fluid">
     <div class="card-columns m-4">
-      {% for rencontre in rencontres %}
-        <div class="card">
+      {% for rencontre in rencontres %}<div class="card">
         <div class="card-header py-2 bg-dark text-white">{{ rencontre }}</div>
-        <div class="card-body">
-        {% for observation in rencontre.observations.all %}<tr>
-              <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 show-stats-btn" href="#" value="{{observation.sujet.pk}}">
-              Mise à jour</a>
-            <hr />
-            <p>{{observation.text | linebreaks }}</p>
-         {% endfor %}
-         </div>
-         </div>
-       {% endfor %}
-  </div>
+        <div class="card-body">{% for observation in rencontre.observations.all %}
+           <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 my-0 show-stats-btn" href="#" value="{{observation.sujet.pk}}">
+           Mise à jour</a>
+           <hr />
+           <span class="text-justify">{{observation.text | linebreaks }}</span>
+         {% endfor %}</div>
+      </div>{% endfor %}
+    </div>
 
-  <div class="card" id="update-stats">
+    <div class="card" id="update-stats">
     <h6 class="card-header"><span id="sujet-name"></span> <small>Fiche statistiques</small>
         <div class="pull-right" id="update-buttons">
         <label for="submit-form" class="btn btn-primary" id="update-stats-btn" pk="">Enregistrer</label>
@@ -102,21 +115,6 @@
       </div>
     </div>
   </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">
   $(function(){
 

maraudes/templates/maraudes/compterendu_form.html

@@ -3,19 +3,23 @@
   {% if form.id %}{% bootstrap_field form.id %}{% endif %}
   {% with lyt="inline" grp="col" sz="small" %}
   {% 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 %}
-  <span class="btn-group pr-1">
-    <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>
+  <div class="col">
+    {% bootstrap_field form.heure_debut form_group_class="my-0" layout=lyt size=sz %}
+      <span class="btn-group d-flex justify-content-center my-0">
+        <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>
+  </div>
   {% bootstrap_field form.duree layout=lyt size=sz form_group_class=grp %}
   {% endwith %}
 </div>
-<hr />
 <div class="form">
   {{ inline_formset.management_form }}
   {% for form in inline_formset %}
     <div class="dynamic-formset">
+    <hr />
     {% if form.id %}{% bootstrap_field form.id %}{% endif %}
     {% bootstrap_field form.sujet size="small" show_label=False %}
     {% bootstrap_field form.text size="small" show_label=False %}

maraudes/templates/maraudes/index.html

@@ -27,6 +27,7 @@
         {% endif %}
         </p>
         <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>
     {% 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">
               <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>
         </ul>
     </div>
     <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="noteAppel" role="tabpanel">
+        <div class="tab-pane fade show active" id="noteAppel" role="tabpanel">
          {% include "notes/form_appel_inner.html" with form=appel_form %}
         </div>
         <div class="tab-pane fade" id="noteSignalement">

maraudes/templates/maraudes/lieu_create.html

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