fixed template tag rules but still have design alignment issues to solve

Felipe Henrique de Almeida Bormann
1 parent b842d2bc
Showing 4 changed files with 45 additions and 23 deletions Show diff stats
amadeus/static/css/base/amadeus.css
categories/forms.py
categories/templates/categories/list.html
categories/views.py
@@ -468,7 +468,7 @@ ul, li {
 }
 /* Icon Topic */
 .divMoreActions {
-  text-align: right; height: 37px; float: right;
+  text-align: right; height: 30px; float: right;
 }
 .divMoreActions > .btn-group {
@@ -476,12 +476,10 @@ ul, li {
 }
 .moreAccordion {
-  height: 37px;
+  height: 30px;
 }
 /*.divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}*/
-.divMoreActions , .moreAccordion{
-  padding-top: 3px;
-}
+
 .moreAccordion button{margin-bottom: 0px; margin-top: 8px;}
 .titleTopic {padding-top: 10px; padding-bottom: 10px;}
 .titleTopic a h4, .titleTopic h4{color: white;}
@@ -7,5 +7,6 @@ class CategoryForm(forms.ModelForm):
         fields = ( 'name', 'description', 'visible', 'coordinators', )
         widgets = {
 			'description': forms.Textarea,
+			'coordinators' : forms.SelectMultiple,
 		}
 \ No newline at end of file
@@ -25,6 +25,12 @@
 {% if user.is_staff %}
   <a href="{% url 'categories:create' %}"><button id="create-category"> {% trans "Create Category" %}</button></a>
+
+{% else %}
+  <ul>
+    <li>{% trans "My subjects" %}</li>
+    <li>{% trans "all subjects" %}</li>
+  </ul>
 {% endif %}
 <!-- Code for listing categories -->
@@ -39,8 +45,11 @@
               <a  class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
             </h4>
-            {% if user.is_staff %}
-               <div class="col-xs-6 col-md-6 divMoreActions" >
+         
+           
+
+            {% if user.is_staff or user in category.coordinators.all %}
+               <div class="col-xs-1 col-md-1 divMoreActions" >
                 <div class="btn-group">
                   <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
@@ -52,16 +61,20 @@
                   </ul>
                 </div>
             </div>
-              
-            {% else %}
-               <a href=""><i class="fa fa-list" aria-hidden="true"></i></a>
+            {% endif %}
+
+             {% if not user.is_staff  %}
+            <div class="col-md-5 pull-right">
+            
+              <a href=""><i class="fa fa-list" aria-hidden="true"></i></a>
               <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
               <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
-
               <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
+
+            
+            </div>
             {% endif %}
-             
           </div>
@@ -4,6 +4,7 @@ from .models import Category
 from django.core.urlresolvers import reverse_lazy
 from rolepermissions.verifications import has_role
+from django.contrib import messages
 from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _
@@ -49,15 +50,13 @@ class IndexView(LoginRequiredMixin, ListView):
         context = super(IndexView, self).get_context_data(**kwargs)
         list_categories = None
         categories = self.get_queryset().order_by('name')
-        if has_role(self.request.user,'system_admin'):
-            categories = self.get_queryset().order_by('name')
+        
+        for category in categories:
+            print(category.coordinators)
+            #if self.request.user in category.coordinators:
+            #    print("here")
-        elif has_role(self.request.user,'professor'):
-        	pass
-            #list_categories = self.get_queryset().filter(professors__in = [self.request.user]).order_by('name')
-            # categorys_categories = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
-        elif has_role(self.request.user, 'student'):
-            pass
+        
         context['title'] = _('Categories')
@@ -100,11 +99,20 @@ class CreateCategory(HasRoleMixin, CreateView):
     def form_valid(self, form):
         self.object = form.save()
+        
+
+
         #TODO: Implement log calls
         return super(CreateCategory, self).form_valid(form)
+    def get_success_url(self):
+        print(self.object.coordinators)
+        objeto = self.object.name
+        messages.success(self.request, _('Category "%s" register successfully!')%(objeto))
+        return reverse_lazy('categories:index')
-class DeleteCategory(HasRoleMixin, DeleteView):
+
+class DeleteCategory(DeleteView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
@@ -115,9 +123,11 @@ class DeleteCategory(HasRoleMixin, DeleteView):
     def delete(self, request, *args, **kwargs):
         category = get_object_or_404(Category, slug = self.kwargs.get('slug'))
         subjects = Subject.objects.filter(category = category)
-        print("aqui 3")
+        
         if len(subjects) > 0:
-            return HttpResponse(_('There are subjects attched to this category'))
+            #objeto = category
+            #messages.success(self.request, _('cannot delete Category "%s" ')%(objeto))
+            return reverse_lazy('categories:index')
         return super(DeleteCategory, self).delete(self, request, *args, **kwargs)
	@@ -7,5 +7,6 @@ class CategoryForm(forms.ModelForm):		@@ -7,5 +7,6 @@ class CategoryForm(forms.ModelForm):
7	fields = ( 'name', 'description', 'visible', 'coordinators', )	7	fields = ( 'name', 'description', 'visible', 'coordinators', )
8	widgets = {	8	widgets = {
9	'description': forms.Textarea,	9	'description': forms.Textarea,
		10	+ 'coordinators' : forms.SelectMultiple,
10	}	11	}
11		12
12	\ No newline at end of file	13	\ No newline at end of file