Token makeover

src/backoffice/templates/includes/index_facilities.html

@@ -1,6 +1,5 @@
 {% if perms.camps.orga_team_member or facilityfeedback_teams or is_team_facilitator or perms.camps.gis_team_member %}
   <h3>Facilities</h3>
-  <div class="list-group list-group-flush">
     {% if perms.camps.orga_team_member or perms.camps.gis_team_member %}
       <a href="{% url 'backoffice:facility_type_list' camp_slug=camp.slug %}" class="list-group-item list-group-item-action">
         <h4 class="list-group-item-heading">
@@ -35,5 +34,4 @@ <h4 class="list-group-item-heading">
         </a>
       {% endif %}
     {% endfor %}
-  </div>
 {% endif %}

src/backoffice/templates/includes/index_game.html

@@ -1,11 +1,14 @@
 {% if perms.camps.game_team_member %}
-  <h3>Secret Tokens</h3>
+  <h3>Game Team</h3>
   <a href="{% url 'backoffice:token_list' camp_slug=camp.slug %}" class="list-group-item list-group-item-action">
     <h4 class="list-group-item-heading">Tokens</h4>
-    <p class="list-group-item-text">Use this view to see a list of Tokens, and to create, update and delete them</p>
-  </a>
+    <p class="list-group-item-text">Use this view to see a list of Tokens, and to <b>create</b>, <b>update</b> and <b>delete</b> them</p>  </a>
   <a href="{% url 'backoffice:token_stats' camp_slug=camp.slug %}" class="list-group-item list-group-item-action">
     <h4 class="list-group-item-heading">Token Stats</h4>
     <p class="list-group-item-text">Use this view to see token find stats</p>
   </a>
+  <a href="{% url 'backoffice:token_category_list' camp_slug=camp.slug %}" class="list-group-item list-group-item-action">
+    <h4 class="list-group-item-heading">Token categories</h4>
+    <p class="list-group-item-text">Use this view to see a list of Token Categories, and to <b>create</b>, <b>update</b> and <b>delete</b> them</p>
+  </a>
 {% endif %}

src/backoffice/templates/index.html

@@ -27,7 +27,9 @@ <h3 class="ms-3">{{ camp.title }} Backoffice</h3>
       <div class="tab-content">
         {% for item, value in backoffice_tabs.items %}
           <div role="tabpanel" class="tab-pane fade{% if forloop.first %} show active{% endif %}" id="{{ item }}">
+            <div class="list-group list-group-flush">
             {% include "includes/index_"|add:item|add:".html" %}
+            </div>
           </div>
         {% endfor %}
       </div>

src/backoffice/templates/token_category_delete.html

@@ -0,0 +1,18 @@
+{% extends 'base.html' %}
+{% load django_bootstrap5 %}
+
+{% block content %}
+  <div class="card">
+    <div class="card-header">
+      <h2 class="card-title">Delete Token category {{ object.name }}?</h2>
+    </div>
+    <div class="card-body">
+      <p class="lead">This Category has <b>{{ object.token_set.count }}</b> Tokens related</p>
+      <form method="POST">
+        {% csrf_token %}
+        <button type="submit" name="Delete" class="btn btn-danger"><i class="fas fa-times"></i> Yes, Delete it</button>
+        <a href="{% url 'backoffice:token_category_list' camp_slug=camp.slug %}" class="btn btn-secondary"><i class="fas fa-undo"></i> Cancel</a>
+      </form>
+    </div>
+  </div>
+{% endblock content %}

src/backoffice/templates/token_category_detail.html

@@ -0,0 +1,65 @@
+{% extends 'base.html' %}
+
+{% block title %}
+  Token Category Details | BackOffice | {{ block.super }}
+{% endblock %}
+
+{% block content %}
+  <div class="card">
+    <div class="card-header">
+      <h3 class="card-title">Token Category Details | BackOffice</h3>
+    </div>
+    <div class="card-body">
+      <p>
+        <a href="{% url 'backoffice:token_category_update' camp_slug=camp.slug pk=object.pk %}" class="btn btn-primary"><i class="fas fa-edit"></i> Update Category</a>
+        <a href="{% url 'backoffice:token_category_delete' camp_slug=camp.slug pk=object.pk %}" class="btn btn-danger"><i class="fas fa-times"></i> Delete Category</a>
+        <a href="{% url 'backoffice:token_category_list' camp_slug=camp.slug %}" class="btn btn-secondary"><i class="fas fa-undo"></i> Category List</a>
+      </p>
+      <table class="table">
+        <tbody>
+          <tr>
+            <th>Category:</th>
+            <td>{{ object.name }}</p>
+          </tr>
+          <tr>
+            <th>Description:</th>
+            <td>{{ object.description }}</p>
+          </tr>
+          <tr>
+            <th>Used by:</th>
+            <td>{{ object.token_set.count }}</td>
+          </tr>
+          <tr>
+            <th>Created:</th>
+            <td>{{ object.created }}</p>
+          </tr>
+          <tr>
+            <th>Last updated:</th>
+            <td>{{ object.updated }}</p>
+          </tr>
+        </tbody>
+      </table>
+      <h3>Related tokens</h3>
+      <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
+        <thead>
+          <tr>
+            <th>Token</th>
+            <th>Camp</th>
+            <th>Hint</th>
+            <th>Description</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for token in object.token_set.all %}
+            <tr>
+              <td><a href="{% url 'backoffice:token_detail' camp_slug=token.camp.slug pk=token.pk %}">{{ token.token }}</a></td>
+              <td>{{ token.camp }}</td>
+              <td>{{ token.hint }}</td>
+              <td>{{ token.description }}</td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+{% endblock %}

src/backoffice/templates/token_category_form.html

@@ -0,0 +1,21 @@
+{% extends 'base.html' %}
+{% load django_bootstrap5 %}
+{% load static %}
+
+{% block content %}
+  <div class="card">
+    <div class="card-header">
+      <h3 class="card-title">{% if form.instance.pk %}Update{% else %}Create new{% endif %} Token Category</h3>
+    </div>
+    <div class="card-body">
+      <form method="POST">
+        {% csrf_token %}
+        {% bootstrap_form form %}
+        <button type="submit" class="btn btn-success"><i class="fas fa-check"></i> Save</button>
+        <button type="submit" class="btn btn-success" name="_addanother"><i class="fas fa-check"></i> Save and add another</button>
+        <button type="submit" class="btn btn-success" name="_addtoken"><i class="fas fa-check"></i> Save and add token</button>
+        <a href="{% url 'backoffice:token_category_list' camp_slug=camp.slug %}" class="btn btn-secondary"><i class="fas fa-undo"></i> Cancel</a>
+      </form>
+    </div>
+  </div>
+{% endblock content %}

src/backoffice/templates/token_category_list.html

@@ -0,0 +1,53 @@
+{% extends 'base.html' %}
+{% load bornhack %}
+
+{% block title %}
+  Token Category List | Backoffice | {{ block.super }}
+{% endblock %}
+
+{% block content %}
+  <div class="card">
+    <div class="card-header">
+      <h3 class="card-title">Token Category List - BackOffice</h3>
+    </div>
+    <div class="card-body">
+      <p>This is a list of all token categories.</p>
+      {% if not object_list %}
+        <p class="lead">No categories found.</p>
+      {% else %}
+        <p>
+          <a class="btn btn-success" href="{% url 'backoffice:token_category_create' camp_slug=camp.slug %}"><i class="fas fa-plus"></i> Create category</a>
+          <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}#game"><i class="fas fa-undo"></i> Backoffice</a>
+          <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
+            <thead>
+              <tr>
+                <th>Name</th>
+                <th>Description</th>
+                <th class="text-start">Used by</th>
+                <th>Actions</th>
+              </tr>
+            </thead>
+            <tbody>
+              {% for category in object_list %}
+                <tr>
+                  <td><a href="{% url 'backoffice:token_category_detail' camp_slug=camp.slug pk=category.pk %}">{{ category.name }}</a></td>
+                  <td>{{ category.description }}</td>
+                  <td class="text-start">{{ category.token_set.count }}</td>
+                  <td>
+                    <a href="{% url 'backoffice:token_create' camp_slug=camp.slug %}" class="me-1"><i class="fas fa-add text-success"></i></a>
+                    <a href="{% url 'backoffice:token_category_detail' camp_slug=camp.slug pk=category.pk %}" class="me-1"><i class="fas fa-search text-info"></i></a>
+                    <a href="{% url 'backoffice:token_category_update' camp_slug=camp.slug pk=category.pk %}" class="me-1"><i class="fas fa-edit"></i></a>
+                    <a href="{% url 'backoffice:token_category_delete' camp_slug=camp.slug pk=category.pk %}" class="me-1"><i class="fas fa-trash text-danger"></i></a>
+                </td>
+                </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+        </p>
+      {% endif %}
+      <p>
+        <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}#game"><i class="fas fa-undo"></i> Backoffice</a>
+      </p>
+    </div>
+  </div>
+{% endblock content %}

src/backoffice/templates/token_detail.html

@@ -18,35 +18,49 @@ <h3 class="card-title">Token Details | Tokens | BackOffice</h3>
       <table class="table">
         <tbody>
           <tr>
-            <th>Token</th>
-            <td>{{ token.tokene }}</td>
+            <th>Token:</th>
+            <td>{{ token.token }}</td>
           </tr>
           <tr>
-            <th>Category</th>
-            <td>{{ token.category }}</p>
+            <th>Category:</th>
+            <td><a href="{% url 'backoffice:token_category_detail' camp_slug=camp.slug pk=token.category.pk %}">{{ token.category.name }}</a></p>
           </tr>
           <tr>
-            <th>Description</th>
+            <th>Hint:</th>
+            <td>{{ token.hint }}</p>
+          </tr>
+          <tr>
+            <th>Description:</th>
             <td>{{ token.description }}</p>
           </tr>
           <tr>
-            <th>Finds</th>
+            <th>Finds:</th>
             <td>{{ token.tokenfind_set.count }} times</p>
           </tr>
+          <tr>
+            <th>Created:</th>
+            <td>{{ token.created }}</p>
+          </tr>
+          <tr>
+            <th>Last updated:</th>
+            <td>{{ token.updated }}</p>
+          </tr>
         </tbody>
       </table>
       <h3>Token Finds</h3>
       <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
         <thead>
           <tr>
-            <th>Email</th>
+              <th>Public credit name</th>
+              <th>Username</th>
             <th>Timestamp</th>
           </tr>
         </thead>
         <tbody>
           {% for tf in token.tokenfind_set.all %}
             <tr>
-              <td>{{ tf.user.email }}</td>
+              <td>{{ tf.user.profile.public_credit_name }}</td>
+              <td>{{ tf.user.username }}</td>
               <td>{{ tf.created }}</td>
             </tr>
           {% endfor %}

src/backoffice/templates/token_form.html

@@ -12,7 +12,7 @@ <h3 class="card-title">{% if request.resolver_match.url_name == "token_update" %
         {% csrf_token %}
         {% bootstrap_form form %}
         <button type="submit" class="btn btn-success"><i class="fas fa-check"></i> Save</button>
-        <a href="{% url 'backoffice:pos_list' camp_slug=camp.slug %}" class="btn btn-secondary"><i class="fas fa-undo"></i> Cancel</a>
+        <a href="{% url 'backoffice:token_list' camp_slug=camp.slug %}" class="btn btn-secondary"><i class="fas fa-undo"></i> Cancel</a>
       </form>
     </div>
   </div>

src/backoffice/templates/token_list.html

@@ -14,13 +14,16 @@
         <p class="lead">No tokens found.</p>
       {% else %}
         <p>
-          <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}"><i class="fas fa-undo"></i> Backoffice</a>
+          <a class="btn btn-success" href="{% url 'backoffice:token_create' camp_slug=camp.slug %}"><i class="fas fa-plus"></i> Create Token</a>
+          <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}#game"><i class="fas fa-undo"></i> Backoffice</a>
           <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
             <thead>
               <tr>
+                <th>Category</th>
                 <th>Token</th>
                 <th>Active</th>
-                <th>Category</th>
+                <th>Time Limits</th>
+                <th>Hint</th>
                 <th>Description</th>
                 <th>Finds</th>
                 <th>Actions</th>
@@ -29,6 +32,7 @@
             <tbody>
               {% for token in token_list %}
                 <tr>
+                  <td><a href="{% url 'backoffice:token_category_detail' camp_slug=camp.slug pk=token.category.pk %}">{{ token.category.name }}</a></td>
                   <td><a href="{% url 'backoffice:token_detail' camp_slug=camp.slug pk=token.pk %}">{{ token.token }}</a></td>
                   <td>
                     {% if token.active %}
@@ -42,25 +46,33 @@
                       </span>
                     {% endif %}
                   </td>
-                  <td>{{ token.category }}</td>
+                  <td>
+                    {% if token.valid_when.lower %}
+                      From {{ token.valid_when.lower }}<br>
+                    {% endif %}
+                    {% if token.valid_when.upper %}
+                      To {{ token.valid_when.upper  }}
+                    {% endif %}
+                    {% if not token.valid_when %}
+                      -
+                    {% endif %}
+                  </td>
+                  <td>{{ token.hint }}</td>
                   <td>{{ token.description }}</td>
                   <td>{{ token.tokenfind_set.count }}</td>
                   <td>
-                    <div class="btn-group-vertical">
-                      <a href="{% url 'backoffice:token_detail' camp_slug=camp.slug pk=token.pk %}" class="btn btn-primary"><i class="fas fa-search"></i> Details</a>
-                      <a href="{% url 'backoffice:token_update' camp_slug=camp.slug pk=token.pk %}" class="btn btn-primary"><i class="fas fa-edit"></i> Update</a>
-                      <a href="{% url 'backoffice:token_delete' camp_slug=camp.slug pk=token.pk %}" class="btn btn-danger"><i class="fas fa-times"></i> Delete</a>
-                    </div>
-                  </td>
+                    <a href="{% url 'backoffice:token_detail' camp_slug=camp.slug pk=token.pk %}"><i class="fas fa-search text-info"></i></a>
+                    <a href="{% url 'backoffice:token_update' camp_slug=camp.slug pk=token.pk %}"><i class="fas fa-edit"></i></a>
+                    <a href="{% url 'backoffice:token_delete' camp_slug=camp.slug pk=token.pk %}"<i class="fas fa-trash text-danger"></i></a>
+                </td>
                 </tr>
               {% endfor %}
             </tbody>
           </table>
         </p>
       {% endif %}
       <p>
-        <a class="btn btn-success" href="{% url 'backoffice:token_create' camp_slug=camp.slug %}"><i class="fas fa-plus"></i> Create Token</a>
-        <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}"><i class="fas fa-undo"></i> Backoffice</a>
+        <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}#game"><i class="fas fa-undo"></i> Backoffice</a>
       </p>
     </div>
   </div>

src/backoffice/templates/token_stats.html

@@ -11,19 +11,21 @@
     <div class="card-body">
       <p>A list of users and the number of tokens they found</p>
       <p>
-        <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}"><i class="fas fa-undo"></i> Backoffice</a>
+        <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}#game"><i class="fas fa-undo"></i> Backoffice</a>
         <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
           <thead>
             <tr>
-              <th>Name</th>
+              <th>Public credit name</th>
+              <th>Username</th>
               <th>Finds</th>
               <th>Last token found</th>
             </tr>
           </thead>
           <tbody>
             {% for user in user_list %}
               <tr>
-                <td>{{ user.profile.public_credit_name|default:user.username }}</td>
+                <td>{{ user.profile.public_credit_name }}</td>
+                <td>{{ user.username }}</td>
                 <td>{{ user.token_find_count }}</td>
                 <td>{{ user.last_token_find }}</td>
               </tr>
@@ -32,7 +34,7 @@
         </table>
       </p>
       <p>
-        <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}"><i class="fas fa-undo"></i> Backoffice</a>
+        <a class="btn btn-secondary" href="{% url 'backoffice:index' camp_slug=camp.slug %}#game"><i class="fas fa-undo"></i> Backoffice</a>
       </p>
     </div>
   </div>