Skip to content

Commit

Permalink
fix: Some Conflicts resolved
Browse files Browse the repository at this point in the history 
Conflicts in views.py have been resolved
  • Loading branch information
@joseluisps21
joseluisps21 committed Nov 24, 2022
1 parent b788d3c commit 04deb3d
Showing 1 changed file with 80 additions and 52 deletions.
132 changes: 80 additions & 52 deletions decide/census/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,6 @@ def remove_from_census(request):
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({'remove': True}, request), status=ST_401)


def census_gender(request):
if request.user.is_staff:
template = loader.get_template("census_gender.html")
votings = Voting.objects.all()
try:
genders = set(u.gender for u in User.objects.all())
except BaseException:
genders = set()
context = {
'votings': votings,
'genders': genders,

def census_group(request):
if request.user.is_staff:
template = loader.get_template("census_by_group.html")
Expand All @@ -166,21 +153,37 @@ def census_group(request):
context = {
'votings': votings,
'users': users

}
return HttpResponse(template.render(context, request))
else:
template = loader.get_template("result_page.html")
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)

def census_maritialStatus(request):
if request.user.is_staff:
template = loader.get_template("census_maritialStatus.html")
votings = Voting.objects.all()
try:
maritialStatus = set(u.maritialStatus for u in User.objects.all())
except BaseException:
maritialStatus = set()
context = {
'votings': votings,
'maritialStatus': maritialStatus,
}
return HttpResponse(template.render(context, request))
else:
template = loader.get_template("result_page.html")
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)

def add_by_gender_to_census(request):
def add_by_maritialStatus_to_census(request):
template = loader.get_template("result_page.html")
if request.user.is_staff:
voting_id = request.POST['voting-select']
genders = request.POST['gender-select']
users = User.objects.filter(gender in genders)
maritialStatus = request.POST['maritialStatus-select']
users = User.objects.filter(maritial_status in maritialStatus)
for user in users:
try:
census_by_voting = Census.objects.get(voting_id=voting_id,voter_id=user.id)
Expand All @@ -196,44 +199,86 @@ def add_by_gender_to_census(request):
else:
messages.info(request, "The user was already assigned to the voting")
status_code = 200



return HttpResponse(template.render({}, request), status=status_code)

else:
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)

def census_age(request):

def census_nationality(request):
if request.user.is_staff:
template = loader.get_template("census_age.html")
template = loader.get_template("census_nationality.html")
votings = Voting.objects.all()
try:
nationality = set(u.nationality for u in User.objects.all())
except BaseException:
nationality = set()
context = {
'votings': votings,
'nationality': nationality,
}
return HttpResponse(template.render(context, request))
else:
template = loader.get_template("result_page.html")
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)

def census_maritialStatus(request):
def add_by_nationality_to_census(request):
template = loader.get_template("result_page.html")
if request.user.is_staff:
template = loader.get_template("census_maritialStatus.html")
voting_id = request.POST['voting-select']
nation = request.POST['nationality-select']
users = User.objects.filter(nationality in nation)
for user in users:
try:
census_by_voting = Census.objects.get(voting_id=voting_id,voter_id=user.id)
except Census.DoesNotExist:
census_by_voting = None
status_code=404
if census_by_voting == None:
census = Census(voting_id=voting_id, voter_id=user.id)
census.save()
messages.success(request, "User added to the voting correctly")
status_code=ST_201

else:
messages.info(request, "The user was already assigned to the voting")
status_code = 200


return HttpResponse(template.render({}, request), status=status_code)

else:
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)

def census_gender(request):
if request.user.is_staff:
template = loader.get_template("census_gender.html")
votings = Voting.objects.all()
try:
maritialStatus = set(u.maritialStatus for u in User.objects.all())
genders = set(u.gender for u in User.objects.all())
except BaseException:
maritialStatus = set()
genders = set()
context = {
'votings': votings,
'maritialStatus': maritialStatus,
'genders': genders,
}
return HttpResponse(template.render(context, request))
else:
template = loader.get_template("result_page.html")
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)

def add_by_maritialStatus_to_census(request):
def add_by_gender_to_census(request):
template = loader.get_template("result_page.html")
if request.user.is_staff:
voting_id = request.POST['voting-select']
maritialStatus = request.POST['maritialStatus-select']
users = User.objects.filter(maritial_status in maritialStatus)
genders = request.POST['gender-select']
users = User.objects.filter(gender in genders)
for user in users:
try:
census_by_voting = Census.objects.get(voting_id=voting_id,voter_id=user.id)
Expand All @@ -249,47 +294,34 @@ def add_by_maritialStatus_to_census(request):
else:
messages.info(request, "The user was already assigned to the voting")
status_code = 200



return HttpResponse(template.render({}, request), status=status_code)

else:
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)


def census_nationality(request):
def census_age(request):
if request.user.is_staff:
template = loader.get_template("census_nationality.html")
template = loader.get_template("census_age.html")
votings = Voting.objects.all()
try:
nationality = set(u.nationality for u in User.objects.all())
except BaseException:
nationality = set()
context = {
'votings': votings,
'nationality': nationality,
}
return HttpResponse(template.render(context, request))
else:
template = loader.get_template("result_page.html")
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)


def add_by_age_to_census(request):
template = loader.get_template("result_page.html")
if request.user.is_staff:
voting_id = request.POST['voting-select']
minAge = request.POST['minimum-age']
maxAge = request.POST['maximum-age']
users = User.objects.filter(age >= minAge and age<=maxAge)

def add_by_nationality_to_census(request):
template = loader.get_template("result_page.html")
if request.user.is_staff:
voting_id = request.POST['voting-select']
nation = request.POST['nationality-select']
users = User.objects.filter(nationality in nation)
for user in users:
try:
census_by_voting = Census.objects.get(voting_id=voting_id,voter_id=user.id)
Expand All @@ -305,14 +337,10 @@ def add_by_nationality_to_census(request):
else:
messages.info(request, "The user was already assigned to the voting")
status_code = 200


return HttpResponse(template.render({}, request), status=status_code)

else:
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)

else:
messages.error(request, "You must be a staff member to access this page")
return HttpResponse(template.render({}, request), status=ST_401)
return HttpResponse(template.render({}, request), status=ST_401)

0 comments on commit 04deb3d

Please sign in to comment.