Skip to content

Commit 5c76b74

Browse files
committed
ADDED CameraScheduleAdmin
1 parent 980e64a commit 5c76b74

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

src/CameraAlgorithms/admin.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django.contrib import admin
2-
from .models.camera import Camera, ZoneCameras
2+
from .models.camera import Camera, ZoneCameras, CameraSchedule
33
from .models.algorithm import Algorithm, CameraAlgorithm, CameraAlgorithmLog
44

55

@@ -43,3 +43,13 @@ class ZoneCamerasAdmin(admin.ModelAdmin):
4343
"date_created",
4444
"date_updated",
4545
)
46+
47+
48+
@admin.register(CameraSchedule)
49+
class CameraScheduleAdmin(admin.ModelAdmin):
50+
list_filter = ("camera", "working_time_day")
51+
list_display = ("camera", "working_time_day_display")
52+
53+
def working_time_day_display(self, obj):
54+
return str(obj.working_time_day) if obj.working_time_day else "—"
55+
working_time_day_display.short_description = "Working Time Day"

src/Mailer/models.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,19 @@ class Meta:
7070

7171

7272
class WorkingTimeDaysOfWeek(models.Model):
73-
"""
74-
Working time days of week
75-
"""
76-
working_time = models.ForeignKey("WorkingTime", on_delete=models.CASCADE)
77-
day_of_week = models.ForeignKey("DayOfWeek", on_delete=models.CASCADE)
73+
working_time = models.ForeignKey(
74+
"WorkingTime",
75+
on_delete=models.CASCADE,
76+
db_column="workingtime_id"
77+
)
78+
day_of_week = models.ForeignKey(
79+
"DayOfWeek",
80+
on_delete=models.CASCADE,
81+
db_column="dayofweek_id"
82+
)
83+
84+
def __str__(self):
85+
return f"{self.day_of_week} - {self.working_time}"
7886

7987
class Meta:
8088
verbose_name = "Working time days of week"
@@ -83,21 +91,14 @@ class Meta:
8391

8492

8593
class WorkingTime(models.Model):
86-
"""
87-
Working time MinMax
88-
"""
89-
9094
time_start = models.TimeField(verbose_name="Start time")
9195
time_end = models.TimeField(verbose_name="End time")
9296
days_of_week = models.ManyToManyField(DayOfWeek, through="WorkingTimeDaysOfWeek", blank=True)
9397

9498
def __str__(self):
95-
return f"{self.time_end} - {self.time_start}"
99+
return f"{self.time_start} - {self.time_end}"
96100

97101
class Meta:
98102
verbose_name = "Working time"
99103
verbose_name_plural = "Working time"
100104
db_table = "working_time"
101-
102-
103-

0 commit comments

Comments
 (0)