Skip to content

Commit

Permalink
#476 - fix indentation issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexlittle
alexlittle committed Nov 3, 2019
1 parent 76009c4 commit 5ca74f1
Show file tree
Hide file tree
Showing 19 changed files with 259 additions and 254 deletions.
3 changes: 1 addition & 2 deletions activitylog/forms.py
View file
Expand Up @@ -17,8 +17,7 @@ class UploadActivityLogForm(forms.Form):
required=True,
label=_(u'Activity Log'),
error_messages={'required':
_(u'Please select an activity log file to \
upload')},
_(u'Please select an activity log file to upload')},
)

def __init__(self, *args, **kwargs):
Expand Down
6 changes: 3 additions & 3 deletions activitylog/views.py
View file
Expand Up @@ -140,7 +140,7 @@ def upload_view(request):

# save activity_log_file
uploaded_activity_log = UploadedActivityLog(create_user=request.user,
file=activity_log_file)
file=activity_log_file)
uploaded_activity_log.save()

# open file and process
Expand All @@ -152,5 +152,5 @@ def upload_view(request):
else:
form = UploadActivityLogForm()
return render(request, 'activitylog/upload.html',
{'form': form,
'title': _(u'Upload Activity Log')})
{'form': form,
'title': _(u'Upload Activity Log')})
22 changes: 11 additions & 11 deletions api/publish.py
View file
Expand Up @@ -47,9 +47,9 @@ def check_required_fields(request, validation_errors):
else:
course_file = request.FILES[api.COURSE_FILE_FIELD]
if course_file is not None and course_file.content_type != 'application/zip' and course_file.content_type != 'application/x-zip-compressed':
validation_errors.append("You may only upload a zip file")
msg_text = _(u"Invalid zip file")
CoursePublishingLog(action="invalid_zip", data=msg_text).save()
validation_errors.append("You may only upload a zip file")
msg_text = _(u"Invalid zip file")
CoursePublishingLog(action="invalid_zip", data=msg_text).save()

return validation_errors

Expand Down Expand Up @@ -112,10 +112,10 @@ def publish_view(request):
course, status_code = handle_uploaded_file(request.FILES[api.COURSE_FILE_FIELD], extract_path, request, user)

CoursePublishingLog(course=course if course else None,
new_version=course.version if course else None,
user=user,
action="api_file_uploaded",
data=request.FILES[api.COURSE_FILE_FIELD].name).save()
new_version=course.version if course else None,
user=user,
action="api_file_uploaded",
data=request.FILES[api.COURSE_FILE_FIELD].name).save()
if course is False:
status = status_code if status_code is not None else 500
response_data = {
Expand All @@ -136,10 +136,10 @@ def publish_view(request):

msgs = get_messages_array(request)
CoursePublishingLog(course=course,
new_version=course.version,
user=user,
action="api_course_published",
data=_(u'Course published via API')).save()
new_version=course.version,
user=user,
action="api_course_published",
data=_(u'Course published via API')).save()
if len(msgs) > 0:
return JsonResponse({'messages': msgs}, status=201)
else:
Expand Down
12 changes: 9 additions & 3 deletions api/serializers.py
View file
Expand Up @@ -11,7 +11,9 @@ def to_json(self, data, options=None):
options = options or {}
data = self.to_simple(data, options)
return json.dumps(data,
sort_keys=True, ensure_ascii=False, indent=self.json_indent)
sort_keys=True,
ensure_ascii=False,
indent=self.json_indent)


class UserJSONSerializer(Serializer):
Expand All @@ -24,7 +26,9 @@ def to_json(self, data, options=None):
data['users'] = data['objects']
del data['objects']
return json.dumps(data,
sort_keys=True, ensure_ascii=False, indent=self.json_indent)
sort_keys=True,
ensure_ascii=False,
indent=self.json_indent)


class CourseJSONSerializer(Serializer):
Expand All @@ -39,4 +43,6 @@ def to_json(self, data, options=None):
del data['objects']

return json.dumps(data,
sort_keys=True, ensure_ascii=False, indent=self.json_indent)
sort_keys=True,
ensure_ascii=False,
indent=self.json_indent)
3 changes: 1 addition & 2 deletions av/handler.py
View file
Expand Up @@ -16,8 +16,7 @@ def upload(request, user):

form = UploadMediaForm(request.POST, request.FILES, request=request)
if form.is_valid():
uploaded_media = UploadedMedia(create_user=user,
update_user=user, )
uploaded_media = UploadedMedia(create_user=user, update_user=user)
uploaded_media.file = request.FILES["media_file"]
uploaded_media.save()
file = open(uploaded_media.file.path, 'rb')
Expand Down
20 changes: 10 additions & 10 deletions av/views.py
View file
Expand Up @@ -33,8 +33,8 @@ def home_view(request):
media = paginator.page(paginator.num_pages)

return render(request, 'av/home.html',
{'title': _(u'Uploaded Media'),
'page': media})
{'title': _(u'Uploaded Media'),
'page': media})

@user_can_upload
def upload_view(request):
Expand All @@ -49,8 +49,8 @@ def upload_view(request):
form = UploadMediaForm() # An unbound form

return render(request, 'av/upload.html',
{'form': form,
'title': _(u'Upload Media')})
{'form': form,
'title': _(u'Upload Media')})

@user_can_upload
def upload_success_view(request, id):
Expand All @@ -59,9 +59,9 @@ def upload_success_view(request, id):
embed_code = media.get_embed_code(request.build_absolute_uri(media.file.url))

return render(request, 'av/upload_success.html',
{'title': _(u'Upload Media'),
'media': media,
'embed_code': embed_code})
{'title': _(u'Upload Media'),
'media': media,
'embed_code': embed_code})

@user_can_upload
def media_view(request, id):
Expand All @@ -70,9 +70,9 @@ def media_view(request, id):
embed_code = media.get_embed_code(request.build_absolute_uri(media.file.url))

return render(request, 'av/view.html',
{'title': _(u'Media'),
'media': media,
'embed_code': embed_code})
{'title': _(u'Media'),
'media': media,
'embed_code': embed_code})

@user_can_upload
def set_default_image_view(request, image_id):
Expand Down
19 changes: 10 additions & 9 deletions content/views.py
View file
Expand Up @@ -51,9 +51,9 @@ def media_embed_helper(request):
form = MediaEmbedHelperForm()

return render(request, 'oppia/content/media-embed-helper.html',
{'settings': settings,
'form': form,
'processed_media': processed_media})
{'settings': settings,
'form': form,
'processed_media': processed_media})


def process_media_file(media_guid, media_url, media_local_file, download_error, processed_media):
Expand Down Expand Up @@ -109,8 +109,8 @@ def get_length(filename):
'-show_streams',
'-loglevel',
'quiet'],
stdout = subprocess.PIPE,
stderr = subprocess.STDOUT)
stdout = subprocess.PIPE,
stderr = subprocess.STDOUT)

duration = float(json.loads(result.stdout.read())['streams'][0]['duration'])
if duration != 0:
Expand All @@ -129,10 +129,11 @@ def generate_media_screenshots(media_local_file, media_guid):
if not os.path.exists(image_path):
os.makedirs(image_path)

image_generator_command = ("%s %s" % (settings.SCREENSHOT_GENERATOR_PROGRAM, settings.SCREENSHOT_GENERATOR_PROGRAM_PARAMS)) % (media_local_file,
content.SCREENSHOT_IMAGE_WIDTH,
content.SCREENSHOT_IMAGE_HEIGHT,
image_path)
image_generator_command = ("%s %s" % (settings.SCREENSHOT_GENERATOR_PROGRAM,
settings.SCREENSHOT_GENERATOR_PROGRAM_PARAMS)) % (media_local_file,
content.SCREENSHOT_IMAGE_WIDTH,
content.SCREENSHOT_IMAGE_HEIGHT,
image_path)
subprocess.call(image_generator_command, shell=True)
return image_path

Expand Down
2 changes: 1 addition & 1 deletion deviceadmin/views.py
View file
Expand Up @@ -32,7 +32,7 @@ def user_devices_list(request):
devices = paginator.page(paginator.num_pages)

return render(request, 'deviceadmin/list.html',
{'page': devices, 'page_ordering': ordering})
{'page': devices, 'page_ordering': ordering})


def send_message_to_device(request):
Expand Down
8 changes: 4 additions & 4 deletions gamification/forms.py
View file
Expand Up @@ -57,8 +57,8 @@ def __init__(self, *args, **kwargs):
help_text= event.get_helper_text())
except AttributeError:
self.fields[event.event.event] = forms.IntegerField(initial=int(event.points),
label=event.get_label(),
help_text= event.get_helper_text())
label=event.get_label(),
help_text= event.get_helper_text())

self.helper = FormHelper()
self.helper.form_class = 'form-horizontal'
Expand Down Expand Up @@ -95,8 +95,8 @@ def __init__(self, *args, **kwargs):
help_text= event.get_helper_text())
except AttributeError:
self.fields[event.event.event] = forms.IntegerField(initial=int(event.points),
label=event.get_label(),
help_text= event.get_helper_text())
label=event.get_label(),
help_text= event.get_helper_text())

self.helper = FormHelper()
self.helper.form_class = 'form-horizontal'
Expand Down
8 changes: 4 additions & 4 deletions oppia/forms/cohort.py
View file
Expand Up @@ -18,11 +18,11 @@ class CohortForm(forms.Form):
required=False,
help_text=_("A comma separated list of usernames"), )
start_date = forms.CharField(required=True,
error_messages={'required': _('Please enter a valid date'),
'invalid': _('Please enter a valid date')}, )
error_messages={'required': _('Please enter a valid date'),
'invalid': _('Please enter a valid date')}, )
end_date = forms.CharField(required=True,
error_messages={'required': _('Please enter a valid date'),
'invalid': _('Please enter a valid date')}, )
error_messages={'required': _('Please enter a valid date'),
'invalid': _('Please enter a valid date')}, )
courses = forms.CharField(widget=forms.Textarea(),
required=False,
help_text=_("A comma separated list of course codes"), )
Expand Down
45 changes: 22 additions & 23 deletions oppia/uploader.py
View file
Expand Up @@ -148,11 +148,11 @@ def process_course(extract_path, f, mod_name, request, user):
msg_text = _(u'Gamification for "%(event)s" at course level added') % {'event': e.event}
messages.info(request, msg_text)
CoursePublishingLog(course=course,
new_version=meta_info['versionid'],
old_version=old_course_version,
user=user,
action="gamification_added",
data=msg_text).save()
new_version=meta_info['versionid'],
old_version=old_course_version,
user=user,
action="gamification_added",
data=msg_text).save()

process_quizzes_locally = False
if 'exportversion' in meta_info and meta_info['exportversion'] >= settings.OPPIA_EXPORT_LOCAL_MINVERSION:
Expand Down Expand Up @@ -187,12 +187,11 @@ def parse_course_contents(req, xml_doc, course, user, new_course, process_quizze
msg_text = _(u"There don't appear to be any activities in this upload file.")
messages.info(req, msg_text)
CoursePublishingLog(course=course,
user=user,
action="no_activities",
data=msg_text).save()
user=user,
action="no_activities",
data=msg_text).save()
return


for idx, s in enumerate(structure.findall("section")):

activities = s.find('activities')
Expand Down Expand Up @@ -234,9 +233,9 @@ def parse_course_contents(req, xml_doc, course, user, new_course, process_quizze
msg_text = _(u'File %(filename)s has a download URL larger than the maximum length permitted. The media file has not been registered, so it won\'t be tracked. Please, fix this issue and upload the course again.') % {'filename': media.filename}
messages.info(req, msg_text)
CoursePublishingLog(course=course,
user=user,
action="media_url_too_long",
data=msg_text).save()
user=user,
action="media_url_too_long",
data=msg_text).save()
else:
media.download_url = url
# get any optional attributes
Expand All @@ -261,9 +260,9 @@ def parse_course_contents(req, xml_doc, course, user, new_course, process_quizze
msg_text = _(u'Gamification for "%(event)s" at course level added') % {'event': e.event}
messages.info(req, msg_text)
CoursePublishingLog(course=course,
user=user,
action="course_gamification_added",
data=msg_text).save()
user=user,
action="course_gamification_added",
data=msg_text).save()

def parse_baseline_activities(req, xml_doc, course, user, new_course, process_quizzes_locally):
for meta in xml_doc.findall('meta')[:1]:
Expand Down Expand Up @@ -342,19 +341,19 @@ def parse_and_save_activity(req, user, course, section, act, new_course, process
msg_text = _(u'Activity "%(act)s"(%(digest)s) did not exist previously.') % {'act': activity.title, 'digest': activity.digest}
messages.warning(req, msg_text)
CoursePublishingLog(course=course,
user=user,
action="activity_added",
data=msg_text).save()
user=user,
action="activity_added",
data=msg_text).save()
else:
msg_text = _(u'Activity "%(act)s"(%(digest)s) previously existed. Updated with new information') % {'act': activity.title, 'digest':activity.digest}
'''
If we also want to show the activities that previously existed, uncomment this next line
messages.info(req, msg_text)
'''
CoursePublishingLog(course=course,
user=user,
action="activity_updated",
data=msg_text).save()
user=user,
action="activity_updated",
data=msg_text).save()

if (act_type == "quiz") and process_quiz_locally:
updated_json = parse_and_save_quiz(req, user, activity, act)
Expand Down Expand Up @@ -523,8 +522,8 @@ def create_quiz_questions(user, quiz, quiz_obj ):
for q in quiz_obj['questions']:

question = Question(owner=user,
type=q['question']['type'],
title=q['question']['title'])
type=q['question']['type'],
title=q['question']['title'])
question.save()

quiz_question = QuizQuestion(quiz=quiz, question=question, order=q['order'])
Expand Down

0 comments on commit 5ca74f1

Please sign in to comment.