{% block extrahead %}
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/tablesorter.css" media="screen"/>
- <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-1.5.1.min.js"></script>
- <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.tablesorter.min.js"></script>
+ <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-1.5.1.min.js"></script>
+ <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.tablesorter.min.js"></script>
<script>
- $(document).ready(function() {
+ $(document).ready(function() {
$(".tablesorter").tablesorter({
dateFormat: 'uk',
headers: {
4: {sorter: "shortDate"},
+ 5: {sorter: "shortDate"}
}
}
- );
+ );
});
- </script>
+ </script>
{% endblock %}
{% block title %}RH - DAE - Embauches{% endblock %}
from django.contrib import messages
from django.conf import settings
from django.contrib.auth.decorators import login_required
+from django.contrib.contenttypes.models import ContentType
from reversion.models import Version
@dae_groupe_requis
def postes_liste(request):
""" Liste des postes. """
- vars = dict()
-
- vars['postes_a_traiter'] = dae.Poste.objects.mes_choses_a_faire(request.user).all().order_by('-date_creation')
- vars['postes_en_cours'] = dae.Poste.objects.ma_region_ou_service(request.user).filter(~Q(etat=POSTE_ETAT_FINALISE)).order_by('-date_creation')
-
- return render_to_response('dae/postes_liste.html', vars, RequestContext(request))
+ content_type = ContentType.objects.get_for_model(dae.Poste)
+ extra_select = {'derniere_validation': (
+ "SELECT MAX(date) FROM workflow_workflowcommentaire "
+ "WHERE content_type_id = '%s' AND object_id = dae_poste.id" % content_type.id
+ )}
+ postes_a_traiter = dae.Poste.objects.mes_choses_a_faire(request.user) \
+ .extra(select=extra_select).order_by('-date_creation')
+ postes_en_cours = dae.Poste.objects.ma_region_ou_service(request.user) \
+ .extra(select=extra_select).filter(~Q(etat=POSTE_ETAT_FINALISE)).order_by('-date_creation')
+ return render_to_response('dae/postes_liste.html', {
+ 'postes_a_traiter': postes_a_traiter,
+ 'postes_en_cours': postes_en_cours,
+ }, RequestContext(request))
@login_required
def poste_piece(request, id, filename):
@dossier_dans_ma_region_ou_service
def embauches_liste(request):
""" Liste des embauches. """
- vars = dict()
- vars['embauches_a_traiter'] = dae.Dossier.objects.mes_choses_a_faire(request.user).all().order_by('-date_creation')
- vars['embauches_en_cours'] = dae.Dossier.objects.ma_region_ou_service(request.user).order_by('-date_creation').exclude(etat=DOSSIER_ETAT_FINALISE)
- return render_to_response('dae/embauches_liste.html', vars, RequestContext(request))
+ content_type = ContentType.objects.get_for_model(dae.Dossier)
+ extra_select = {'derniere_validation': (
+ "SELECT MAX(date) FROM workflow_workflowcommentaire "
+ "WHERE content_type_id = '%s' AND object_id = dae_dossier.id" % content_type.id
+ )}
+ embauches_a_traiter = dae.Dossier.objects.mes_choses_a_faire(request.user) \
+ .extra(select=extra_select).order_by('-date_creation')
+ embauches_en_cours = dae.Dossier.objects.ma_region_ou_service(request.user) \
+ .extra(select=extra_select).order_by('-date_creation').exclude(etat=DOSSIER_ETAT_FINALISE)
+ return render_to_response('dae/embauches_liste.html', {
+ 'embauches_a_traiter': embauches_a_traiter,
+ 'embauches_en_cours': embauches_en_cours,
+ }, RequestContext(request))
@dae_groupe_requis
def embauches_finalisees(request):