Add task capture, work reports, daily digests and private contacts
Build and publish container images / images (push) Successful in 16m37s
Build and publish container images / images (push) Successful in 16m37s
This commit is contained in:
1 parent
50b8b0323f
commit
b4792bb175
50 files changed
+2678
-17
No files matched your search
@@ -0,0 +1,2 @@
|
||||
#contacts-app{max-width:1200px;margin:auto;padding:1rem}#contacts-controls{display:flex;gap:.5rem;flex-wrap:wrap}.contacts-layout{display:grid;grid-template-columns:minmax(200px,1fr) minmax(300px,2fr);gap:1rem;margin-top:1rem}#contacts-list>button{display:block;width:100%;text-align:start;padding:.5rem;border:0;border-bottom:1px solid var(--border-color,#7775);background:transparent;color:inherit}#contact-editor form{display:grid;gap:.6rem}#contact-editor label{display:grid;grid-template-columns:8rem 1fr;gap:.5rem}#contact-editor input,#contact-editor textarea{width:100%;min-width:0}#contact-editor textarea{min-height:5rem}#contact-editor details pre{white-space:pre-wrap;overflow-wrap:anywhere;max-height:20rem;overflow:auto}@media(max-width:650px){.contacts-layout{grid-template-columns:1fr}#contacts-list{max-height:30vh;overflow:auto}#contact-editor label{grid-template-columns:1fr}}
|
||||
#contacts-app,#contacts-app *{box-sizing:border-box}.contacts-layout>*{min-width:0}#contacts-list button{overflow-wrap:anywhere}
|
||||
@@ -0,0 +1,11 @@
|
||||
#task-productivity{max-width:1200px;margin:1rem auto;padding:0 1rem;color:var(--fg,var(--text-color));box-sizing:border-box}
|
||||
body:has(#task-productivity) .topbar,body:has(#contacts-app) .topbar{flex-wrap:wrap;gap:.5rem}
|
||||
#task-productivity,#contacts-app{min-width:0;width:100%;overflow-wrap:anywhere}
|
||||
@media(max-width:600px){body:has(#task-productivity) .topbar,body:has(#contacts-app) .topbar{padding:.5rem;gap:.3rem}body:has(#task-productivity) .topbar>.brand,body:has(#contacts-app) .topbar>.brand{flex:1}body:has(#task-productivity) .topbar>nav{display:none}}
|
||||
.productivity-nav,.productivity-controls{display:flex;flex-wrap:wrap;align-items:center;gap:.65rem;margin:.5rem 0}.productivity-nav a{color:var(--link,var(--accent,#478ddd))}
|
||||
.productivity-stats{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:.6rem;margin:1rem 0}.productivity-stat{padding:.6rem;border:1px solid var(--border,#8885);border-radius:.4rem}.productivity-stat strong{display:block;font-size:1.5rem}
|
||||
.productivity-heatmap-scroll{overflow:auto;max-width:100%;padding:.4rem 0}.productivity-heatmap{display:grid;grid-template-rows:repeat(7,13px);grid-auto-flow:column;grid-auto-columns:13px;gap:3px;width:max-content}
|
||||
.productivity-day{padding:0;min-width:0;border:0;border-radius:2px;background:var(--border,#8884);cursor:pointer}.productivity-day[data-level="1"]{background:#9be9a8}.productivity-day[data-level="2"]{background:#40c463}.productivity-day[data-level="3"]{background:#30a14e}.productivity-day[data-level="4"]{background:#216e39}.productivity-day:focus-visible{outline:2px solid var(--link,#4af);outline-offset:2px}
|
||||
.productivity-table-wrap{overflow:auto}.productivity-table{border-collapse:collapse;width:100%}.productivity-table th,.productivity-table td{padding:.35rem .5rem;text-align:left;border-bottom:1px solid var(--border,#8884)}.productivity-table a{color:var(--link,#478ddd)}
|
||||
.productivity-settings{max-width:850px}.productivity-setting{display:grid;grid-template-columns:minmax(180px,1fr) minmax(160px,2fr);gap:.5rem;padding:.4rem 0;border-bottom:1px solid var(--border,#8884);align-items:center}.productivity-setting input,.productivity-setting select,.productivity-controls input{box-sizing:border-box;width:100%;min-width:0;color:inherit;background:var(--input-bg,var(--bg,#222));border:1px solid var(--border,#8887);border-radius:.3rem;padding:.4rem}.productivity-setting input[type=checkbox]{width:2.2rem;height:1.2rem;accent-color:var(--link,#40a060)}.productivity-controls input{width:auto}.productivity-settings button,.productivity-controls button{padding:.4rem .8rem;color:inherit;background:var(--button-bg,var(--bg,#555));border:1px solid var(--border,#8887);border-radius:.3rem;cursor:pointer}.productivity-note{font-size:.85rem;opacity:.8}.productivity-running{padding:.5rem;border:1px solid var(--border,#8885);display:flex;gap:.5rem;align-items:center;flex-wrap:wrap}
|
||||
@media(max-width:600px){.productivity-stats{grid-template-columns:repeat(2,minmax(0,1fr))}.productivity-setting{grid-template-columns:1fr}.productivity-setting input,.productivity-setting select,.productivity-settings button{min-height:42px}.productivity-controls{align-items:stretch}.productivity-controls input{max-width:43%}#task-productivity{padding:0 .6rem}.productivity-table th,.productivity-table td{padding:.5rem .3rem}}
|
||||
@@ -0,0 +1,10 @@
|
||||
(()=>{'use strict';const app=document.getElementById('contacts-app');if(!app)return;const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.contacts/',writable=app.dataset.writable==='true',status=document.getElementById('contacts-status'),list=document.getElementById('contacts-list'),editor=document.getElementById('contact-editor'),controls=document.getElementById('contacts-controls');
|
||||
const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;},button=(text,fn)=>{const b=el('button',text);b.type='button';b.onclick=fn;return b;};app.querySelector('h1').textContent=t('Private contacts','個人アドレス帳');app.querySelector('nav a').textContent=t('Tasks','タスク');app.querySelector('nav a+a').textContent=t('Settings','設定');
|
||||
async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(r.status===412?t('Changed or duplicate UID. Your input is retained.','競合または同じUIDの連絡先があります。入力は保持しています。'):t('Unable to save/load. Check your login, permissions and input.','保存・読込できません。ログイン、権限、入力を確認してください。'));return d;}
|
||||
let dirty=false,busy=false,ticket=0;const search=el('input');search.type='search';search.placeholder=search.ariaLabel=t('Name, email, phone, organization','名前・メール・電話・所属');controls.append(search);const trash=el('select');trash.ariaLabel=t('Contacts or trash','連絡先・削除済み');for(const [value,label]of [['0',t('Contacts','連絡先')],['1',t('Deleted contacts','削除済み')]]){const o=el('option',label);o.value=value;trash.append(o);}controls.append(trash);trash.onchange=()=>load();const allowLeave=()=>!dirty||confirm(t('Discard unsaved edits?','未保存の変更を破棄しますか?'));
|
||||
function show(c){dirty=false;editor.replaceChildren();const form=el('form'),inputs={};for(const [key,label,multi] of [['name',t('Name','名前'),false],['emails',t('Emails (one per line)','メール(1行1件)'),true],['phones',t('Phones (one per line)','電話(1行1件)'),true],['organization',t('Organization','所属'),false],['notes',t('Notes','メモ'),true]]){const l=el('label',label),n=el(multi?'textarea':'input');n.value=Array.isArray(c[key])?c[key].join('\n'):c[key]||'';n.disabled=!writable;n.name=key;if(key==='name'){n.required=true;n.maxLength=300;}l.append(n);form.append(l);inputs[key]=n;n.oninput=()=>{dirty=true;};}
|
||||
const actions=el('div'),save=el('button',t('Save','保存'));save.type='submit';save.disabled=!writable;actions.append(save);if(c.version){const a=el('a',t('Export vCard','vCardを書き出す'));a.href=api+'items/'+c.uuid+'.vcf';actions.append(' ',a);const remove=button(c.deleted?t('Restore','復元'):t('Delete','削除'),async()=>{if(busy||!confirm(c.deleted?t('Restore this contact?','この連絡先を復元しますか?'):t('Delete this contact?','この連絡先を削除しますか?')))return;busy=true;try{await request('items/'+c.uuid,{method:'PUT',headers:{'If-Match':'"'+c.version+'"'},body:JSON.stringify({...c,deleted:!c.deleted})});dirty=false;editor.replaceChildren();await load();}catch(e){status.textContent=e.message;}finally{busy=false;}});remove.disabled=!writable;actions.append(' ',remove);}
|
||||
form.append(actions);form.onsubmit=async e=>{e.preventDefault();if(busy)return;const draft={...c};for(const key of Object.keys(inputs))draft[key]=['emails','phones'].includes(key)?inputs[key].value.split('\n').map(v=>v.trim()).filter(Boolean):inputs[key].value;busy=true;save.disabled=true;try{const d=await request('items'+(c.version?'/'+c.uuid:''),{method:c.version?'PUT':'POST',headers:c.version?{'If-Match':'"'+c.version+'"'}:{},body:JSON.stringify(draft)});show(d.item);status.textContent=t('Saved','保存しました');await load();}catch(e){status.textContent=e.message;}finally{busy=false;save.disabled=!writable;}};editor.append(form);if(c.vcard){const d=el('details'),summary=el('summary',t('Original vCard (unsupported properties are retained)','vCard(未対応プロパティも保持)'));d.append(summary,el('pre',c.vcard));editor.append(d);}inputs.name.focus();}
|
||||
async function load(after='',append=false){const id=++ticket;try{const d=await request('items?'+new URLSearchParams({q:search.value,after,deleted:trash.value}));if(id!==ticket)return;if(!append)list.replaceChildren();list.querySelector('[data-more]')?.remove();for(const c of d.items){const b=button(c.name+' · '+(c.emails[0]||c.organization||''),async()=>{if(!allowLeave())return;try{const d=await request('items/'+c.uuid);show(d.item);}catch(e){status.textContent=e.message;}});list.append(b);}if(d.next){const b=button(t('More','続き'),()=>load(d.next,true));b.dataset.more='true';list.append(b);}if(!list.children.length)list.append(el('p',t('No contacts','連絡先がありません')));}catch(e){status.textContent=e.message;}}
|
||||
let timer;search.oninput=()=>{clearTimeout(timer);timer=setTimeout(()=>load(),200);};if(writable){controls.append(button(t('New contact','連絡先を追加'),()=>{if(allowLeave())show({uuid:crypto.randomUUID(),version:0,emails:[],phones:[],deleted:false});}));const file=el('input');file.type='file';file.accept='.vcf,text/vcard';file.hidden=true;controls.append(button(t('Import vCard','vCardを取り込む'),()=>file.click()),file);file.onchange=async()=>{const f=file.files[0];if(!f)return;try{if(f.size>2*1024*1024)throw Error(t('Maximum 2 MiB','上限は2 MiBです'));const text=await f.text();const cards=text.match(/BEGIN:VCARD\r?\n[\s\S]*?END:VCARD(?:\r?\n|$)/g)||[];if(!cards.length||cards.length>200||text.replace(/BEGIN:VCARD\r?\n[\s\S]*?END:VCARD(?:\r?\n|$)/g,'').trim())throw Error(t('Expected up to 200 UTF-8 vCards (3.0/4.0).','UTF-8のvCard 3.0/4.0(最大200件)を指定してください。'));if(!confirm(t('Import contacts: ','連絡先を取り込みます:')+cards.length+'\n'+t('Existing identical UID/content is skipped. Conflicts are not overwritten.','同一UID・内容は重複登録しません。競合は上書きせず報告します。')))return;let success=0,failed=[];for(let i=0;i<cards.length;i++){try{await request('import',{method:'POST',headers:{'Content-Type':'text/vcard'},body:cards[i]});success++;}catch(e){failed.push(i+1);}}status.textContent=t('Imported/existing: ','取り込み済み・既存:')+success+(failed.length?t(' / Failed card numbers: ',' / 失敗したカード番号:')+failed.join(', '):'');await load();}catch(e){status.textContent=e.message;}finally{file.value='';}};}
|
||||
window.addEventListener('beforeunload',e=>{if(dirty){e.preventDefault();e.returnValue='';}});load();})();
|
||||
@@ -0,0 +1,14 @@
|
||||
(function(root){'use strict';function parse(input){
|
||||
const tokens=[];let value='',quote='',escaped=false,started=false;
|
||||
for(const ch of input.trim()){if(escaped){value+=ch;escaped=false;started=true;continue;}if(ch==='\\'){escaped=true;continue;}if(quote){if(ch===quote)quote='';else value+=ch;continue;}if(ch==='"'||ch==="'"){quote=ch;started=true;continue;}if(/\s/.test(ch)){if(started){tokens.push(value);value='';started=false;}}else{value+=ch;started=true;}}
|
||||
if(quote||escaped)throw Error('Unclosed quote / 引用符を閉じてください');if(started)tokens.push(value);
|
||||
if(tokens[0]?.toLowerCase()!=='add'||!['task','cal'].includes(tokens[1]?.toLowerCase()))throw Error('add task / add cal');
|
||||
const kind=tokens[1].toLowerCase(),options={},title=[],allowed=kind==='task'?['project','cost','due','start','review','planned','complexity']:['calendar','from','to'];
|
||||
for(const token of tokens.slice(2)){const m=token.match(/^([a-z]+):(.*)$/i);if(!m){title.push(token);continue;}const key=m[1].toLowerCase();if(!allowed.includes(key)||Object.hasOwn(options,key)||!m[2])throw Error('Invalid option / オプションを確認:'+key);options[key]=m[2];}
|
||||
if(!title.join(' ').trim())throw Error('Title required / 件名を入力してください');
|
||||
if(options.cost){const m=options.cost.match(/^(\d+(?:\.\d+)?)(h|m)$/);if(!m)throw Error('cost:2h / cost:30m');options.estimate_minutes=Number(m[1])*(m[2]==='h'?60:1);if(!Number.isInteger(options.estimate_minutes)||options.estimate_minutes>10080)throw Error('Invalid cost / 工数を確認してください');}
|
||||
for(const k of ['due','start','review','planned'])if(options[k]&&!/^\d{4}-\d{2}-\d{2}$/.test(options[k]))throw Error(k+':YYYY-MM-DD');
|
||||
if(options.complexity&&!/^[1-5]$/.test(options.complexity))throw Error('complexity:1–5');
|
||||
if(kind==='cal'&&(!options.from||!options.to))throw Error('from:YYYY-MM-DDTHH:mm to:YYYY-MM-DDTHH:mm');
|
||||
return {kind,title:title.join(' '),options};
|
||||
}root.PagesWikiHomeCommand={parse};if(typeof module!=='undefined')module.exports={parse};})(globalThis);
|
||||
@@ -0,0 +1,3 @@
|
||||
const {test}=require('node:test');const assert=require('node:assert/strict');const {parse}=require('./home-command-parser.js');
|
||||
test('commands preserve quoted project and title',()=>{const c=parse('add task "調査を進める" project:"開発 計画" cost:2h due:2026-11-02');assert.equal(c.title,'調査を進める');assert.equal(c.options.project,'開発 計画');assert.equal(c.options.estimate_minutes,120);});
|
||||
test('calendar and malformed input',()=>{assert.equal(parse('add cal 会議 from:2026-11-02T09:00 to:2026-11-02T10:00').kind,'cal');for(const v of ['add task','add task x cost:0.001h','add task x foo:z','add task x project:a project:b','add task "x','add cal x'])assert.throws(()=>parse(v));});
|
||||
@@ -0,0 +1,12 @@
|
||||
(()=>{'use strict';const input=document.querySelector('[data-home-type-search]'),parser=window.PagesWikiHomeCommand;if(!input||!parser)return;const form=input.closest('form'),ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.tasks/',box=document.createElement('section');box.className='home-command-panel';box.hidden=true;box.style.cssText='position:relative;z-index:30;padding:.7rem;border-radius:.5rem;background:var(--bg-color,var(--bg,#222));color:var(--text-color,var(--fg,#eee));text-align:start';form.after(box);let busy=false,sequence=0,timer,prepared=null;
|
||||
const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;};
|
||||
async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json'}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t('Check login, permissions, dates and current task settings. Input is retained.','ログイン、権限、日時、タスク設定を確認してください。入力は保持しています。'));return d;}
|
||||
const matches=()=>/^add\s+(task|cal)\b/i.test(input.value.trim());
|
||||
async function resolve(kind,name){const d=await request(kind==='project'?'items?'+new URLSearchParams({kind:'project',view:'all',q:name,limit:100}):'calendars'),items=d.items.filter(c=>kind==='project'?c.title===name||c.uuid===name:c.name===name||c.pretty_name===name||c.id===name||!name);if(items.length!==1||d.next)throw Error(t('Select a unique '+kind+' (name or UUID).',kind==='project'?'プロジェクトを名前またはUUIDで一意に指定してください。':'カレンダーを指定してください(calendar:名前)。'));return kind==='project'?items[0].uuid:items[0].id;}
|
||||
async function suggestions(){const id=++sequence;if(!matches()){box.hidden=true;return;}box.hidden=false;box.replaceChildren(el('small',t('Enter: review → Create. Dates use the Domain timezone.','Enterで確認 → 作成。日時はドメインのタイムゾーンです。')));const m=input.value.match(/\b(project|calendar):([^\s"]*)$/i);if(!m)return;try{const kind=m[1].toLowerCase(),d=await request(kind==='project'?'items?'+new URLSearchParams({kind:'project',view:'all',q:m[2],limit:20}):'calendars');if(id!==sequence||!matches())return;for(const c of d.items.filter(c=>kind==='project'||c.name.toLowerCase().includes(m[2].toLowerCase())).slice(0,8)){const b=el('button',kind==='project'?c.title:c.name);b.type='button';b.style.display='block';b.onclick=()=>{const name=kind==='project'?c.title:c.pretty_name;input.value=input.value.slice(0,m.index)+kind+':'+JSON.stringify(name)+' ';input.focus();prepared=null;sequence++;box.replaceChildren();};box.append(b);}}catch(e){if(id===sequence)box.append(el('p',e.message));}}
|
||||
input.addEventListener('input',()=>{prepared=null;sequence++;clearTimeout(timer);timer=setTimeout(suggestions,180);});input.addEventListener('keydown',e=>{if(matches()&&e.key==='Escape'){box.hidden=true;sequence++;}});
|
||||
form.addEventListener('submit',async e=>{if(!matches())return;e.preventDefault();e.stopImmediatePropagation();if(busy)return;clearTimeout(timer);sequence++;busy=true;const source=input.value;box.hidden=false;box.replaceChildren();try{const cmd=parser.parse(source),o=cmd.options;let path,payload;
|
||||
if(prepared?.source===source){({path,payload}=prepared);}else if(cmd.kind==='task'){path='capture';payload={request_id:crypto.randomUUID(),title:cmd.title};if(o.project)payload.project_uuid=await resolve('project',o.project);for(const [a,b]of [['due','due_on'],['start','start_on'],['planned','planned_on'],['review','review_on'],['estimate_minutes','estimate_minutes']])if(o[a]!==undefined)payload[b]=o[a];if(o.complexity)payload.complexity=Number(o.complexity);}else{path='calendar-capture';payload={request_id:crypto.randomUUID(),title:cmd.title,calendar_uuid:await resolve('calendar',o.calendar||''),from:o.from,to:o.to};}
|
||||
if(source!==input.value)return;prepared={source,path,payload};box.append(el('strong',cmd.title),el('pre',Object.entries(o).map(([k,v])=>k+': '+v).join('\n')));const create=el('button',t('Create','作成')),cancel=el('button',t('Cancel','キャンセル'));create.type=cancel.type='button';cancel.onclick=()=>{box.hidden=true;};create.onclick=async()=>{if(busy)return;busy=true;create.disabled=true;cancel.disabled=true;input.disabled=true;try{const d=await request(path,{method:'POST',body:JSON.stringify(payload)});prepared=null;box.replaceChildren();const link=el('a',t('Created → Open','作成しました → 開く'));link.href=path==='capture'?'/v/plan/task/'+d.item.uuid:'/v/plan/event/'+encodeURIComponent(d.uid)+'?calendar='+encodeURIComponent(d.calendar);box.append(link);input.value='';}catch(err){box.append(el('p',err.message));}finally{busy=false;create.disabled=false;cancel.disabled=false;input.disabled=false;}};box.append(create,cancel);
|
||||
}catch(err){box.append(el('p',err.message));}finally{busy=false;}},true);
|
||||
})();
|
||||
@@ -105,6 +105,7 @@
|
||||
candidates = [];
|
||||
close();
|
||||
const query = input.value.trim();
|
||||
if (/^add\s+(task|cal)\b/i.test(query)) return;
|
||||
if ([...query].length < 2) return;
|
||||
timer = setTimeout(() => request(query), 140);
|
||||
});
|
||||
@@ -114,6 +115,7 @@
|
||||
else if (event.key === 'Escape') { event.preventDefault(); close(); }
|
||||
});
|
||||
form.addEventListener('submit', event => {
|
||||
if (/^add\s+(task|cal)\b/i.test(input.value.trim())) return;
|
||||
if (event.ctrlKey || event.metaKey) return;
|
||||
const options = rows();
|
||||
let selected = active >= 0 ? options[active] : null;
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
function button(label,icon,fn){const b=el('button',icon);b.type='button';b.title=b.ariaLabel=label;b.addEventListener('click',fn);actions.append(b);return b;}
|
||||
const detail=el('a','⋯');detail.title=detail.ariaLabel=t('Details','詳細');detail.href='/v/plan/task/'+item.uuid;detail.dataset.action='detail';if(options.onDetail)detail.addEventListener('click',e=>{if(e.ctrlKey||e.metaKey||e.shiftKey||e.button)return;e.preventDefault();if(blocked())return;options.onDetail(item.uuid);});actions.append(detail);
|
||||
function blocked(){if(saving||dirtyRows.has(row)){message(t('Save or reload this row first.','先にこの行の変更を保存するか再読込してください。'));return true;}return false;}
|
||||
if(writable&&!item.archived)button(t('Start work recording','作業時間を記録開始'),'▶',()=>{if(!blocked())document.getElementById('tasks-app')?.dispatchEvent(new CustomEvent('task-work',{detail:item}));}).dataset.action='work';
|
||||
button(t('Calendar time blocks','カレンダーへ時間枠を追加'),'▦',async()=>{if(blocked())return;try{const d=await request(api+'/'+item.uuid);document.getElementById('tasks-app')?.dispatchEvent(new CustomEvent('task-plan',{detail:d.item}));}catch(e){message(e.message);}}).dataset.action='plan';
|
||||
const reset=button(t('Reload row (discard edits)','行を再読込(編集を破棄)'),'↻',async()=>{if(saving)return;if(dirtyRows.has(row)&&!confirm(t('Discard changes in this row?','この行の変更を破棄しますか?')))return;try{const d=await request(api+'/'+item.uuid);item=d.item;draft={};dirtyRows.delete(row);Object.keys(inputs).forEach(k=>inputs[k].value=item[k]||'');paint();message('','idle');}catch(e){message(e.message);}});reset.dataset.action='reload';
|
||||
function buttonMore(cursor){const more=el('button',t('More subtasks','続きのサブタスク'));more.type='button';more.className='task-children-more';more.addEventListener('click',async()=>{if(dirtyRows.size)return;more.disabled=true;try{const d=await request(api+'?'+new URLSearchParams({view:'family',parent:item.uuid,limit:100,before:cursor}));if(dirtyRows.size)return;d.items.forEach(c=>more.before(create(c,{...options,initialChildren:[],context:false,nested:true})));if(d.next)more.replaceWith(buttonMore(d.next));else more.remove();}catch(e){message(e.message);}finally{more.disabled=false;}});return more;}
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
(() => {
|
||||
'use strict';
|
||||
const root=document.getElementById('task-productivity');if(!root)return;
|
||||
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;};
|
||||
const status=document.getElementById('productivity-status'),content=document.getElementById('productivity-content');
|
||||
root.querySelectorAll('[data-word]').forEach(n=>n.textContent=t(n.dataset.word));root.querySelector('h1').textContent=t(root.dataset.view==='settings'?'settings':'report');
|
||||
async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:AbortSignal.timeout(15000),...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;}
|
||||
const error=e=>{status.textContent=e.message||t('error');};
|
||||
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']){
|
||||
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(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);
|
||||
}
|
||||
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;}};
|
||||
}
|
||||
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(){
|
||||
const controls=el('form');controls.className='productivity-controls';const from=el('input'),to=el('input');from.type=to.type='date';from.required=to.required=true;from.ariaLabel=ja?'開始日':'From';to.ariaLabel=ja?'終了日(含まない)':'To (exclusive)';const refresh=el('button','↻ '+t('refresh'));controls.append(from,to,refresh);
|
||||
const results=el('section');content.replaceChildren(controls,results);let generation=0;
|
||||
async function load(){const ticket=++generation;refresh.disabled=true;try{const query=new URLSearchParams();if(from.value)query.set('from',from.value);if(to.value)query.set('to',to.value);const d=await request('report?'+query);if(ticket!==generation)return;status.textContent=d.partial?t('partial'):d.timezone;
|
||||
if(!from.value&&d.days.length){from.value=d.days[0].date;const end=new Date(d.days.at(-1).date+'T12:00:00Z');end.setUTCDate(end.getUTCDate()+1);to.value=end.toISOString().slice(0,10);}
|
||||
const stats=el('div');stats.className='productivity-stats';for(const [label,key,divisor] of [['completed','completed',1],['points','points',1],['work','work_ms',3600000],['focus','focus_ms',3600000]]){const card=el('div',t(label));card.className='productivity-stat';const sum=d.days.reduce((total,day)=>total+day[key],0)/divisor;card.append(el('strong',divisor===1?String(sum):sum.toFixed(2)));stats.append(card);}
|
||||
const scroll=el('div');scroll.className='productivity-heatmap-scroll';const grid=el('div');grid.className='productivity-heatmap';grid.ariaLabel=t('report');const detail=el('section');detail.append(taskTable(d));let detailSequence=0;
|
||||
if(d.days.length){const weekday=new Date(d.days[0].date+'T12:00:00Z').getUTCDay();for(let i=0;i<weekday;i++)grid.append(el('span'));}
|
||||
for(const day of d.days){const cell=el('button');cell.type='button';cell.className='productivity-day';cell.dataset.level=String(day.points===0?0:day.points<=3?1:day.points<=8?2:day.points<=20?3:4);cell.title=cell.ariaLabel=`${day.date}: ${day.completed} ${t('completed')}, ${day.points} ${t('points')}, ${(day.work_ms/3600000).toFixed(2)}h`;
|
||||
cell.onclick=async()=>{const sequence=++detailSequence;try{const next=new Date(day.date+'T12:00:00Z');next.setUTCDate(next.getUTCDate()+1);const single=await request('report?'+new URLSearchParams({from:day.date,to:next.toISOString().slice(0,10)}));if(sequence!==detailSequence)return;detail.replaceChildren(el('h2',day.date),taskTable(single));}catch(e){error(e);}};grid.append(cell);}
|
||||
scroll.append(grid);const note=el('p',ja?'1タスクのポイント = 1 + ⌈見積分数 / 30⌉ × 複雑度(1〜5)。完了取消は集計から除外。作業時間とPomodoroは別集計で、重複する場合は加算しません。':'Points per task = 1 + ceil(estimated minutes / 30) × complexity (1–5). Reopened tasks are excluded. Work and Pomodoro are separate; overlapping time is not added together.');note.className='productivity-note';results.replaceChildren(stats,scroll,note,detail);
|
||||
}catch(e){error(e);}finally{refresh.disabled=false;}}
|
||||
controls.onsubmit=e=>{e.preventDefault();load();};await load();
|
||||
}
|
||||
(root.dataset.view==='settings'?settings():report()).catch(error);
|
||||
})();
|
||||
@@ -0,0 +1,6 @@
|
||||
(()=>{'use strict';const app=document.getElementById('tasks-app');if(!app)return;const ja=document.documentElement.lang.startsWith('ja'),t=(a,b)=>ja?b:a,api='/_/api/v1/extension/organizer.tasks/',bar=document.createElement('section'),label=document.createElement('a'),clock=document.createElement('span'),stop=document.createElement('button'),status=document.createElement('span');bar.className='task-work-bar';bar.hidden=true;bar.style.cssText='display:none;grid-column:1/-1;gap:.6rem;align-items:center;flex-wrap:wrap;padding:.5rem 0';stop.type='button';stop.textContent=t('■ Stop recording','■ 作業記録を終了');status.role='status';bar.append(label,clock,stop,status);app.prepend(bar);let current=null,busy=false;
|
||||
async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json'}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t('Recording failed. Check the active timer and reload; no duplicate timer is started.','記録できません。実行中の記録と権限を確認し再読込してください。タイマーは重複開始しません。'));return d;}
|
||||
function tick(){clock.textContent=current?.uuid?Math.floor(Math.max(0,Date.now()-current.start_ms)/60000)+' min':'';}
|
||||
async function load(){if(busy||document.hidden)return;try{const d=await request('work');current=d.item;bar.hidden=!current?.uuid;bar.style.display=bar.hidden?'none':'flex';if(current?.uuid){label.href='/v/plan/task/'+current.task_uuid;const task=await request('items/'+current.task_uuid);label.textContent=t('Recording: ','作業記録:')+task.item.title;}tick();}catch(e){status.textContent=e.message;}}
|
||||
app.addEventListener('task-work',async e=>{if(busy)return;busy=true;try{await request('work',{method:'POST',body:JSON.stringify({action:'start',uuid:crypto.randomUUID(),task_uuid:e.detail.uuid})});status.textContent='';}catch(err){bar.hidden=false;bar.style.display='flex';status.textContent=err.message;const feedback=document.getElementById('tasks-status');if(feedback)feedback.textContent=err.message;}finally{busy=false;await load();}});
|
||||
stop.onclick=async()=>{if(busy||!current?.uuid)return;busy=true;stop.disabled=true;try{await request('work',{method:'POST',body:JSON.stringify({...current,action:'stop'})});status.textContent='';}catch(e){status.textContent=e.message;}finally{busy=false;stop.disabled=false;await load();}};setInterval(()=>{if(!document.hidden)tick();},10000);setInterval(load,60000);document.addEventListener('visibilitychange',load);load();})();
|
||||
+10
-3
@@ -34,6 +34,8 @@
|
||||
const icons = {carryover:'↶',today:'☀',tomorrow:'⇢',inbox:'↓',backlog:'≡',someday:'◇',review:'↻',all:'☷',projects:'▱',done:'✓',archived:'▣'};
|
||||
Object.keys(icons).forEach(key => { const a = el('a'); a.href = routes[key] || '/v/plan/tasks/' + key; a.append(el('span',icons[key]),el('span',t(key))); if(view===key||(key==='tomorrow'&&view==='day'&&selectedDate===nextDay(today)))a.setAttribute('aria-current','page'); $('nav').append(a); });
|
||||
const schedule=el('a','▦ '+t('schedule'));schedule.href='/v/plan/tasks/schedule'+(projectID?'?project='+projectID:'');$('nav').append(schedule);
|
||||
for(const [route,label] of [['report',ja?'▥ 達成度・作業レポート':'▥ Activity report'],['settings',ja?'⚙ 既定値・メール':'⚙ Defaults and email']]){const a=el('a',label);a.href='/v/plan/tasks/'+route;$('nav').append(a);}
|
||||
const contacts=el('a',ja?'♧ 連絡先':'♧ Contacts');contacts.href='/v/plan/contacts';$('nav').append(contacts);
|
||||
$('date').textContent = view==='day'?selectedDate:today; $('heading').textContent = t(view === 'project' ? 'project' : view === 'detail' || view === 'new' ? 'all' : view);
|
||||
$('help').textContent = t(view==='today'?'todayHelp':view==='review'?'reviewHelp':'private');
|
||||
$('search-label').textContent=t('search');$('quick-title').placeholder=t('quick');$('quick-title').setAttribute('aria-label',t('title'));
|
||||
@@ -53,7 +55,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');
|
||||
function blank(kind='task') { return { uuid:crypto.randomUUID(),kind,title:'',notes:'',status:'todo',bucket:['inbox','backlog','someday'].includes(view)?view:'inbox',priority:1,estimate_minutes:0,project_uuid:kind==='task'?projectID:'',page_uuid:'',due_on:'',planned_on:['today','day'].includes(view)&&kind==='task'?(view==='day'?selectedDate:today):'',review_on:'',archived:false,version:0 }; }
|
||||
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 }; }
|
||||
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;}
|
||||
@@ -97,6 +101,7 @@
|
||||
if($('dialog').open&&!closeDialog())return;
|
||||
const ticket=++detailGeneration;dialogController?.abort();dialogController=new AbortController();$('error').textContent='';editing=null;dirty=false;$('fields').replaceChildren();Object.keys(fields).forEach(k=>delete fields[k]);$('history').open=false;$('history').querySelector('ol').replaceChildren();$('dialog-title').textContent=t('loading');$('save').disabled=true;$('archive').hidden=true;$('history').hidden=true;$('project-open').hidden=true;$('dialog').showModal();
|
||||
try {
|
||||
if(!id&&kind==='task')await refreshDefaults();
|
||||
const data=id?await request(api+'/'+id,{signal:dialogController.signal}):{item:blank(kind),page_path:''};if(ticket!==detailGeneration)return;editing=data.item;
|
||||
$('dialog-title').textContent=t(id?'edit':kind==='project'?'newProject':'newTask');
|
||||
const title=field('title',t('title'),'text',editing.title,true);title.required=true;title.maxLength=300;
|
||||
@@ -108,6 +113,8 @@
|
||||
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;
|
||||
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;
|
||||
@@ -132,14 +139,14 @@
|
||||
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;});
|
||||
function readForm(){const item={...editing};['title','notes','notes_subpath','status','bucket','project_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'].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;}
|
||||
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;}}
|
||||
$('form').addEventListener('submit',e=>{e.preventDefault();submit();});$('archive').addEventListener('click',()=>submit(true));
|
||||
$('history').addEventListener('toggle',async()=>{if(!$('history').open||!editing?.version)return;const id=editing.uuid;try{const data=await request(api+'/'+id+'/history');if(editing?.uuid!==id)return;const ol=$('history').querySelector('ol');ol.replaceChildren();data.items.forEach(v=>ol.append(el('li','#'+v.version+' · '+new Date(v.created_at_ms).toLocaleString())));}catch(e){$('error').textContent=e.message;}});
|
||||
$('new').addEventListener('click',()=>open('',view==='projects'?'project':'task'));
|
||||
let capturing=false,captureDraft=null;
|
||||
$('capture').addEventListener('submit',async e=>{e.preventDefault();if(capturing)return;const title=$('quick-title').value.trim();if(!title)return;capturing=true;const b=$('capture').querySelector('button');b.disabled=$('quick-title').disabled=true;if(!captureDraft||captureDraft.title!==title)captureDraft={...blank(),title};try{await saveItem(captureDraft);captureDraft=null;$('quick-title').value='';await load();}catch(err){$('status').textContent=err.message;}finally{capturing=false;b.disabled=$('quick-title').disabled=false;$('quick-title').focus();}});
|
||||
$('capture').addEventListener('submit',async e=>{e.preventDefault();if(capturing)return;const title=$('quick-title').value.trim();if(!title)return;capturing=true;const b=$('capture').querySelector('button');b.disabled=$('quick-title').disabled=true;try{if(!captureDraft||captureDraft.title!==title){await refreshDefaults();captureDraft={...blank(),title};}await saveItem(captureDraft);captureDraft=null;$('quick-title').value='';await load();}catch(err){$('status').textContent=err.message;}finally{capturing=false;b.disabled=$('quick-title').disabled=false;$('quick-title').focus();}});
|
||||
function debounce(fn,delay){let timer;return()=>{clearTimeout(timer);timer=setTimeout(fn,delay);};}
|
||||
$('search').addEventListener('input',debounce(()=>load(),200));$('refresh').addEventListener('click',()=>load());$('more').addEventListener('click',()=>load(true));
|
||||
async function loadProject(){try{const {item}=await request(api+'/'+projectID);$('heading').textContent=item.title;$('help').textContent=(item.archived?t('archived')+' · ':'')+(item.notes||t('private'));$('new').hidden=$('capture').hidden=!writable||item.archived;$('project-edit').hidden=false;$('project-edit').title=$('project-edit').ariaLabel=t('edit');}catch(e){$('status').textContent=e.message;}}
|
||||
|
||||
Reference in new issue
Block a user