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

Updated after global configuration on new git installation

Browse Source
This commit is contained in:
artus40
2016-12-15 18:28:29 +01:00
parent f4bb37ae63
commit ffe73585c6
6 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maraudes/templates/compte_rendu/compterendu_create.html
View File

@@ -37,7 +37,7 @@
</script>
<div class="row">
<div class="col-md-6 col-sd-12">
<div class="col-lg-6 col-md-12">
<form method="post" action="{% url 'maraudes:create' maraude.pk %}?finalize=False">
{% csrf_token %}
<div class="panel panel-primary panel-collapse">
@@ -53,7 +53,7 @@
</div>
</form>
</div>
<div class="col-md-6 col-sd-12">
<div class="col-lg-6 col-md-12">
<div class="panel panel-default">
<div class="panel-heading"><h4 class="panel-title">Enregistrées</h4></div>
<table class="table">

12
maraudes/templates/compte_rendu/menu/creation.html
View File

@@ -1,9 +1,9 @@
{% load bootstrap3 %}
<li class="dropdown app-menu"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Création<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#" id="new-sujet">{% bootstrap_icon "user" %} Nouveau sujet</a></li>
<li><a href="#" id="new-lieu">{% bootstrap_icon "globe" %} Nouveau lieu</a></li>
</ul>
<li class="dropdown app-menu"><a class="dropdown-toggle" data-toggle="dropdown" href="#">Création<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#" id="new-sujet">{% bootstrap_icon "user" %} Nouveau sujet</a></li>
<li><a href="#" id="new-lieu">{% bootstrap_icon "globe" %} Nouveau lieu</a></li>
</ul>
<script type="text/javascript">
/* Lier les boutons de création
@@ -25,7 +25,7 @@
} else {
$(modal).modal('toggle');
// Reload page ?
location.reload(true)
location.reload(true)
}
},
error: function (xhr, ajaxOptions, thrownError) {

13
maraudes/views.py
View File

@@ -167,8 +167,8 @@ class CompteRenduCreateView(generic.DetailView):
self.form = RencontreForm(*args,
initial=initial)
self.inline_formset = ObservationInlineFormSet(
*args,
instance=self.form.instance,
*args,
instance=self.form.instance
)
def finalize(self):
@@ -203,14 +203,11 @@ class CompteRenduCreateView(generic.DetailView):
rencontre.save()
self.inline_formset.save()
return self.get(request, *args, **kwargs)
return redirect('maraudes:create', pk=self.get_object().pk)
def get(self, request, new_form=True, *args, **kwargs):
try:
if request.GET['finalize'] == "True":
return self.finalize()
except:
pass
if request.GET.get('finalize', False) == "True":
return self.finalize()
def calculate_end_time(debut, duree):
end_minute = debut.minute + duree

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

@@ -1,6 +1,3 @@
<h4>Informations générales</h4>
<p><strong>Première rencontre :</strong> {{ sujet.premiere_rencontre }}</p>
<div class="panel panel-primary">
<div class="panel-heading" role="tab" id="ficheInfoHeading">
<div class="row">

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

@@ -1,4 +1,6 @@
<table class="table">
<tr><th colspan="4" class="active">Informations générales</th></tr>
<tr><th>Première rencontre :</th><td> {{ sujet.premiere_rencontre }}</td></tr>
<tr><th colspan="4" class="active">É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>

4
website/templates/base.html
View File

@@ -12,10 +12,10 @@
<body>
<div class="container-fluid">
<div class="row">
<div class="col-sm-3 col-md-2 col-lg-2">
<div class="col-md-3 col-lg-2">
{% include "navbar.html" %}
</div>
<div class="col-sm-9 col-md-10 col-lg-10">
<div class="col-md-9 col-lg-10">
<h1 class="page-header">{% block page_header %}{% endblock %}</h1>
{% bootstrap_messages %}
{% block content %}{% endblock %}