claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ordering of period_availabilities to please PostgreSQL (over SQLite)

Browse source
This commit is contained in:
Claude Paroz 2016-08-31 14:44:03 +02:00
parent 90535c610b
commit 5ee98aefe4
4 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
stages/tests.py
View file

@ -1,3 +1,4 @@
import json
from datetime import date
from django.contrib.auth.models import User
@ -44,7 +45,7 @@ class StagesTest(TestCase):
corporation=corp, title="Monsieur", first_name="Jean", last_name="Horner",
is_main=True, role="Responsable formation",
)
p1 = Period.objects.create(
cls.p1 = Period.objects.create(
title="Stage de pré-sensibilisation", start_date="2012-11-26", end_date="2012-12-07",
section=sect_ase, level=lev1,
)
@ -53,12 +54,12 @@ class StagesTest(TestCase):
section=sect_ase, level=lev2,
)
av1 = Availability.objects.create(
corporation=corp, domain=dom_hand, period=p1, contact=contact,
corporation=corp, domain=dom_hand, period=cls.p1, contact=contact,
comment="Dispo pour pré-sensibilisation",
)
Availability.objects.create(
corporation=corp, domain=dom_pe, period=p1, contact=contact,
comment="",
corporation=corp, domain=dom_pe, period=cls.p1, contact=contact,
comment="Dispo prioritaire", priority=True,
)
av3 = Availability.objects.create(
corporation=corp, domain=dom_pe, period=p2,
@ -112,6 +113,13 @@ class StagesTest(TestCase):
st.save()
self.assertEqual(st.archived_text, "")
def test_period_availabilities(self):
# Testing here because PeriodTest does not have all data at hand.
response = self.client.get(reverse('period_availabilities', args=[self.p1.pk]))
decoded = json.loads(response.content.decode('utf-8'))
self.assertEqual(len(decoded), 2)
self.assertEqual([item['priority'] for item in decoded], [True, False])
class PeriodTest(TestCase):
def setUp(self):

2
stages/views.py
View file

@ -248,7 +248,7 @@ def period_availabilities(request, pk):
corps = [{'id': av.id, 'id_corp': av.corporation.id, 'corp_name': av.corporation.name,
'domain': av.domain.name, 'free': av.free, 'priority': av.priority}
for av in period.availability_set.select_related('corporation').all(
).order_by('priority', 'corporation__name')]
).order_by('-priority', 'corporation__name')]
return HttpResponse(json.dumps(corps), content_type="application/json")
def new_training(request):