diff --git a/ajax/calendarEvents.php b/ajax/calendarEvents.php index 7e7d9c4..4a90379 100644 --- a/ajax/calendarEvents.php +++ b/ajax/calendarEvents.php @@ -357,6 +357,40 @@ if ($_SESSION['id']) { $i++; } + // Добавляем сделки из deal_user для текущего пользователя + $sql_deals = "SELECT d.id, d.title, d.side_one_requisition_id FROM deals d + INNER JOIN deal_user du ON du.deal_id = d.id + WHERE du.user_id = " . intval($_SESSION['id']) . " + AND d.id NOT IN (" . (empty($seenDealIds) ? '0' : implode(',', $seenDealIds)) . ")"; + $q_deals = mysql_query($sql_deals); + while ($dealRow = mysql_fetch_assoc($q_deals)) { + $did = (int)$dealRow['id']; + $dealTitle = $dealRow['title']; + $sideOneReqId = (int)$dealRow['side_one_requisition_id']; + + // Получаем schedule_date из связанной заявки + $q_dates = mysql_query("SELECT schedule_date, deal_id FROM user_client_events WHERE deal_id = " . $did . " AND type = 'deal' AND schedule_date IS NOT NULL AND cancel = 0 ORDER BY schedule_date DESC LIMIT 1"); + if ($q_dates && mysql_num_rows($q_dates) > 0) { + $dateRow = mysql_fetch_assoc($q_dates); + $scheduleDate = $dateRow['schedule_date']; + } else { + // Берём created_at сделки как fallback + $q_created = mysql_query("SELECT created_at FROM deals WHERE id = " . $did); + $scheduleDate = ($q_created && mysql_num_rows($q_created) > 0) ? mysql_fetch_assoc($q_created)['created_at'] : date('Y-m-d H:i:s'); + } + + if ($i > 0) { echo ',{'; } else { echo '{'; } + echo '"id" : "' . $i . '", '; + echo '"table_id" : "' . $did . '", '; + echo '"start" : "' . date(DateTime::ATOM, strtotime($scheduleDate)) . '", '; + echo '"client_id" : "0",'; + echo '"req_id" : "' . $sideOneReqId . '",'; + $className = "deal"; + echo '"title": "' . str_replace('"', "'", $dealTitle) . '","className" : "' . $className . '"'; + echo "}"; + $i++; + } + //if($_SESSION['id'] == 5238){ if (isset($post['start'])) { // echo $post['start'];