Merge branch 'master' into dev

Matheus Lins
2 parents 92de728a 34d6ebe7
Showing 9 changed files with 102 additions and 51 deletions Show diff stats
core/forms.py
core/static/css/base/amadeus.css
core/templates/index.html
core/templates/register_user.html
core/views.py
requirements.txt
users/forms.py
users/templates/list_users.html
users/templates/users/create.html
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from users.models import User
+from pycpfcnpj import cpfcnpj
+import re
+
+
 class RegisterUserForm(forms.ModelForm):
-    password = forms.CharField(label='Senha', widget=forms.PasswordInput)
-    password2 = forms.CharField(label = 'Confirmacao de Senha', widget = forms.PasswordInput)
+    password = forms.CharField(label=_('Password'), widget=forms.PasswordInput)
+    password2 = forms.CharField(label = _('Password confirmation'), widget = forms.PasswordInput)
     # birth_date = forms.DateField(widget=forms.SelectDateWidget())
     MIN_LENGTH = 8
+    def validate_cpf(self, cpf):
+        cpf = ''.join(re.findall('\d', str(cpf)))
+        # print(cpf)
+
+        # if (not cpf) or (len(cpf) < 11):
+        #     return False
+
+        # #Get only the first 9 digits and generate other 2
+        # _int = map(int, cpf)
+        # integer = list(map(int, cpf))
+        # new = integer[:9]
+
+        # while len(new) < 11:
+        #     r = sum([(len(new) + 1 - i)* v for i, v in enumerate(new)]) % 11
+
+        #     if r > 1:
+        #         f = 11 - r
+        #     else:
+        #         f = 0
+        #     new.append(f)
+
+        # #if generated number is the same(original) the cpf is valid
+        # new2 = list(new)
+        # if new2 == _int:
+        #     return cpf
+        # else:
+        #     return False
+        if cpfcnpj.validate(cpf):
+            return True
+        return False
+
     def clean_email(self):
         email = self.cleaned_data['email']
         if User.objects.filter(email = email).exists():
             raise forms.ValidationError(_('There is already a registered User with this e-mail'))
         return email
+    def clean_cpf(self):
+        cpf = self.cleaned_data['cpf']
+        if User.objects.filter(cpf = cpf).exists():
+            raise forms.ValidationError(_('There is already a registeres User with this CPF'))
+        if not self.validate_cpf(cpf):
+            raise forms.ValidationError(_('Please enter a valid CPF'))
+        return cpf
+
     def clean_password(self):
         password = self.cleaned_data.get('password')
@@ -271,6 +271,14 @@ a.alert_message:hover{color : grey}
   display: none;
 }
+/*Logo register user*/
+#logo{
+  max-width: 30%;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+/*====================== ========*/
+
 .accordion {
     background: #c0c0c0;
 }
@@ -21,30 +21,25 @@
         </div>
       </div>
     </div>
-    <div class="row">
-        {% for breadcrumb in breadcrumbs %}
-          <a href="{{ breadcrumb.url }}">{{ breadcrumb.text }}</a>
-        {% endfor %}
-    </div>
   	<div class="row ">
       <div class="col-md-8 col-md-offset-2 col-sm-8 col-sm-offset-2 col-xs-8 col-xs-offset-2 col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2">
-          {% if message %}
-            <div class="alert alert-danger alert-dismissible" role="alert">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                  <span aria-hidden="true">&times;</span>
-                </button>
-              <ul>
-                  <li>{{ message }}</li>
-              </ul>
-            </div>
-          {% endif %}
+        {% if messages %}
+            {% for message in messages %}
+                <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                    <p>{{ message }}</p>
+                </div>
+            {% endfor %}
+        {% endif %}
           <div class="card">
                 <div class="card-block">
                     <form id="form-login" class="form-group" method="post" action="">
-        							{% csrf_token %}
-        							<div class="form-group is-empty">
-        								<label for="inputEmail" class="col-md-4 col-xs-4 col-sm-4 col-lg-4 control-label"> {% trans 'Username' %}</label>
+						{% csrf_token %}
+						<div class="form-group is-empty">
+							<label for="inputEmail" class="col-md-4 col-xs-4 col-sm-4 col-lg-4 control-label"> {% trans 'Username' %}</label>
                         <div class="col-md-8 col-xs-8 col-lg-8 col-sm-8">
                             <input form="form-login" type="text" name="username" class="form-control" id="inputEmail" placeholder="Username" value="{% if username %}{{username}}{% endif %}">
                         </div>
@@ -44,6 +44,8 @@
 						                        </button>
 						                    </span>
 						                </div>
+						            {% elif field.auto_id == 'id_cpf' %}
+		                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
 									{% else %}
 										{% render_field field class='form-control' %}
 										<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
@@ -68,7 +70,7 @@
 								<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />	
 							</div>
 							<div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
-								<a href="{% url 'core:home' %}" class="btn btn-sm btn-success" >{% trans 'Register' %}</a>	
+								<a href="{% url 'core:home' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>	
 							</div>
 						</form>
@@ -79,4 +81,5 @@
 	</div>
 	<br clear="all" />
+	<script src="{% static 'js/base/amadeus.js' %}"></script>
 {% endblock %}
@@ -80,7 +80,7 @@ def login(request):
 			login_user(request, user)
 			return redirect(reverse("app:index"))
 		else:
-			context["message"] = _("E-mail or password are incorrect!")
+			messages.add_message(request, messages.ERROR, _('E-mail or password are incorrect.'))
 			context["username"] = username
 	elif request.user.is_authenticated:
 		return redirect(reverse('app:index'))
 click==6.6
+deps==0.1.0
 Django==1.10
-django-autoslug==1.9.3
 django-bootstrap-breadcrumbs==0.8
 django-discover-runner==1.0
 django-role-permissions==1.2.1
@@ -10,6 +10,8 @@ itsdangerous==0.24
 Jinja2==2.8
 MarkupSafe==0.23
 Pillow==3.3.1
-psycopg2==2.6.2
+pkg-resources==0.0.0
+pycpfcnpj==1.0.2
 six==1.10.0
+slugify==0.0.1
 Werkzeug==0.11.11
@@ -5,6 +5,7 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from rolepermissions.shortcuts import assign_role
 from django.contrib.auth.forms import UserCreationForm
+from core.forms import RegisterUserForm
 from .models import User
@@ -25,26 +26,26 @@ class ProfileForm(forms.ModelForm):
 			'password':forms.PasswordInput
 		}
-class UserForm(UserCreationForm):
-	# def save(self, commit=True):
-	# 	super(UserForm, self).save()
-	#
-	# 	#if not self.instance.image:
-	# 	#	self.instance.image = os.path.join(os.path.dirname(settings.BASE_DIR), 'uploads', 'no_image.jpg')
-	#
-	# 	# self.instance.set_password(self.cleaned_data['password'])
-	# 	# self.instance.save()
-	#
-	# 	if self.instance.is_staff:
-	# 		assign_role(self.instance, 'system_admin')
-	# 	elif self.instance.type_profile == 2:
-	# 		assign_role(self.instance, 'student')
-	# 	elif self.instance.type_profile == 1:
-	# 		assign_role(self.instance, 'professor')
-	#
-	# 	self.instance.save()
-	#
-	# 	return self.instance
+class UserForm(RegisterUserForm):
+	def save(self, commit=True):
+		super(UserForm, self).save()
+	
+		if not self.instance.image:
+			self.instance.image = os.path.join(os.path.dirname(settings.BASE_DIR), 'uploads', 'no_image.jpg')
+	
+		self.instance.set_password(self.cleaned_data['password1'])
+		self.instance.save()
+	
+		if self.instance.is_staff:
+			assign_role(self.instance, 'system_admin')
+		elif self.instance.type_profile == 2:
+			assign_role(self.instance, 'student')
+		elif self.instance.type_profile == 1:
+			assign_role(self.instance, 'professor')
+	
+		self.instance.save()
+	
+		return self.instance
 	class Meta:
 		model = User
@@ -26,7 +26,7 @@
 {% block content %}
     {% if messages %}
         {% for message in messages %}
-            <div class="alert alert-{{ message.tag }} alert-dismissible" role="alert">
+            <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
@@ -14,10 +14,9 @@
 {% block content %}
-	<script src="{% static 'js/base/amadeus.js' %}"></script>
 	{% if messages %}
 		{% for message in messages %}
-			<div class="alert alert-success alert-dismissible" role="alert">
+			<div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
 				<button type="button" class="close" data-dismiss="alert" aria-label="Close">
 					<span aria-hidden="true">&times;</span>
 				</button>
@@ -49,8 +48,8 @@
 				                </div>
 				      		{% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
                 				<div class="checkbox">
-                  					<label>
-                      					<input type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {{field.label}}
+                  					<label for="{{ field.auto_id }}">
+                      					{% render_field field %}<span class="checkbox-material"><span class="check"></span></span> {{field.label}}
                   					</label>
                 				</div>
                 			{% elif field.auto_id == 'id_cpf' %}
@@ -76,7 +75,7 @@
 						</div>
 					{% endfor %}
 					<div class="col-md-offset-2 col-md-2 col-sm-2 col-xs-2">
-						<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
+						<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" onclick="validarCpfSemAlert(id_cpf, CPF, idElementoMensagemErro)'" />
 					</div>
 					<div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
 						<a href="{% url 'users:manage' %}" class="btn btn-sm btn-default" >{% trans 'Cancel' %}</a>
@@ -91,5 +90,5 @@
 {% endblock %}
 {% block javascript %}
-	
+	<script src="{% static 'js/base/amadeus.js' %}"></script>
 {% endblock %}
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	from users.models import User	3	from users.models import User
		4	+from pycpfcnpj import cpfcnpj
		5	+import re
		6	+
		7	+
4		8
5	class RegisterUserForm(forms.ModelForm):	9	class RegisterUserForm(forms.ModelForm):
6		10
7	- password = forms.CharField(label='Senha', widget=forms.PasswordInput)
8	- password2 = forms.CharField(label = 'Confirmacao de Senha', widget = forms.PasswordInput)	11	+ password = forms.CharField(label=_('Password'), widget=forms.PasswordInput)
		12	+ password2 = forms.CharField(label = _('Password confirmation'), widget = forms.PasswordInput)
9	# birth_date = forms.DateField(widget=forms.SelectDateWidget())	13	# birth_date = forms.DateField(widget=forms.SelectDateWidget())
10	MIN_LENGTH = 8	14	MIN_LENGTH = 8
11		15
		16	+ def validate_cpf(self, cpf):
		17	+ cpf = ''.join(re.findall('\d', str(cpf)))
		18	+ # print(cpf)
		19	+
		20	+ # if (not cpf) or (len(cpf) < 11):
		21	+ # return False
		22	+
		23	+ # #Get only the first 9 digits and generate other 2
		24	+ # _int = map(int, cpf)
		25	+ # integer = list(map(int, cpf))
		26	+ # new = integer[:9]
		27	+
		28	+ # while len(new) < 11:
		29	+ # r = sum([(len(new) + 1 - i)* v for i, v in enumerate(new)]) % 11
		30	+
		31	+ # if r > 1:
		32	+ # f = 11 - r
		33	+ # else:
		34	+ # f = 0
		35	+ # new.append(f)
		36	+
		37	+ # #if generated number is the same(original) the cpf is valid
		38	+ # new2 = list(new)
		39	+ # if new2 == _int:
		40	+ # return cpf
		41	+ # else:
		42	+ # return False
		43	+ if cpfcnpj.validate(cpf):
		44	+ return True
		45	+ return False
		46	+
12	def clean_email(self):	47	def clean_email(self):
13	email = self.cleaned_data['email']	48	email = self.cleaned_data['email']
14	if User.objects.filter(email = email).exists():	49	if User.objects.filter(email = email).exists():
15	raise forms.ValidationError(_('There is already a registered User with this e-mail'))	50	raise forms.ValidationError(_('There is already a registered User with this e-mail'))
16	return email	51	return email
17		52
		53	+ def clean_cpf(self):
		54	+ cpf = self.cleaned_data['cpf']
		55	+ if User.objects.filter(cpf = cpf).exists():
		56	+ raise forms.ValidationError(_('There is already a registeres User with this CPF'))
		57	+ if not self.validate_cpf(cpf):
		58	+ raise forms.ValidationError(_('Please enter a valid CPF'))
		59	+ return cpf
		60	+
18	def clean_password(self):	61	def clean_password(self):
19	password = self.cleaned_data.get('password')	62	password = self.cleaned_data.get('password')
20		63
	@@ -271,6 +271,14 @@ a.alert_message:hover{color : grey}		@@ -271,6 +271,14 @@ a.alert_message:hover{color : grey}
271	display: none;	271	display: none;
272	}	272	}
273		273
		274	+/Logo register user/
		275	+#logo{
		276	+ max-width: 30%;
		277	+ margin-top: 1em;
		278	+ margin-bottom: 1em;
		279	+}
		280	+/====================== ========/
		281	+
274	.accordion {	282	.accordion {
275	background: #c0c0c0;	283	background: #c0c0c0;
276	}	284	}
	@@ -80,7 +80,7 @@ def login(request):		@@ -80,7 +80,7 @@ def login(request):
80	login_user(request, user)	80	login_user(request, user)
81	return redirect(reverse("app:index"))	81	return redirect(reverse("app:index"))
82	else:	82	else:
83	- context["message"] = _("E-mail or password are incorrect!")	83	+ messages.add_message(request, messages.ERROR, _('E-mail or password are incorrect.'))
84	context["username"] = username	84	context["username"] = username
85	elif request.user.is_authenticated:	85	elif request.user.is_authenticated:
86	return redirect(reverse('app:index'))	86	return redirect(reverse('app:index'))
	@@ -26,7 +26,7 @@		@@ -26,7 +26,7 @@
26	{% block content %}	26	{% block content %}
27	{% if messages %}	27	{% if messages %}
28	{% for message in messages %}	28	{% for message in messages %}
29	- <div class="alert alert-{{ message.tag }} alert-dismissible" role="alert">	29	+ <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
30	<button type="button" class="close" data-dismiss="alert" aria-label="Close">	30	<button type="button" class="close" data-dismiss="alert" aria-label="Close">
31	<span aria-hidden="true">×</span>	31	<span aria-hidden="true">×</span>
32	</button>	32	</button>