Merging version

.gitignore

@@ -27,4 +27,7 @@ data/
 !.vscode/tasks.json 
 !.vscode/launch.json 
 !.vscode/extensions.json 
-.history
+.history
+
+# Mac OS
+.DS_Store

docker-compose.yml

@@ -6,8 +6,8 @@ services:
         container_name: "ultron_db"
         environment:
             POSTGRES_DB: "ultron"
-            POSTGRES_USER: "my_user"
-            POSTGRES_PASSWORD: "my_password"
+            POSTGRES_USER: "ironman"
+            POSTGRES_PASSWORD: "jarvis"
         ports:
             - "5432:5432"
         volumes:

requirements.txt

@@ -5,7 +5,6 @@ django-extensions==3.1.3
 install==1.3.4
 Markdown==3.3.4
 pendulum==2.1.2
-psycopg2==2.9.2
 python-dateutil==2.8.2
 pytz==2021.3
 pytzdata==2020.1
@@ -14,3 +13,4 @@ six==1.16.0
 sqlparse==0.4.2
 whitenoise==5.3.0
 gunicorn==20.1.0
+psycopg2==2.9.2

templates/followup/chronos/list.html

@@ -8,11 +8,13 @@
                 <h4 class=""> Chronos Listing</h4>
             </div>
             <div class="col-1 ml-auto">
-                <a href="{% url 'chrono_create' %}">
-                    <button type="submit" value="add" class="btn btn-icon btn-warning ">
-                        <i class="tim-icons icon-simple-add"></i>
-                    </button>
-                </a>
+                <div class="text-right">
+                    <a href="{% url 'chrono_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>

templates/locations/places/list.html

@@ -8,11 +8,13 @@
                 <h4 class=""> Places Listing</h4>
             </div>
             <div class="col-1 ml-auto">
-                <a href="{% url 'place_create' %}">
-                    <button type="submit" value="add" class="btn btn-icon btn-warning ">
-                        <i class="tim-icons icon-simple-add"></i>
-                    </button>
-                </a>
+                <div class="text-right">
+                    <a href="{% url 'place_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>

templates/objectives/routines/list.html

@@ -3,19 +3,25 @@
 {% block datacontent %}
 <div class="card mb-0">
     <div class="card-header">
-        <h4 class=""> Routines' Listing</h4>
-        <div class="text-right">
-            <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 class="row">
+            <div class="col-2">
+                <h4 class="card-title"> Routines' Listing</h4>
+            </div>
+            <div class="col-1 ml-auto">
+                <div class="text-right">
+                    <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 class="card-body pb-0">
-        <div class="table-responsive pb-0">
-            <table class="table tablesorter table-striped table-condensed" data-sort="table" id="maintable">
+    <div class="card-body">
+        <div class="table-responsive">
             {% if routine_list %}
+            <table class="table tablesorter table-striped table-condensed" data-sort="table" id="maintable">
                 <thead>
                     <tr>
                         <th style="width: 3%"></th>
@@ -48,21 +54,12 @@
                     </tr>
                     {% endfor %}
                 </tbody>
-            {% else %}
-                <tr>
-                    <td>There are no routine corresponding to your criterias</td>
-                </tr>
-            {% endif %}
             </table>
+            {% else %}
+                There are no routine corresponding to your criterias
+            {% endif %}
         </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>
 {% endblock %}
 

templates/peoples/gymnasts/list.html

@@ -8,11 +8,13 @@
                 <h4 class=""> Gymnast Listing</h4>
             </div>
             <div class="col-1 ml-auto">
-                <a href="{% url 'gymnast_create' %}">
-                    <button type="submit" value="add" class="btn btn-icon btn-warning ">
-                        <i class="tim-icons icon-simple-add"></i>
-                    </button>
-                </a>
+                <div class="text-right">
+                    <a href="{% url 'gymnast_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>

templates/planning/events/list.html

@@ -8,11 +8,13 @@
                 <h4 class=""> Event Listing</h4>
             </div>
             <div class="col-1 ml-auto">
-                <a href="{% url 'event_create' %}">
-                    <button type="submit" value="add" class="btn btn-icon btn-warning ">
-                        <i class="tim-icons icon-simple-add"></i>
-                    </button>
-                </a>
+                <div class="text-right">
+                    <a href="{% url 'event_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>

templates/ultron/dashboard/dashboard.html

@@ -2,8 +2,6 @@
 
 {% block page_title %}Dashboard{% endblock %}
 
-<!-- {% block title %}Overview{% endblock %} -->
-
 {% block content %}
 
 <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>
                     </div>
-                    <ul class="list-unstyled mb-0">
-                        <li>{{ nb_gymnast }} active gymnasts</li>
-                        <li>{{ nb_event }} events</li>
-                        <li>{{ nb_skill }} skills</li>
-                        <li>{{ nb_routine }} routines</li>
-                        <li>{{ nb_score }} scores</li>
+                    {% if  nb_gymnast or nb_event or nb_skill or nb_routine or nb_score %}
+                    <ul class="list-unstyled">
+                        {% if  nb_gymnast %}<li>{{ nb_gymnast }} active gymnasts</li>{% endif %}
+                        {% if  nb_event %}<li>{{ nb_event }} events</li>{% endif %}
+                        {% if  nb_skill %}<li>{{ nb_skill }} skills</li>{% endif %}
+                        {% if  nb_routine %}<li>{{ nb_routine }} routines</li>{% endif %}
+                        {% if  nb_score %}<li>{{ nb_score }} scores</li>{% endif %}
                     </ul>
+                    {% else %}
+                        No statistics to display.
+                    {% endif %}
                 </div>
             </div>
         </div>