Skip to content

Commit

Permalink
#476 fix line length issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexlittle
alexlittle committed Nov 19, 2019
1 parent ecebfbb commit ac41fb6
Show file tree
Hide file tree
Showing 8 changed files with 230 additions and 133 deletions.
53 changes: 37 additions & 16 deletions activitylog/views.py
View file
Expand Up @@ -29,24 +29,32 @@ def process_uploaded_trackers(request, trackers, user, user_api_key):
success, results = create_resource(TrackerResource, request, tracker)
if success:
messages.info(request,
_(u"Tracker activity for %(username)s added" \
_(u"Tracker activity for %(username)s added"
% {'username': user.username}))
else:
messages.warning(request, _(
u"Already uploaded: tracker activity %(uuid)s for %(username)s added" % {'username': user.username,
'uuid': tracker.get('digest')}),
'danger')
u"Already uploaded: tracker activity %(uuid)s for \
%(username)s added" % {'username': user.username,
'uuid': tracker.get('digest')}),
'danger')


def process_uploaded_quizresponses(request, quiz_responses, user, user_api_key):
def process_uploaded_quizresponses(request,
quiz_responses,
user,
user_api_key):
request.user = user
for quizattempt in quiz_responses:
success, results = create_resource(QuizAttemptResource, request, quizattempt)
success, results = create_resource(QuizAttemptResource,
request,
quizattempt)
if success:
messages.info(request, _(u"Quiz attempt for %(username)s added" % {'username': user.username}))
messages.info(request, _(u"Quiz attempt for %(username)s added"
% {'username': user.username}))
else:
messages.info(request,
_(u"Already uploaded: quiz attempt for %(username)s added" % {'username': user.username}))
_(u"Already uploaded: quiz attempt for \
%(username)s added" % {'username': user.username}))


def process_uploaded_file(request, json_data):
Expand All @@ -63,16 +71,20 @@ def process_uploaded_file(request, json_data):
email=user['email'],
)

req_user.password = user['password'] if 'password' in user else make_password(None)
req_user.password = user['password'] \
if 'password' in user else make_password(None)
req_user.first_name = user['firstname']
req_user.last_name = user['lastname']
req_user.save()

user_profile = UserProfile()
user_profile.user = req_user
user_profile.phone_number = user['phoneno'] if 'phoneno' in user else None
user_profile.job_title = user['jobtitle'] if 'jobtitle' in user else None
user_profile.organisation = user['organisation'] if 'organisation' in user else None
user_profile.phone_number = user['phoneno'] \
if 'phoneno' in user else None
user_profile.job_title = user['jobtitle'] \
if 'jobtitle' in user else None
user_profile.organisation = user['organisation'] \
if 'organisation' in user else None
user_profile.save()

messages.warning(request, _(
Expand All @@ -86,12 +98,20 @@ def process_uploaded_file(request, json_data):
if (created):
messages.warning(request, _(
u"Generated new ApiKey for %(username)s : %(apikey)s" % {
'username': username, 'apikey': user_api_key.key}), 'danger')
'username': username,
'apikey': user_api_key.key}),
'danger')

if 'trackers' in user:
process_uploaded_trackers(request, user['trackers'], req_user, user_api_key)
process_uploaded_trackers(request,
user['trackers'],
req_user,
user_api_key)
if 'quizresponses' in user:
process_uploaded_quizresponses(request, user['quizresponses'], req_user, user_api_key)
process_uploaded_quizresponses(request,
user['quizresponses'],
req_user,
user_api_key)
except ApiKey.DoesNotExist:
messages.warning(request, _(u"%(username)s not found. Please \
check that this file is being uploaded to the correct server." % {'username': username}), 'danger')
Expand Down Expand Up @@ -119,7 +139,8 @@ def validate_server(request, data):
else:
print('Different tracker server: {}'.format(data['server']))
messages.warning(request, _(
"The server in the activity log file does not match with the current one"))
"The server in the activity log file does not match with the \
current one"))
return False
else:
messages.warning(request, _(
Expand Down
56 changes: 35 additions & 21 deletions gamification/views.py
View file
Expand Up @@ -51,11 +51,13 @@ def leaderboard_export(request, course_id=None):


def load_course_points(request, course):
course_custom_points = CourseGamificationEvent.objects.filter(course=course)
course_custom_points = CourseGamificationEvent.objects \
.filter(course=course)
if len(course_custom_points) > 0:
return course_custom_points
else:
course_default_points = DefaultGamificationEvent.objects.exclude(level=DefaultGamificationEvent.GLOBAL)
course_default_points = DefaultGamificationEvent.objects \
.exclude(level=DefaultGamificationEvent.GLOBAL)
initialise_course_points(request, course, course_default_points)
return course_default_points

Expand Down Expand Up @@ -137,45 +139,57 @@ def edit_course_gamification(request, course_id):
reference = form.cleaned_data.get('reference')
defaults = {'points': points, 'user': request.user}

to_delete = formset.can_delete and formset._should_delete_form(form)
to_delete = formset.can_delete \
and formset._should_delete_form(form)

updated = True
if level == 'course':
if to_delete:
CourseGamificationEvent.objects.filter(course_id=reference,
event=event).delete()
CourseGamificationEvent.objects \
.filter(course_id=reference,
event=event).delete()
else:
CourseGamificationEvent.objects.update_or_create(course_id=reference,
event=event,
defaults=defaults)
CourseGamificationEvent.objects \
.update_or_create(course_id=reference,
event=event,
defaults=defaults)
elif level == 'activity':
if to_delete:
ActivityGamificationEvent.objects.filter(activity_id=reference,
event=event).delete()
ActivityGamificationEvent.objects \
.filter(activity_id=reference,
event=event).delete()
else:
ActivityGamificationEvent.objects.update_or_create(activity_id=reference,
event=event,
defaults=defaults)
ActivityGamificationEvent.objects \
.update_or_create(activity_id=reference,
event=event,
defaults=defaults)
elif level == 'media':
if to_delete:
MediaGamificationEvent.objects.filter(media_id=reference,
event=event).delete()
MediaGamificationEvent.objects \
.filter(media_id=reference,
event=event).delete()
else:
MediaGamificationEvent.objects.update_or_create(media_id=reference,
event=event,
defaults=defaults)
MediaGamificationEvent.objects \
.update_or_create(media_id=reference,
event=event,
defaults=defaults)

if updated:
writer = GamificationXMLWriter(course)
new_version = writer.update_gamification(request.user)
messages.success(request, 'Course XML updated. New version: {}'.format(new_version))
messages.success(request,
'Course XML updated. New version: {}'
.format(new_version))
else:
print(formset.errors)
else:
formset = events_formset(prefix='events')

activities = Activity.objects.filter(section__course=course).select_related('section').prefetch_related('gamification_events')
media = Media.objects.filter(course=course).prefetch_related('gamification_events')
activities = Activity.objects.filter(section__course=course) \
.select_related('section') \
.prefetch_related('gamification_events')
media = Media.objects.filter(course=course) \
.prefetch_related('gamification_events')

default_points = {
'course': DefaultGamificationEvent.objects.exclude(level=DefaultGamificationEvent.GLOBAL),
Expand Down

0 comments on commit ac41fb6

Please sign in to comment.