Compare commits
2 Commits
6864cb5118
...
5609fc1351
Author | SHA1 | Date |
---|---|---|
Gregory Trullemans | 5609fc1351 | |
Gregory Trullemans | 35e8e8cf9a |
|
@ -27,4 +27,7 @@ data/
|
||||||
!.vscode/tasks.json
|
!.vscode/tasks.json
|
||||||
!.vscode/launch.json
|
!.vscode/launch.json
|
||||||
!.vscode/extensions.json
|
!.vscode/extensions.json
|
||||||
.history
|
.history
|
||||||
|
|
||||||
|
# Mac OS
|
||||||
|
.DS_Store
|
|
@ -6,8 +6,8 @@ services:
|
||||||
container_name: "ultron_db"
|
container_name: "ultron_db"
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: "ultron"
|
POSTGRES_DB: "ultron"
|
||||||
POSTGRES_USER: "my_user"
|
POSTGRES_USER: "ironman"
|
||||||
POSTGRES_PASSWORD: "my_password"
|
POSTGRES_PASSWORD: "jarvis"
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "5432:5432"
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -5,7 +5,6 @@ django-extensions==3.1.3
|
||||||
install==1.3.4
|
install==1.3.4
|
||||||
Markdown==3.3.4
|
Markdown==3.3.4
|
||||||
pendulum==2.1.2
|
pendulum==2.1.2
|
||||||
psycopg2==2.9.2
|
|
||||||
python-dateutil==2.8.2
|
python-dateutil==2.8.2
|
||||||
pytz==2021.3
|
pytz==2021.3
|
||||||
pytzdata==2020.1
|
pytzdata==2020.1
|
||||||
|
@ -14,3 +13,4 @@ six==1.16.0
|
||||||
sqlparse==0.4.2
|
sqlparse==0.4.2
|
||||||
whitenoise==5.3.0
|
whitenoise==5.3.0
|
||||||
gunicorn==20.1.0
|
gunicorn==20.1.0
|
||||||
|
psycopg2==2.9.2
|
|
@ -8,11 +8,13 @@
|
||||||
<h4 class=""> Chronos Listing</h4>
|
<h4 class=""> Chronos Listing</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-1 ml-auto">
|
<div class="col-1 ml-auto">
|
||||||
<a href="{% url 'chrono_create' %}">
|
<div class="text-right">
|
||||||
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
<a href="{% url 'chrono_create' %}">
|
||||||
<i class="tim-icons icon-simple-add"></i>
|
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
||||||
</button>
|
<i class="tim-icons icon-simple-add"></i>
|
||||||
</a>
|
</button>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -8,11 +8,13 @@
|
||||||
<h4 class=""> Places Listing</h4>
|
<h4 class=""> Places Listing</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-1 ml-auto">
|
<div class="col-1 ml-auto">
|
||||||
<a href="{% url 'place_create' %}">
|
<div class="text-right">
|
||||||
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
<a href="{% url 'place_create' %}">
|
||||||
<i class="tim-icons icon-simple-add"></i>
|
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
||||||
</button>
|
<i class="tim-icons icon-simple-add"></i>
|
||||||
</a>
|
</button>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -3,19 +3,25 @@
|
||||||
{% block datacontent %}
|
{% block datacontent %}
|
||||||
<div class="card mb-0">
|
<div class="card mb-0">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<h4 class=""> Routines' Listing</h4>
|
<div class="row">
|
||||||
<div class="text-right">
|
<div class="col-2">
|
||||||
<a href="{% url 'routine_create' %}">
|
<h4 class="card-title"> Routines' Listing</h4>
|
||||||
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
</div>
|
||||||
<i class="tim-icons icon-simple-add"></i>
|
<div class="col-1 ml-auto">
|
||||||
</button>
|
<div class="text-right">
|
||||||
</a>
|
<a href="{% url 'routine_create' %}">
|
||||||
|
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
||||||
|
<i class="tim-icons icon-simple-add"></i>
|
||||||
|
</button>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body pb-0">
|
<div class="card-body">
|
||||||
<div class="table-responsive pb-0">
|
<div class="table-responsive">
|
||||||
<table class="table tablesorter table-striped table-condensed" data-sort="table" id="maintable">
|
|
||||||
{% if routine_list %}
|
{% if routine_list %}
|
||||||
|
<table class="table tablesorter table-striped table-condensed" data-sort="table" id="maintable">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 3%"></th>
|
<th style="width: 3%"></th>
|
||||||
|
@ -48,21 +54,12 @@
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
{% else %}
|
|
||||||
<tr>
|
|
||||||
<td>There are no routine corresponding to your criterias</td>
|
|
||||||
</tr>
|
|
||||||
{% endif %}
|
|
||||||
</table>
|
</table>
|
||||||
|
{% else %}
|
||||||
|
There are no routine corresponding to your criterias
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-footer text-right text-muted pt-0">
|
|
||||||
<a href="{% url 'routine_create' %}">
|
|
||||||
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
|
||||||
<i class="tim-icons icon-simple-add"></i>
|
|
||||||
</button>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|
|
@ -8,11 +8,13 @@
|
||||||
<h4 class=""> Gymnast Listing</h4>
|
<h4 class=""> Gymnast Listing</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-1 ml-auto">
|
<div class="col-1 ml-auto">
|
||||||
<a href="{% url 'gymnast_create' %}">
|
<div class="text-right">
|
||||||
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
<a href="{% url 'gymnast_create' %}">
|
||||||
<i class="tim-icons icon-simple-add"></i>
|
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
||||||
</button>
|
<i class="tim-icons icon-simple-add"></i>
|
||||||
</a>
|
</button>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -8,11 +8,13 @@
|
||||||
<h4 class=""> Event Listing</h4>
|
<h4 class=""> Event Listing</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-1 ml-auto">
|
<div class="col-1 ml-auto">
|
||||||
<a href="{% url 'event_create' %}">
|
<div class="text-right">
|
||||||
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
<a href="{% url 'event_create' %}">
|
||||||
<i class="tim-icons icon-simple-add"></i>
|
<button type="submit" value="add" class="btn btn-icon btn-warning ">
|
||||||
</button>
|
<i class="tim-icons icon-simple-add"></i>
|
||||||
</a>
|
</button>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
|
|
||||||
{% block page_title %}Dashboard{% endblock %}
|
{% block page_title %}Dashboard{% endblock %}
|
||||||
|
|
||||||
<!-- {% block title %}Overview{% endblock %} -->
|
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
@ -31,13 +29,17 @@
|
||||||
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage_week }}%;"></div>
|
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentage_week }}%;"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ul class="list-unstyled mb-0">
|
{% if nb_gymnast or nb_event or nb_skill or nb_routine or nb_score %}
|
||||||
<li>{{ nb_gymnast }} active gymnasts</li>
|
<ul class="list-unstyled">
|
||||||
<li>{{ nb_event }} events</li>
|
{% if nb_gymnast %}<li>{{ nb_gymnast }} active gymnasts</li>{% endif %}
|
||||||
<li>{{ nb_skill }} skills</li>
|
{% if nb_event %}<li>{{ nb_event }} events</li>{% endif %}
|
||||||
<li>{{ nb_routine }} routines</li>
|
{% if nb_skill %}<li>{{ nb_skill }} skills</li>{% endif %}
|
||||||
<li>{{ nb_score }} scores</li>
|
{% if nb_routine %}<li>{{ nb_routine }} routines</li>{% endif %}
|
||||||
|
{% if nb_score %}<li>{{ nb_score }} scores</li>{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
{% else %}
|
||||||
|
No statistics to display.
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue