From a9c1d06ece7245cfe3293b743ee82b2567ac0204 Mon Sep 17 00:00:00 2001 From: Toni Lyttinen Date: Sun, 2 Feb 2020 12:59:23 +0000 Subject: [PATCH 1/7] Updated heevit.svg to 2020 version. --- ohlhafv/static/ohlhafv/img/heevit.svg | 3487 +++++++++++++++++++++---- 1 file changed, 3015 insertions(+), 472 deletions(-) diff --git a/ohlhafv/static/ohlhafv/img/heevit.svg b/ohlhafv/static/ohlhafv/img/heevit.svg index f711e47..1f49076 100644 --- a/ohlhafv/static/ohlhafv/img/heevit.svg +++ b/ohlhafv/static/ohlhafv/img/heevit.svg @@ -1,473 +1,3016 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + From 3188a8e52008954cc2cb4c87e9e2559e9dd44923 Mon Sep 17 00:00:00 2001 From: Toni Lyttinen Date: Sun, 2 Feb 2020 13:01:42 +0000 Subject: [PATCH 2/7] Replace heevit.svg --- ohlhafv/static/ohlhafv/img/heevit.svg | 3206 ++----------------------- 1 file changed, 191 insertions(+), 3015 deletions(-) diff --git a/ohlhafv/static/ohlhafv/img/heevit.svg b/ohlhafv/static/ohlhafv/img/heevit.svg index 1f49076..23b05d8 100644 --- a/ohlhafv/static/ohlhafv/img/heevit.svg +++ b/ohlhafv/static/ohlhafv/img/heevit.svg @@ -1,3016 +1,192 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d9116e51ca4467b02a97f5bc89d1e983abfaaba5 Mon Sep 17 00:00:00 2001 From: Toni Lyttinen Date: Sun, 2 Feb 2020 13:07:11 +0000 Subject: [PATCH 3/7] Updated background color to match image --- ohlhafv/static/ohlhafv/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ohlhafv/static/ohlhafv/css/base.css b/ohlhafv/static/ohlhafv/css/base.css index 25cbcdb..04a1eef 100644 --- a/ohlhafv/static/ohlhafv/css/base.css +++ b/ohlhafv/static/ohlhafv/css/base.css @@ -1,6 +1,6 @@ html, body { background: #fdd504; - background: linear-gradient(#fdaa02, #fdd504) no-repeat center center fixed; + background: linear-gradient(#fcf4de, #fcf4de) no-repeat center center fixed; } body { From eb0bfdbd21b2cc59fcca4f6221c65e7da31cb9b9 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 2 Feb 2020 15:26:29 +0200 Subject: [PATCH 4/7] Move bad test fail one year forward --- webapp/tests/test_contact.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/tests/test_contact.py b/webapp/tests/test_contact.py index 747fbf7..c357730 100644 --- a/webapp/tests/test_contact.py +++ b/webapp/tests/test_contact.py @@ -74,7 +74,7 @@ class ContactsTestCase(APITestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) serializer = OccupationSerializer( - Occupation.by_year(2019), + Occupation.by_year(2020), many=True ) self.assertEqual(response.data["results"], serializer.data) From a2a2b9830ead9332ff5fcd926ce02c3ba7d0b4c0 Mon Sep 17 00:00:00 2001 From: Toni Lyttinen Date: Sun, 2 Feb 2020 13:28:41 +0000 Subject: [PATCH 5/7] Update background color to match the image From e7164bb613b3448f9734a0cdf8912b47e49b4b02 Mon Sep 17 00:00:00 2001 From: Toni Lyttinen Date: Sun, 2 Feb 2020 13:29:15 +0000 Subject: [PATCH 6/7] Update heevit.svg image to 2020 version --- ohlhafv/static/ohlhafv/img/heevit.svg | 3206 +++++++++++++++++++++++-- 1 file changed, 3015 insertions(+), 191 deletions(-) diff --git a/ohlhafv/static/ohlhafv/img/heevit.svg b/ohlhafv/static/ohlhafv/img/heevit.svg index 23b05d8..1f49076 100644 --- a/ohlhafv/static/ohlhafv/img/heevit.svg +++ b/ohlhafv/static/ohlhafv/img/heevit.svg @@ -1,192 +1,3016 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + From b790906b23b48b7c760cebcad9065edcf6965350 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 2 Feb 2020 15:31:05 +0200 Subject: [PATCH 7/7] Fix year issue in contact tests --- webapp/tests/test_contact.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/webapp/tests/test_contact.py b/webapp/tests/test_contact.py index c357730..a153c58 100644 --- a/webapp/tests/test_contact.py +++ b/webapp/tests/test_contact.py @@ -62,29 +62,31 @@ def createPerson(name): class ContactsTestCase(APITestCase): + current_year = timezone.now().year + old_year = 1970 def setUp(self): - createOccupation(timezone.now().year, role=createRoleBoard(), dummydata=1) - createOccupation(timezone.now().year, dummydata=2) - createOccupation(1970, role=createRoleBoard(), dummydata=3) - createOccupation(1970, dummydata=4) + createOccupation(self.current_year, role=createRoleBoard(), dummydata=1) + createOccupation(self.current_year, dummydata=2) + createOccupation(self.old_year, role=createRoleBoard(), dummydata=3) + createOccupation(self.old_year, dummydata=4) def test_get(self): response = self.client.get(f"{URL}", format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) serializer = OccupationSerializer( - Occupation.by_year(2020), + Occupation.by_year(self.current_year), many=True ) self.assertEqual(response.data["results"], serializer.data) 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) serializer = OccupationSerializer( - Occupation.by_year(1970), + Occupation.by_year(self.old_year), many=True )