Atualizado cadastro de usuários e funções para vizualização das tafer…

…as dos cronograma por cliente
CesarAugusto88 · Sep 14, 2020 · 61b5a80 · 61b5a80
1 parent 1ba6b3e
commit 61b5a80
Show file tree

Hide file tree

Showing 78 changed files with 670 additions and 603 deletions.
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: gunicorn confidence_chronogram.wsgi --log-file -
+web: gunicorn confidencechronogram.wsgi --log-file -
diff --git a/account/templates/account/cadastrar_cliente.html b/account/templates/account/cadastrar_cliente.html
diff --git a/account/templates/account/cadastrar_funcionario.html b/account/templates/account/cadastrar_funcionario.html
diff --git a/account/urls.py b/account/urls.py
diff --git a/account/views.py b/account/views.py
diff --git a/account/__init__.py → apps/__init__.py b/account/__init__.py → apps/__init__.py
diff --git a/account/migrations/__init__.py → apps/account/__init__.py b/account/migrations/__init__.py → apps/account/__init__.py
diff --git a/account/admin.py → apps/account/admin.py b/account/admin.py → apps/account/admin.py
diff --git a/account/apps.py → apps/account/apps.py b/account/apps.py → apps/account/apps.py
diff --git a/apps/account/forms.py b/apps/account/forms.py
@@ -0,0 +1,19 @@
+from django import forms
+
+from apps.confidencechronograms.models import Cliente, Funcionario
+
+
+class ClienteForm(forms.ModelForm):
+    class Meta:
+        model = Cliente
+        fields = (
+            'nome', 'endereco', 'razao_social', 'tipo_pessoa', 'cpf_cnpj', 'rg_ie',
+            'cep', 'uf', 'email', 'fone1', 'usuario_cli'
+            )
+
+class FuncionarioForm(forms.ModelForm):
+    class Meta:
+        model = Funcionario
+        fields = (
+            'nome', 'endereco', 'cpf', 'rg', 'fone1', 'bloqueado', 'usuario_fun'
+            )
diff --git a/confidence_chronograms/__init__.py → apps/account/migrations/__init__.py b/confidence_chronograms/__init__.py → apps/account/migrations/__init__.py
diff --git a/account/models.py → apps/account/models.py b/account/models.py → apps/account/models.py
diff --git a/apps/account/templates/alterar_senha.html b/apps/account/templates/alterar_senha.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="pt-br">
+<head>
+    <meta charset="UTF-8">
+    <title>Alterar senha</title>
+</head>
+<body>
+<div class="container" style="padding-top: 15px;">
+    <form method="post">
+        {% csrf_token %}
+
+        <div class="form-group">
+            {{form_senha.old_password.errors}}
+            <label>Senha antiga: </label>
+            {{form_senha.old_password}}
+        </div>
+
+        <div class="form-group">
+            {{form_senha.new_password1.errors}}
+            <label>Nova senha: </label>
+            {{form_senha.new_password1}}
+        </div>
+
+        <div class="form-group">
+            {{form_senha.new_password2.errors}}
+            <label>Confirmação de senha: </label>
+            {{form_senha.new_password2}}
+        </div>
+
+        <div class="form-group">
+            <input type="submit" value="Alterar" class="btn btn-primary">
+        </div>
+    </form>
+</div>
+</body>
+</html>
diff --git a/account/templates/account/register_clie.html → apps/account/templates/cadastro_cliente.html b/account/templates/account/register_clie.html → apps/account/templates/cadastro_cliente.html
@@ -1,31 +1,28 @@
 {% extends 'base-funcionario.html' %}
-
 {% block content %}
-<div class="container" style="margin-top: 50px;">
-    <!-- fazer dois templates. cliente e funcionario e direciona botao...-->
-    <h1>|Cadastrar Usuário Cliente|</h1>
+<div class="container" style="padding-top: 15px;">
     <form method="post">
         {% csrf_token %}
-
-        <div>
+        <h1>|Cadastro de Usuário Cliente|</h1>
+        <div class="form-group">
             {{form_usuario.username.errors}}
             <label>Username: </label>
             {{form_usuario.username}}
         </div>
-    
-        <div>
+
+        <div class="form-group">
             {{form_usuario.password1.errors}}
             <label>Senha: </label>
             {{form_usuario.password1}}
         </div>
-    
-        <div>
+
+        <div class="form-group">
             {{form_usuario.password2.errors}}
             <label>Confirmação de senha: </label>
             {{form_usuario.password2}}
         </div>
-    
-        <div>
+
+        <div class="form-group">
             <input type="submit" value="Cadastrar" class="btn btn-primary">
         </div>
     </form>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: gunicorn confidence_chronogram.wsgi --log-file -
		web: gunicorn confidencechronogram.wsgi --log-file -