diff --git a/RoutesApp/models.py b/RoutesApp/models.py index 3f1d39a..b389a04 100644 --- a/RoutesApp/models.py +++ b/RoutesApp/models.py @@ -1,6 +1,7 @@ from django.db import models from django.utils.translation import gettext_lazy as _ from BaseModels.base_models import BaseModel +from colorfield.fields import ColorField type_transport_choices = [ @@ -38,8 +39,8 @@ class Route(BaseModel): type_transport = models.CharField( choices=type_transport_choices, default='', verbose_name=_('Выберите способ перевозки')) - departure_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время выезда')) - arrival_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время прибытия')) + departure_DT = models.DateTimeField(verbose_name=_('Дата и время выезда')) + arrival_DT = models.DateTimeField(verbose_name=_('Дата и время прибытия')) from_address_point = models.IntegerField(verbose_name=_('Пункт выезда')) to_address_point = models.IntegerField(verbose_name=_('Пункт приезда')) from_city = models.ForeignKey( @@ -62,6 +63,15 @@ class Route(BaseModel): receive_msg_by_sms = models.BooleanField(default=False, verbose_name=_('Получать уведомления по SMS')) owner = models.ForeignKey(User, verbose_name=_('Владелец'), related_name='rel_routes_for_owner', on_delete=models.CASCADE) + rising_DT = models.DateTimeField( + verbose_name=_('Дата и время последнего поднятия'), + blank=True, null=True + ) + select_color = ColorField( + verbose_name=_('Цвет выделения'), + blank=True, null=True + ) + def __str__(self): if self.name: return f'{self.name}' diff --git a/static/js/push/registerSw.js b/static/js/push/registerSw.js index e3f6a78..a4c22ed 100644 --- a/static/js/push/registerSw.js +++ b/static/js/push/registerSw.js @@ -71,7 +71,7 @@ function urlBase64ToUint8Array(base64String) { // return outputData; // } -const subscribe = async (reg) => { +const push_subscribe = async (reg) => { const subscription = await reg.pushManager.getSubscription(); if (subscription) { sendSubData(subscription); @@ -93,7 +93,7 @@ const subscribe = async (reg) => { const sendSubData = async (subscription) => { const browser = navigator.userAgent.match(/(firefox|msie|chrome|safari|trident)/ig)[0].toLowerCase(); const data = { - status_type: 'subscribe', + status_type: 'push_subscribe', subscription: subscription.toJSON(), browser: browser, user_agent: browser,