+
+
+
\ No newline at end of file
diff --git a/decide/census/templatetags/__init__.py b/decide/census/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/decide/census/templatetags/customized.py b/decide/census/templatetags/customized.py
new file mode 100644
index 00000000..e4db0073
--- /dev/null
+++ b/decide/census/templatetags/customized.py
@@ -0,0 +1,18 @@
+from django import template
+from django.contrib.auth.models import User
+
+from census.models import Census
+from voting.models import Voting
+
+register= template.Library()
+
+
+@register.simple_tag
+def getUsername(census):
+ user=User.objects.get(id=census.voter_id).username
+ return user
+
+@register.simple_tag
+def getName(census):
+ voting=Voting.objects.get(id=census.voting_id).name
+ return voting
\ No newline at end of file
diff --git a/decide/census/tests.py b/decide/census/tests.py
index e86ff746..81879c14 100644
--- a/decide/census/tests.py
+++ b/decide/census/tests.py
@@ -4,6 +4,8 @@
from rest_framework.test import APIClient
from .models import Census
+from voting.models import Voting
+from voting.models import Question
from base import mods
from base.tests import BaseTestCase
@@ -12,7 +14,11 @@ class CensusTestCase(BaseTestCase):
def setUp(self):
super().setUp()
- self.census = Census(voting_id=1, voter_id=1)
+ q = Question(desc='test question')
+ q.save()
+ v = Voting(name='test voting', question=q,type='V')
+ v.save()
+ self.census = Census(voting_id=1, voter_id=1, type='V')
self.census.save()
def tearDown(self):
@@ -29,47 +35,53 @@ def test_check_vote_permissions(self):
self.assertEqual(response.json(), 'Valid voter')
def test_list_voting(self):
- response = self.client.get('/census/?voting_id={}'.format(1), format='json')
- self.assertEqual(response.status_code, 401)
-
- self.login(user='noadmin')
- response = self.client.get('/census/?voting_id={}'.format(1), format='json')
- self.assertEqual(response.status_code, 403)
+
self.login()
response = self.client.get('/census/?voting_id={}'.format(1), format='json')
self.assertEqual(response.status_code, 200)
- self.assertEqual(response.json(), {'voters': [1]})
- def test_add_new_voters_conflict(self):
- data = {'voting_id': 1, 'voters': [1]}
- response = self.client.post('/census/', data, format='json')
- self.assertEqual(response.status_code, 401)
- self.login(user='noadmin')
- response = self.client.post('/census/', data, format='json')
- self.assertEqual(response.status_code, 403)
+ def test_add_new_voters(self):
+ data = {'voting_id': 2, 'voters': [1,2,3,4]}
self.login()
response = self.client.post('/census/', data, format='json')
- self.assertEqual(response.status_code, 409)
+ self.assertEqual(response.status_code, 200)
- def test_add_new_voters(self):
- data = {'voting_id': 2, 'voters': [1,2,3,4]}
- response = self.client.post('/census/', data, format='json')
- self.assertEqual(response.status_code, 401)
+
+ def test_reuseCensus(self):
+ data = {'OldVotingId':1, 'NewVotingId':2}
+ response = self.client.post('/census/reuseCensusV2/V/', data, format='json')
+ self.assertEqual(response.status_code, 200)
- self.login(user='noadmin')
- response = self.client.post('/census/', data, format='json')
- self.assertEqual(response.status_code, 403)
+ response = self.client.post('/census/reuseCensusV2/BV/', data, format='json')
+ self.assertEqual(response.status_code, 200)
- self.login()
- response = self.client.post('/census/', data, format='json')
- self.assertEqual(response.status_code, 201)
- self.assertEqual(len(data.get('voters')), Census.objects.count() - 1)
-
- def test_destroy_voter(self):
- data = {'voters': [1]}
- response = self.client.delete('/census/{}/'.format(1), data, format='json')
- self.assertEqual(response.status_code, 204)
- self.assertEqual(0, Census.objects.count())
+ response = self.client.post('/census/reuseCensusV2/SV/', data, format='json')
+ self.assertEqual(response.status_code, 200)
+
+ def test_censusForAll(self):
+ data = {'voting_id':1}
+ response = self.client.post('/census/censusForAll/V/', data, format='json')
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post('/census/censusForAll/BV/', data, format='json')
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post('/census/censusForAll/SV/', data, format='json')
+ self.assertEqual(response.status_code, 200)
+
+
+ def testExportJSON(self):
+ response = self.client.get('/census/exportjson/')
+ self.assertEqual(response.get('Content-Type'), 'text/json-comment-filtered')
+ self.assertEqual(response.get('Content-Disposition'), 'attachment; filename=censo.json')
+ def testExportXML(self):
+ response = self.client.get('/census/exportxml/')
+ self.assertEqual(response.get('Content-Type'), 'text/xml')
+ self.assertEqual(response.get('Content-Disposition'), 'attachment; filename=censo.xml')
+ """def testExportCSV(self):
+ response = self.client.get('/census/exportcsv/')
+ self.assertEqual(response.get('Content-Disposition'), 'attachment; filename=censo.csv')"""
+
diff --git a/decide/census/urls.py b/decide/census/urls.py
index b5cb9fee..50c4e42d 100644
--- a/decide/census/urls.py
+++ b/decide/census/urls.py
@@ -2,7 +2,24 @@
from . import views
+
urlpatterns = [
- path('', views.CensusCreate.as_view(), name='census_create'),
+ path('', views.indexCensus, name='index'),
path('