dashboard milestones stub

tlapbot/owncast_helpers.py

@@ -208,6 +208,16 @@ def add_to_milestone(db, redeem_name, points):
     return False
 
 
+def all_milestones(db):
+    try:
+        cursor = db.execute(
+            """SELECT name, count, goal FROM milestones"""
+        )
+        return cursor.fetchall()
+    except Error as e:
+        current_app.logger.error(f"Error occured selecting all milestones: {e.args[0]}")
+
+
 def all_counters(db):
     try:
         cursor = db.execute(

tlapbot/owncast_redeem_dashboard.py

@@ -1,7 +1,7 @@
 from flask import render_template, Blueprint, request, current_app
 from tlapbot.db import get_db
 from tlapbot.owncast_helpers import (pretty_redeem_queue, all_counters,
-        read_all_users_with_username)
+        all_milestones, read_all_users_with_username)
 from datetime import datetime, timezone
 
 bp = Blueprint('redeem_dashboard', __name__)
@@ -19,6 +19,7 @@ def dashboard():
     return render_template('dashboard.html',
                            queue=pretty_redeem_queue(db),
                            counters=all_counters(db),
+                           milestones=all_milestones(db),
                            redeems=current_app.config['REDEEMS'],
                            prefix=current_app.config['PREFIX'],
                            passive=current_app.config['PASSIVE'],

tlapbot/templates/dashboard.html

@@ -11,6 +11,9 @@
     <div class="tab">
         <button class="tablinks" onclick="openTab(event, 'dashboard')", id="defaultOpen">Tlapbot dashboard</button>
         {% if not passive %}
+        {% if queue %}
+        <button class="tablinks" onclick="openTab(event, 'redeem-queue')">Redeem queue</button>
+        {% endif %}
         <button class="tablinks" onclick="openTab(event, 'redeems-list')">Redeems help</button>
         {% endif %}
     </div>
@@ -40,47 +43,59 @@
             {% endif %}
 
             {% if not passive %}
-                {% if counters %}
+            {% if counters %}
-                <table>
+            <table>
-                    <thead>
+                <thead>
-                        <tr>
+                    <tr>
-                            <th>Active counters</th>
+                        <th>Active counters</th>
-                        </tr>
+                    </tr>
-                    </thead>
+                </thead>
-                    {% for counter in counters %}
+                {% for counter in counters %}
-                    <tbody>
-                        <td> {{ counter[0] }} </td>
-                        <td> {{ counter[1] }} </td>   
-                    </tbody>
-                    {% endfor %}
-                </table>
-                {% endif %}
-
-                {% if queue %}
-                <table>
-                    <thead>
-                        <tr>
-                            <th colspan="2">Recent redeems</th>
-                        </tr>
-                        <tr>
-                            <th>Time</th>
-                            <th>Redeem</th>
-                            <th>Redeemer</th>
-                            <th>Note</th>
-                        </tr>
-                    </thead>
-                    {% for row in queue %}
                 <tbody>
-                        <td>{{ row[0].replace(tzinfo=utc_timezone).astimezone().strftime("%H:%M") }}</td>
+                    <td> {{ counter[0] }} </td>
-                        <td>{{ row[1] }}</td>
+                    <td> {{ counter[1] }} </td>   
-                        <td>{{ row[3] }}</td>
+                </tbody>
-                        {% if row[2] %}
+                {% endfor %}
-                        <td>{{ row[2] }}</td>
+            </table>
-                        {% endif %}
+            {% endif %}
-                    </tbody>
+            {% if milestones %}
-                    {% endfor %}
+            {% for milestone in milestones %}
-                </table>
+            <label for="file"> {{ milestone[0] }}</label>
-                {% endif %}
+
+            <progress id="file" max={{ milestone[2] }} value={{ milestone[1] }}></progress>
+            {% endfor %}
+            {% endif %}
+            {% endif %}
+        </body>
+    </div>
+
+    <div id='redeem-queue' class="tabcontent">
+        <body>
+            <h3>Redeems Queue</h3>
+            {% if queue %}
+            <table>
+                <thead>
+                    <tr>
+                        <th colspan="2">Recent redeems</th>
+                    </tr>
+                    <tr>
+                        <th>Time</th>
+                        <th>Redeem</th>
+                        <th>Redeemer</th>
+                        <th>Note</th>
+                    </tr>
+                </thead>
+                {% for row in queue %}
+            <tbody>
+                    <td>{{ row[0].replace(tzinfo=utc_timezone).astimezone().strftime("%H:%M") }}</td>
+                    <td>{{ row[1] }}</td>
+                    <td>{{ row[3] }}</td>
+                    {% if row[2] %}
+                    <td>{{ row[2] }}</td>
+                    {% endif %}
+                </tbody>
+                {% endfor %}
+            </table>
             {% endif %}
         </body>
     </div>
@@ -92,6 +107,8 @@
             <li><strong>Counter</strong> redeems add +1 to their counter.</li>
             <li><strong>List</strong> redeems get added to the list of recent redeems (without a note).</li>
             <li><strong>Note</strong> redeems require you to send a message together with the redeem.</li>
+            <li><strong>Milestone</strong> redeems are long-term goals to which you can donate any amount of points you want.</li>
+            <li>They will be completed once the amount of points donated reaches the goal.</li>
         </ul>
         <body>
             {% if redeems %}