fixed some issues

Felipe Henrique de Almeida Bormann
1 parent bfb98dad
Showing 8 changed files with 53 additions and 10 deletions Show diff stats
amadeus/static/css/base/amadeus.css
categories/forms.py
categories/templates/categories/create.html
categories/templates/categories/list.html
categories/templates/categories/update.html
categories/templatetags/__init__.py
categories/templatetags/switchevenodd.py
categories/views.py
@@ -59,12 +59,12 @@
 }
 #create-category{
-  margin-left: 40%;
+  margin-left: 20%;
   margin-bottom: 1%;
   border: none;
   background-color: #66BB6A;
   color: #FFFFFF;
-  width: 200px;
+  width: 60%;
   height: 40px;
   font-size: 15px;
 }
@@ -9,4 +9,4 @@ class CategoryForm(forms.ModelForm):
 			'description': forms.Textarea,
 			'coordinators' : forms.SelectMultiple,
 		}
-       
 \ No newline at end of file
+		
 \ No newline at end of file
 {% extends 'categories/home.html' %}
-{% load widget_tweaks static i18n permission_tags django_bootstrap_breadcrumbs %}
+{% load widget_tweaks static i18n permission_tags django_bootstrap_breadcrumbs switchevenodd %}
 {% block breadcrumbs %}
   {{ block.super }}
@@ -28,6 +28,24 @@
 					{% elif field.auto_id == 'id_description' %}
 						{% render_field field class='form-control text_wysiwyg' %}
+
+						
+					{% comment %}
+						
+					{% endcomment %}
+					{% elif field.auto_id == 'id_coordinators' %}
+						<select id="{{field.auto_id}}" multiple="multiple" class="form-control"
+						style="position: absolute; left: -9999px;" name="coordinators">
+						
+							{% for value, name in form.fields.coordinators.choices %}
+								
+								<option value="{{value}}">{{name}}</option>
+							
+								
+								
+							{% endfor %}
+						</select>
+					
 					{% else %}
 						{% render_field field class='form-control' %}
 					{% endif %}
@@ -84,11 +84,12 @@
                                 {{coordinator.username}}
                             {% endfor %}
                         </h4>
-                        {{category.description|safe}}
+                        
+                    </div>
+                    {{category.description|safe}}
                          {% if user in category.coordinators.all %}
                         <button class="create-subject-btn"> {% trans "create new subject" %} </button>
                     {% endif %}
-                    </div>
                     {% comment %}
@@ -66,8 +66,8 @@
     });
     $('#id_coordinators').multiSelect({
-		   selectableHeader: "<input type='text' class='search-input' autocomplete='off' placeholder='{% trans "try an username" %} '>",
-		  selectionHeader: "<input type='text' class='search-input' autocomplete='off' placeholder='{% trans "try an username" %} '>",
+		   selectableHeader: "<input type='text' class='search-input category-search-users' autocomplete='off' placeholder='{% trans "try an username" %} '>",
+		  selectionHeader: "<input type='text' class='search-input category-search-users' autocomplete='off' placeholder='{% trans "try an username" %} '>",
 		  afterInit: function(ms){
 		    var that = this,
 		        $selectableSearch = that.$selectableUl.prev(),
@@ -0,0 +1,16 @@
+from django import template
+
+register = template.Library()
+
+class switchevenodd(template.Node):
+	"""docstring for switchevenodd"""
+	def __init__(self, *args):
+		if args:
+			print(args)
+		
+	def render(self, context):
+		
+		context['switch'] = not context['switch']
+		return ''
+
+register.tag('switchevenodd', switchevenodd)
 \ No newline at end of file
@@ -18,6 +18,8 @@ from subjects.models import Subject
 from log.mixins import LogMixin
+from users.models import User
+
 class IndexView(LoginRequiredMixin, ListView):
     login_url = reverse_lazy("users:login")
@@ -72,6 +74,7 @@ class CreateCategory(views.SuperuserRequiredMixin, HasRoleMixin, LogMixin, Creat
     success_url = reverse_lazy('categories:index')
+
     def get_initial(self):
         initial = super(CreateCategory, self).get_initial()
@@ -82,16 +85,21 @@ class CreateCategory(views.SuperuserRequiredMixin, HasRoleMixin, LogMixin, Creat
             initial['description'] = category.description
             initial['name'] = category.name
             initial['visible'] = category.visible
-            #initial['coordinators'] = category.coordinators
+           
             self.log_action = 'replicate'
             self.log_context['replicated_category_id'] = category.id
             self.log_context['replicated_category_name'] = category.name
             self.log_context['replicated_category_slug'] = category.slug
-
         return initial
+    def get_context_data(self, **kwargs):
+        context = super(CreateCategory, self).get_context_data(**kwargs)
+        context['users_count'] = User.objects.all().count()
+        context['switch'] = True
+        return context
+
     def get_form(self, form_class=None):
         """
	@@ -59,12 +59,12 @@		@@ -59,12 +59,12 @@
59	}	59	}
60		60
61	#create-category{	61	#create-category{
62	- margin-left: 40%;	62	+ margin-left: 20%;
63	margin-bottom: 1%;	63	margin-bottom: 1%;
64	border: none;	64	border: none;
65	background-color: #66BB6A;	65	background-color: #66BB6A;
66	color: #FFFFFF;	66	color: #FFFFFF;
67	- width: 200px;	67	+ width: 60%;
68	height: 40px;	68	height: 40px;
69	font-size: 15px;	69	font-size: 15px;
70	}	70	}
1	{% extends 'categories/home.html' %}	1	{% extends 'categories/home.html' %}
2		2
3	-{% load widget_tweaks static i18n permission_tags django_bootstrap_breadcrumbs %}	3	+{% load widget_tweaks static i18n permission_tags django_bootstrap_breadcrumbs switchevenodd %}
4		4
5	{% block breadcrumbs %}	5	{% block breadcrumbs %}
6	{{ block.super }}	6	{{ block.super }}
	@@ -28,6 +28,24 @@		@@ -28,6 +28,24 @@
28		28
29	{% elif field.auto_id == 'id_description' %}	29	{% elif field.auto_id == 'id_description' %}
30	{% render_field field class='form-control text_wysiwyg' %}	30	{% render_field field class='form-control text_wysiwyg' %}
		31	+
		32	+
		33	+ {% comment %}
		34	+
		35	+ {% endcomment %}
		36	+ {% elif field.auto_id == 'id_coordinators' %}
		37	+ <select id="{{field.auto_id}}" multiple="multiple" class="form-control"
		38	+ style="position: absolute; left: -9999px;" name="coordinators">
		39	+
		40	+ {% for value, name in form.fields.coordinators.choices %}
		41	+
		42	+ <option value="{{value}}">{{name}}</option>
		43	+
		44	+
		45	+
		46	+ {% endfor %}
		47	+ </select>
		48	+
31	{% else %}	49	{% else %}
32	{% render_field field class='form-control' %}	50	{% render_field field class='form-control' %}
33	{% endif %}	51	{% endif %}
	@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
		1	+from django import template
		2	+
		3	+register = template.Library()
		4	+
		5	+class switchevenodd(template.Node):
		6	+ """docstring for switchevenodd"""
		7	+ def __init__(self, *args):
		8	+ if args:
		9	+ print(args)
		10	+
		11	+ def render(self, context):
		12	+
		13	+ context['switch'] = not context['switch']
		14	+ return ''
		15	+
		16	+register.tag('switchevenodd', switchevenodd)
0	\ No newline at end of file	17	\ No newline at end of file