[chronojump-server] Changing all attributes to same name pattern and updating chronojump diagram



commit ef64585734797e5325f455277dec390a575643aa
Author: Max Ros i Morejon <mros33 gmail com>
Date:   Mon Oct 8 11:46:37 2018 +0200

    Changing all attributes to same name pattern and updating chronojump diagram

 .../chronojump_networks/organizations/models.py       |   3 +--
 .../chronojump_networks/tasks/models.py               |  10 +++++-----
 diagrams/networks.dia                                 | Bin 3453 -> 4838 bytes
 3 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/organizations/models.py 
b/chronojumpserver-django/chronojump_networks/organizations/models.py
index 28e578a..2b0fe8a 100644
--- a/chronojumpserver-django/chronojump_networks/organizations/models.py
+++ b/chronojumpserver-django/chronojump_networks/organizations/models.py
@@ -189,8 +189,7 @@ class Exercise(ChronojumpBaseModel):
 
     station = models.ForeignKey(Station,
                                 on_delete=models.CASCADE,
-                                related_name='exercises',
-                                db_column='stationId')
+                                related_name='exercises')
 
     percentBodyMassDisplaced = models.FloatField(null=True, default=0)
 
diff --git a/chronojumpserver-django/chronojump_networks/tasks/models.py 
b/chronojumpserver-django/chronojump_networks/tasks/models.py
index c3f580f..400e8a7 100644
--- a/chronojumpserver-django/chronojump_networks/tasks/models.py
+++ b/chronojumpserver-django/chronojump_networks/tasks/models.py
@@ -28,29 +28,29 @@ class Task(models.Model):
     ts = models.DateTimeField(auto_now_add=True)
     person = models.ForeignKey(Player,
                                on_delete = models.CASCADE,
-                               db_column='personId',
+                               db_column='person_id',
                                related_name='player_tasks')
     coach = models.ForeignKey(User,
                               on_delete = models.SET_NULL,
-                              db_column = 'coachId',
+                              db_column = 'coach_id',
                               related_name = 'coach_tasks',
                               null=True)
 
     gym = models.ForeignKey(Gym,
                             on_delete = models.CASCADE,
-                            db_column='gymId',
+                            db_column='gym_id',
                             related_name='gym_tasks',
                             null=True)
 
     station = models.ForeignKey(Station,
                             on_delete = models.CASCADE,
-                            db_column='stationId',
+                            db_column='station_id',
                             related_name='station_tasks',
                             null=True)
 
     exercise = models.ForeignKey(Exercise,
                             on_delete = models.CASCADE,
-                            db_column='exerciseId',
+                            db_column='exercise_id',
                             related_name='exercise_tasks',
                             null=True)
 
diff --git a/diagrams/networks.dia b/diagrams/networks.dia
index ae9b950..991fd20 100644
Binary files a/diagrams/networks.dia and b/diagrams/networks.dia differ


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]