Saras355 · ginafia · May 1, 2024 · May 1, 2024 · May 1, 2024 · May 1, 2024
diff --git a/Procfile b/Procfile
@@ -0,0 +1,2 @@
+# web: gunicorn tk_basdat.wsgi --log-file -
+web: waitress-serve --port=$PORT tk_basdat.wsgi:application
diff --git a/akun/urls.py b/akun/urls.py
@@ -2,15 +2,9 @@
 from .views import *
 app_name = 'akun'
 
-
 urlpatterns = [
-    path('list_tables/', list_tables, name='list_tables'),
-    # path('register/', register_with_postgres, name='register' ),
     path('login/', login_with_postgres, name='login' ),
     path('register_choice/', register_choice, name='register_choice'),
-    # path('register_pengguna/<str:role>/', register_pengguna, name='register'),
-    # path('logout/', logout_with_postgres, name='logout'),
-    # path('dashboard/', dashboard, name='dashboard'),
     path('dashboard/', dashboard, name='dashboard'),
     path('register/pengguna/', register_pengguna, name='register_pengguna'),
     path('register/label/', register_label, name='register_label'),

diff --git a/akun/views.py b/akun/views.py
diff --git a/album_song_royalti/templates/cek_royalti.html b/album_song_royalti/templates/cek_royalti.html
@@ -1,32 +1,97 @@
 <!DOCTYPE html>
-<html>
-    {% include 'nav.html' %}
+<html lang="en">
+
 <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Cek Royalti</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
 </head>
+
 <body>
-    <h1>Daftar Royalti</h1>
-    <table border="1">
-        <thead>
-            <tr>
-                <th>Judul Lagu</th>
-                <th>Judul Album</th>
-                <th>Total Play</th>
-                <th>Total Download</th>
-                <th>Total Royalti Didapat</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for royalti in royalti_list %}
-            <tr>
-                <td>{{ royalti.0 }}</td>
-                <td>{{ royalti.1 }}</td>
-                <td>{{ royalti.2 }}</td>
-                <td>{{ royalti.3 }}</td>
-                <td>Rp {{ royalti.4 }}</td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+    <div class="container mt-5">
+        <h1 class="mb-4">Cek Royalti</h1>
+
+        <!-- Royalti sebagai Artist -->
+        {% if  royalti_artist %}
+            <h2>Royalti sebagai Artist</h2>
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <th>Judul Lagu</th>
+                        <th>Judul Album</th>
+                        <th>Total Play</th>
+                        <th>Total Download</th>
+                        <th>Total Royalti Didapat</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for royalti in royalti_artist %}
+                    <tr>
+                        <td>{{ royalti.0 }}</td>
+                        <td>{{ royalti.1 }}</td>
+                        <td>{{ royalti.2 }}</td>
+                        <td>{{ royalti.3 }}</td>
+                        <td>{{ royalti.4 }}</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+
+        {% if royalti_songwriter %}
+            <!-- Royalti sebagai Songwriter -->
+            <h2>Royalti sebagai Songwriter</h2>
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <th>Judul Lagu</th>
+                        <th>Judul Album</th>
+                        <th>Total Play</th>
+                        <th>Total Download</th>
+                        <th>Total Royalti Didapat</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for royalti in royalti_songwriter %}
+                    <tr>
+                        <td>{{ royalti.0 }}</td>
+                        <td>{{ royalti.1 }}</td>
+                        <td>{{ royalti.2 }}</td>
+                        <td>{{ royalti.3 }}</td>
+                        <td>{{ royalti.4 }}</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+
+        {% if royalti_label %}
+            <!-- Royalti sebagai Label -->
+            <h2>Royalti sebagai Label</h2>
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <th>Judul Lagu</th>
+                        <th>Judul Album</th>
+                        <th>Total Play</th>
+                        <th>Total Download</th>
+                        <th>Total Royalti Didapat</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for royalti in royalti_label %}
+                    <tr>
+                        <td>{{ royalti.0 }}</td>
+                        <td>{{ royalti.1}}</td>
+                        <td>{{ royalti.2 }}</td>
+                        <td>{{ royalti.3 }}</td>
+                        <td>{{ royalti.4 }}</td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        {% endif %}
+    </div>
 </body>
 </html>
diff --git a/album_song_royalti/templates/create_album.html b/album_song_royalti/templates/create_album.html
@@ -28,7 +28,7 @@ <h2>Lagu Pertama</h2>
             <option value="" selected disabled>Pilih Artist</option>
             {% if request.session.user_data.is_artist %}
                 <option value="{{ request.session.user_data.nama }}">{{ request.session.user_data.nama }}</option>
-            {% elif request.session.user_data.is_songwriter %}
+            {% else %}
                 {% for artist in artists %}
                     <option value="{{ artist.email_akun }}">{{ artist.email_akun }}</option>
                 {% endfor %}

diff --git a/album_song_royalti/templates/create_lagu.html b/album_song_royalti/templates/create_lagu.html
@@ -10,7 +10,7 @@ <h1>Create lagu untuk di Album {{judul_album}} - {{album_id}}</h1>
     <form method="post" action="{% url 'create_lagu' album_id %}">       
         {% csrf_token %}
 
-        <h2>Lagu Pertama</h2>
+        <!-- <h2>Lagu Pertama</h2> -->
         <label for="judul_lagu">Judul Lagu:</label>
         <input type="text" id="judul_lagu" name="judul_lagu" required><br>
 

diff --git a/album_song_royalti/templates/lihat_detail_lagu.html b/album_song_royalti/templates/lihat_detail_lagu.html
@@ -34,6 +34,6 @@ <h1>Detail Lagu</h1>
         <p>Lagu tidak ditemukan.</p>
     {% endif %}
 
-    <a href="{% url 'list_album_artist' %}">Kembali ke Daftar Album</a>
+    <!-- <a href="{% url 'list_album_artist' %}">Kembali ke Daftar Album</a> -->
 </body>
 </html>
diff --git a/album_song_royalti/urls.py b/album_song_royalti/urls.py
@@ -2,17 +2,6 @@
 from album_song_royalti.views import *
 
 urlpatterns = [
-    # path('create-album/', create_album, name='create_album'),
-    # path('success_create_album/', success_create_album, name='success_create_album'),
-
-    # #untuk list album
-    # path('list-album/', list_album, name='list_album'),
-    # path('hapus-album/<uuid:album_id>/',hapus_album, name='hapus_album'),
-    # path('lihat-daftar-lagu/<uuid:album_id>/', list_lagu, name='lihat_daftar_lagu'),
-    # path('create-lagu/<uuid:album_id>/', create_lagu, name='create_lagu'),
-    # # path('create-lagu/<uuid:album_id>/', create_lagu, name='create_lagu'),
-    # path('lihat-detail/<uuid:lagu_id>/',lihat_detail, name='lihat_detail'),
-    # path('hapus-lagu/<uuid:lagu_id>/',hapus_lagu, name='hapus_lagu'),
     #cek royalti
     path('cek-royalti/', cek_royalti, name='cek_royalti'),
     #baru
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# web: gunicorn tk_basdat.wsgi --log-file -
		web: waitress-serve --port=$PORT tk_basdat.wsgi:application