From b8b6a22c0d7caf99d41557a2615142ff642fc83a Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Mon, 29 Jul 2024 08:39:41 +0200 Subject: [PATCH] Se pueden crear repostajes --- RepostajesPy/servicios/repostajes/paginas.py | 12 +++++++---- .../repostajes/templates/_branding.html | 2 +- .../servicios/repostajes/templates/_head.html | 2 +- .../repostajes/templates/_navegacion.html | 2 +- .../repostajes/templates/add_repostaje.html | 21 ++++++++++--------- .../repostajes/templates/edit_vehiculo.html | 2 +- .../servicios/repostajes/templates/index.html | 4 ++-- .../repostajes/templates/repostajes.html | 2 +- .../servicios/repostajes/templates/song.html | 9 -------- .../repostajes/templates/vehiculo.html | 2 +- .../repostajes/templates/vehiculoscard.html | 4 ++-- 11 files changed, 29 insertions(+), 33 deletions(-) diff --git a/RepostajesPy/servicios/repostajes/paginas.py b/RepostajesPy/servicios/repostajes/paginas.py index 4595986..4426b7f 100644 --- a/RepostajesPy/servicios/repostajes/paginas.py +++ b/RepostajesPy/servicios/repostajes/paginas.py @@ -2,7 +2,7 @@ from flask import Blueprint, render_template, request, redirect, url_for, curren from werkzeug.utils import secure_filename from flask_login import login_user, logout_user, login_required from sqlalchemy import desc - +import datetime import os from .models import db, Repostajes, Vehiculos @@ -51,20 +51,24 @@ def repostaje(repostaje_id): @login_required def add_repostaje(): if request.method == 'POST': - fecha = request.form['fecha'] + fecha = datetime.date.fromisoformat(request.form['fecha']) vehiculo_id = request.form['vehiculo_id'] kms = request.form['kms'] litros = request.form['litros'] importe = request.form['importe'] + descuento = 0 + precioxlitro = int(importe) / int(litros) - - new_repostaje = Repostajes(fecha=fecha, vehiculo_id=vehiculo_id, kms=kms, litros=litros, importe=importe) + new_repostaje = Repostajes(fecha=fecha, vehiculo_id=vehiculo_id, kms=kms, litros=litros, importe=importe, 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) @bp.route('/edit_repostaje/', methods=['GET', 'POST']) diff --git a/RepostajesPy/servicios/repostajes/templates/_branding.html b/RepostajesPy/servicios/repostajes/templates/_branding.html index 42b6210..2256f6f 100644 --- a/RepostajesPy/servicios/repostajes/templates/_branding.html +++ b/RepostajesPy/servicios/repostajes/templates/_branding.html @@ -1,4 +1,4 @@
- +
\ No newline at end of file diff --git a/RepostajesPy/servicios/repostajes/templates/_head.html b/RepostajesPy/servicios/repostajes/templates/_head.html index 9b6cf5a..a2ab5e0 100644 --- a/RepostajesPy/servicios/repostajes/templates/_head.html +++ b/RepostajesPy/servicios/repostajes/templates/_head.html @@ -1,7 +1,7 @@ - Lyrics - Letras de canciones + Repostajes de vehículos particulares diff --git a/RepostajesPy/servicios/repostajes/templates/_navegacion.html b/RepostajesPy/servicios/repostajes/templates/_navegacion.html index a0bf06b..a28126d 100644 --- a/RepostajesPy/servicios/repostajes/templates/_navegacion.html +++ b/RepostajesPy/servicios/repostajes/templates/_navegacion.html @@ -1,7 +1,7 @@