Merge pull request #15 from rafael1717y/Rafael_12052022

rascunho formulário simulacao
rafael1717y · May 12, 2022 · c731782 · c731782
2 parents b641944 + da86c79
commit c731782
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 18 deletions.
diff --git a/app/__init__.py b/app/__init__.py
@@ -24,8 +24,9 @@
 login.login_view = "login"
 
 
-# Logs
-# ----
+# Boilerplate de Logs
+# -------------------
+# TODO: transformação em uma função
 if not app.debug:
     if not os.path.exists("logs"):
         os.mkdir("logs")
@@ -34,13 +35,14 @@
     )
     file_handler.setFormatter(
         logging.Formatter(
-            "%(asctime)s %(levelname)s: %(message)s [in %(pathname)s:%(lineno)d]"
+            '%(asctime)s  %(name)s  %(levelname)s'
+            'l:%(lineno)d f:%(filename)s: %(message)s'
         )
     )
     file_handler.setLevel(logging.INFO)
     app.logger.addHandler(file_handler)
     app.logger.setLevel(logging.INFO)
-    app.logger.info("Econovolt startup")
+    app.logger.info("A aplicação Econovolt iniciou...")
 
 
 # Depois da instância da aplicação criada:

diff --git a/app/forms.py b/app/forms.py
@@ -1,5 +1,5 @@
 from flask_wtf import FlaskForm
-from wtforms import StringField, PasswordField, BooleanField, SubmitField
+from wtforms import StringField, PasswordField, BooleanField, SubmitField, TextAreaField, IntegerField, RadioField, SelectField, SelectMultipleField
 from wtforms.validators import ValidationError, DataRequired, Email, EqualTo
 from app.models import User
 
@@ -47,3 +47,21 @@ def validate_email(self, email):
         user = User.query.filter_by(email=email.data).first()
         if user is not None:
             raise ValidationError("Por favor, use um email diferente.")
+
+
+class NewSimulationForm(FlaskForm):
+        # as categorias deverão vir do db?? Colocar apenas itens maior consumo??
+        # Para um item -- ou um for com o num itens??
+        item_1 = SelectField("Itens", choices=["Geladeira", "Umidificador", "Chuveiro"], option_widget=None, validate_choice=True)
+        quantidade_1 = SelectField("Quantidade", choices=["1", "2", "3", "4", "5"], option_widget=None, validate_choice=True)
+        tempo_de_uso_1 = IntegerField("Tempo de uso em minutos")
+        potencia_1= IntegerField("Potência")
+
+        item_2 = SelectField("Itens", choices=["Geladeira", "Umidificador", "Chuveiro"], option_widget=None, validate_choice=True)
+        quantidade_2 = SelectField("Quantidade", choices=["1", "2", "3", "4", "5"], option_widget=None, validate_choice=True)
+        tempo_de_uso_2 = IntegerField("Tempo de uso em minutos")  # ou horas
+        potencia_2= IntegerField("Potência")
+
+
+
+        submit = SubmitField("Adicionar")
diff --git a/app/routes.py b/app/routes.py
@@ -4,9 +4,9 @@
 from app import app, db
 from app.forms import LoginForm, RegistrationForm
 from app.models import User
-from app.forms import ResetPasswordRequestForm, ResetPasswordForm
+from app.forms import ResetPasswordRequestForm, ResetPasswordForm, NewSimulationForm
 from app.email import send_password_reset_email
-
+import pdb
 
 @app.route("/")  # users
 def index():
@@ -106,3 +106,15 @@ def reset_password(token):
         flash("Sua senha foi alterada.")
         return redirect(url_for("login"))
     return render_template("reset_password.html", form=form)
+
+
+# View para realizar uma simulação
+@app.route("/new_simulation", methods=["GET", "POST"])
+def new_simulation():
+    #pdb.set_trace()
+    form = NewSimulationForm()
+    if request.method == "POST":
+        print(form.item.data,
+              form.quantidade.data)
+        return redirect(url_for("index"))
+    return render_template("new_simulation.html", form=form)
diff --git a/app/static/css/style.css b/app/static/css/style.css
@@ -34,4 +34,6 @@ body {
     left: 0;
     }
 
-
+    textarea {
+      resize: none;
+    }
diff --git a/app/templates/base.html b/app/templates/base.html
@@ -61,16 +61,7 @@
   <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
 
 
-  <footer class="bg-dark text-center text-white">
-    <!-- Grid container -->
-
-    <!-- Copyright -->
-    <div class="text-center p-3" style="background-color: rgba(0, 0, 0, 0.2);">
-      © 2022 Todos os direitos reservados - 
-      <a class="text-white" href="https://mdbootstrap.com/">Grupo PI 63</a>
-    </div>
-    <!-- Copyright -->
-  </footer>
+
 
 
 

diff --git a/app/templates/new_simulation.html b/app/templates/new_simulation.html
@@ -0,0 +1,62 @@
+{% extends 'base.html' %}
+{% block title %} Realizar uma simulação {% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col-lg-7 offset-lg-2 my-5">
+        <h1>Realizar uma nova simulação</h1>
+        <form method="POST" action="{{ url_for('new_simulation') }}">
+            {{ form.hidden_tag() }}
+            <div class="form-group">
+                {{ form.item_1.label }}
+                {{ form.item_1(class="form-control")}}
+            </div>
+            <div class="form-group">
+                {{ form.quantidade_1.label }}
+                {{ form.quantidade_1(class="form-control")}}
+            </div>
+            <div class="form-group">
+                {{ form.tempo_de_uso_1.label }}
+                {{ form.tempo_de_uso_1(class="form-control")}}
+            </div>
+            <div class="form-group">
+                {{ form.potencia_1.label }}
+                {{ form.potencia_1(class="form-control")}}
+            </div>
+
+            <div class="form-group">
+                {{ form.item_2.label }}
+                {{ form.item_2(class="form-control")}}
+            </div>
+            <div class="form-group">
+                {{ form.quantidade_2.label }}
+                {{ form.quantidade_2(class="form-control")}}
+            </div>
+            <div class="form-group">
+                {{ form.tempo_de_uso_2.label }}
+                {{ form.tempo_de_uso_2(class="form-control")}}
+            </div>
+            <div class="form-group">
+                {{ form.potencia_2.label }}
+                {{ form.potencia_2(class="form-control")}}
+            </div>
+
+
+
+
+            <hr>
+            {{ form.submit(class="btn btn-primary form-control") }}            
+        </form>
+    </div>
+
+
+
+
+
+</div>
+
+
+
+
+
+{% endblock %}