From 26b4254ffe2b2f847d3c0e8e578a26f4be398a0d Mon Sep 17 00:00:00 2001
From: Celestino Rey <creylopez@yahoo.es>
Date: Fri, 12 Jul 2024 11:41:40 +0200
Subject: [PATCH] =?UTF-8?q?Se=20a=C3=B1ade=20canci=C3=B3n=20desde=20vista?=
 =?UTF-8?q?=20de=20album=20y=20se=20pasan=20autor,=20nombre=20y=20se=20ave?=
 =?UTF-8?q?rigua=20n=C3=BAmero=20de=20pista=20a=20a=C3=B1adir.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LyricsPy/K8S/Makefile                         |  3 +--
 LyricsPy/servicios/lyrics/paginas.py          | 19 +++++++++++++------
 .../lyrics/templates/add_song2album.html      |  7 +------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/LyricsPy/K8S/Makefile b/LyricsPy/K8S/Makefile
index fc590ea..062582a 100644
--- a/LyricsPy/K8S/Makefile
+++ b/LyricsPy/K8S/Makefile
@@ -1,5 +1,4 @@
-export IMG_VERSION = 6.6
-
+export IMG_VERSION = 6.7
 imagen:
 	cd ../servicios; make
 
diff --git a/LyricsPy/servicios/lyrics/paginas.py b/LyricsPy/servicios/lyrics/paginas.py
index dfe4b5c..3046475 100644
--- a/LyricsPy/servicios/lyrics/paginas.py
+++ b/LyricsPy/servicios/lyrics/paginas.py
@@ -1,6 +1,7 @@
 from flask import Blueprint, render_template, request, redirect, url_for, current_app, send_from_directory
 from werkzeug.utils import secure_filename
 from flask_login import login_user, logout_user, login_required
+from sqlalchemy import desc
 
 import os
 
@@ -66,14 +67,20 @@ def add_song():
 @bp.route('/add_song2album/<int:album_id>', methods=['GET', 'POST'])
 @login_required
 def add_song2album(album_id):
+    album = Album.query.filter_by(id=album_id).first() # obtiene el album cuyo id hemos recibido
+
+    ultimapista = Song.query.filter_by(album_id=album.id).order_by(desc(Song.pista)).first()
+
+    if ultimapista:
+        pista = ultimapista.pista + 1
+        print("Mayor: ", ultimapista.pista)
+    else:
+        pista = 1
+        print("No hay ninguna pista")
+
     if request.method == 'POST':
         title = request.form['title']
-#        author = request.form['author']
-#        album_id = request.form['album_id']
         lyrics = request.form['lyrics']
-        pista = request.form['pista']
-
-        album = Album.query.filter_by(id=album_id).first() # obtiene el album cuyo id hemos recibido
         author = album.artist
 
         new_song = Song(title=title, author=author, album_id=album_id, lyrics=lyrics, pista=pista)
@@ -83,7 +90,7 @@ def add_song2album(album_id):
         return redirect(url_for('paginas.album', album_id=album_id))
     
     albums = Album.query.all()
-    return render_template('add_song2album.html', album_id=album_id)
+    return render_template('add_song2album.html', pista=pista, album=album, album_id=album_id)
 
 @bp.route('/add_album', methods=['GET', 'POST'])
 @login_required
diff --git a/LyricsPy/servicios/lyrics/templates/add_song2album.html b/LyricsPy/servicios/lyrics/templates/add_song2album.html
index 11c9038..e92b596 100644
--- a/LyricsPy/servicios/lyrics/templates/add_song2album.html
+++ b/LyricsPy/servicios/lyrics/templates/add_song2album.html
@@ -2,14 +2,9 @@
 
 {% block content %}
 <div class="column is-4 is-offset-4">
-    <h3>Añadir nueva canción</h3>
+    <h3>Añadir nueva canción en la pista número {{ pista }} para album '{{ album.name }}'</h3>
     <div class="box">
         <form method="POST" action=" {{ url_for('paginas.add_song2album', album_id=album_id) }}"> 
-            <div class="text mb-3">
-                <label for="pista">Nº de pista:</label>
-                <input class="form-control" type="number" id="pista" name="pista" required>
-            </div>
-
             <div class="text mb-3">
                 <label for="title">Título:</label>
                 <input class="form-control" type="text" id="title" name="title" required>