From a6bf3dfe41bec1896acf6a047562f79b6028836b Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Wed, 4 Nov 2026 10:12:25 +0900 Subject: [PATCH] Refine task editor layout and personal reminder defaults --- docs/design/ja/organizer-dashboard.md | 8 ++ docs/design/ja/task-reminders.md | 10 ++- internal/server/productivity_browser_test.go | 21 ++++- internal/server/task_productivity.go | 13 +++ internal/server/task_productivity_test.go | 82 +++++++++++++++++++ .../server/testdata/productivity-browser.js | 27 +++++- internal/server/testdata/tasks-browser.js | 2 +- internal/store/task_productivity.go | 13 ++- static/css/tasks.css | 51 ++++++++++++ static/js/task-productivity.js | 14 ++-- static/js/tasks.js | 40 +++++++-- templates/pages/organizer_dashboard.gohtml | 2 +- templates/pages/organizer_settings.gohtml | 2 +- templates/pages/tasks.gohtml | 4 +- 14 files changed, 263 insertions(+), 26 deletions(-) diff --git a/docs/design/ja/organizer-dashboard.md b/docs/design/ja/organizer-dashboard.md index 46cbbb1..2d5a8a3 100644 --- a/docs/design/ja/organizer-dashboard.md +++ b/docs/design/ja/organizer-dashboard.md @@ -18,6 +18,14 @@ 個人設定は通常の設定画面と同じURI体系・テーマを使うが、専用の軽量な画面として返す。GET/HEADかつ正確な `panel=organizer` の場合だけ個人向けハンドラーに振り分け、管理用設定やアカウント一覧は取得・描画しない。POSTの管理者チェックは緩和しない。保存先は既存の本人用APIであり、一般利用者に管理権限を付与しない。 +## タスク編集画面と通知既定値 + +2026-11-04の追加実装(v0.7.0の本番反映には含まない)では、デスクトップの編集画面を最大1180px幅の2カラムへ整理した。左側は件名・状態・整理先・プロジェクト・メモと作業アクション、右側は取り組む日・期限・見直す日・工程日付・優先度・工数・複雑度・Inbox通知とする。主要項目は1024×768でもスクロールなしで表示でき、低いウィンドウや詳細設定展開時には入力部分だけをスクロールする。保存操作はフッターに残す。 + +状態・整理先・複雑度はnative radioの単一選択を使い、選択中の項目をテーマ色と下線で示す。状態・整理先には記号を添え、複雑度は1〜5の数値と段階表示を併用する。ラベル、キーボード操作、読み取り専用制限は維持する。担当者UUID、プロジェクト検索、Wiki連携は詳細設定に折りたたみ、入力検証エラー時には展開する。 + +760px以下では1カラムにし、主な入力と選択ボタンは44px以上のタッチ領域を確保する。個人設定には新規タスクの期限日・取り組む日のInbox通知と通知時刻を設ける。適用条件と既存データの扱いは[タスク通知](task-reminders.md)を参照する。 + ## ウィジェット 初期構成は次の6種類。任意のHTML・iframe・外部URL・スクリプトを登録する機能ではなく、サーバーが許可する組み込みIDを使う。 diff --git a/docs/design/ja/task-reminders.md b/docs/design/ja/task-reminders.md index 7d72c03..786fe1a 100644 --- a/docs/design/ja/task-reminders.md +++ b/docs/design/ja/task-reminders.md @@ -1,10 +1,14 @@ # タスク通知:予約・配信・取消 -更新日:2026-09-25。個人タスクの期限日/計画日のInbox通知を実装。カレンダー通知、メール、OS push、集中タイマー、quiet hours、通知の集約は未実装。 +更新日:2026-11-04。本書は個人タスクの期限日/取り組む日のInbox通知と、その個人既定値を扱う。日次メールやOS通知、集中タイマーは別機能として扱い、Inbox予約の配信条件と混同しない。 ## 操作と既定値 -タスク編集に「期限日にInboxへ通知」「取り組む日にInboxへ通知」と時刻入力を追加する。両方とも既定OFF。通知を選択した日付が必須で、未指定の時刻は09:00。期限は引き続き日付型であり、通知時刻によって時刻付きの締切へ変換しない。プロジェクトには通知を設定しない。 +タスク編集に「期限日にInboxへ通知」「取り組む日にInboxへ通知」と時刻入力を置く。未設定の個人では両方ともOFF、未指定の時刻は09:00。通知を選択した日付は必須。期限は引き続き日付型であり、通知時刻によって時刻付きの締切へ変換しない。プロジェクトには通知を設定しない。 + +2026-11-04のソース更新では、個人設定 `/-/sys/config?panel=organizer` に期限日・取り組む日の通知既定値と通知時刻を追加した。Domain・本人ごとの既存preferences JSONに `notify_due`、`notify_planned`、`reminder_time` を保存する。DBスキーマ変更は不要。メールの日次配信とは独立した設定であり、古い設定の通知はOFFのまま、時刻は09:00として読む。 + +既定値は新規タスクだけに使い、既存タスクの設定や予約を一括変更しない。対応する日付がある場合だけ通知ONとし、日付のない簡易追加は許可する。新規編集画面で日付を入力した場合にも既定値を適用するが、利用者が通知を明示的に選び直した後はその選択を優先する。簡易追加・サブタスクはpreferencesの `defaults` を使用し、capture APIはリクエストの日付上書き後に通知の既定値を適用する。既存のitems APIの更新、CalDAV更新に個人既定値を強制しない。 保存時のドメイン設定のタイムゾーンをサーバー側で取得し、`reminder_timezone` に記録する。APIが指定した別のzoneを信用しない。設定画面のzone変更だけでは保存済み予約を動かさず、タスクの再保存で新しいzoneを適用する。編集画面には保存時に適用するzoneを表示する。 @@ -42,4 +46,4 @@ Inboxには一般的な通知文と対象UUIDだけを保存し、個人タス テスト対象:初期OFF、指定日とzoneでの予約、夏時間、存在しない時刻、日付変更・完了・取消・アーカイブ・OFF、権限失効、拡張停止、期限切れ予約、同一機会の重複防止、並列配信、予約/Inbox挿入失敗時のrollback、現時点での件名表示、別所有者への漏えい防止。ブラウザでは通知設定の保存、バックグラウンド配信後の赤丸、Inbox表示まで隔離環境で確認する。 -次段階:個人/ドメインの通知既定値、quiet hours、集約、予約状態の詳細表示、ローカルカレンダーの時間枠との関連付け・予定通知。外部から取り込んだカレンダー内容へのアクセスは、別途許可があるまで行わない。 +次段階:ドメインの通知既定値、quiet hours、集約、予約状態の詳細表示、ローカルカレンダーの時間枠との関連付け・予定通知。外部から取り込んだカレンダー内容へのアクセスは、別途許可があるまで行わない。 diff --git a/internal/server/productivity_browser_test.go b/internal/server/productivity_browser_test.go index c769ca0..be22417 100644 --- a/internal/server/productivity_browser_test.go +++ b/internal/server/productivity_browser_test.go @@ -15,10 +15,19 @@ func TestProductivityChromium(t *testing.T) { if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { t.Skip("opt-in Chromium") } - for _, view := range []string{"contacts", "settings", "report", "tasks", "home"} { - for _, size := range []string{"desktop", "mobile"} { + for _, view := range []string{"contacts", "settings", "report", "tasks", "home", "editor"} { + sizes := []string{"desktop", "mobile"} + if view == "editor" { + sizes = append(sizes, "laptop", "mobile-small", "english") + } + for _, size := range sizes { t.Run(view+"-"+size, func(t *testing.T) { s, token, domain, actor := taskFixture(t) + if size == "english" { + if err := s.store.SetConfigInDomain(domain, "locale", "en"); err != nil { + t.Fatal(err) + } + } s.mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { s.renderSearchHome(w, r, "search") }) item := newTaskRecord("task", "Browser work task") item.Status = "done" @@ -38,7 +47,7 @@ func TestProductivityChromium(t *testing.T) { if e != nil { t.Fatal(e) } - path := map[string]string{"contacts": "/v/plan/contacts", "settings": "/-/sys/config?panel=organizer", "report": "/v/plan/dashboard", "tasks": "/v/plan/tasks", "home": "/"}[view] + path := map[string]string{"contacts": "/v/plan/contacts", "settings": "/-/sys/config?panel=organizer", "report": "/v/plan/dashboard", "tasks": "/v/plan/tasks", "home": "/", "editor": "/v/plan/task/-/new"}[view] server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { r.Header.Set("Authorization", "Bearer "+token) if r.Method == "GET" && r.URL.RequestURI() == path { @@ -64,6 +73,12 @@ func TestProductivityChromium(t *testing.T) { if size == "mobile" { width, height = "390", "844" } + if size == "laptop" { + width, height = "1024", "768" + } + if size == "mobile-small" { + width, height = "320", "568" + } ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) defer cancel() shot := "" diff --git a/internal/server/task_productivity.go b/internal/server/task_productivity.go index b002b17..d201e22 100644 --- a/internal/server/task_productivity.go +++ b/internal/server/task_productivity.go @@ -34,9 +34,21 @@ func defaultTask(p store.TaskPreferences, now time.Time) store.TaskRecord { *date.target = now.AddDate(0, 0, *date.offset).Format("2006-01-02") } } + applyTaskReminderDefaults(&item, p) return item } +// Undated captures must remain possible, even when reminder defaults are on. +// Apply after date overrides, and never apply to updates of existing tasks. +func applyTaskReminderDefaults(item *store.TaskRecord, p store.TaskPreferences) { + item.NotifyDue = p.NotifyDue && item.DueOn != "" + item.NotifyPlanned = p.NotifyPlanned && item.PlannedOn != "" + item.ReminderTime = p.ReminderTime + if item.ReminderTime == "" { + item.ReminderTime = "09:00" + } +} + type taskCaptureInput struct { RequestID string `json:"request_id"` Title string `json:"title"` @@ -198,6 +210,7 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request, if input.Complexity != nil { item.Complexity = *input.Complexity } + applyTaskReminderDefaults(&item, p) raw, _ := json.Marshal(input) hash := sha256.Sum256(raw) item, err = s.store.CaptureTask(r.Context(), domain, actor, input.RequestID, hex.EncodeToString(hash[:]), item) diff --git a/internal/server/task_productivity_test.go b/internal/server/task_productivity_test.go index 49f9ff8..a01fc3d 100644 --- a/internal/server/task_productivity_test.go +++ b/internal/server/task_productivity_test.go @@ -32,6 +32,88 @@ func TestTaskDigestSMTPContent(t *testing.T) { } } +func TestTaskReminderPreferencesAndCapture(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + existing, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Existing without reminders"), 0) + if err != nil { + t.Fatal(err) + } + w := taskRequest(s, token, "GET", "preferences", nil, "") + var result struct { + Preferences store.TaskPreferences `json:"preferences"` + Defaults store.TaskRecord `json:"defaults"` + } + if err = json.Unmarshal(w.Body.Bytes(), &result); err != nil { + t.Fatal(err) + } + if result.Preferences.NotifyDue || result.Preferences.NotifyPlanned || result.Preferences.ReminderTime != "09:00" { + t.Fatal("unexpected initial reminder preferences", result.Preferences) + } + p := result.Preferences + p.NotifyDue, p.NotifyPlanned, p.ReminderTime = true, true, "10:35" + w = taskRequest(s, token, "PUT", "preferences", p, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + if err = json.Unmarshal(w.Body.Bytes(), &result); err != nil { + t.Fatal(err) + } + p = result.Preferences + for _, clock := range []string{"9:00", "24:00", "10:35:00", "garbage"} { + bad := p + bad.ReminderTime = clock + if w = taskRequest(s, token, "PUT", "preferences", bad, ""); w.Code != 422 { + t.Fatal("invalid clock accepted", clock, w.Code) + } + } + for _, tc := range []struct { + name string + dates map[string]any + due, planned bool + }{ + {"undated", map[string]any{}, false, false}, + {"dated", map[string]any{"due_on": "2030-01-02", "planned_on": "2030-01-01"}, true, true}, + {"cleared", map[string]any{"due_on": "", "planned_on": ""}, false, false}, + } { + input := tc.dates + input["request_id"] = uuid.NewString() + input["title"] = tc.name + w = taskRequest(s, token, "POST", "capture", input, "") + if w.Code != 201 { + t.Fatal(tc.name, w.Code, w.Body) + } + var response struct { + Item store.TaskRecord `json:"item"` + } + if err = json.Unmarshal(w.Body.Bytes(), &response); err != nil { + t.Fatal(err) + } + if response.Item.NotifyDue != tc.due || response.Item.NotifyPlanned != tc.planned || response.Item.ReminderTime != "10:35" { + t.Fatal("wrong reminder defaults", response.Item) + } + if tc.due && response.Item.ReminderTimezone == "" { + t.Fatal("missing server timezone") + } + } + zero := 0 + p.PlannedDays = &zero + if w = taskRequest(s, token, "PUT", "preferences", p, ""); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + w = taskRequest(s, token, "GET", "preferences", nil, "") + if err = json.Unmarshal(w.Body.Bytes(), &result); err != nil { + t.Fatal(err) + } + if !result.Defaults.NotifyPlanned || result.Defaults.NotifyDue || result.Defaults.PlannedOn == "" { + t.Fatal("dated defaults missing", result.Defaults) + } + loaded, err := s.store.GetTask(ctx, domain, actor, existing.UUID) + if err != nil || loaded.Version != existing.Version || loaded.NotifyDue || loaded.NotifyPlanned { + t.Fatal("existing task changed", loaded, err) + } +} + func TestTaskCaptureDefaultsReplayAndPermissions(t *testing.T) { s, token, domain, actor := taskFixture(t) ctx := context.Background() diff --git a/internal/server/testdata/productivity-browser.js b/internal/server/testdata/productivity-browser.js index 5caf78e..3b7d7d1 100644 --- a/internal/server/testdata/productivity-browser.js +++ b/internal/server/testdata/productivity-browser.js @@ -1,6 +1,29 @@ window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<120;i++){if(fn())return;await new Promise(r=>setTimeout(r,100));}throw Error('Timed out: '+fn.toString());};const fill=(n,value)=>{n.value=value;n.dispatchEvent(new Event('input',{bubbles:true}));};try{ const path=location.pathname; - if(path==='/v/plan/contacts'){ + if(path==='/v/plan/task/-/new'){ + const api='/_/api/v1/extension/organizer.tasks/',dialog=document.querySelector('#tasks-dialog'),form=document.querySelector('#tasks-form'); + const input=name=>form.querySelector('[name="'+name+'"]'); + await wait(()=>input('page_path'));if(input('notify_due').checked||input('notify_planned').checked)throw Error('Initial defaults not off'); + document.querySelector('#tasks-close').click(); + const prefs=await fetch(api+'preferences').then(r=>r.json());const saved=await fetch(api+'preferences',{method:'PUT',headers:{'Content-Type':'application/json'},body:JSON.stringify({...prefs.preferences,notify_due:true,notify_planned:true,reminder_time:'10:35'})});if(!saved.ok)throw Error('Preferences save failed'); + document.querySelector('#tasks-new').click();await wait(()=>input('page_path')); + if(input('notify_due').checked||input('notify_planned').checked)throw Error('Undated task enabled reminders'); + fill(input('title'),'タスク編集のレイアウト確認');fill(input('notes'),'主要項目を左右に整理。日付と通知をまとめて設定します。'); + fill(input('planned_on'),'2030-01-01');fill(input('due_on'),'2030-01-02'); + if(!input('notify_due').checked||!input('notify_planned').checked||input('reminder_time').value!=='10:35')throw Error('Dated defaults missing'); + input('notify_due').click();fill(input('due_on'),'2030-01-03');if(input('notify_due').checked)throw Error('Explicit reminder choice overwritten'); + for(const [key,value] of [['status','doing'],['bucket','backlog'],['complexity','4']]){const radio=form.querySelector('[name="'+key+'"][value="'+value+'"]');if(radio.type!=='radio')throw Error('Not a native radio group');radio.click();if(form.querySelectorAll('[name="'+key+'"]:checked').length!==1)throw Error('Multiple radio choices');} + fill(input('estimate_minutes'),'90');form.requestSubmit();await wait(()=>!dialog.open); + const items=await fetch(api+'items?q='+encodeURIComponent('レイアウト確認')).then(r=>r.json());const task=items.items[0]; + if(task.status!=='doing'||task.bucket!=='backlog'||task.complexity!==4||!task.notify_planned||task.notify_due||task.reminder_time!=='10:35')throw Error('Editor fields not persisted'); + await wait(()=>document.querySelector('[data-task-id="'+task.uuid+'"] [data-action=detail]'));document.querySelector('[data-task-id="'+task.uuid+'"] [data-action=detail]').click();await wait(()=>input('page_path')); + if(input('notify_due').checked)throw Error('Defaults changed existing task'); + if(form.querySelector('.task-editor-advanced').open)throw Error('Advanced section should start collapsed'); + const fields=document.querySelector('#tasks-fields'),rect=dialog.getBoundingClientRect(); + if(rect.width>innerWidth+1||rect.height>innerHeight+1||fields.scrollWidth>fields.clientWidth+1)throw Error('Editor overflow'); + if(innerWidth>=1000){const left=form.querySelector('.task-editor-main').getBoundingClientRect(),right=form.querySelector('.task-editor-plan').getBoundingClientRect();if(right.left<=left.right||Math.abs(right.top-left.top)>2)throw Error('Editor is not two columns');if(fields.scrollHeight>fields.clientHeight+2)throw Error('Desktop editor needs scrolling: '+fields.scrollHeight+'/'+fields.clientHeight);} + if(innerWidth<760&&form.querySelector('.task-editor-plan').getBoundingClientRect().topdocument.querySelector('#contacts-controls button'));document.querySelector('#contacts-controls button').click();fill(document.querySelector('[name=name]'),'ブラウザ連絡先');fill(document.querySelector('[name=emails]'),'browser@example.invalid');fill(document.querySelector('[name=notes]'),'Non-public notes');document.querySelector('#contact-editor form').requestSubmit();await wait(()=>document.querySelector('#contacts-list button')?.textContent.includes('ブラウザ'));const r=await fetch('/_/api/v1/extension/organizer.contacts/items?q=browser').then(r=>r.json());if(r.items.length!==1)throw Error('Contact save missing'); fill(document.querySelector('[name=name]'),'変更後');document.querySelector('#contact-editor form').requestSubmit();await wait(()=>document.querySelector('#contacts-list button')?.textContent.includes('変更後')); await wait(()=>document.querySelector('.contact-history'));document.querySelector('.contact-history').open=true;await wait(()=>document.querySelectorAll('.contact-history-row').length===2);document.querySelectorAll('.contact-history-row')[1].querySelector('button').click();await wait(()=>document.querySelector('.contact-history pre').textContent.includes('ブラウザ連絡先')); @@ -8,7 +31,7 @@ window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<12 const exported=await fetch('/_/api/v1/extension/organizer.contacts/export.vcf').then(r=>r.text());if(!exported.includes('ブラウザ連絡先'))throw Error('Export missing'); document.querySelector('#tasks-dav-open').click();await wait(()=>document.querySelector('#tasks-dav-dialog').open);const dav=document.querySelector('#tasks-dav-dialog');if(getComputedStyle(dav.querySelector('.dav-compat-toggle')).display!=='none')throw Error('CalDAV-only compatibility visible');fill(dav.querySelector('form>input'),'Browser contact client');dav.querySelector('form').requestSubmit();await wait(()=>!dav.querySelector('section').hidden);const credentials=await fetch('/_/api/v1/caldav-credentials').then(r=>r.json());if(credentials.items.length!==1||credentials.items[0].scope!=='contacts')throw Error('Wrong credential scope');dav.querySelector('tbody button').click();await wait(()=>!dav.querySelector('tbody button'));dav.querySelector('header button').click(); }else if(path==='/-/sys/config'){ - await wait(()=>document.querySelector('[name=due_days]'));fill(document.querySelector('[name=due_days]'),'2');document.querySelector('.productivity-settings').requestSubmit();await wait(()=>document.querySelector('#productivity-status').textContent.includes('保存'));const d=await fetch('/_/api/v1/extension/organizer.tasks/preferences').then(r=>r.json());if(d.preferences.due_days!==2)throw Error('Preferences missing'); + await wait(()=>document.querySelector('[name=due_days]'));fill(document.querySelector('[name=due_days]'),'2');document.querySelector('[name=notify_due]').click();document.querySelector('[name=notify_planned]').click();fill(document.querySelector('[name=reminder_time]'),'08:45');document.querySelector('.productivity-settings').requestSubmit();await wait(()=>document.querySelector('#productivity-status').textContent.includes('保存'));const d=await fetch('/_/api/v1/extension/organizer.tasks/preferences').then(r=>r.json());if(d.preferences.due_days!==2||!d.preferences.notify_due||!d.preferences.notify_planned||d.preferences.reminder_time!=='08:45'||!d.defaults.notify_due||d.defaults.notify_planned)throw Error('Preferences missing'); }else if(path==='/v/plan/dashboard'){ await wait(()=>document.querySelectorAll('.productivity-day').length>300);if(!document.querySelector('.productivity-day[data-level="2"]'))throw Error('Seven-point completion missing'); if(document.querySelectorAll('[data-widget]').length!==6)throw Error('Widget registry missing'); diff --git a/internal/server/testdata/tasks-browser.js b/internal/server/testdata/tasks-browser.js index eb5b670..3afc05e 100644 --- a/internal/server/testdata/tasks-browser.js +++ b/internal/server/testdata/tasks-browser.js @@ -1,7 +1,7 @@ window.addEventListener('load', async () => { const $=id=>document.getElementById('tasks-'+id); const wait=async fn=>{for(let i=0;i<100;i++){if(fn())return;await new Promise(r=>setTimeout(r,50));}throw Error('Timed out: '+fn);}; - const value=(name,text)=>{const n=document.querySelector('#tasks-form [name="'+name+'"]');if(!n)throw Error('Missing field '+name);n.value=text;n.dispatchEvent(new Event('input',{bubbles:true}));}; + const value=(name,text)=>{let n=document.querySelector('#tasks-form [name="'+name+'"]');if(!n)throw Error('Missing field '+name);if(n.type==='radio'){n=document.querySelector('#tasks-form [name="'+name+'"][value="'+text+'"]');n.click();}else{n.value=text;n.dispatchEvent(new Event('input',{bubbles:true}));}}; try { if (!sessionStorage.getItem('focus-reload')) { $('dav-open').click(); await wait(()=>$('dav-dialog').open&&$('dav-dialog').querySelector('thead')); diff --git a/internal/store/task_productivity.go b/internal/store/task_productivity.go index 27e05f5..897fbd7 100644 --- a/internal/store/task_productivity.go +++ b/internal/store/task_productivity.go @@ -40,13 +40,16 @@ type TaskPreferences struct { ReviewDays *int `json:"review_days"` Estimate int `json:"estimate_minutes"` Complexity int `json:"complexity"` + NotifyDue bool `json:"notify_due"` + NotifyPlanned bool `json:"notify_planned"` + ReminderTime string `json:"reminder_time"` DigestEnabled bool `json:"digest_enabled"` DigestTime string `json:"digest_time"` Timezone string `json:"timezone"` } func (s *Store) TaskPreferences(ctx context.Context, domain, actor string) (TaskPreferences, error) { - p := TaskPreferences{AssigneeUUID: actor, Complexity: 1, DigestTime: "09:00", Timezone: "UTC"} + p := TaskPreferences{AssigneeUUID: actor, Complexity: 1, ReminderTime: "09:00", DigestTime: "09:00", Timezone: "UTC"} if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { return p, err } @@ -86,6 +89,14 @@ func (s *Store) SaveTaskPreferences(ctx context.Context, domain, actor string, p if s.ReadOnly { return p, ErrReadOnly } + // Older clients do not send this field. Preserve their default clock. + if p.ReminderTime == "" { + p.ReminderTime = "09:00" + } + clock, clockErr := time.Parse("15:04", p.ReminderTime) + if clockErr != nil || clock.Format("15:04") != p.ReminderTime { + return p, ErrTaskInvalid + } for _, n := range []*int{p.DueDays, p.StartDays, p.PlannedDays, p.ReviewDays} { if n != nil && (*n < 0 || *n > 3650) { return p, ErrTaskInvalid diff --git a/static/css/tasks.css b/static/css/tasks.css index fa76afb..d3fbcec 100644 --- a/static/css/tasks.css +++ b/static/css/tasks.css @@ -24,6 +24,57 @@ body:has(#tasks-app)>.topbar{min-width:0}#tasks-app{box-sizing:border-box} @media(max-width:760px){body:has(#tasks-app)>.topbar{flex-wrap:wrap;padding:.65rem;gap:.5rem}body:has(#tasks-app)>.topbar>.brand{flex:1;min-width:0}body:has(#tasks-app)>.topbar>.brand>a{display:block;overflow:hidden;text-overflow:ellipsis}body:has(#tasks-app)>.topbar>nav{order:2;width:100%}body:has(#tasks-app)>.topbar>.city-map-launch{margin-inline:0;flex-shrink:0}#tasks-fields{grid-template-columns:minmax(0,1fr) minmax(0,1fr)}} @media(max-width:760px){#tasks-dialog{max-width:none}#tasks-form{max-height:calc(100dvh - 2rem);height:100%}#tasks-fields{flex:1}#tasks-form>footer{margin-top:.5rem}} +/* Detail editor: content on the left, scheduling on the right. */ +#tasks-dialog{width:min(1180px,96vw);max-height:96dvh;padding:1rem;overflow:hidden} +body:has(#tasks-dialog[open]){overflow:hidden} +#tasks-form{max-height:calc(96dvh - 2rem);min-height:0} +#tasks-fields{gap:.7rem;margin:.5rem 0;overscroll-behavior:contain;scrollbar-gutter:stable} +#tasks-fields.task-editor-grid{grid-template-columns:minmax(0,1fr) minmax(0,1fr);align-items:start} +.task-editor-main,.task-editor-plan{min-width:0;display:flex;flex-direction:column;gap:.55rem} +.task-editor-plan{border-left:1px solid var(--border,#8885);padding-left:1rem} +#tasks-fields label{min-width:0;margin:0;font-size:.82rem;gap:.2rem} +#tasks-fields input,#tasks-fields select,#tasks-fields textarea{font-size:.88rem;padding:.4rem .5rem;margin:0} +#tasks-fields input[type=date]::-webkit-calendar-picker-indicator,#tasks-fields input[type=time]::-webkit-calendar-picker-indicator{background-color:#e8e8e8;border-radius:2px;opacity:.75} +#tasks-fields textarea{min-height:6rem;max-height:14rem} +#tasks-fields .task-editor-main>label:has(textarea){flex:1} +.task-editor-dates,.task-editor-effort,.task-editor-extra{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:.5rem} +#tasks-fields fieldset{min-width:0;margin:0;padding:0;border:0} +#tasks-fields legend{font-size:.82rem;margin:0 0 .25rem;padding:0;color:var(--fg)} +.task-choice-options{display:flex;gap:.3rem} +#tasks-fields .task-choice-options label{position:relative;flex:1;display:flex} +#tasks-fields .task-choice-options input{position:absolute;width:1px;height:1px;opacity:0;padding:0;clip-path:inset(50%)} +.task-choice-options label>span{box-sizing:border-box;display:flex;align-items:center;justify-content:center;gap:.3rem;min-height:2.2rem;padding:.35rem .2rem;border:1px solid var(--border,#8885);border-radius:.4rem;cursor:pointer;text-align:center;line-height:1.25;background:var(--panel,var(--bg))} +.task-choice-options input:checked+span{border-color:var(--accent);background:color-mix(in srgb,var(--accent) 20%,var(--bg));box-shadow:inset 0 -2px var(--accent);font-weight:600} +.task-choice-options input:focus-visible+span{outline:2px solid var(--accent);outline-offset:2px} +.task-choice-options input:disabled+span{opacity:.65;cursor:default} +.task-choice-icon{color:var(--accent);font-size:1rem} +[data-field=complexity] .task-choice-icon{font-size:.5rem;letter-spacing:-.08em} +#tasks-fields .task-editor-reminders{padding:.5rem .65rem;border:1px solid var(--border,#8885);border-radius:.5rem;display:grid;grid-template-columns:minmax(0,1fr) 7rem;gap:.4rem .6rem} +#tasks-fields .task-editor-reminders label.task-toggle{grid-column:1;font-size:.8rem} +#tasks-fields .task-editor-reminders label:has(input[type=time]){grid-column:2;grid-row:1/3;align-self:center} +#tasks-fields .task-editor-reminders small{grid-column:1/-1;font-size:.7rem;color:var(--muted,var(--fg));line-height:1.45} +.task-editor-advanced{grid-column:1/-1;border-top:1px solid var(--border,#8885);padding-top:.4rem;font-size:.82rem} +.task-editor-advanced summary{cursor:pointer;padding:.2rem 0} +.task-editor-extra{margin-top:.5rem} +#tasks-fields .task-editor-extra .task-full{grid-column:auto} +.task-editor-actions{display:flex;gap:.4rem;flex-wrap:wrap} +#tasks-app .task-editor-actions button{font-size:.8rem;padding:.4rem .55rem} +#tasks-form>footer{margin-top:.5rem} +#tasks-error:empty{display:none} +#tasks-history{max-height:8rem;overflow:auto} +@media(max-width:760px){ + #tasks-dialog{width:100%;max-width:none;height:100dvh;max-height:100dvh;padding:.75rem} + #tasks-form{max-height:calc(100dvh - 1.5rem)} + #tasks-fields.task-editor-grid{grid-template-columns:minmax(0,1fr)} + .task-editor-plan{border-left:0;border-top:1px solid var(--border,#8885);padding: .65rem 0 0} + #tasks-fields input,#tasks-fields select,#tasks-fields textarea{font-size:16px;min-height:44px;max-width:100%} + .task-choice-options label>span{min-height:44px;font-size:.78rem} + #tasks-fields .task-choice-options input{min-height:0} + #tasks-fields label.task-toggle{min-height:44px} + #tasks-fields label.task-toggle input{min-height:0;flex-shrink:0} + .task-editor-extra{grid-template-columns:minmax(0,1fr)} +} + /* Inline tasks: shared columns on desktop, labelled touch controls on mobile. */ .tasks-list-scroll{min-width:0} .task-inline-header{display:none} diff --git a/static/js/task-productivity.js b/static/js/task-productivity.js index 7b688a3..1115e9a 100644 --- a/static/js/task-productivity.js +++ b/static/js/task-productivity.js @@ -4,6 +4,7 @@ const ja=document.documentElement.lang.startsWith('ja'), api='/_/api/v1/extension/organizer.tasks/'; const word={tasks:['Tasks','タスク'],report:['Activity report','達成度・作業レポート'],settings:['Task defaults and email','タスクの既定値・メール'],contacts:['Contacts','連絡先'],completed:['Completed','完了件数'],points:['Points','ポイント'],work:['Work hours','作業時間'],focus:['Pomodoro hours','集中時間'],save:['Save','保存'],saved:['Saved','保存しました'],refresh:['Refresh','更新'],project_uuid:['Default project','既定のプロジェクト'],assignee_uuid:['Assignee UUID (annotation only)','担当者UUID(管理用メモ)'],due_days:['Due in days','期限までの日数'],start_days:['Start in days','着手までの日数'],planned_days:['Plan in days','取り組む日までの日数'],review_days:['Review in days','見直しまでの日数'],estimate_minutes:['Estimated minutes','見込み工数(分)'],complexity:['Complexity (1–5)','複雑度(1〜5)'],digest_enabled:['Email daily task list to my account email','毎日のやることリストを自分のメールに送る'],digest_time:['Delivery time','配信時刻'],timezone:['IANA timezone','タイムゾーン(IANA)'],none:['None','なし'],empty:['No records in this period.','この期間の記録はありません。'],partial:['Partial results: narrow the period.','件数上限に達しました。期間を狭めてください。'],error:['Request failed. Input is retained.','処理に失敗しました。入力は保持しています。'],email_required:['Set your account email first.','先にプロフィールにメールアドレスを設定してください。'],smtp_unavailable:['Ask an administrator to configure SMTP.','管理者によるSMTP設定が必要です。']}; const t=k=>(word[k]||[k,k])[ja?1:0],el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;}; + Object.assign(word,{notify_due:['Notify on due dates','期限日に通知する'],notify_planned:['Notify on planned dates','取り組む日に通知する'],reminder_time:['Default notification time','通知の既定時刻']}); const status=root.querySelector('#productivity-status'),content=root.querySelector('#productivity-content'); root.querySelectorAll('[data-word]').forEach(n=>n.textContent=t(n.dataset.word));root.querySelector('h1,h2,h3').textContent=t(root.dataset.view==='settings'?'settings':'report'); async function request(path,options={}){const timeout=AbortSignal.timeout(15000);const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:signal?AbortSignal.any([signal,timeout]):timeout,...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t(d.error||'error'));return d;} @@ -11,18 +12,21 @@ async function settings(){ const data=await request('preferences'),p=data.preferences;const form=el('form');form.className='productivity-settings';const fields={}; const projects=await request('items?kind=project&view=all&limit=100'); - for(const key of ['project_uuid','assignee_uuid','due_days','start_days','planned_days','review_days','estimate_minutes','complexity','digest_enabled','digest_time','timezone']){ + for(const key of ['project_uuid','assignee_uuid','due_days','start_days','planned_days','review_days','estimate_minutes','complexity','notify_due','notify_planned','reminder_time','digest_enabled','digest_time','timezone']){ + if(key==='notify_due')form.append(el('h3',ja?'新規タスクのInbox通知':'Inbox reminders for new tasks')); + if(key==='digest_enabled')form.append(el('h3',ja?'日次メール':'Daily email')); const label=el('label',t(key));label.className='productivity-setting';const input=el(key==='project_uuid'?'select':'input');input.name=key; if(key==='project_uuid'){const empty=el('option',t('none'));empty.value='';input.append(empty);for(const item of projects.items){const option=el('option',item.title);option.value=item.uuid;input.append(option);}if(p[key]&&!projects.items.some(x=>x.uuid===p[key])){const current=el('option',p[key]);current.value=p[key];input.append(current);}} - else if(key==='digest_enabled'){input.type='checkbox';input.checked=p[key];input.setAttribute('role','switch');} + else if(['digest_enabled','notify_due','notify_planned'].includes(key)){input.type='checkbox';input.checked=!!p[key];input.setAttribute('role','switch');} else if(key.endsWith('_days')||['estimate_minutes','complexity'].includes(key)){input.type='number';input.min=key==='complexity'?1:0;input.max=key.endsWith('_days')?3650:key==='complexity'?5:10080;input.step=1;} - else input.type=key==='digest_time'?'time':'text'; - if(key!=='digest_enabled')input.value=p[key]??'';input.disabled=root.dataset.writable!=='true';fields[key]=input;label.append(input);form.append(label); + else input.type=['digest_time','reminder_time'].includes(key)?'time':'text'; + if(input.type!=='checkbox')input.value=p[key]??'';if(key==='reminder_time'){input.required=true;input.step=60;}input.disabled=root.dataset.writable!=='true';fields[key]=input;label.append(input);form.append(label); + if(key==='reminder_time'){const help=el('p',ja?'新規タスクの対応する日付が設定されている場合だけ通知します。既存タスクは変更しません。通知時刻は保存時のドメインのタイムゾーン('+data.timezone+')を使用します。':'Reminders apply only to new tasks with the corresponding date. Existing tasks are unchanged. Times use the Domain timezone on save ('+data.timezone+').');help.className='productivity-note';form.append(help);} } const note=el('p',ja?'日数は作成日からの暦日です。空欄は未設定、0は当日。担当者の指定では閲覧権限は付与されません。メールは今日の計画・期限到来分を最大100件送ります。SMTPは管理者設定を使用し、配信時刻にはキュー待ちの遅延があります。':'Offsets are calendar days from creation; blank means unset, 0 means today. Assignment does not grant access. Email includes up to 100 tasks planned or due today, using administrator SMTP settings. Queue delays may apply.');note.className='productivity-note';form.append(note); if(data.last_digest){const states={sent:['Sent','送信済み'],sending:['Sending / result pending','送信中・結果未確定'],uncertain:['Delivery uncertain (no automatic retry)','結果不明(自動再送なし)'],cancelled:['Cancelled','送信取消']};form.append(el('p',(ja?'直近の配信: ':'Latest delivery: ')+data.last_digest.day+' · '+(states[data.last_digest.state]||['Unknown','不明'])[ja?1:0]));} const save=el('button',t('save'));save.type='submit';save.disabled=root.dataset.writable!=='true';form.append(save);content.replaceChildren(form); - form.onsubmit=async event=>{event.preventDefault();if(!form.reportValidity())return;save.disabled=true;const value={...p};for(const [key,input] of Object.entries(fields)){value[key]=key==='digest_enabled'?input.checked:input.type==='number'?(input.value===''?null:Number(input.value)):input.value;}try{const result=await request('preferences',{method:'PUT',body:JSON.stringify(value)});Object.assign(p,result.preferences);status.textContent=t('saved');}catch(e){error(e);}finally{save.disabled=false;}}; + form.onsubmit=async event=>{event.preventDefault();if(!form.reportValidity())return;save.disabled=true;const value={...p};for(const [key,input] of Object.entries(fields)){value[key]=input.type==='checkbox'?input.checked:input.type==='number'?(input.value===''?null:Number(input.value)):input.value;}try{const result=await request('preferences',{method:'PUT',body:JSON.stringify(value)});Object.assign(p,result.preferences);status.textContent=t('saved');}catch(e){error(e);}finally{save.disabled=false;}}; } function taskTable(data){const wrap=el('div');wrap.className='productivity-table-wrap';const table=el('table');table.className='productivity-table';const head=el('tr');for(const name of [ja?'タスク':'Task',t('points'),t('work')])head.append(el('th',name));const thead=el('thead');thead.append(head);table.append(thead);const body=el('tbody');for(const task of data.tasks){const row=el('tr'),name=el('td'),link=el('a',(task.completed?'✓ ':'')+(task.title||task.uuid));link.href='/v/plan/task/'+encodeURIComponent(task.uuid);name.append(link);row.append(name,el('td',String(task.points||0)),el('td',(task.work_ms/3600000).toFixed(2)));body.append(row);}table.append(body);wrap.append(table);if(!data.tasks.length)wrap.append(el('p',t('empty')));return wrap;} async function report(){ diff --git a/static/js/tasks.js b/static/js/tasks.js index 5d7c1ca..cc444eb 100644 --- a/static/js/tasks.js +++ b/static/js/tasks.js @@ -53,9 +53,9 @@ if(view==='carryover')$('help').textContent=ja?'昨日以前の計画・期限が残っている未完了タスク。行の矢印で割り当て直します(期限は変更しません)。':'Unfinished tasks planned or due before today. Use the row arrow to reschedule without changing the due date.'; } if(!writable)$('help').textContent+=' '+t('readonly'); - let taskDefaults={}; - async function refreshDefaults(){taskDefaults=(await request('/_/api/v1/extension/organizer.tasks/preferences')).defaults;} - function blank(kind='task') { const defaults=kind==='task'?taskDefaults:{};return { ...defaults,uuid:crypto.randomUUID(),kind,title:'',notes:'',status:'todo',bucket:['inbox','backlog','someday'].includes(view)?view:'inbox',priority:1,estimate_minutes:defaults.estimate_minutes||0,project_uuid:kind==='task'?(projectID||defaults.project_uuid||''):'',page_uuid:'',due_on:defaults.due_on||'',planned_on:['today','day'].includes(view)&&kind==='task'?(view==='day'?selectedDate:today):(defaults.planned_on||''),review_on:defaults.review_on||'',archived:false,version:0 }; } + let taskDefaults={},reminderDefaults={}; + async function refreshDefaults(){const data=await request('/_/api/v1/extension/organizer.tasks/preferences');taskDefaults=data.defaults;reminderDefaults=data.preferences;} + function blank(kind='task') { const defaults=kind==='task'?taskDefaults:{};const item={ ...defaults,uuid:crypto.randomUUID(),kind,title:'',notes:'',status:'todo',bucket:['inbox','backlog','someday'].includes(view)?view:'inbox',priority:1,estimate_minutes:defaults.estimate_minutes||0,project_uuid:kind==='task'?(projectID||defaults.project_uuid||''):'',page_uuid:'',due_on:defaults.due_on||'',planned_on:['today','day'].includes(view)&&kind==='task'?(view==='day'?selectedDate:today):(defaults.planned_on||''),review_on:defaults.review_on||'',archived:false,version:0 };if(kind==='task'){item.notify_due=!!(reminderDefaults.notify_due&&item.due_on);item.notify_planned=!!(reminderDefaults.notify_planned&&item.planned_on);}return item; } function listView(){return ['project','detail','new'].includes(view)?'all':view;} async function load(append=false) { if(window.PagesWikiTaskRows?.hasDirty()){$('status').textContent=ja?'編集中の行を保存または再読込してください。':'Save or reload edited rows first.';return;} @@ -90,6 +90,29 @@ } const fields={}; function field(name,label,type,value,full=false,options=null){const l=el('label',label,full?'task-full':'');let input=el(type==='textarea'?'textarea':options?'select':'input');if(options)options.forEach(([val,text])=>{const o=el('option',text);o.value=val;input.append(o);});else if(type!=='textarea')input.type=type;input.name=name;input.value=value??'';input.disabled=!writable;fields[name]=input;l.append(input);$('fields').append(l);return input;} + function choices(name,label,value,options){ + const group=el('fieldset',undefined,'task-choices');group.dataset.field=name;group.append(el('legend',label)); + const row=el('div',undefined,'task-choice-options'); + for(const [key,text,icon] of options){const choice=el('label'),input=el('input');input.type='radio';input.name=name;input.value=String(key);input.checked=String(value)===String(key);const caption=el('span');if(icon){const mark=el('span',icon,'task-choice-icon');mark.setAttribute('aria-hidden','true');caption.append(mark);}caption.append(document.createTextNode(text));choice.append(input,caption);row.append(choice);} + group.append(row);group.disabled=!writable; + Object.defineProperty(group,'value',{get:()=>group.querySelector('input:checked')?.value||'',set:value=>group.querySelectorAll('input').forEach(input=>input.checked=input.value===String(value))}); + fields[name]=group;$('fields').append(group);return group; + } + function arrangeEditor(){ + const root=$('fields');root.classList.toggle('task-editor-grid',editing.kind==='task');if(editing.kind!=='task')return; + const column=cls=>el('section',undefined,cls),left=column('task-editor-main'),right=column('task-editor-plan'); + const move=(target,names)=>names.forEach(name=>{const node=fields[name];if(node)target.append(node.tagName==='FIELDSET'?node:node.parentElement);}); + move(left,['title','status','bucket','project_uuid','notes']); + const dates=el('div',undefined,'task-editor-dates');move(dates,['planned_on','due_on','start_on','end_on','review_on']);right.append(dates); + const effort=el('div',undefined,'task-editor-effort');move(effort,['priority','estimate_minutes']);right.append(effort);move(right,['complexity']); + const reminders=el('fieldset',undefined,'task-editor-reminders');reminders.append(el('legend',ja?'Inbox通知':'Inbox reminders'));move(reminders,['notify_planned','notify_due','reminder_time']); + const help=root.querySelector('small.task-full');if(help)reminders.append(help);right.append(reminders); + const advanced=el('details',undefined,'task-editor-advanced');advanced.append(el('summary',ja?'詳細設定・Wiki連携':'Advanced settings & Wiki links')); + const extra=el('div',undefined,'task-editor-extra');move(extra,['project_search','assignee_uuid','page_path']); + const actions=el('div',undefined,'task-editor-actions'); + for(const node of [...root.children]){if(node.matches('button.task-full'))actions.append(node);else extra.append(node);} + if(actions.children.length)left.append(actions);advanced.append(extra);root.append(left,right,advanced); + } async function fillProjects(selected) { const ticket=++projectGeneration, target=fields.project_uuid;if(!target)return; try {const data=await request(api+'?'+new URLSearchParams({kind:'project',view:'all',limit:'100',q:fields.project_search?.value||''}));if(ticket!==projectGeneration||target!==fields.project_uuid)return;const items=data.items;if(selected&&!items.some(p=>p.uuid===selected)){try{const d=await request(api+'/'+selected);if(d.item.kind==='project')items.unshift(d.item);}catch{ /* inaccessible reference is not exposed */ }}target.replaceChildren();const none=el('option',t('noProject'));none.value='';target.append(none);items.forEach(p=>{const o=el('option',p.title);o.value=p.uuid;target.append(o);});target.value=selected||'';if(selected&&target.value!==selected){const o=el('option',t('not_found'));o.value=selected;target.append(o);target.value=selected;}} @@ -105,19 +128,21 @@ const title=field('title',t('title'),'text',editing.title,true);title.required=true;title.maxLength=300; const notes=field('notes',t('notes'),'textarea',editing.notes,true);notes.maxLength=16384; if(editing.kind==='task'){ - field('status',t('status'),'select',editing.status,false,['todo','doing','done','cancelled'].map(k=>[k,t(k)])); - field('bucket',t('bucket'),'select',editing.bucket,false,['inbox','backlog','someday'].map(k=>[k,t(k)])); + choices('status',t('status'),editing.status,[['todo',t('todo'),'○'],['doing',t('doing'),'◐'],['done',t('done'),'✓'],['cancelled',t('cancelled'),'−']]); + choices('bucket',t('bucket'),editing.bucket,['inbox','backlog','someday'].map(k=>[k,t(k),icons[k]])); field('project_search',t('projectSearch'),'search','',true).addEventListener('input',debounce(()=>fillProjects(fields.project_uuid.value),250)); field('project_uuid',t('project'),'select',editing.project_uuid,true,[[editing.project_uuid,t(editing.project_uuid?'loading':'noProject')]]);await fillProjects(editing.project_uuid);if(ticket!==detailGeneration)return; field('priority',t('priority'),'select',editing.priority,false,[[0,t('low')],[1,t('normal')],[2,t('high')],[3,t('urgent')]]); const estimate=field('estimate_minutes',t('estimate'),'number',editing.estimate_minutes);estimate.min=0;estimate.max=10080; - const complexity=field('complexity',ja?'複雑度(1〜5)':'Complexity (1–5)','number',editing.complexity||1);complexity.min=1;complexity.max=5; + choices('complexity',ja?'複雑度:低 → 高':'Complexity: low → high',editing.complexity||1,[1,2,3,4,5].map(n=>[n,String(n),'▰'.repeat(n)])); field('assignee_uuid',ja?'担当者UUID(権限は付与しません)':'Assignee UUID (does not grant access)','text',editing.assignee_uuid||'',true); ['due_on','planned_on','review_on','start_on','end_on'].forEach(k=>field(k,t(k),'date',editing[k])); ['notify_due','notify_planned'].forEach(k=>{const input=field(k,t(k),'checkbox','',true);input.checked=!!editing[k];input.parentElement.classList.add('task-toggle');}); const clock=field('reminder_time',t('reminder_time'),'time',editing.reminder_time||'09:00');clock.step=60; const reminderHelp=el('small',t('reminder_help')+' '+t('reminder_zone')+': '+app.dataset.timezone,'task-full');$('fields').append(reminderHelp); const requirements=()=>{fields.due_on.required=fields.notify_due.checked;fields.planned_on.required=fields.notify_planned.checked;clock.required=fields.notify_due.checked||fields.notify_planned.checked;};fields.notify_due.addEventListener('change',requirements);fields.notify_planned.addEventListener('change',requirements);requirements(); + // Defaults follow dates only while creating, unless explicitly overridden. + if(!id)for(const [date,key] of [['due_on','notify_due'],['planned_on','notify_planned']]){let touched=false;fields[key].addEventListener('change',()=>{touched=true;});fields[date].addEventListener('input',()=>{if(!touched){fields[key].checked=!!(fields[date].value&&reminderDefaults[key]);requirements();}});} } if(editing.kind==='project'){const folder=field('notes_subpath',t('notes_subpath'),'text',editing.notes_subpath||'tasks',true);folder.maxLength=500;folder.placeholder='tasks';$('fields').append(el('small',ja?'例:関連Wikiが /projects/app、サブ階層が tasks → /projects/app/tasks/件名。Wikiの公開範囲に従います。':'Example: project Wiki /projects/app + subfolder tasks → /projects/app/tasks/title. Wiki permissions apply.','task-full'));} field('page_path',t('page'),'text',data.page_path,true).placeholder='/lab/project'; @@ -131,12 +156,13 @@ } $('archive').hidden=!id||!writable;$('archive').textContent=t(editing.archived?'restore':'archive');$('save').hidden=!writable;$('save').disabled=false;$('history').hidden=!id; if(editing.kind==='project'&&id){$('project-open').hidden=false;$('project-open').href=href(editing);$('project-open').textContent=t('openProject');} - title.focus(); + arrangeEditor();title.focus(); }catch(e){if(e.name!=='AbortError'&&ticket===detailGeneration)$('error').textContent=e.message;} } function closeDialog(force=false){if(saving)return false;if(!force&&dirty&&!confirm(t('discard')))return false;detailGeneration++;projectGeneration++;dialogController?.abort();$('dialog').close();editing=null;dirty=false;return true;} $('close').addEventListener('click',()=>closeDialog());$('dialog').addEventListener('cancel',e=>{e.preventDefault();closeDialog();}); $('form').addEventListener('input',()=>{dirty=true;}); + $('form').addEventListener('invalid',event=>{const details=event.target.closest('details');if(details)details.open=true;},true); function readForm(){const item={...editing};['title','notes','notes_subpath','status','bucket','project_uuid','assignee_uuid','due_on','planned_on','review_on','start_on','end_on','reminder_time'].forEach(k=>{if(fields[k])item[k]=fields[k].value;});['notify_due','notify_planned'].forEach(k=>{if(fields[k])item[k]=fields[k].checked;});['priority','estimate_minutes','complexity'].forEach(k=>{if(fields[k])item[k]=Number(fields[k].value);});if(fields.page_path?.dataset.changed||(!item.page_uuid&&fields.page_path?.value))item.page_path=fields.page_path.value;return item;} async function saveItem(item){const data=await request(api+(item.version?'/'+item.uuid:''),{method:item.version?'PUT':'POST',headers:item.version?{'If-Match':'"'+item.version+'"'}:{},body:JSON.stringify(item)});app.dispatchEvent(new Event('task-today-refresh'));return data;} async function submit(archive=false){if(!editing||saving||!writable)return;if(!$('form').reportValidity())return;const item=readForm();if(archive)item.archived=!item.archived;saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=true;$('error').textContent='';try{await saveItem(item);saving=false;closeDialog(true);await load();if(projectID)await loadProject();}catch(e){$('error').textContent=e.message;}finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=false;}} diff --git a/templates/pages/organizer_dashboard.gohtml b/templates/pages/organizer_dashboard.gohtml index e0ee849..0adb0a1 100644 --- a/templates/pages/organizer_dashboard.gohtml +++ b/templates/pages/organizer_dashboard.gohtml @@ -4,4 +4,4 @@ {{ template "organizer-nav" . }}

{{ T "organizer.dashboard" }}

{{ .Today }} · {{ .Timezone }}

-
{{ end }} +{{ end }} diff --git a/templates/pages/organizer_settings.gohtml b/templates/pages/organizer_settings.gohtml index 69297fe..5764be8 100644 --- a/templates/pages/organizer_settings.gohtml +++ b/templates/pages/organizer_settings.gohtml @@ -5,4 +5,4 @@

{{ T "organizer.settings" }}

{{ T "organizer.private" }}

{{ if .TasksEnabled }}

{{ end }} {{ if .CalendarEnabled }}

{{ T "organizer.calendar_defaults" }}

{{ end }} -
{{ end }} +{{ end }} diff --git a/templates/pages/tasks.gohtml b/templates/pages/tasks.gohtml index da0630e..9e51653 100644 --- a/templates/pages/tasks.gohtml +++ b/templates/pages/tasks.gohtml @@ -1,6 +1,6 @@ {{ define "tasks.gohtml" }} {{ T "tasks.title" }} · {{ .WikiName }} - +
{{ template "auth-menu" . }}
{{ template "organizer-nav" . }}
@@ -11,4 +11,4 @@

    -
    {{ end }} +{{ end }}