Skip to content
Snippets Groups Projects
Commit 731fc050 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

run hooks

parent e11d3c69
No related branches found
No related tags found
1 merge request!9Release
Pipeline #15166 passed
......@@ -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(
......
......@@ -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"),
),
]
......@@ -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",
),
),
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment