节点与活动支持导出 ICS 日历(批 27)
- 新增 src/Ics.php:RFC 5545 生成器(CRLF、75 octet 折行且不切断
UTF-8 字符、TEXT 转义、时间输出 UTC Z、UID 固定为 triplog-node-{id}
使重复导入按 UID 更新而不堆重复事件)。
- 新增路由 nodes/ics、activities/ics:节点级导出单个事件
(SUMMARY=活动名·节点标题、DTSTART/DTEND、LOCATION=出发地、
DESCRIPTION=车次/航班号+备注);活动级导出整个行程(跳过已取消
节点与已生成执行记录的计划节点,口径与详情页展示一致)。
- 入口:活动详情页「导出日历」、节点详情页「导出日历」、
节点卡片「日历」链接。
- 修复隐性事故:index.php 漏 require src/Ics.php(无 autoloader 的
项目里新增类必须同步入口),部署哨兵新增「src/ 每个类文件都被
index.php require」逐文件对账。
- 验证:php -l 61 文件全过;渲染检查 386 项全过;Ics 单测 42 项
全过(转义/折行/UTC/拼装);服务器 e2e 391 项全过(含 11c 节
17 项 ICS 断言)。
This commit is contained in:
@@ -8,11 +8,59 @@ use App\Auth;
|
||||
use App\Comments;
|
||||
use App\Database;
|
||||
use App\Expenses;
|
||||
use App\Ics;
|
||||
use App\Members;
|
||||
use App\Mime;
|
||||
|
||||
class ActivityController
|
||||
{
|
||||
/**
|
||||
* 活动级导出:整个活动 → 一个 .ics(多个 VEVENT),导入后就是这次旅行的完整日历。
|
||||
*
|
||||
* 口径与详情页展示一致(批 27):
|
||||
* * 已取消的节点不导出(日历是「要去/去过」的安排,取消的没有意义);
|
||||
* * 计划节点若已生成执行记录,只导执行版(同一个行程导两遍会重复提醒);
|
||||
* * 事件 UID 与节点级导出同源(triplog-node-{id}),两个入口重复导入不堆事件。
|
||||
*/
|
||||
public function ics(): void
|
||||
{
|
||||
$db = Database::get();
|
||||
$id = (int)($_GET['id'] ?? 0);
|
||||
$activity = $this->fetchOwnActivity($id);
|
||||
if (!$activity) {
|
||||
http_response_code(404);
|
||||
exit('活动不存在');
|
||||
}
|
||||
|
||||
$stmt = $db->prepare('SELECT tn.*, nt.name AS node_type_name, tm.mode_type AS travel_mode_type
|
||||
FROM trip_nodes tn
|
||||
LEFT JOIN node_types nt ON nt.id = tn.node_type_id
|
||||
LEFT JOIN travel_modes tm ON tm.id = tn.travel_mode_id
|
||||
WHERE tn.activity_id = ?
|
||||
ORDER BY tn.start_time ASC, tn.id ASC');
|
||||
$stmt->execute([$id]);
|
||||
$nodes = $stmt->fetchAll();
|
||||
|
||||
// 已生成执行记录的计划节点 id 集合(这些计划版跳过,导执行版)
|
||||
$executed = [];
|
||||
foreach ($nodes as $n) {
|
||||
if (!empty($n['original_plan_node_id'])) {
|
||||
$executed[(int)$n['original_plan_node_id']] = true;
|
||||
}
|
||||
}
|
||||
|
||||
$blocks = [];
|
||||
foreach ($nodes as $n) {
|
||||
if (($n['status'] ?? '') === 'cancelled') continue;
|
||||
if (isset($executed[(int)$n['id']])) continue;
|
||||
$n['activity_title'] = (string)$activity['title'];
|
||||
$blocks[] = Ics::event(NodeController::buildEventFields($n));
|
||||
}
|
||||
|
||||
Ics::emit('TripLog-' . (string)$activity['title'],
|
||||
Ics::calendar($blocks, (string)$activity['title']));
|
||||
}
|
||||
|
||||
public function index(): void
|
||||
{
|
||||
$db = Database::get();
|
||||
|
||||
Reference in New Issue
Block a user