diff --git a/RepostajesDj/K8S/Makefile b/RepostajesDj/K8S/Makefile
index c154379..ffb83fc 100644
--- a/RepostajesDj/K8S/Makefile
+++ b/RepostajesDj/K8S/Makefile
@@ -1,6 +1,6 @@
export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
-export IMG_VERSION = 1.43
-export IMG_NGINX_VERSION = 1.17
+export IMG_VERSION = 0.9
+export IMG_NGINX_VERSION = 1.0
# limpia todo
all: imagen nginx clean install
@@ -14,22 +14,22 @@ install:
-kubectl create -f env-prod-configmap.yaml
-kubectl create -f env-prod-db-configmap.yaml
- -kubectl create -f pv-local-libros.yaml
- -kubectl create -f libros-prod-persistentvolumeclaim.yaml
+ -kubectl create -f pv-local-vehiculos.yaml
+ -kubectl create -f vehiculos-prod-persistentvolumeclaim.yaml
-kubectl create -f static-volume-persistentvolumeclaim.yaml
-kubectl create -f postgres-data-persistentvolumeclaim.yaml
-kubectl create -f db-deployment.yaml
-kubectl create -f db-service.yaml
- -envsubst < libros-deployment.yaml |kubectl create -f -
+ -envsubst < vehiculos-deployment.yaml |kubectl create -f -
-envsubst < nginx-deployment.yaml |kubectl create -f -
-kubectl create -f nginx-service.yaml
clean:
-envsubst < nginx-deployment.yaml |kubectl delete -f -
-kubectl delete -f nginx-service.yaml
- -envsubst < libros-deployment.yaml |kubectl delete -f -
+ -envsubst < vehiculos-deployment.yaml |kubectl delete -f -
-kubectl delete -f db-deployment.yaml
-kubectl delete -f db-service.yaml
@@ -39,8 +39,8 @@ clean:
-kubectl delete -f postgres-data-persistentvolumeclaim.yaml
-kubectl delete -f static-volume-persistentvolumeclaim.yaml
- -kubectl delete -f libros-prod-persistentvolumeclaim.yaml
- -kubectl delete -f pv-local-libros.yaml
+ -kubectl delete -f vehiculos-prod-persistentvolumeclaim.yaml
+ -kubectl delete -f pv-local-vehiculos.yaml
-kubectl delete -f reg-secret.yaml
-kubectl delete -f namespace.yaml
diff --git a/RepostajesDj/requirements.txt b/RepostajesDj/requirements.txt
index 4c99c68..9303601 100644
--- a/RepostajesDj/requirements.txt
+++ b/RepostajesDj/requirements.txt
@@ -1,4 +1,12 @@
asgiref==3.8.1
-Django==5.1
+Django==4.2
+flake8==7.1.1
+gunicorn==22.0.0
+mccabe==0.7.0
+packaging==24.1
+pillow==10.4.0
+psycopg2-binary==2.9.6
+pycodestyle==2.12.1
+pyflakes==3.2.0
sqlparse==0.5.1
typing_extensions==4.12.2
diff --git a/RepostajesDj/vehiculos/repostajes/admin.py b/RepostajesDj/vehiculos/repostajes/admin.py
index 6593c20..955f3cd 100644
--- a/RepostajesDj/vehiculos/repostajes/admin.py
+++ b/RepostajesDj/vehiculos/repostajes/admin.py
@@ -4,11 +4,12 @@ from django.contrib.auth.admin import UserAdmin
# Register your models here.
-from .models import Vehiculos, Repostajes, ReyMotaUser
+from .models import Vehiculo, Repostaje, ReyMotaUser
from .forms import ReyMotaUserCreationForm, ReyMotaUserChangeForm
-admin.site.register(Vehiculos)
-admin.site.register(Repostajes)
+admin.site.register(Vehiculo)
+admin.site.register(Repostaje)
+
class ReyMotaUserAdmin(UserAdmin):
add_form = ReyMotaUserCreationForm
diff --git a/RepostajesDj/vehiculos/repostajes/forms.py b/RepostajesDj/vehiculos/repostajes/forms.py
index 8497008..4cdfdb7 100644
--- a/RepostajesDj/vehiculos/repostajes/forms.py
+++ b/RepostajesDj/vehiculos/repostajes/forms.py
@@ -22,7 +22,7 @@ class RepostajeForm(forms.ModelForm):
model = Repostaje
fields = ['fecha', 'kms', 'litros', 'descuento']
- fecha = forms.DateFieldField(
+ fecha = forms.DateField(
widget=forms.TextInput(attrs={'class': 'form-control'}))
kms = forms.DecimalField(
widget=forms.TextInput(attrs={'class': 'form-control'}))
diff --git a/RepostajesDj/vehiculos/repostajes/models.py b/RepostajesDj/vehiculos/repostajes/models.py
index 3665507..a65f628 100644
--- a/RepostajesDj/vehiculos/repostajes/models.py
+++ b/RepostajesDj/vehiculos/repostajes/models.py
@@ -28,13 +28,13 @@ class Vehiculo(models.Model):
class Repostaje(models.Model):
vehiculo = models.ForeignKey(Vehiculo, on_delete=models.CASCADE)
fecha = models.DateField()
- kms = models.DecimalField(blank=True, null=True)
- litros = models.DecimalField(blank=True, null=True)
- descuento = models.DecimalField(blank=True, null=True)
- precioxlitro = models.DecimalField(blank=True, null=True)
- kmsrecorridos = models.DecimalField(blank=True, null=True)
- consumo = models.DecimalField(blank=True, null=True)
-
+ kms = models.DecimalField(max_digits=10, decimal_places=2, blank=True, null=True)
+ litros = models.DecimalField(max_digits=4, decimal_places=2, blank=True, null=True)
+ descuento = models.DecimalField(max_digits=4, decimal_places=2, blank=True, null=True)
+ precioxlitro = models.DecimalField(max_digits=4, decimal_places=2, blank=True, null=True)
+ kmsrecorridos = models.DecimalField(max_digits=5, decimal_places=2, blank=True, null=True)
+ consumo = models.DecimalField(max_digits=4, decimal_places=2, blank=True, null=True)
+
def __str__(self):
return self.fecha
diff --git a/RepostajesDj/vehiculos/repostajes/templates/_cabecera.html b/RepostajesDj/vehiculos/repostajes/templates/_cabecera.html
index 09c071f..47f0803 100644
--- a/RepostajesDj/vehiculos/repostajes/templates/_cabecera.html
+++ b/RepostajesDj/vehiculos/repostajes/templates/_cabecera.html
@@ -103,7 +103,7 @@
- Autores
+ Vehículos
diff --git a/RepostajesDj/vehiculos/repostajes/templates/repostajes/lista_vehiculos.html b/RepostajesDj/vehiculos/repostajes/templates/repostajes/lista_vehiculos.html
index 8ce30a9..29204bd 100644
--- a/RepostajesDj/vehiculos/repostajes/templates/repostajes/lista_vehiculos.html
+++ b/RepostajesDj/vehiculos/repostajes/templates/repostajes/lista_vehiculos.html
@@ -5,7 +5,7 @@
@@ -68,4 +68,4 @@
{% endfor %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/RepostajesDj/vehiculos/repostajes/views.py b/RepostajesDj/vehiculos/repostajes/views.py
index 3411c67..7ab647b 100644
--- a/RepostajesDj/vehiculos/repostajes/views.py
+++ b/RepostajesDj/vehiculos/repostajes/views.py
@@ -6,6 +6,7 @@ from django.contrib.auth.decorators import login_required
from .models import Vehiculo, Repostaje
from .forms import VehiculoForm, RepostajeForm
+
@login_required
def principal(request):
vehiculos = Vehiculo.objects.all()
@@ -13,6 +14,7 @@ def principal(request):
return render(request, 'repostajes/index.html', {'vehiculos': vehiculos, 'repostajes': repostajes})
+
# Vistas para los vehiculos
@login_required
def lista_vehiculos(request):
@@ -24,9 +26,10 @@ def lista_vehiculos(request):
def detalle_vehiculo(request, vehiculo_id):
vehiculo = get_object_or_404(Vehiculo, pk=vehiculo_id)
- libros = Repostaje.objects.filter(vehiculo=vehiculo_id)
+ repostajes = Repostaje.objects.filter(vehiculo=vehiculo_id)
+
+ return render(request, 'repostajes/detalle_vehiculo.html', {'vehiculo': vehiculo, 'repostajes': repostajes})
- return render(request, 'repostajes/detalle_vehiculo.html', {'vehiculo': vehiculo, 'libros': libros})
@login_required
def nuevo_vehiculo(request):
@@ -34,11 +37,12 @@ def nuevo_vehiculo(request):
form = VehiculoForm(request.POST, request.FILES)
if form.is_valid():
form.save()
- return redirect('lista_vehiculoes')
+ return redirect('lista_vehiculos')
else:
form = VehiculoForm()
return render(request, 'repostajes/form_vehiculo.html', {'form': form})
+
@login_required
def editar_vehiculo(request, vehiculo_id):
vehiculo = get_object_or_404(Vehiculo, pk=vehiculo_id)
@@ -46,7 +50,7 @@ def editar_vehiculo(request, vehiculo_id):
form = VehiculoForm(request.POST, request.FILES, instance=vehiculo)
if form.is_valid():
form.save()
- return redirect('lista_vehiculoes')
+ return redirect('lista_vehiculos')
else:
form = VehiculoForm(instance=vehiculo)
return render(request, 'repostajes/form_vehiculo.html', {'form': form})
@@ -56,49 +60,49 @@ def editar_vehiculo(request, vehiculo_id):
def eliminar_vehiculo(request, vehiculo_id):
vehiculo = get_object_or_404(Vehiculo, pk=vehiculo_id)
vehiculo.delete()
- return redirect('lista_vehiculoes')
+ return redirect('lista_vehiculos')
-# Vistas para los libros
+# Vistas para los repostajes
@login_required
-def lista_libros(request):
- libros = Repostaje.objects.all()
- return render(request, 'repostajes/lista_libros.html', {'libros': libros})
+def lista_repostajes(request):
+ repostajes = Repostaje.objects.all()
+ return render(request, 'repostajes/lista_repostajes.html', {'repostajes': repostajes})
@login_required
-def detalle_libro(request, libro_id):
- libro = get_object_or_404(Repostaje, pk=libro_id)
- return render(request, 'repostajes/detalle_libro.html', {'libro': libro})
+def detalle_repostaje(request, repostaje_id):
+ repostaje = get_object_or_404(Repostaje, pk=repostaje_id)
+ return render(request, 'repostajes/detalle_repostaje.html', {'repostaje': repostaje})
@login_required
-def nuevo_libro(request):
+def nuevo_repostaje(request):
if request.method == 'POST':
form = RepostajeForm(request.POST, request.FILES)
if form.is_valid():
form.save()
- return redirect('lista_libros')
+ return redirect('lista_repostajes')
else:
form = RepostajeForm()
- return render(request, 'repostajes/form_libro.html', {'form': form})
+ return render(request, 'repostajes/form_repostaje.html', {'form': form})
@login_required
-def editar_libro(request, libro_id):
- libro = get_object_or_404(Repostaje, pk=libro_id)
+def editar_repostaje(request, repostaje_id):
+ repostaje = get_object_or_404(Repostaje, pk=repostaje_id)
if request.method == 'POST':
- form = RepostajeForm(request.POST, request.FILES, instance=libro)
+ form = RepostajeForm(request.POST, request.FILES, instance=repostaje)
if form.is_valid():
form.save()
- return redirect('lista_libros')
+ return redirect('lista_repostajes')
else:
- form = RepostajeForm(instance=libro)
- return render(request, 'repostajes/form_libro.html', {'form': form})
+ form = RepostajeForm(instance=repostaje)
+ return render(request, 'repostajes/form_repostaje.html', {'form': form})
@login_required
-def eliminar_libro(request, libro_id):
- libro = get_object_or_404(Repostaje, pk=libro_id)
- libro.delete()
- return redirect('lista_libros')
+def eliminar_repostaje(request, repostaje_id):
+ repostaje = get_object_or_404(Repostaje, pk=repostaje_id)
+ repostaje.delete()
+ return redirect('lista_repostajes')
diff --git a/RepostajesDj/vehiculos/vehiculos/urls.py b/RepostajesDj/vehiculos/vehiculos/urls.py
index 84f3ce0..898d2cc 100644
--- a/RepostajesDj/vehiculos/vehiculos/urls.py
+++ b/RepostajesDj/vehiculos/vehiculos/urls.py
@@ -35,4 +35,4 @@ urlpatterns = [
if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL,
- document_root=settings.MEDIA_ROOT)
\ No newline at end of file
+ document_root=settings.MEDIA_ROOT)