Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Felipe Bormann
2 parents 16614fc3 9935e5b5
Showing 11 changed files with 99 additions and 101 deletions Show diff stats
file_link/serializers.py
goals/serializers.py
links/serializers.py
news/migrations/0003_auto_20170610_1512.py
pdf_file/serializers.py
pdf_file/views.py
subjects/views.py
themes/migrations/0006_auto_20170610_1512.py
topics/serializers.py
webpage/serializers.py
youtube_video/serializers.py
@@ -92,13 +92,7 @@ class SimpleFileLinkSerializer(serializers.ModelSerializer):
 					data["topic"] = topic
 				else:
 					data["topic"] = get_object_or_404(Topic, id = topic["id"])
-
-				if not data["file_content"] is None:
-					f = open(os.path.join(settings.MEDIA_ROOT, data["file_content"]), encoding="latin-1")
-					file = File(f)
-
-					data["file_content"] = file
-
+			
 				file_link_data = data
 				pendencies = file_link_data["pendencies_resource"]
@@ -208,12 +202,6 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer):
 				else:
 					data["topic"] = get_object_or_404(Topic, id = topic["id"])
-				if not data["file_content"] is None:
-					f = open(os.path.join(settings.MEDIA_ROOT, data["file_content"]), encoding="latin-1")
-					file = File(f)
-
-					data["file_content"] = file
-
 				file_link_data = data
 				pendencies = file_link_data["pendencies_resource"]
@@ -242,6 +230,7 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer):
 					file_link.tags.add(tag)
 				students = data["students"]
+				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
 				for student_data in students:
 					logs = student_data["get_items"]
@@ -260,12 +249,6 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer):
 								if not l_exists.exists():
 									Log.objects.create(**log)
 						else:
-							if not student_data["image"] is None:
-								f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1")
-								file = File(f)
-
-								student_data["image"] = file
-
 							student = User()
 							student.email = student_data["email"]
 							student.username = student_data["username"]
@@ -292,11 +275,10 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer):
 								Log.objects.create(**log)
 					file_link.students.add(student)
+					subject.students.add(student)
 				groups = data["groups"]
-				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
-
 				for group_data in groups:
 					g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
@@ -185,6 +185,7 @@ class CompleteGoalSerializer(serializers.ModelSerializer):
 					goals.tags.add(tag)
 				students = data["students"]
+				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
 				for student_data in students:
 					logs = student_data["get_items"]
@@ -203,12 +204,6 @@ class CompleteGoalSerializer(serializers.ModelSerializer):
 								if not l_exists.exists():
 									Log.objects.create(**log)
 						else:
-							if not student_data["image"] is None:
-								f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1")
-								file = File(f)
-
-								student_data["image"] = file
-
 							student = User()
 							student.email = student_data["email"]
 							student.username = student_data["username"]
@@ -235,11 +230,10 @@ class CompleteGoalSerializer(serializers.ModelSerializer):
 								Log.objects.create(**log)
 					goals.students.add(student)
+					subject.students.add(student)
 				groups = data["groups"]
-				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
-
 				for group_data in groups:
 					g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
@@ -167,6 +167,7 @@ class CompleteLinkSerializer(serializers.ModelSerializer):
 					link.tags.add(tag)
 				students = data["students"]
+				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
 				for student_data in students:
 					logs = student_data["get_items"]
@@ -185,12 +186,6 @@ class CompleteLinkSerializer(serializers.ModelSerializer):
 								if not l_exists.exists():
 									Log.objects.create(**log)
 						else:
-							if not student_data["image"] is None:
-								f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1")
-								file = File(f)
-
-								student_data["image"] = file
-
 							student = User()
 							student.email = student_data["email"]
 							student.username = student_data["username"]
@@ -217,11 +212,10 @@ class CompleteLinkSerializer(serializers.ModelSerializer):
 								Log.objects.create(**log)
 					links.students.add(student)
+					subject.students.add(student)
 				groups = data["groups"]
-				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
-
 				for group_data in groups:
 					g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-06-10 18:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0002_auto_20170413_2034'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='news',
+            name='content',
+            field=models.TextField(blank=True, verbose_name='News Content'),
+        ),
+    ]
@@ -86,12 +86,6 @@ class SimplePDFFileSerializer(serializers.ModelSerializer):
 				else:
 					data["topic"] = get_object_or_404(Topic, id = topic["id"])
-				if not data["file"] is None:
-					f = open(os.path.join(settings.MEDIA_ROOT, data["file"]), encoding="latin-1")
-					file = File(f)
-
-					data["file"] = file
-
 				pdf_data = data
 				pendencies = pdf_data["pendencies_resource"]
@@ -183,6 +177,7 @@ class CompletePDFFileSerializer(serializers.ModelSerializer):
 		pdf = None
 		if not topic["id"] is None:
+
 			if "subject" in topic:
 				r_exits = Resource.objects.filter(topic__subject = topic["subject"], name__unaccent__iexact = data["name"])
 			else:
@@ -201,13 +196,6 @@ class CompletePDFFileSerializer(serializers.ModelSerializer):
 				else:
 					data["topic"] = get_object_or_404(Topic, id = topic["id"])
-
-				if not data["file"] is None:
-					f = open(os.path.join(settings.MEDIA_ROOT, data["file"]), encoding="latin-1")
-					file = File(f)
-
-					data["file"] = file
-
 				pdf_data = data
 				pendencies = pdf_data["pendencies_resource"]
@@ -236,6 +224,7 @@ class CompletePDFFileSerializer(serializers.ModelSerializer):
 					pdf.tags.add(tag)
 				students = data["students"]
+				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
 				for student_data in students:
 					logs = student_data["get_items"]
@@ -254,12 +243,6 @@ class CompletePDFFileSerializer(serializers.ModelSerializer):
 								if not l_exists.exists():
 									Log.objects.create(**log)
 						else:
-							if not student_data["image"] is None:
-								f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1")
-								file = File(f)
-
-								student_data["image"] = file
-
 							student = User()
 							student.email = student_data["email"]
 							student.username = student_data["username"]
@@ -286,10 +269,10 @@ class CompletePDFFileSerializer(serializers.ModelSerializer):
 								Log.objects.create(**log)
 					pdf.students.add(student)
+					subject.students.add(student)
 				groups = data["groups"]
-				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
 				for group_data in groups:
 					g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
@@ -56,7 +56,6 @@ class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView):
         context['pdf_file'] = pdf_file
         context['subject'] = pdf_file.topic.subject
-
         self.log_context['category_id'] = pdf_file.topic.subject.category.id
         self.log_context['category_name'] = pdf_file.topic.subject.category.name
         self.log_context['category_slug'] = pdf_file.topic.subject.category.slug
@@ -81,6 +80,7 @@ class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView):
         if not path.exists(pdf_file.file.path):
             raise Http404()
+        
         if pdf_file.show_window:
             response = HttpResponse(open(pdf_file.file.path, 'rb').read(),content_type = 'application/pdf')
             return response
@@ -101,7 +101,10 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
+    log_component = 'resources'
     log_resource = 'pdffile'
+    log_action = 'create'
+    log_context = {}
     def dispatch(self, request, *args, **kwargs):
         slug = self.kwargs.get('slug', '')
@@ -770,20 +770,22 @@ def realize_backup(request, subject):
     for filelink in filelinks:
-        if os.path.exists(filelink.file_content.path):
-            fdir, fname = os.path.split(filelink.file_content.path)
-            zip_path = os.path.join(resource_files_subdir, fname)
+        if bool(filelink.file_content):
+            if os.path.exists(filelink.file_content.path):
+                fdir, fname = os.path.split(filelink.file_content.path)
+                zip_path = os.path.join(resource_files_subdir, fname)
-            # Add file, at correct path
-            zf.write(filelink.file_content.path, zip_path)
+                # Add file, at correct path
+                zf.write(filelink.file_content.path, zip_path)
     for pdffile in pdffiles:
-        if os.path.exists(pdffile.file.path):
-            fdir, fname = os.path.split(pdffile.file.path)
-            zip_path = os.path.join(resource_files_subdir, fname)
+        if bool(pdffile.file):
+            if os.path.exists(pdffile.file.path):
+                fdir, fname = os.path.split(pdffile.file.path)
+                zip_path = os.path.join(resource_files_subdir, fname)
-            # Add file, at correct path
-            zf.write(pdffile.file.path, zip_path)
+                # Add file, at correct path
+                zf.write(pdffile.file.path, zip_path)
     file = open("backup.json", "w")
@@ -793,11 +795,12 @@ def realize_backup(request, subject):
         participants = User.objects.filter(subject_student__slug = subject)
         for user in participants:
-            if os.path.exists(user.image.path):
-                fdir, fname = os.path.split(user.image.path)
-                zip_path = os.path.join('users', fname)
+            if bool(user.image):
+                if os.path.exists(user.image.path):
+                    fdir, fname = os.path.split(user.image.path)
+                    zip_path = os.path.join('users', fname)
-                zf.write(user.image.path, zip_path)
+                    zf.write(user.image.path, zip_path)
         serializer_w = CompleteWebpageSerializer(webpages, many = True)
         serializer_y = CompleteYTVideoSerializer(ytvideos, many = True)
@@ -813,13 +816,23 @@ def realize_backup(request, subject):
         serializer_p = SimplePDFFileSerializer(pdffiles, many = True)
         serializer_g = SimpleGoalSerializer(goals, many = True)
+    if len(serializer_w.data) > 0:
+        data_list.append(serializer_w.data)
-    data_list.append(serializer_w.data)
-    data_list.append(serializer_y.data)
-    data_list.append(serializer_f.data)
-    data_list.append(serializer_l.data)
-    data_list.append(serializer_p.data)
-    data_list.append(serializer_g.data)
+    if len(serializer_y.data) > 0:
+        data_list.append(serializer_y.data)
+
+    if len(serializer_f.data) > 0:
+        data_list.append(serializer_f.data)
+
+    if len(serializer_l.data) > 0:
+        data_list.append(serializer_l.data)
+
+    if len(serializer_p.data) > 0:
+        data_list.append(serializer_p.data)
+
+    if len(serializer_g.data) > 0:
+        data_list.append(serializer_g.data)
     json.dump(data_list, file)
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-06-10 18:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('themes', '0005_auto_20170209_1434'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='themes',
+            name='css_style',
+            field=models.CharField(choices=[('green', 'Green'), ('contrast', 'Contrast'), ('red', 'Red'), ('black', 'Black')], default='green', max_length=50, verbose_name='Css Style'),
+        ),
+    ]
@@ -16,15 +16,16 @@ class TopicSerializer(serializers.ModelSerializer):
 			if topic.exists():
 				data = topic[0].__dict__
 			else:
-				topic = Topic.objects.filter(subject = subject, repository = True)
+				data["id"] = ""
+				data["subject"] = subject
+				data["order"] = Topic.objects.filter(subject = subject).count() + 1
-				if topic.exists():
-					data = topic[0].__dict__
-				else:
-					data["id"] = ""
-					data["subject"] = subject
-					data["order"] = Topic.objects.filter(subject = subject).count() + 1
+				if data["repository"] == True:
+					topic = Topic.objects.filter(subject = subject, repository = True)
+					if topic.exists():
+						data = topic[0].__dict__
+				
 		return data
 	class Meta:
@@ -167,6 +167,7 @@ class CompleteWebpageSerializer(serializers.ModelSerializer):
 					webpage.tags.add(tag)
 				students = data["students"]
+				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
 				for student_data in students:
 					logs = student_data["get_items"]
@@ -186,12 +187,6 @@ class CompleteWebpageSerializer(serializers.ModelSerializer):
 								if not l_exists.exists():
 									Log.objects.create(**log)
 						else:
-							if not student_data["image"] is None:
-								f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1")
-								file = File(f)
-
-								student_data["image"] = file
-
 							student = User()
 							student.email = student_data["email"]
 							student.username = student_data["username"]
@@ -218,11 +213,10 @@ class CompleteWebpageSerializer(serializers.ModelSerializer):
 								Log.objects.create(**log)
 					webpage.students.add(student)
+					subject.students.add(student)
 				groups = data["groups"]
-				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
-
 				for group_data in groups:
 					g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
@@ -169,6 +169,7 @@ class CompleteYTVideoSerializer(serializers.ModelSerializer):
 					ytvideo.tags.add(tag)
 				students = data["students"]
+				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
 				for student_data in students:
 					logs = student_data["get_items"]
@@ -187,12 +188,6 @@ class CompleteYTVideoSerializer(serializers.ModelSerializer):
 								if not l_exists.exists():
 									Log.objects.create(**log)
 						else:
-							if not student_data["image"] is None:
-								f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1")
-								file = File(f)
-
-								student_data["image"] = file
-
 							student = User()
 							student.email = student_data["email"]
 							student.username = student_data["username"]
@@ -219,11 +214,10 @@ class CompleteYTVideoSerializer(serializers.ModelSerializer):
 								Log.objects.create(**log)
 					ytvideo.students.add(student)
+					subject.students.add(student)
 				groups = data["groups"]
-				subject = get_object_or_404(Subject, slug = self.context.get("subject", None))
-
 				for group_data in groups:
 					g_exists = StudentsGroup.objects.filter(subject = subject, slug = group_data["slug"])
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10.4 on 2017-06-10 18:12
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('news', '0002_auto_20170413_2034'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AlterField(
	16	+ model_name='news',
	17	+ name='content',
	18	+ field=models.TextField(blank=True, verbose_name='News Content'),
	19	+ ),
	20	+ ]