Cambio repostajes por macrociclos

src/templates/macrociclos/detalle_deportista.html

@@ -2,7 +2,7 @@
 
 {% block menuapp %}
 
-{% include 'repostajes/_menu-repostajes.html' %}
+{% include 'macrociclos/_menu-macrociclos.html' %}
 
 {% endblock menuapp %}
 
@@ -15,7 +15,7 @@
                     <h4 class="notification-title mb-1">{{ repostaje.fecha }}</h4>
                     
                     <ul class="notification-meta list-inline mb-0">
-                        <li class="list-inline-item"><a href="{% url 'repostajes:detalle_vehiculo' repostaje.vehiculo_id %}">{{ repostaje.vehiculo.matricula }}</a></li>
+                        <li class="list-inline-item"><a href="{% url 'macrociclos:detalle_vehiculo' repostaje.vehiculo_id %}">{{ repostaje.vehiculo.matricula }}</a></li>
                         <li class="list-inline-item">|</li>
                         <li class="list-inline-item">{{ repostaje.kms }} kms</li>
                         <li class="list-inline-item">|</li>

src/templates/macrociclos/detalle_entrenador.html

@@ -2,7 +2,7 @@
 
 {% block menuapp %}
 
-{% include 'repostajes/_menu-repostajes.html' %}
+{% include 'macrociclos/_menu-macrociclos.html' %}
 
 {% endblock menuapp %}
 
@@ -29,7 +29,7 @@
         </div>
         <div class="app-card-body p-4">
 
-            {% if repostajes %}
+            {% if macrociclos %}
                 <table class="table app-table-hover mb-0 text-left">
                     <thead>
                         <tr>
@@ -44,33 +44,33 @@
                         </tr>
                     </thead>
                     <tbody>
-                        {% for repostaje in repostajes %}
+                        {% for macrociclo in macrociclos %}
                         <tr>
-                            <td class="cell"><a href="{% url 'repostajes:detalle_repostaje' repostaje.id %}">{{ repostaje.fecha }}</a></td>
-                            <td class="cell">{{ repostaje.kms }}</td>
-                            <td class="cell">{{ repostaje.litros }}</td>
-                            <td class="cell">{{ repostaje.importe }}</td>
-                            <td class="cell">{{ repostaje.descuento }}</td>
-                            <td class="cell">{{ repostaje.precioxlitro }}</td>
-                            <td class="cell">{{ repostaje.kmsrecorridos }}</td>
-                            <td class="cell">{{ repostaje.consumo }}</td>
+                            <td class="cell"><a href="{% url 'macrociclos:detalle_macrociclo' macrociclo.id %}">{{ macrociclo.fecha }}</a></td>
+                            <td class="cell">{{ macrociclo.kms }}</td>
+                            <td class="cell">{{ macrociclo.litros }}</td>
+                            <td class="cell">{{ macrociclo.importe }}</td>
+                            <td class="cell">{{ macrociclo.descuento }}</td>
+                            <td class="cell">{{ macrociclo.precioxlitro }}</td>
+                            <td class="cell">{{ macrociclo.kmsrecorridos }}</td>
+                            <td class="cell">{{ macrociclo.consumo }}</td>
                         </tr>
                         {% endfor %}	
                     </tbody>
                 </table>
             {% else %}
-                <p>No se han encontrado repostajes para este vehiculo</p>
+                <p>No se han encontrado macrociclos para este vehiculo</p>
             {% endif %}
         </div>
     </div>
 
     <div class="row g-3 mb-4 align-items-center justify-content-between">
         <div class="col-auto">
-            <a class="btn app-btn-secondary" href="{% url 'repostajes:lista_repostajes' %}">Volver al inicio</a>
+            <a class="btn app-btn-secondary" href="{% url 'macrociclos:lista_macrociclos' %}">Volver al inicio</a>
         </div>
 
         <div class="col-auto">
-            <a class="btn app-btn-primary" href="{% url 'repostajes:nuevo_repostaje' %}">Añadir repostaje</a> <!-- Faltaría poner el id del vehiculo-->
+            <a class="btn app-btn-primary" href="{% url 'macrociclos:nuevo_macrociclo' %}">Añadir macrociclo</a> <!-- Faltaría poner el id del vehiculo-->
         </div>
     </div>
 </div>

src/templates/macrociclos/form_deportista.html

@@ -2,13 +2,13 @@
 
 {% block menuapp %}
 
-{% include 'repostajes/_menu-repostajes.html' %}
+{% include 'macrociclos/_menu-macrociclos.html' %}
 
 {% endblock menuapp %}
 
 {% block content %}
 <div class="column is-4 is-offset-4">
-    <h3>{% if form.instance.pk %}Editar repostaje{% else %}Nuevo repostaje{% endif %}</h3>
+    <h3>{% if form.instance.pk %}Editar macrociclo{% else %}Nuevo macrociclo{% endif %}</h3>
     <div class="box">
         <form method="POST"  enctype="multipart/form-data"> 
             {% csrf_token %}

src/templates/macrociclos/form_entrenador.html

@@ -2,7 +2,7 @@
 
 {% block menuapp %}
 
-{% include 'repostajes/_menu-repostajes.html' %}
+{% include 'macrociclos/_menu-macrociclos.html' %}
 
 {% endblock menuapp %}
 

src/templates/macrociclos/index.html

@@ -2,7 +2,7 @@
 
 {% block menuapp %}
 
-{% include 'repostajes/_menu-repostajes.html' %}
+{% include 'macrociclos/_menu-macrociclos.html' %}
 
 {% endblock menuapp %}
 

src/templates/macrociclos/lista_deportistas.html

@@ -2,7 +2,7 @@
 
 {% block menuapp %}
 
-{% include 'repostajes/_menu-repostajes.html' %}
+{% include 'macrociclos/_menu-macrociclos.html' %}
 
 {% endblock menuapp %}
 
@@ -10,14 +10,14 @@
 		    <div class="container-xl">
 			    <div class="row g-3 mb-4 align-items-center justify-content-between">
 				    <div class="col-auto">
-			            <h1 class="app-page-title mb-0">Repostajes</h1>
+			            <h1 class="app-page-title mb-0">Macrociclos</h1>
 				    </div>
 			    </div><!--//row-->				
 				<div class="col-auto">
 					<div class="page-utilities">
 					    <div class="row g-4 justify-content-start justify-content-md-end align-items-center">
 						    <div class="col-auto">
-							   <a class="btn app-btn-primary" href="{% url 'repostajes:nuevo_repostaje' %}">Añadir repostaje</a>
+							   <a class="btn app-btn-primary" href="{% url 'macrociclos:nuevo_macrociclo' %}">Añadir macrociclo</a>
 						    </div>
 					    </div><!--//row-->
 				    </div><!--//table-utilities-->
@@ -40,19 +40,19 @@
 												<th class="cell">Consumo/100 kms</th>
 											</tr>
 										</thead>
-										{% for repostaje in repostajes %}
+										{% for macrociclo in macrociclos %}
 
 										<tbody>
 											<tr>
-												<td class="cell"><a href="{% url 'repostajes:detalle_repostaje' repostaje.id %}">{{ repostaje.fecha }}</a></td>
-												<td class="cell"><a href="{% url 'repostajes:detalle_vehiculo' repostaje.vehiculo.id %}">{{ repostaje.vehiculo.matricula }}</a></td>
-												<td class="cell">{{ repostaje.kms }}</td>
-												<td class="cell">{{ repostaje.litros }}</td>
-												<td class="cell">{{ repostaje.importe }} €</td>
-												<td class="cell">{{ repostaje.descuento }} €</td>
-												<td class="cell">{{ repostaje.precioxlitro }} €</td>
-												<td class="cell">{{ repostaje.kmsrecorridos }}</td>
-												<td class="cell">{{ repostaje.consumo }}</td>
+												<td class="cell"><a href="{% url 'macrociclos:detalle_macrociclo' macrociclo.id %}">{{ macrociclo.fecha }}</a></td>
+												<td class="cell"><a href="{% url 'macrociclos:detalle_vehiculo' macrociclo.vehiculo.id %}">{{ macrociclo.vehiculo.matricula }}</a></td>
+												<td class="cell">{{ macrociclo.kms }}</td>
+												<td class="cell">{{ macrociclo.litros }}</td>
+												<td class="cell">{{ macrociclo.importe }} €</td>
+												<td class="cell">{{ macrociclo.descuento }} €</td>
+												<td class="cell">{{ macrociclo.precioxlitro }} €</td>
+												<td class="cell">{{ macrociclo.kmsrecorridos }}</td>
+												<td class="cell">{{ macrociclo.consumo }}</td>
 											</tr>
 										</tbody>
 										{% endfor %}		

src/templates/macrociclos/lista_entrenadores.html

@@ -2,7 +2,7 @@
 
 {% block menuapp %}
 
-{% include 'repostajes/_menu-repostajes.html' %}
+{% include 'macrociclos/_menu-macrociclos.html' %}
 
 {% endblock menuapp %}
 
@@ -18,7 +18,7 @@
 					<div class="page-utilities">
 					    <div class="row g-4 justify-content-start justify-content-md-end align-items-center">
 						    <div class="col-auto">
-							   <a class="btn app-btn-primary" href="{% url 'repostajes:nuevo_vehiculo' %}">Añadir vehiculo</a>
+							   <a class="btn app-btn-primary" href="{% url 'macrociclos:nuevo_vehiculo' %}">Añadir vehiculo</a>
 						    </div>
 					    </div><!--//row-->
 				    </div><!--//table-utilities-->
@@ -35,7 +35,7 @@
 						        {% else %}
 									Sin imágen
 								{% endif %}
-							    <h4 class="app-doc-title truncate mb-0"><a href="{% url 'repostajes:detalle_vehiculo' vehiculo.id %}">{{ vehiculo.matricula}}</a></h4>
+							    <h4 class="app-doc-title truncate mb-0"><a href="{% url 'macrociclos:detalle_vehiculo' vehiculo.id %}">{{ vehiculo.matricula}}</a></h4>
 							    
 							    <div class="app-card-actions">
 								    <div class="dropdown">
@@ -45,14 +45,14 @@
 			</svg>
 									    </div><!--//dropdown-toggle-->
 									    <ul class="dropdown-menu">
-										    <li><a class="dropdown-item" href="{% url 'repostajes:detalle_vehiculo' vehiculo.id %}"><svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-eye me-2" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+										    <li><a class="dropdown-item" href="{% url 'macrociclos:detalle_vehiculo' vehiculo.id %}"><svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-eye me-2" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 	  <path fill-rule="evenodd" d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8zM1.173 8a13.134 13.134 0 0 0 1.66 2.043C4.12 11.332 5.88 12.5 8 12.5c2.12 0 3.879-1.168 5.168-2.457A13.134 13.134 0 0 0 14.828 8a13.133 13.133 0 0 0-1.66-2.043C11.879 4.668 10.119 3.5 8 3.5c-2.12 0-3.879 1.168-5.168 2.457A13.133 13.133 0 0 0 1.172 8z"/>
 	  <path fill-rule="evenodd" d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5zM4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0z"/>
 	</svg>Ver</a></li>
-											<li><a class="dropdown-item" href="{% url 'repostajes:editar_vehiculo' vehiculo.id %}"><svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil me-2" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+											<li><a class="dropdown-item" href="{% url 'macrociclos:editar_vehiculo' vehiculo.id %}"><svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-pencil me-2" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 	  <path fill-rule="evenodd" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>
 	</svg>Editar</a></li>
-											<li><a class="dropdown-item" href="{% url 'repostajes:eliminar_vehiculo' vehiculo.id %}"><svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-download me-2" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+											<li><a class="dropdown-item" href="{% url 'macrociclos:eliminar_vehiculo' vehiculo.id %}"><svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-download me-2" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
 	  <path fill-rule="evenodd" d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
 	  <path fill-rule="evenodd" d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
 	</svg>Eliminar</a></li>