TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
New Ohlhafv graphics

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!14
This commit is contained in:
Toni Lyttinen
2020-02-02 14:00:17 +00:00
parent 41762e920f b790906b23
commit 5e434408b0
2 changed files with 3024 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ohlhafv/static/ohlhafv/img/heevit.svg
+3015 -472
View File
File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 227 KiB

webapp/tests/test_contact.py
+9 -7
View File
@@ -62,29 +62,31 @@ def createPerson(name):
class ContactsTestCase(APITestCase): class ContactsTestCase(APITestCase):
current_year = timezone.now().year
old_year = 1970
def setUp(self): def setUp(self):
createOccupation(timezone.now().year, role=createRoleBoard(), dummydata=1) createOccupation(self.current_year, role=createRoleBoard(), dummydata=1)
createOccupation(timezone.now().year, dummydata=2) createOccupation(self.current_year, dummydata=2)
createOccupation(1970, role=createRoleBoard(), dummydata=3) createOccupation(self.old_year, role=createRoleBoard(), dummydata=3)
createOccupation(1970, dummydata=4) createOccupation(self.old_year, dummydata=4)
def test_get(self): def test_get(self):
response = self.client.get(f"{URL}", format='json') response = self.client.get(f"{URL}", format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
serializer = OccupationSerializer( serializer = OccupationSerializer(
Occupation.by_year(2019), Occupation.by_year(self.current_year),
many=True many=True
) )
self.assertEqual(response.data["results"], serializer.data) self.assertEqual(response.data["results"], serializer.data)
def test_get_by_year(self): def test_get_by_year(self):
response = self.client.get(f"{URL}?year=1970", format='json') response = self.client.get(f"{URL}?year={self.old_year}", format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
serializer = OccupationSerializer( serializer = OccupationSerializer(
Occupation.by_year(1970), Occupation.by_year(self.old_year),
many=True many=True
) )