Merge pull request #182 from expsa/dev_odex25_mobile

fix time zone
This commit is contained in:
AbuzarExp 2024-07-14 11:32:34 +03:00 committed by GitHub
commit 874a94102d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 9 deletions

View File

@ -3,7 +3,10 @@ from odoo import http
from odoo.http import request
from odoo.addons.website.controllers.main import Website
from odoo.tools.translate import _
from odoo import models, fields
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
import pytz
from datetime import datetime
# Local modules
from ...http_helper import http_helper
from ...data_util import data_util
@ -18,6 +21,12 @@ _logger = logging.getLogger(__name__)
class NotificationController(http.Controller):
def convert_to_user_timezone(self, datetime_utc):
datetime_user_tz = fields.Datetime.context_timestamp(request, fields.Datetime.from_string(datetime_utc))
return fields.Datetime.to_string(datetime_user_tz)
@http.route(['/rest_api/v2/notifications/', '/rest_api/v2/notifications/page/<int:page>'], type='http', auth='none', csrf=False, methods=['GET'], website=True)
def index(self, page=1, **kw):
"""
@ -51,8 +60,7 @@ class NotificationController(http.Controller):
url_args={},
step=20
)
records = user.env['firebase.notification'].search(domain).search(
domain, limit=20, offset=pager['offset'])
records = user.env['firebase.notification'].search(domain).search(domain, limit=20, offset=pager['offset'])
for res in records:
notifications.append({
@ -65,9 +73,9 @@ class NotificationController(http.Controller):
"sent": res.sent,
"viewed": res.viewed,
"meta": res.meta,
"write_date": str(res.write_date),
"iso_date": str(res.iso_date),
"create_date": str(res.create_date),
"write_date": self.convert_to_user_timezone(res.write_date),
"iso_date": res.iso_date,
"create_date": self.convert_to_user_timezone(res.create_date),
"uuid": res.uid,
})
prev = pager['page_previous']['url']
@ -127,9 +135,9 @@ class NotificationController(http.Controller):
"sent": res.sent,
"viewed": res.viewed,
"meta": res.meta,
"write_date": str(res.write_date),
"iso_date": str(res.iso_date),
"create_date": str(res.create_date),
"write_date": self.convert_to_user_timezone(res.write_date),
"iso_date": res.iso_date,
"create_date": self.convert_to_user_timezone(res.create_date),
"uuid": res.uid,
})