diff --git a/base/templatetags/base_extras.py b/base/templatetags/base_extras.py index 2a033d4..30b775c 100644 --- a/base/templatetags/base_extras.py +++ b/base/templatetags/base_extras.py @@ -18,7 +18,7 @@ def notification(texte): dtD=date.today() - timedelta(days=1) dateDebut = str(dtD.year)+'-'+str(dtD.month)+'-'+str(dtD.day) - personNotSentMsg = PersonneContact.objects.filter(isactif=True).count()-Observation.objects.filter(dateDebut=dateDebut, dateFin=dateFin).values('observer').distinct().count() + personNotSentMsg = PersonneContact.objects.all().count()-Observation.objects.filter(dateDebut=dateDebut, dateFin=dateFin).values('observer').distinct().count() listQueryDash = {"nbAgent":str(nmbAgent), "msgNotValidate":str(msgNotValidate), "personNotSentMsg":str(personNotSentMsg)} result = listQueryDash[texte] diff --git a/smslapli/templates/admin/base.html b/smslapli/templates/admin/base.html index 22a9956..86f3f7a 100644 --- a/smslapli/templates/admin/base.html +++ b/smslapli/templates/admin/base.html @@ -71,7 +71,7 @@ {% endblock %} {% endif %} - +{% comment %} {% block messages %} {% if messages %} {% endif %} {% endblock messages %} - +{% endcomment %}
{% block pretitle %}{% endblock %} diff --git a/smslapli/templates/admin/change_form.html b/smslapli/templates/admin/change_form.html index 036117e..aba44f2 100644 --- a/smslapli/templates/admin/change_form.html +++ b/smslapli/templates/admin/change_form.html @@ -33,7 +33,7 @@ {% block object-tools-items %}
  • {% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %} - {% trans "History" %} + {% trans "History" %}
  • {% if has_absolute_url %}
  • {% trans "View on site" %}
  • {% endif %} {% endblock %} @@ -135,32 +135,11 @@
    {% endblock %} diff --git a/smslapli/templates/admin/includes/fieldset.html b/smslapli/templates/admin/includes/fieldset.html index 5680832..1bf6d32 100644 --- a/smslapli/templates/admin/includes/fieldset.html +++ b/smslapli/templates/admin/includes/fieldset.html @@ -28,7 +28,6 @@ {% endfor %} diff --git a/smslapli/templates/admin/object_history.html b/smslapli/templates/admin/object_history.html index 69d4a38..f4e04c2 100644 --- a/smslapli/templates/admin/object_history.html +++ b/smslapli/templates/admin/object_history.html @@ -3,13 +3,13 @@ {% block content1 %} {% block breadcrumbs %} -#} -{##} + {% endblock %} {% endblock %} `` \ No newline at end of file diff --git a/smslapli/templates/admin/submit_line.html b/smslapli/templates/admin/submit_line.html index 826d0e2..057a5bf 100644 --- a/smslapli/templates/admin/submit_line.html +++ b/smslapli/templates/admin/submit_line.html @@ -13,7 +13,6 @@ .submit-row{ text-align: center; padding: 10px; -{# background-color: yellow;#} } .submit-row input{ display: inline-block;