sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.1.6 rising and select for routes by subscribe

Browse Source
This commit is contained in:
SDE
2024-06-03 01:45:04 +03:00
parent 079a7d3925
commit 23fe1c3647
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
RoutesApp/models.py
View File

@@ -1,6 +1,7 @@
from django.db import models from django.db import models
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from BaseModels.base_models import BaseModel from BaseModels.base_models import BaseModel
from colorfield.fields import ColorField
type_transport_choices = [ type_transport_choices = [
@@ -38,8 +39,8 @@ class Route(BaseModel):
type_transport = models.CharField( type_transport = models.CharField(
choices=type_transport_choices, default='', verbose_name=_('Выберите способ перевозки')) choices=type_transport_choices, default='', verbose_name=_('Выберите способ перевозки'))
departure_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время выезда')) departure_DT = models.DateTimeField(verbose_name=_('Дата и время выезда'))
arrival_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время прибытия')) arrival_DT = models.DateTimeField(verbose_name=_('Дата и время прибытия'))
from_address_point = models.IntegerField(verbose_name=_('Пункт выезда')) from_address_point = models.IntegerField(verbose_name=_('Пункт выезда'))
to_address_point = models.IntegerField(verbose_name=_('Пункт приезда')) to_address_point = models.IntegerField(verbose_name=_('Пункт приезда'))
from_city = models.ForeignKey( from_city = models.ForeignKey(
@@ -62,6 +63,15 @@ class Route(BaseModel):
receive_msg_by_sms = models.BooleanField(default=False, verbose_name=_('Получать уведомления по SMS')) 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) 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): def __str__(self):
if self.name: if self.name:
return f'{self.name}' return f'{self.name}'

4
static/js/push/registerSw.js
View File

@@ -71,7 +71,7 @@ function urlBase64ToUint8Array(base64String) {
// return outputData; // return outputData;
// } // }
const subscribe = async (reg) => { const push_subscribe = async (reg) => {
const subscription = await reg.pushManager.getSubscription(); const subscription = await reg.pushManager.getSubscription();
if (subscription) { if (subscription) {
sendSubData(subscription); sendSubData(subscription);
@@ -93,7 +93,7 @@ const subscribe = async (reg) => {
const sendSubData = async (subscription) => { const sendSubData = async (subscription) => {
const browser = navigator.userAgent.match(/(firefox|msie|chrome|safari|trident)/ig)[0].toLowerCase(); const browser = navigator.userAgent.match(/(firefox|msie|chrome|safari|trident)/ig)[0].toLowerCase();
const data = { const data = {
status_type: 'subscribe', status_type: 'push_subscribe',
subscription: subscription.toJSON(), subscription: subscription.toJSON(),
browser: browser, browser: browser,
user_agent: browser, user_agent: browser,