diff --git a/timer/consumers.py b/timer/consumers.py index a3333388db9990723a95644a73a98c7e6577f957..3eef521cbed50aac1850577269c1addeba37d93f 100644 --- a/timer/consumers.py +++ b/timer/consumers.py @@ -152,8 +152,12 @@ class TimerConsumer(AsyncWebsocketConsumer): if "time" in json_data: # Don't save here in case there is a tick thread running - self.timer.minutes = self.timer.initial_minutes = json_data["time"]["minutes"] - self.timer.seconds = self.timer.initial_seconds = json_data["time"]["seconds"] + self.timer.minutes = self.timer.initial_minutes = json_data["time"][ + "minutes" + ] + self.timer.seconds = self.timer.initial_seconds = json_data["time"][ + "seconds" + ] reset_timer = True @@ -165,7 +169,9 @@ class TimerConsumer(AsyncWebsocketConsumer): reset_timer = True - if reset_timer or (self.timer.id not in running_timer_threads and self.timer.is_running): + if reset_timer or ( + self.timer.id not in running_timer_threads and self.timer.is_running + ): await self.run_timer() response.update( diff --git a/timer/migrations/0004_ongoingtimer_is_running_ongoingtimer_iteration.py b/timer/migrations/0004_ongoingtimer_is_running_ongoingtimer_iteration.py index 12bb46d5596184a7a96563ebbcf035309f40b65c..ad0f3401236e0295162831d1e70eac435c8c1e09 100644 --- a/timer/migrations/0004_ongoingtimer_is_running_ongoingtimer_iteration.py +++ b/timer/migrations/0004_ongoingtimer_is_running_ongoingtimer_iteration.py @@ -4,20 +4,19 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ - ('timer', '0003_remove_ongoingtimer_hours'), + ("timer", "0003_remove_ongoingtimer_hours"), ] operations = [ migrations.AddField( - model_name='ongoingtimer', - name='is_running', - field=models.BooleanField(default=False, verbose_name='AktuálnÄ› běžĂ'), + model_name="ongoingtimer", + name="is_running", + field=models.BooleanField(default=False, verbose_name="AktuálnÄ› běžĂ"), ), migrations.AddField( - model_name='ongoingtimer', - name='iteration', - field=models.IntegerField(default=0, verbose_name='Iterace'), + model_name="ongoingtimer", + name="iteration", + field=models.IntegerField(default=0, verbose_name="Iterace"), ), ] diff --git a/timer/migrations/0005_ongoingtimer_initial_minutes_and_more.py b/timer/migrations/0005_ongoingtimer_initial_minutes_and_more.py index 6e9bc3fb861858cb5af1eaad1b3e6d9975040a0d..680f363fc912617040264bfd2a5d19a2945b7461 100644 --- a/timer/migrations/0005_ongoingtimer_initial_minutes_and_more.py +++ b/timer/migrations/0005_ongoingtimer_initial_minutes_and_more.py @@ -5,27 +5,46 @@ from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ - ('timer', '0004_ongoingtimer_is_running_ongoingtimer_iteration'), + ("timer", "0004_ongoingtimer_is_running_ongoingtimer_iteration"), ] operations = [ migrations.AddField( - model_name='ongoingtimer', - name='initial_minutes', - field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(limit_value=0), django.core.validators.MaxValueValidator(limit_value=60)], verbose_name='PĹŻvodnĂ Minuty'), + model_name="ongoingtimer", + name="initial_minutes", + field=models.IntegerField( + default=0, + validators=[ + django.core.validators.MinValueValidator(limit_value=0), + django.core.validators.MaxValueValidator(limit_value=60), + ], + verbose_name="PĹŻvodnĂ Minuty", + ), preserve_default=False, ), migrations.AddField( - model_name='ongoingtimer', - name='initial_seconds', - field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(limit_value=0), django.core.validators.MaxValueValidator(limit_value=60)], verbose_name='PĹŻvodnĂ sekundy'), + model_name="ongoingtimer", + name="initial_seconds", + field=models.IntegerField( + default=0, + validators=[ + django.core.validators.MinValueValidator(limit_value=0), + django.core.validators.MaxValueValidator(limit_value=60), + ], + verbose_name="PĹŻvodnĂ sekundy", + ), preserve_default=False, ), migrations.AlterField( - model_name='ongoingtimer', - name='seconds', - field=models.IntegerField(validators=[django.core.validators.MinValueValidator(limit_value=0), django.core.validators.MaxValueValidator(limit_value=60)], verbose_name='Sekundy'), + model_name="ongoingtimer", + name="seconds", + field=models.IntegerField( + validators=[ + django.core.validators.MinValueValidator(limit_value=0), + django.core.validators.MaxValueValidator(limit_value=60), + ], + verbose_name="Sekundy", + ), ), ]