From e874a320b66ba12242da88d1cad270c058fb09b8 Mon Sep 17 00:00:00 2001
From: ailsoncgt <acgt@cin.ufpe.br>
Date: Sun, 30 Oct 2016 19:04:14 -0300
Subject: [PATCH] Fixing commented errors #188

---
 app/templates/home.html                 | 10 ++++++++--
 core/static/css/base/amadeus.css        |  4 ++++
 core/static/js/base/amadeus.js          | 19 +++++++++----------
 users/forms.py                          | 11 +++++++++--
 users/templates/users/edit_profile.html | 17 ++++++++++++-----
 users/templates/users/update.html       | 10 +++++-----
 users/views.py                          | 13 ++++++++++---
 7 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/app/templates/home.html b/app/templates/home.html
index e15b5f4..1dd56d4 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -5,8 +5,14 @@
 {% block javascript %}
     {% if page_obj %}
         <script type="text/javascript">
-            var pageNum = {{ page_obj.number }}; // The latest page loaded
-            var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
+            {% if page_obj and paginator %}
+                var pageNum = {{ page_obj.number }}; // The latest page loaded
+                var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages    
+            {% else %}
+                var pageNum = 0 ; // The latest page loaded
+                var numberPages = 0 ; // Indicates the number of pages
+            {% endif %}
+            
             var baseUrl = '{% url "app:index" %}';
 
             // loadOnScroll handler
diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index 39aecf3..a0107d1 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -2,6 +2,10 @@
   clear: both;
 }
 
+.mg-b-5m{
+  margin-bottom: 5em;
+}
+
 .navbar .logo {position: absolute; top: 6px; text-align: center; height: 48px; width: 48px;}
 
 /* Modal */
diff --git a/core/static/js/base/amadeus.js b/core/static/js/base/amadeus.js
index d28891c..36490c6 100644
--- a/core/static/js/base/amadeus.js
+++ b/core/static/js/base/amadeus.js
@@ -14,6 +14,7 @@ function campoNumerico(campo, evento){
         return true;
     } else {
     	evento.returnValue = false;
+  	    evento.preventDefault();
   	    return false;
     }
 };
@@ -28,7 +29,7 @@ function formatarCpf(campo, evento){
 	}
 	else if( evento ) { // Firefox
         codTecla = evento.which;
-        }
+    }
 	tamanho = campo.value.length;
 	if( (codTecla > 47 && codTecla < 58)  || codTecla== 8 || codTecla == 0){
 		if(tamanho < 14 ){
@@ -41,8 +42,8 @@ function formatarCpf(campo, evento){
 			}
 		}else{
 			evento.returnValue = false;
+			return false;
 		}
-		return true;
 	} else {
 		return false;
 	}
@@ -61,30 +62,28 @@ function formatarTelefone(campo, evento){
 	}
 	tamanho = campo.value.length;
 	
-	if(((codTecla > 47 && codTecla < 58) || (codTecla == 8)) && tamanho < 15){
+	if(((codTecla > 47 && codTecla < 58) && tamanho < 15)){
 	
 		if(tamanho == 0){
 			campo.value = "(" + campo.value;
 		}else if( tamanho == 3 ){
 			campo.value = campo.value + ") ";
-		}else if(tamanho == 9){
+		}else if(tamanho == 10){
 			campo.value = campo.value + "-";
-		}else if(tamanho == 14){
-			// alert('oi');
-			campo.value = campo.value.slice(0, 4) + campo.value.slice(5, 14);
-			campo.value = campo.value.slice(0, 8) + campo.value.slice(9, 10) + campo.value.slice(8, 9) + campo.value.slice(10, 14)
 		}
 		return true;
 
+
 	} else if(codTecla == 0 || codTecla == 8){
 		return true;
 	} else {
 		evento.returnValue = false;
+		evento.preventDefault()
 		return false;
 	}
+	evento.preventDefault()
 	return false;
-}
-
+};
 /*
 This functions get the next 5 notifications from the user given a "step"(an amount) of previous notifications
 */
diff --git a/users/forms.py b/users/forms.py
index a1da1b5..d5e811a 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -63,7 +63,6 @@ class UpdateUserForm(forms.ModelForm):
 	def clean_birth_date(self):
 		birth_date = self.cleaned_data['birth_date']
 		if birth_date >= date.today():
-			print('===============' + date.today() + '================')
 			raise forms.ValidationError(_('Please enter a valid date'))
 		return birth_date
 
@@ -73,10 +72,18 @@ class UpdateUserForm(forms.ModelForm):
 		'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'titration', 
 		'year_titration', 'institution', 'curriculum', 'is_staff', 'is_active']
 		
-class UpdateProfileForm(UpdateUserForm):
+class UpdateProfileFormAdmin(UpdateUserForm):
 
 	class Meta:
 		model = User
 		fields = ['username', 'name', 'email', 'birth_date', 'city', 
 		'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'titration', 
 		'year_titration', 'institution', 'curriculum', 'is_staff', 'is_active']
+
+class UpdateProfileForm(UpdateUserForm):
+
+	class Meta:
+		model = User
+		fields = ['username', 'name', 'email', 'birth_date', 'city', 
+		'state', 'gender', 'cpf', 'phone', 'image', 'titration', 
+		'year_titration', 'institution', 'curriculum']
diff --git a/users/templates/users/edit_profile.html b/users/templates/users/edit_profile.html
index 99fc268..3bfb722 100644
--- a/users/templates/users/edit_profile.html
+++ b/users/templates/users/edit_profile.html
@@ -1,4 +1,4 @@
-{% extends 'list_users.html' %}
+{% extends 'users/profile.html' %}
 
 {% load static i18n permission_tags %}
 {% load widget_tweaks %}
@@ -6,9 +6,13 @@
 {% load django_bootstrap_breadcrumbs %}
 
 {% block breadcrumbs %}
-
-  {{ block.super }}
-    {% breadcrumb 'Update User' 'users:update' %}
+	{% if user|has_role:'system_admin' %}
+		{{ block.super }}
+    	{% breadcrumb 'Update User' 'users:update' %}	
+	{% else %}
+		{{ block.super }}
+		{% breadcrumb 'Update Profile' 'users:update' %}
+	{% endif %}  	
 
 {% endblock %}
 
@@ -25,7 +29,7 @@
 		{% endfor %}
 	{% endif %}
 
-	<div class="card">
+	<div class="card mg-b-5m">
 		<div class="card-content">
 			<div class="card-body">
 				<form method="post" action="" enctype="multipart/form-data">
@@ -53,6 +57,9 @@
 
                 			{% elif field.auto_id == 'id_phone' %}
                 				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
+							
+							{% elif field.auto_id == 'id_year_titration' %}
+								{% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
 
                 			{% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
                 				{% if user|has_role:'system_admin' %}
diff --git a/users/templates/users/update.html b/users/templates/users/update.html
index 0102cb2..8f598a3 100644
--- a/users/templates/users/update.html
+++ b/users/templates/users/update.html
@@ -6,10 +6,10 @@
 {% load django_bootstrap_breadcrumbs %}
 
 {% block breadcrumbs %}
-
-  {{ block.super }}
-    {% breadcrumb 'Update User' 'users:update' %}
-
+	
+	{{ block.super }}
+	{% breadcrumb 'Update User' 'users:update' %}
+    
 {% endblock %}
 
 
@@ -25,7 +25,7 @@
 		{% endfor %}
 	{% endif %}
 
-	<div class="card">
+	<div class="card mg-b-5m">
 		<div class="card-content">
 			<div class="card-body">
 				<form method="post" action="" enctype="multipart/form-data">
diff --git a/users/views.py b/users/views.py
index ec0a66a..c3e48ef 100644
--- a/users/views.py
+++ b/users/views.py
@@ -7,8 +7,9 @@ from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from rolepermissions.shortcuts import assign_role
+from rolepermissions.verifications import has_role
 from .models import User
-from .forms import UserForm, UpdateProfileForm, UpdateUserForm
+from .forms import UserForm, UpdateProfileForm, UpdateUserForm, UpdateProfileFormAdmin
 
 # ================ ADMIN =======================
 class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
@@ -110,8 +111,6 @@ class Remove_account(generic.TemplateView):
 
 
 class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
-
-	allowed_roles = ['student']
 	login_url = reverse_lazy("core:home")
 	template_name = 'users/edit_profile.html'
 	form_class = UpdateProfileForm
@@ -121,6 +120,14 @@ class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
 		user = get_object_or_404(User, username = self.request.user.username)
 		return user
 
+	def get_context_data(self, **kwargs):
+		context = super(UpdateProfile, self).get_context_data(**kwargs)
+		if has_role(self.request.user, 'system_admin'):
+			context['form'] = UpdateProfileFormAdmin(instance = self.object)
+		else:
+			context['form'] = UpdateProfileForm(instance = self.object)
+		return context
+
 	def form_valid(self, form):
 		form.save()
 		messages.success(self.request, _('Profile edited successfully!'))
--
libgit2 0.21.2