diff --git a/jarvis/followup/migrations/0058_alter_intensity_unique_together_and_more.py b/jarvis/followup/migrations/0058_alter_intensity_unique_together_and_more.py new file mode 100644 index 0000000..47b71ed --- /dev/null +++ b/jarvis/followup/migrations/0058_alter_intensity_unique_together_and_more.py @@ -0,0 +1,71 @@ +# Generated by Django 4.2 on 2023-10-18 10:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("followup", "0057_injury"), + ] + + operations = [ + migrations.AlterUniqueTogether( + name="intensity", + unique_together=set(), + ), + migrations.AlterField( + model_name="injury", + name="injury_type", + field=models.SmallIntegerField( + choices=[ + (0, "Abrasion"), + (1, "Dental Injury"), + (2, "Dislocation / Subluxation"), + (3, "Fracture"), + (4, "Haematoma / Contusion / Bruise"), + (5, "Head Concussion"), + (6, "Laceration"), + (7, "Lesion of Meniscus or Cartilage"), + (8, "Muscle Rupture /Strain / Tear / Cramps"), + (9, "Nerve Injury"), + (10, "Other Bone Injury"), + (11, "Sprain / Ligament Injury"), + (12, "Tendon Injury / Rupture / Tendinosis / Bursitis"), + ], + verbose_name="Type", + ), + ), + migrations.AlterField( + model_name="injury", + name="location", + field=models.SmallIntegerField( + choices=[ + (0, "Abdomen"), + (1, "Ankle"), + (2, "Elbow"), + (3, "Foot / Toe"), + (4, "Hand / Finger / Thumb"), + (5, "Head / Face"), + (6, "Hip / Groin"), + (7, "Knee"), + (8, "Low back / Sacrum / Pelvis"), + (9, "Lower Leg / Achilles Tendon"), + (10, "Neck / Cervical Spine"), + (11, "Shoulder / Clavicula"), + (12, "Sternum / Ribs / Upper back"), + (13, "Thigh"), + (14, "Upper arm"), + (15, "Wrist"), + ], + verbose_name="Location", + ), + ), + migrations.AlterField( + model_name="injury", + name="mechanism", + field=models.PositiveSmallIntegerField( + choices=[(0, "Overuse"), (1, "Trauma")], verbose_name="Mechanism" + ), + ), + ] diff --git a/jarvis/followup/models.py b/jarvis/followup/models.py index 8e82ed1..f492b0c 100644 --- a/jarvis/followup/models.py +++ b/jarvis/followup/models.py @@ -559,7 +559,7 @@ class Intensity(Markdownizable, Seasonisable): class Meta: verbose_name = "Intensity" verbose_name_plural = "Intensities" - unique_together = ("gymnast", "date") + # unique_together = ("gymnast", "date") gymnast = models.ForeignKey( Gymnast, on_delete=models.CASCADE, related_name="intensities" diff --git a/jarvis/followup/templates/chronos/list.html b/jarvis/followup/templates/chronos/list.html index ee1c624..e1a794b 100644 --- a/jarvis/followup/templates/chronos/list.html +++ b/jarvis/followup/templates/chronos/list.html @@ -92,7 +92,7 @@ paging: false, searching: false, ordering: false, - // "bInfo" : false, + "bInfo": false, }); }); diff --git a/jarvis/location/templates/clubs/list.html b/jarvis/location/templates/clubs/list.html index 86094dc..7802387 100644 --- a/jarvis/location/templates/clubs/list.html +++ b/jarvis/location/templates/clubs/list.html @@ -8,7 +8,7 @@
{% if club_list %} - +
@@ -27,11 +27,7 @@
Name
{% else %} - - - - -
There are no places corresponding to your criterias
+ There are no places corresponding to your criterias. {% endif %}
@@ -47,7 +43,11 @@ }, dateFormat: "uk", sortList: [[3,0], [1,0]] - }) + }); + + $('#club_table').DataTable({ + "bInfo": false, + }); }); {% endblock %} \ No newline at end of file diff --git a/jarvis/location/templates/places/list.html b/jarvis/location/templates/places/list.html index c95aeb0..face714 100644 --- a/jarvis/location/templates/places/list.html +++ b/jarvis/location/templates/places/list.html @@ -22,7 +22,7 @@
-
+
{% if place_list %} @@ -83,7 +83,7 @@ paging: false, searching: false, ordering: false, - // "bInfo" : false, + "bInfo": false, }); }); diff --git a/jarvis/objective/templates/skills/list.html b/jarvis/objective/templates/skills/list.html index 1f45d1b..1a9a19f 100644 --- a/jarvis/objective/templates/skills/list.html +++ b/jarvis/objective/templates/skills/list.html @@ -75,12 +75,12 @@ }) $('#skill_table').DataTable({ - scrollY: 500, + scrollY: 500, scrollCollapse: true, - paging: false, - searching: false, - ordering: false, - // "bInfo" : false, + paging: false, + searching: false, + ordering: false, + "bInfo": false, }); });