weborsha/Joywork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix calendar mobile

Browse Source
This commit is contained in:
mac 2026-07-16 18:58:26 +03:00
parent b00403a684
commit 0644330c7a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/v2/app/src/controllers/CommonController.php
View File

@ -14557,6 +14557,7 @@ class CommonController extends ApiController
`e`.`calendar_view`, `e`.`calendar_view`,
`e`.`cancel`, `e`.`cancel`,
`e`.`tel`, `e`.`tel`,
`e`.`deal_id`,
`o`.`nazv`, `o`.`nazv`,
`e`.`name` `e`.`name`
@ -14581,6 +14582,7 @@ class CommonController extends ApiController
`e`.`calendar_view`, `e`.`calendar_view`,
`e`.`cancel`, `e`.`cancel`,
0 AS `tel`, 0 AS `tel`,
0 AS `deal_id`,
`o`.`nazv`, `o`.`nazv`,
'' AS `name` FROM `user_sub_comments` AS `s` '' AS `name` FROM `user_sub_comments` AS `s`
LEFT JOIN `user_object_events` AS `e` ON e.`id` = `s`.`event_id` LEFT JOIN `user_object_events` AS `e` ON e.`id` = `s`.`event_id`
@ -14592,6 +14594,11 @@ class CommonController extends ApiController
if ($query = mysql_query($sql)) { if ($query = mysql_query($sql)) {
while ($event = mysql_fetch_assoc($query)) { while ($event = mysql_fetch_assoc($query)) {
// Deal-события обрабатываются отдельно в client_events
if ($event['type'] == 'deal' && !empty($event['deal_id'])) {
continue;
}
$type = null; $type = null;
$is_viewed = false; $is_viewed = false;
$event['nazv'] = str_replace('"', "'", $event['nazv']); $event['nazv'] = str_replace('"', "'", $event['nazv']);
@ -14872,7 +14879,7 @@ class CommonController extends ApiController
'object_id' => null, 'object_id' => null,
'requisition_id' => !empty($bestEvent['req_id']) ? (int)$bestEvent['req_id'] : null, 'requisition_id' => !empty($bestEvent['req_id']) ? (int)$bestEvent['req_id'] : null,
'employee_id' => null, 'employee_id' => null,
'title' => "Сделка " . str_replace('"', "'", $dealTitle ?: 'без названия'), 'title' => str_replace('"', "'", $dealTitle ?: 'Сделка'),
'event_type' => 'deal', 'event_type' => 'deal',
'is_viewed' => $is_viewed, 'is_viewed' => $is_viewed,
'user_id' => $bestEvent['user_id'], 'user_id' => $bestEvent['user_id'],