From 4472e45afd522004208c5b69cc6b3818d34f0607 Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Tue, 30 Jul 2024 08:17:29 +0200 Subject: [PATCH] Con los cambios hechos fuera de casa --- .../servicios/instance/uploads/born.jpeg | Bin 0 -> 6887 bytes .../servicios/instance/uploads/therising.jpeg | Bin 0 -> 7510 bytes RepostajesPy/servicios/repostajes/models.py | 5 +- RepostajesPy/servicios/repostajes/paginas.py | 21 ++- .../servicios/repostajes/templates/index.html | 154 ++++++++++++++++-- .../repostajes/templates/repostajes.html | 22 +-- .../repostajes/templates/vehiculo.html | 10 +- 7 files changed, 172 insertions(+), 40 deletions(-) create mode 100644 RepostajesPy/servicios/instance/uploads/born.jpeg create mode 100644 RepostajesPy/servicios/instance/uploads/therising.jpeg diff --git a/RepostajesPy/servicios/instance/uploads/born.jpeg b/RepostajesPy/servicios/instance/uploads/born.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..9074f89ab2ee69140745f23e70be99e9b17b9ecf GIT binary patch literal 6887 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 literal 0 HcmV?d00001 diff --git a/RepostajesPy/servicios/instance/uploads/therising.jpeg b/RepostajesPy/servicios/instance/uploads/therising.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..22be7d46a6b47d379422c2543fc4f1c63e7691af GIT binary patch literal 7510 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 literal 0 HcmV?d00001 diff --git a/RepostajesPy/servicios/repostajes/models.py b/RepostajesPy/servicios/repostajes/models.py index 3d76497..6191e63 100644 --- a/RepostajesPy/servicios/repostajes/models.py +++ b/RepostajesPy/servicios/repostajes/models.py @@ -17,6 +17,9 @@ class Vehiculos(db.Model): repostajes = db.relationship('Repostajes', backref='vehiculos', lazy=True) foto = db.Column(db.String(100), nullable=True) + def __repr__(self): + return f'' + class Repostajes(db.Model): id = db.Column(db.Integer, primary_key=True) fecha = db.Column(db.Date, nullable=False) @@ -29,4 +32,4 @@ class Repostajes(db.Model): def __repr__(self): - return f'' + return f'' diff --git a/RepostajesPy/servicios/repostajes/paginas.py b/RepostajesPy/servicios/repostajes/paginas.py index 802030f..7d2a6b6 100644 --- a/RepostajesPy/servicios/repostajes/paginas.py +++ b/RepostajesPy/servicios/repostajes/paginas.py @@ -11,8 +11,11 @@ bp = Blueprint("paginas", __name__) @bp.route('/') def index(): + vehiculos = Vehiculos.query.all() + repostajes = Repostajes.query.all() - return render_template('index.html') + + return render_template('index.html', vehiculos=vehiculos, repostajes=repostajes) @bp.route('/repostajes') def repostajes(): @@ -56,22 +59,24 @@ def add_repostaje(): kms = request.form['kms'] litros = request.form['litros'] importe = request.form['importe'] - dtoing = request.form['dtoing'] - precioxlitro = int(importe) / int(litros) + dtoing = request.form.get('dtoing') - descuento = 0 + if dtoing: + descuento = int(importe) * 0.03 # Aplico el descuento de ING + else : + descuento = 0 # no se marcó la casilla de descuento ING - print("add_repostaje: dtoing ",dtoing) + totalcondto = int(importe) - descuento + precioxlitro = totalcondto / int(litros) - new_repostaje = Repostajes(fecha=fecha, vehiculo_id=vehiculo_id, kms=kms, litros=litros, importe=importe, descuento=descuento, precioxlitro=precioxlitro) + new_repostaje = Repostajes(fecha=fecha, vehiculo_id=vehiculo_id, kms=kms, litros=litros, importe=totalcondto, descuento=descuento, precioxlitro=precioxlitro) db.session.add(new_repostaje) db.session.commit() return redirect(url_for('paginas.vehiculo', vehiculo_id=vehiculo_id)) vehiculos = Vehiculos.query.all() - for coche in vehiculos: - print("add_repostaje: ", coche.matricula) + return render_template('add_repostaje.html', vehiculos=vehiculos) diff --git a/RepostajesPy/servicios/repostajes/templates/index.html b/RepostajesPy/servicios/repostajes/templates/index.html index 4ffca92..b968ab9 100644 --- a/RepostajesPy/servicios/repostajes/templates/index.html +++ b/RepostajesPy/servicios/repostajes/templates/index.html @@ -4,23 +4,147 @@
-

Introducción

+

Resumen

+ + - +
+
+
+
+
+ + + + + + + + + + + + + + + {% for repostaje in repostajes %} + + + + + + + + + + + {% endfor %} + +
#FechaVehículoKilómetrosLitrosDescuentoPrecio/litroImporte
{{ repostaje.id }}{{ repostaje.fecha }}{{ repostaje.vehiculos.matricula }}{{ "%.0f"|format(repostaje.kms) }}{{ "%.2f €"|format(repostaje.litros) }}{{ "%.2f €"|format(repostaje.descuento) }}{{ "%.2f €"|format(repostaje.precioxlitro) }}{{ "%.2f €"|format(repostaje.importe) }}
+
+ +
+
+
+ + {% for micoche in vehiculos %} + +
+
+
+
+ + + + + + + + + + + + + + + + + + + {% for repostaje in repostajes %} + + + + + + + + + + + + + + + + + + + {% endfor %} + + +
Matrícula#FechaVehículoKilómetrosLitrosDescuentoPrecio/litroImporteRecorridosConsumo/100kms
{{ micoche.matricula }} {{ repostaje.id }}{{ repostaje.fecha }}{{ repostaje.vehiculo }}{{ repostaje.kms }}{{ repostaje.litros }}{{ repostaje.descuento }}{{ repostaje.precioxlitro }}{{ repostaje.importe }}{{ repostaje.kmsrecorridos }} 0
+
+
+
+
+ {% endfor %} + + +
+
+
+
+ + + + + + + + + + + {% for row in vehiculos %} + + + + + + + {% endfor %} + + +
#MarcaModeloMatricula
{{ row.id }}{{ row.marca }}{{ row.modelo }}{{ row.matricula }}
+
+
+
+
+
+ + +
{% endblock %} diff --git a/RepostajesPy/servicios/repostajes/templates/repostajes.html b/RepostajesPy/servicios/repostajes/templates/repostajes.html index 87a1d88..a590acd 100644 --- a/RepostajesPy/servicios/repostajes/templates/repostajes.html +++ b/RepostajesPy/servicios/repostajes/templates/repostajes.html @@ -26,11 +26,11 @@ # Fecha Vehículo - Kilómetros - Litros - Descuento - Precio por litro - Importe + Kilómetros + Litros + Descuento + Precio por litro + Importe @@ -38,12 +38,12 @@ {{ repostaje.id }} {{ repostaje.fecha }} - {{ repostaje.vehiculo }} - {{ repostaje.kms }} - {{ repostaje.litros }} - {{ repostaje.descuento }} - {{ repostaje.precioxlitro }} - {{ repostaje.importe }} + {{ repostaje.vehiculos.matricula }} + {{ "%.0f"|format(repostaje.kms) }} + {{ "%.2f €"|format(repostaje.litros) }} + {{ "%.2f €"|format(repostaje.descuento) }} + {{ "%.2f €"|format(repostaje.precioxlitro) }} + {{ "%.2f €"|format(repostaje.importe) }} {% endfor %} diff --git a/RepostajesPy/servicios/repostajes/templates/vehiculo.html b/RepostajesPy/servicios/repostajes/templates/vehiculo.html index bcb17a8..687ffd6 100644 --- a/RepostajesPy/servicios/repostajes/templates/vehiculo.html +++ b/RepostajesPy/servicios/repostajes/templates/vehiculo.html @@ -45,11 +45,11 @@ {{ repostaje.id }} {{ repostaje.fecha }} {{ repostaje.vehiculo }} - {{ repostaje.kms }} - {{ repostaje.litros }} - {{ repostaje.descuento }} - {{ repostaje.precioxlitro }} - {{ repostaje.importe }} + {{ repostaje.kms }} + {{ repostaje.litros }} + {{ "%.2f €"|format(repostaje.descuento) }} + {{ "%.2f €"|format(repostaje.precioxlitro) }} + {{ "%.2f €"|format(repostaje.importe) }} {% endfor %}