v14: 观影/家谱/日程/旅程/资源/任务六模块统一，首页改 dashboard
用户 14 条需求一次交付（1-13 功能 + 14 工作方式）。 观影（1-4） - 返回文案全模块统一为「返回观影」（不再有「返回列表」「返回观影记录」三种叫法） - 观影人一律用彩色人物标签 person_chip：底色由头像主色算出来（上传时存库）， 瀑布流卡片也按人显示；五处观影模板全部改用它 - 人员显示统一走 person_name()（shown → 我给他起的称呼 → 姓名） - 影院管理页与年度报告页的上下两块用 .card + .card 统一给间距（原来紧贴成一整块） 家谱（5） - 树根从「我」换成**辈分最高的祖先**：库画的是"树根的祖先链+后代+树根的兄弟姐妹"， 根=我 时伯父/堂兄/嫂子/侄子一个都不画（12 人夹具只画出 8 人） - focusMap 按**代数**圈定三代（不再按步数），normalizeLinks 把子女对称挂到父母双方 —— 修掉"母亲登录看不到孩子" - 新增「看全部 / 回到我」两个按钮，放在画布外（画布整块被库接管了手势） 统一事件原语（6-9） - 旅程：TripLog 全量迁入（3 趟旅程 / 21 段行程 / 72 张照片 / 5 个人）。 复用 events(kind='trip') + trip_details + trip_nodes（计划/执行双轨保留） - 日程：每人可建日历本（自定义色）+ 共享只读/可写；观影与旅行是每人默认两本， 内容是**从各模块实时派生**的（不复制，所以改了观影日期日历立刻跟着变）； 没有具体时分 = 全天；月视图参照群晖 Calendar - 资源：挂在某人名下的附属信息（标题+正文+多附件），可共享给多人并设只读/读写， 默认折叠、可搜标题与正文 - 任务：看板三列 + 两级子任务 + 评论@人 + 共享 + 循环（完成时按原截止日推下一期） - 统一附件表：四个模块的附件共用一张，下载地址不落库、一律由 media.php 现算 模块化（10-11） - App\Module 是模块的唯一来源（加一行 = 导航条/主题色/个人设置三处自动出现） - 个人设置里可勾选要显示哪些模块、拖动排序（关掉的模块**不会**被兜底补回来） - 每个模块一套主题色（家庭级），只覆盖 --brand 三兄弟，不碰纸墨底色 其他（12-13） - 新增成员表单可选所属分组（编辑表单没有：分组是"我和他的关系"，只归我自己） - 首页改 dashboard：接下来的日子 / 未来七天 / 手头在做 / 往年今日。 家人卡片从首页撤走（看人去名册） 验证（全部通过） - e2e 542 条（新增 4 模块端到端 60+ 条） - 桌面几何 368 / 移动端几何 520 / 家谱 12 / 交互 97 / 老库升级 123 - SQL 列名静态校验 0 处可疑（对着真实表结构） - 反向验证 18 条新注入全部抓住 顺带修掉的既有问题 - 老库升级回填 SQL 按实际存在的列动态拼（缺列不再 1054 炸断升级） - 全新安装时 Schema::ensure 跑在"人还没建"之前 → 补建日历本三处齐备 - 窄屏导航横向溢出（模块从 4 个加到 8 个后顶栏撑破视口）
This commit is contained in:
+405
@@ -0,0 +1,405 @@
|
||||
<?php
|
||||
/**
|
||||
* 旅程（v12，从 TripLog 迁入；导航条上叫「旅程」）。
|
||||
*
|
||||
* 与观影一样挂在**统一事件原语**上：
|
||||
* events(kind='trip') —— 骨架：标题 / 起止时刻 / 地点（目的地）/ 备注
|
||||
* trip_details —— 卫星表：封面图 + 一段话小结
|
||||
* event_attendees —— 同行的人
|
||||
* attachments(target=trip) —— 照片与附件
|
||||
* trip_nodes —— 行程节点：这趟旅程里的一段一段（计划 / 实际走过的双轨）
|
||||
*
|
||||
* 为什么不把 TripLog 的 activities/trip_nodes 原样搬过来：
|
||||
* TripLog 的 activities 与家书的 events 是同一个东西（一次出行 = 一个有时间、有人、
|
||||
* 要上日历的事件）。再建一张 activities 就会出现"两条时间线"，日历要同时读两张表，
|
||||
* 迁移后还得保证两边同步 —— 那正是统一事件原语要消灭的重复。
|
||||
*
|
||||
* 计划/执行双轨（TripLog 最有价值的一点）保留了：
|
||||
* 出发前排的行程是 plan，真正走完记的是 reality，两轨并存，
|
||||
* 于是"我们本来打算去哪、后来实际上去了哪"都能回看。
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App;
|
||||
|
||||
final class Trip
|
||||
{
|
||||
/** 节点类型（TripLog 的 node_types 简化成固定几种 —— 家庭出游用不到那么多） */
|
||||
public const NODE_TYPES = [
|
||||
'play' => ['游玩', '🎡'],
|
||||
'meal' => ['用餐', '🍜'],
|
||||
'move' => ['赶路', '🚗'],
|
||||
'stay' => ['住宿', '🏨'],
|
||||
'other' => ['其他', '📌'],
|
||||
];
|
||||
|
||||
public const NODE_STATUS = [
|
||||
'planned' => '计划中',
|
||||
'ongoing' => '进行中',
|
||||
'done' => '已完成',
|
||||
'cancelled' => '已取消',
|
||||
];
|
||||
|
||||
/** 全部旅程（按出发时间倒序） */
|
||||
public static function all(int $familyId, string $keyword = ''): array
|
||||
{
|
||||
$sql = 'SELECT e.id, e.title, e.starts_at, e.ends_at, e.location, e.note,
|
||||
d.cover_key, d.summary,
|
||||
(SELECT COUNT(*) FROM event_attendees a WHERE a.event_id = e.id) AS attendee_count,
|
||||
(SELECT COUNT(*) FROM trip_nodes n WHERE n.event_id = e.id) AS node_count
|
||||
FROM events e
|
||||
LEFT JOIN trip_details d ON d.event_id = e.id
|
||||
WHERE e.family_id = ? AND e.kind = ?';
|
||||
$bind = [$familyId, 'trip'];
|
||||
$kw = trim($keyword);
|
||||
if ($kw !== '') {
|
||||
$sql .= ' AND (e.title LIKE ? OR e.location LIKE ? OR e.note LIKE ?)';
|
||||
$like = '%' . $kw . '%';
|
||||
array_push($bind, $like, $like, $like);
|
||||
}
|
||||
$sql .= ' ORDER BY e.starts_at DESC, e.id DESC';
|
||||
$st = Database::get()->prepare($sql);
|
||||
$st->execute($bind);
|
||||
return $st->fetchAll();
|
||||
}
|
||||
|
||||
/**
|
||||
* 给一批旅程补上「同行的人」。
|
||||
*
|
||||
* ⚠️ 必须一次性补（N+1 会让列表在几十趟旅程时明显变慢，观影就是这么踩的）。
|
||||
* 一次查询拿全部 event_attendees，再按 event_id 分桶挂回去。
|
||||
*/
|
||||
public static function attachAttendees(array &$rows, int $viewerId = 0): void
|
||||
{
|
||||
$ids = [];
|
||||
foreach ($rows as $r) {
|
||||
$id = (int)($r['id'] ?? 0);
|
||||
if ($id > 0) {
|
||||
$ids[] = $id;
|
||||
}
|
||||
}
|
||||
$byEvent = [];
|
||||
foreach ($rows as $r) {
|
||||
$byEvent[(int)$r['id']] = [];
|
||||
}
|
||||
if ($ids) {
|
||||
$in = implode(',', array_fill(0, count($ids), '?'));
|
||||
$st = Database::get()->prepare(
|
||||
'SELECT a.event_id, p.id, p.name, p.avatar, p.avatar_color, n.nickname AS my_nickname
|
||||
FROM event_attendees a JOIN persons p ON p.id = a.person_id
|
||||
LEFT JOIN nicknames n ON n.target_id = p.id AND n.viewer_id = ?
|
||||
WHERE a.event_id IN (' . $in . ')
|
||||
ORDER BY a.position, p.id'
|
||||
);
|
||||
$st->execute(array_merge([$viewerId], $ids));
|
||||
foreach ($st->fetchAll() as $a) {
|
||||
$byEvent[(int)$a['event_id']][] = $a;
|
||||
}
|
||||
}
|
||||
foreach ($rows as &$r) {
|
||||
$r['attendees'] = $byEvent[(int)$r['id']] ?? [];
|
||||
}
|
||||
unset($r);
|
||||
}
|
||||
|
||||
/** 一条完整旅程 */
|
||||
public static function find(int $familyId, int $id, int $viewerId = 0): ?array
|
||||
{
|
||||
$st = Database::get()->prepare(
|
||||
"SELECT e.*, d.cover_key, d.summary
|
||||
FROM events e LEFT JOIN trip_details d ON d.event_id = e.id
|
||||
WHERE e.family_id = ? AND e.id = ? AND e.kind = 'trip'"
|
||||
);
|
||||
$st->execute([$familyId, $id]);
|
||||
$row = $st->fetch();
|
||||
if (!$row) {
|
||||
return null;
|
||||
}
|
||||
$row['attendees'] = self::attendees($id, $viewerId);
|
||||
$row['photos'] = \App\Attachment::list('trip', $id);
|
||||
return $row;
|
||||
}
|
||||
|
||||
/** 同行的人（带「我叫他什么」与主色，页面按人画标签） */
|
||||
public static function attendees(int $eventId, int $viewerId = 0): array
|
||||
{
|
||||
$st = Database::get()->prepare(
|
||||
'SELECT p.id, p.name, p.avatar, p.avatar_color, n.nickname AS my_nickname
|
||||
FROM event_attendees a JOIN persons p ON p.id = a.person_id
|
||||
LEFT JOIN nicknames n ON n.target_id = p.id AND n.viewer_id = ?
|
||||
WHERE a.event_id = ?
|
||||
ORDER BY a.position, p.id'
|
||||
);
|
||||
$st->execute([$viewerId, $eventId]);
|
||||
return $st->fetchAll();
|
||||
}
|
||||
|
||||
/** @return int 事件 id */
|
||||
public static function create(int $familyId, ?int $creatorId, array $d): int
|
||||
{
|
||||
$db = Database::get();
|
||||
$db->prepare(
|
||||
"INSERT INTO events (family_id, creator_id, kind, title, starts_at, ends_at, location, note, source_ref)
|
||||
VALUES (?, ?, 'trip', ?, ?, ?, ?, ?, ?)"
|
||||
)->execute([
|
||||
$familyId, $creatorId, (string)$d['title'],
|
||||
self::dtOrNull($d['starts_at'] ?? ''), self::dtOrNull($d['ends_at'] ?? ''),
|
||||
self::textOrNull($d['location'] ?? ''), self::textOrNull($d['note'] ?? ''),
|
||||
$d['source_ref'] ?? null,
|
||||
]);
|
||||
$id = (int)$db->lastInsertId();
|
||||
self::saveDetails($id, $d);
|
||||
self::saveAttendees($id, $d['attendees'] ?? []);
|
||||
return $id;
|
||||
}
|
||||
|
||||
public static function update(int $familyId, int $id, array $d): void
|
||||
{
|
||||
$db = Database::get();
|
||||
$db->prepare(
|
||||
"UPDATE events SET title=?, starts_at=?, ends_at=?, location=?, note=?
|
||||
WHERE id=? AND family_id=? AND kind='trip'"
|
||||
)->execute([
|
||||
(string)$d['title'],
|
||||
self::dtOrNull($d['starts_at'] ?? ''), self::dtOrNull($d['ends_at'] ?? ''),
|
||||
self::textOrNull($d['location'] ?? ''), self::textOrNull($d['note'] ?? ''),
|
||||
$id, $familyId,
|
||||
]);
|
||||
self::saveDetails($id, $d);
|
||||
self::saveAttendees($id, $d['attendees'] ?? []);
|
||||
}
|
||||
|
||||
private static function saveDetails(int $eventId, array $d): void
|
||||
{
|
||||
$db = Database::get();
|
||||
$row = [
|
||||
self::keyOrNull($d['cover_key'] ?? ''),
|
||||
self::textOrNull($d['summary'] ?? ''),
|
||||
];
|
||||
$has = $db->prepare('SELECT COUNT(*) FROM trip_details WHERE event_id = ?');
|
||||
$has->execute([$eventId]);
|
||||
if ((int)$has->fetchColumn() > 0) {
|
||||
$db->prepare('UPDATE trip_details SET cover_key=?, summary=? WHERE event_id=?')
|
||||
->execute([...$row, $eventId]);
|
||||
} else {
|
||||
$db->prepare('INSERT INTO trip_details (cover_key, summary, event_id) VALUES (?,?,?)')
|
||||
->execute([...$row, $eventId]);
|
||||
}
|
||||
}
|
||||
|
||||
public static function saveAttendees(int $eventId, array $personIds): void
|
||||
{
|
||||
$db = Database::get();
|
||||
$db->prepare('DELETE FROM event_attendees WHERE event_id = ?')->execute([$eventId]);
|
||||
$ins = $db->prepare('INSERT IGNORE INTO event_attendees (event_id, person_id, position) VALUES (?,?,?)');
|
||||
$pos = 0;
|
||||
foreach ($personIds as $pid) {
|
||||
$pid = (int)$pid;
|
||||
if ($pid > 0) {
|
||||
$pos += 10;
|
||||
$ins->execute([$eventId, $pid, $pos]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static function destroy(int $familyId, int $id): void
|
||||
{
|
||||
// 照片与节点附件一并清（events 级联只带走数据库行，存储对象要自己删）
|
||||
foreach (\App\Attachment::list('trip', $id) as $a) {
|
||||
\App\Attachment::remove((int)$a['id']);
|
||||
}
|
||||
foreach (self::nodes($id) as $n) {
|
||||
foreach (\App\Attachment::list('trip_node', (int)$n['id']) as $a) {
|
||||
\App\Attachment::remove((int)$a['id']);
|
||||
}
|
||||
}
|
||||
Database::get()->prepare("DELETE FROM events WHERE id=? AND family_id=? AND kind='trip'")
|
||||
->execute([$id, $familyId]);
|
||||
}
|
||||
|
||||
// ---------------- 行程节点 ----------------
|
||||
|
||||
/** 这趟旅程的全部节点（plan / reality 两轨，按 position 排） */
|
||||
public static function nodes(int $eventId, int $viewerId = 0): array
|
||||
{
|
||||
$st = Database::get()->prepare(
|
||||
'SELECT * FROM trip_nodes WHERE event_id = ? ORDER BY category, position, starts_at, id'
|
||||
);
|
||||
$st->execute([$eventId]);
|
||||
$rows = $st->fetchAll();
|
||||
$ids = array_map('intval', array_column($rows, 'id'));
|
||||
// 一次性把全部节点的附件取出来（逐节点查会让"十几段的旅程"变成几十次查询）
|
||||
$attach = [];
|
||||
foreach ($ids as $nid) {
|
||||
$attach[$nid] = [];
|
||||
}
|
||||
if ($ids) {
|
||||
$in = implode(',', array_fill(0, count($ids), '?'));
|
||||
$sa = Database::get()->prepare(
|
||||
"SELECT * FROM attachments WHERE target_type = 'trip_node' AND target_id IN ($in)
|
||||
ORDER BY position, id"
|
||||
);
|
||||
$sa->execute($ids);
|
||||
foreach ($sa->fetchAll() as $a) {
|
||||
$attach[(int)$a['target_id']][] = $a;
|
||||
}
|
||||
}
|
||||
foreach ($rows as &$n) {
|
||||
$n['members'] = self::nodeMembersFor((int)$n['id'], $viewerId);
|
||||
$n['attachs'] = $attach[(int)$n['id']] ?? [];
|
||||
}
|
||||
unset($n);
|
||||
return $rows;
|
||||
}
|
||||
|
||||
public static function node(int $id): ?array
|
||||
{
|
||||
$st = Database::get()->prepare('SELECT * FROM trip_nodes WHERE id = ?');
|
||||
$st->execute([$id]);
|
||||
$r = $st->fetch();
|
||||
return $r ?: null;
|
||||
}
|
||||
|
||||
public static function saveNode(int $familyId, int $eventId, array $d, ?int $id = null): int
|
||||
{
|
||||
$db = Database::get();
|
||||
$fields = [
|
||||
self::textOrNull2($d['title'] ?? ''),
|
||||
self::textOrNull($d['detail'] ?? ''),
|
||||
self::textOrNull($d['place'] ?? ''),
|
||||
self::dtOrNull($d['starts_at'] ?? ''),
|
||||
self::dtOrNull($d['ends_at'] ?? ''),
|
||||
in_array($d['node_type'] ?? '', array_keys(self::NODE_TYPES), true) ? $d['node_type'] : 'other',
|
||||
in_array($d['status'] ?? '', array_keys(self::NODE_STATUS), true) ? $d['status'] : 'planned',
|
||||
($d['category'] ?? '') === 'reality' ? 'reality' : 'plan',
|
||||
(int)($d['position'] ?? 100),
|
||||
];
|
||||
if ($id !== null && $id > 0) {
|
||||
$db->prepare(
|
||||
'UPDATE trip_nodes SET title=?, detail=?, place=?, starts_at=?, ends_at=?,
|
||||
node_type=?, status=?, category=?, position=? WHERE id=?'
|
||||
)->execute([...$fields, $id]);
|
||||
$nid = $id;
|
||||
} else {
|
||||
$db->prepare(
|
||||
'INSERT INTO trip_nodes (family_id, event_id, title, detail, place, starts_at, ends_at,
|
||||
node_type, status, category, position) VALUES (?,?,?,?,?,?,?,?,?,?,?)'
|
||||
)->execute([$familyId, $eventId, ...$fields]);
|
||||
$nid = (int)$db->lastInsertId();
|
||||
}
|
||||
self::saveNodeMembers($nid, $d['members'] ?? []);
|
||||
return $nid;
|
||||
}
|
||||
|
||||
public static function deleteNode(int $id): void
|
||||
{
|
||||
foreach (\App\Attachment::list('trip_node', $id) as $a) {
|
||||
\App\Attachment::remove((int)$a['id']);
|
||||
}
|
||||
Database::get()->prepare('DELETE FROM trip_nodes WHERE id = ?')->execute([$id]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 这一段里有谁。
|
||||
*
|
||||
* ⚠️ 昵称必须按**看页面的那个人**的视角取，所以要显式传 $viewerId ——
|
||||
* 成员表里只有"谁参加了"，没有"谁在看"。
|
||||
*/
|
||||
public static function nodeMembersFor(int $nodeId, int $viewerId): array
|
||||
{
|
||||
$st = Database::get()->prepare(
|
||||
'SELECT p.id, p.name, p.avatar, p.avatar_color, n.nickname AS my_nickname
|
||||
FROM trip_node_members m JOIN persons p ON p.id = m.person_id
|
||||
LEFT JOIN nicknames n ON n.target_id = p.id AND n.viewer_id = ?
|
||||
WHERE m.node_id = ? ORDER BY p.id'
|
||||
);
|
||||
$st->execute([$viewerId, $nodeId]);
|
||||
return $st->fetchAll();
|
||||
}
|
||||
|
||||
public static function saveNodeMembers(int $nodeId, array $personIds): void
|
||||
{
|
||||
$db = Database::get();
|
||||
$db->prepare('DELETE FROM trip_node_members WHERE node_id = ?')->execute([$nodeId]);
|
||||
$ins = $db->prepare('INSERT IGNORE INTO trip_node_members (node_id, person_id) VALUES (?,?)');
|
||||
foreach ($personIds as $pid) {
|
||||
$pid = (int)$pid;
|
||||
if ($pid > 0) {
|
||||
$ins->execute([$nodeId, $pid]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------- 展示 ----------------
|
||||
|
||||
/** 起止日期的人话展示（与 Movie::formatWatch 同款口径） */
|
||||
public static function formatSpan(?string $start, ?string $end): string
|
||||
{
|
||||
if ($start === null || $start === '') {
|
||||
return '日期待补';
|
||||
}
|
||||
$ts = strtotime($start);
|
||||
if ($ts === false) {
|
||||
return '日期待补';
|
||||
}
|
||||
$s = date('Y年n月j日', $ts);
|
||||
if ($end === null || $end === '') {
|
||||
return $s;
|
||||
}
|
||||
$te = strtotime($end);
|
||||
if ($te === false) {
|
||||
return $s;
|
||||
}
|
||||
return $s . ' – ' . date('Y年n月j日', $te);
|
||||
}
|
||||
|
||||
public static function typeWord(string $key): string
|
||||
{
|
||||
return self::NODE_TYPES[$key][0] ?? '其他';
|
||||
}
|
||||
|
||||
public static function typeIcon(string $key): string
|
||||
{
|
||||
return self::NODE_TYPES[$key][1] ?? '📌';
|
||||
}
|
||||
|
||||
public static function statusWord(string $key): string
|
||||
{
|
||||
return self::NODE_STATUS[$key] ?? '计划中';
|
||||
}
|
||||
|
||||
// ---------------- 小工具 ----------------
|
||||
|
||||
private static function dtOrNull(string $v): ?string
|
||||
{
|
||||
$v = trim($v);
|
||||
if ($v === '') {
|
||||
return null;
|
||||
}
|
||||
if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $v)) {
|
||||
$v .= ' 00:00:00';
|
||||
}
|
||||
return preg_match('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/', $v) ? $v : null;
|
||||
}
|
||||
|
||||
private static function textOrNull(string $v): ?string
|
||||
{
|
||||
$v = trim($v);
|
||||
return $v !== '' ? $v : null;
|
||||
}
|
||||
|
||||
private static function textOrNull2(string $v): string
|
||||
{
|
||||
return mb_substr(trim($v), 0, 200, 'UTF-8');
|
||||
}
|
||||
|
||||
private static function keyOrNull(string $v): ?string
|
||||
{
|
||||
$v = ltrim(trim($v), '/');
|
||||
if ($v === '' || strpos($v, '..') !== false || strpos($v, "\0") !== false) {
|
||||
return null;
|
||||
}
|
||||
return $v;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user