Changing multiple user selects to display email as well

Zambom
1 parent fac0372e
Showing 8 changed files with 31 additions and 0 deletions Show diff stats
file_link/forms.py
links/forms.py
pdf_file/forms.py
students_group/forms.py
subjects/forms.py
webconference/forms.py
webpage/forms.py
youtube_video/forms.py
@@ -5,12 +5,15 @@ from django.utils.html import strip_tags
 from resubmit.widgets import ResubmitFileWidget
 from subjects.models import Tag
+from subjects.forms import ParticipantsMultipleChoiceField
 from .models import FileLink
 class FileLinkForm(forms.ModelForm):
 	subject = None
 	MAX_UPLOAD_SIZE = 10*1024*1024
+
+	students = ParticipantsMultipleChoiceField(queryset = None)
 	def __init__(self, *args, **kwargs):
 		super(FileLinkForm, self).__init__(*args, **kwargs)
@@ -3,7 +3,9 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.utils.html import strip_tags
 from django.core.exceptions import ValidationError
+
 from subjects.models import Tag
+from subjects.forms import ParticipantsMultipleChoiceField
 from pendencies.forms import PendenciesForm
 from .models import Link
@@ -11,6 +13,8 @@ from .models import Link
 class LinkForm(forms.ModelForm):
 	subject = None
 	MAX_UPLOAD_SIZE = 10*1024*1024
+
+	students = ParticipantsMultipleChoiceField(queryset = None)
 	def __init__(self, *args, **kwargs):
 		super(LinkForm, self).__init__(*args, **kwargs)
@@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.html import strip_tags
 from subjects.models import Tag
+from subjects.forms import ParticipantsMultipleChoiceField
 from resubmit.widgets import ResubmitFileWidget
 from .models import PDFFile
@@ -11,6 +12,8 @@ class PDFFileForm(forms.ModelForm):
     subject = None
     MAX_UPLOAD_SIZE = 10*1024*1024
+    students = ParticipantsMultipleChoiceField(queryset = None)
+
     def __init__(self, *args, **kwargs):
         super(PDFFileForm, self).__init__(*args, **kwargs)
         self.subject = kwargs.get('initial').get('subject', None)
@@ -3,11 +3,13 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from subjects.models import Subject
+from subjects.forms import ParticipantsMultipleChoiceField
 from .models import StudentsGroup
 class StudentsGroupForm(forms.ModelForm):
 	subject = None
+	participants = ParticipantsMultipleChoiceField(queryset = None)
 	def __init__(self, *args, **kwargs):
 		super(StudentsGroupForm, self).__init__(*args, **kwargs)
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 import datetime
+
+from users.models import User
+
 from .models import Subject, Tag
+
+class ParticipantsMultipleChoiceField(forms.ModelMultipleChoiceField):
+    def label_from_instance(self, obj):
+        label = str(obj) + " - (" + obj.email + ")"
+
+        return label
+
 class CreateSubjectForm(forms.ModelForm):
     category_id = None
+    students = ParticipantsMultipleChoiceField(queryset = User.objects.all())
+    professor = ParticipantsMultipleChoiceField(queryset = User.objects.all())
+
     def __init__(self, *args, **kwargs):
         super(CreateSubjectForm, self).__init__(*args, **kwargs)
@@ -6,6 +6,7 @@ from django.forms.models import inlineformset_factory
 import datetime
 from subjects.models import Tag
+from subjects.forms import ParticipantsMultipleChoiceField
 from .models import Webconference, ConferenceSettings
@@ -15,6 +16,7 @@ from pendencies.models import Pendencies
 class WebconferenceForm(forms.ModelForm):
 	subject = None
 	control_subject = forms.CharField(widget = forms.HiddenInput())
+	students = ParticipantsMultipleChoiceField(queryset = None)
 	def __init__(self, *args, **kwargs):
 		super(WebconferenceForm, self).__init__(*args, **kwargs)
@@ -4,6 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.html import strip_tags
 from subjects.models import Tag
+from subjects.forms import ParticipantsMultipleChoiceField
 from .models import Webpage
@@ -11,6 +12,7 @@ from resubmit.widgets import ResubmitFileWidget
 class WebpageForm(forms.ModelForm):
     subject = None
+    students = ParticipantsMultipleChoiceField(queryset = None)
     def __init__(self, *args, **kwargs):
         super(WebpageForm, self).__init__(*args, **kwargs)
@@ -8,6 +8,7 @@ import requests
 import re
 from subjects.models import Tag
+from subjects.forms import ParticipantsMultipleChoiceField
 from pendencies.forms import PendenciesForm
 from pendencies.models import Pendencies
@@ -18,6 +19,7 @@ from .models import YTVideo
 class YTVideoForm(forms.ModelForm):
 	subject = None
 	control_subject = forms.CharField(widget = forms.HiddenInput())
+	students = ParticipantsMultipleChoiceField(queryset = None)
 	def __init__(self, *args, **kwargs):
 		super(YTVideoForm, self).__init__(*args, **kwargs)
1	from django import forms	1	from django import forms
2	from django.utils.translation import ugettext_lazy as _	2	from django.utils.translation import ugettext_lazy as _
3	import datetime	3	import datetime
		4	+
		5	+from users.models import User
		6	+
4	from .models import Subject, Tag	7	from .models import Subject, Tag
5		8
		9	+
		10	+class ParticipantsMultipleChoiceField(forms.ModelMultipleChoiceField):
		11	+ def label_from_instance(self, obj):
		12	+ label = str(obj) + " - (" + obj.email + ")"
		13	+
		14	+ return label
		15	+
6	class CreateSubjectForm(forms.ModelForm):	16	class CreateSubjectForm(forms.ModelForm):
7	category_id = None	17	category_id = None
8		18
		19	+ students = ParticipantsMultipleChoiceField(queryset = User.objects.all())
		20	+ professor = ParticipantsMultipleChoiceField(queryset = User.objects.all())
		21	+
9	def __init__(self, args, *kwargs):	22	def __init__(self, args, *kwargs):
10	super(CreateSubjectForm, self).__init__(args, *kwargs)	23	super(CreateSubjectForm, self).__init__(args, *kwargs)
11		24