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

repair 'Observation' forms

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-06 20:21:59 +02:00
parent e593981696
commit 73696a5b7b
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maraudes/notes.py
View File

@@ -20,6 +20,7 @@ class Observation(Note):
def __str__(self): def __str__(self):
return "%s" % self.sujet return "%s" % self.sujet
def note_date(self): def note_date(self):
""" Enforce value of created_date """ """ Enforce value of created_date """
return self.rencontre.date return self.rencontre.date

6
maraudes/templates/maraudes/panel_dernieres_maraudes.html
View File

@@ -6,9 +6,9 @@
<span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p> <span class="pull-right"><a href="{% url 'maraudes:liste' %}" class="btn btn-primary btn-sm">Aller à la liste</a></span></p>
</div> </div>
<div class="list-group"> <div class="list-group">
{% for maraude in dernieres_maraudes %} {% for m in dernieres_maraudes %}
<a href="{% url 'maraudes:details' maraude.pk %}" class="list-group-item"> <a href="{% url 'maraudes:details' m.pk %}" class="list-group-item {% if maraude == m %} active{% endif %}">
<strong>{{ maraude }}</strong> <small>{{maraude.binome}} & {{maraude.referent}}</small> <strong>{{ m }}</strong> <small>{{m.binome}} & {{m.referent}}</small>
</a> </a>
{% endfor %} {% endfor %}
</div> </div>

3
maraudes/views.py
View File

@@ -93,7 +93,10 @@ class MaraudeListView(MaraudesView, generic.ListView):
class CompteRenduCreateView(MaraudesView, generic.DetailView): class CompteRenduCreateView(MaraudesView, generic.DetailView):
model = Maraude model = Maraude
template_name = "compte_rendu/compterendu_create.html" template_name = "compte_rendu/compterendu_create.html"
context_object_name = "maraude"
header = "Compte-rendu"
header_small = "maraude"
form = None form = None
inline_formset = None inline_formset = None

9
notes/models.py
View File

@@ -32,14 +32,17 @@ class Note(models.Model):
created_time = models.TimeField('Heure', blank=True, null=True) created_time = models.TimeField('Heure', blank=True, null=True)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
child_instance = self.cast() if not self.created_date or not self.created_time:
self.created_date = child_instance.note_date() child_instance = self.cast()
self.created_time = child_instance.note_time() self.created_date = child_instance.note_date()
self.created_time = child_instance.note_time()
return super().save(*args, **kwargs) return super().save(*args, **kwargs)
def _get_child_class_and_instance(self): def _get_child_class_and_instance(self):
self._child_instance = self self._child_instance = self
self._child_class = self.__class__ self._child_class = self.__class__
if self._meta.get_parent_list(): # If self is actually child instance
return
for f in self._meta.get_fields(): for f in self._meta.get_fields():
if f.is_relation and f.one_to_one: if f.is_relation and f.one_to_one:
self._child_instance = getattr(self, f.name) self._child_instance = getattr(self, f.name)

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

@@ -16,7 +16,7 @@
<tr><td colspan="2">{{ sujet.parcours_de_vie }}</td><th>Lien familial</th><td>{{ sujet.lien_familial }}</td></tr> <tr><td colspan="2">{{ sujet.parcours_de_vie }}</td><th>Lien familial</th><td>{{ sujet.lien_familial }}</td></tr>
</table> </table>
<div class="panel-footer text-right"> <div class="panel-footer text-right">
<a href="{% url "sujets:update" pk=sujet.id %}" class="btn btn-primary">Mettre à jour</a> <a href="{% url "sujets:update" pk=sujet.id %}" class="btn btn-sm btn-default">Mettre à jour</a>
</div> </div>
</div> </div>