diff --git a/app/AutomaticKimai/MadelineTelegramAdapter.php b/app/AutomaticKimai/MadelineTelegramAdapter.php
index e7c2548..6a5c547 100644
--- a/app/AutomaticKimai/MadelineTelegramAdapter.php
+++ b/app/AutomaticKimai/MadelineTelegramAdapter.php
@@ -42,7 +42,7 @@ public function __construct(string $sessionPath,int $apiId,string $apiHash)
throw new RuntimeException('MadelineProto session not imported; run the controlled migration first');
}
if (is_link($sessionPath))throw new RuntimeException('Symlinked Telegram session forbidden');
- $this->api=new API($sessionPath,self::settings($apiId,$apiHash,dirname($sessionPath).'/telegram-user.log'));
+ $this->api=new API($sessionPath);
$me=$this->api->getSelf();
if (!is_array($me)||($me['bot']??false)) {
throw new RuntimeException('Authorized individual Telegram user session required');
diff --git a/app/AutomaticKimai/TelegramWebLogin.php b/app/AutomaticKimai/TelegramWebLogin.php
index 88240b3..33f3a4a 100644
--- a/app/AutomaticKimai/TelegramWebLogin.php
+++ b/app/AutomaticKimai/TelegramWebLogin.php
@@ -87,11 +87,7 @@ private function verifiedAccount(): ?array
empty($secrets['TELEGRAM_API_ID'])||empty($secrets['TELEGRAM_API_HASH']))return null;
$old=umask(0077);
try {
- $api=new API($session,MadelineTelegramAdapter::settings(
- (int)$secrets['TELEGRAM_API_ID'],
- (string)$secrets['TELEGRAM_API_HASH'],
- $this->store->root().'/telegram-user.log'
- ));
+ $api=new API($session);
$me=$api->getSelf();
$valid=$api->getAuthorization()===API::LOGGED_IN &&
is_array($me)?self::publicAccount($me):null;
@@ -166,10 +162,7 @@ public function avatar(?object $client=null): ?array
$own=$client===null;
$old=umask(0077);
try {
- $client??=new API($session,MadelineTelegramAdapter::settings(
- (int)$credentials['TELEGRAM_API_ID'],(string)$credentials['TELEGRAM_API_HASH'],
- $this->store->root().'/telegram-user.log'
- ));
+ $client??=new API($session);
$self=$client->getSelf();
if (!is_array($self)||self::publicAccount($self)===null) return null;
$list=$client->photos->getUserPhotos(
diff --git a/app/AutomaticKimai/WeeklyCalendar.php b/app/AutomaticKimai/WeeklyCalendar.php
new file mode 100644
index 0000000..13f9726
--- /dev/null
+++ b/app/AutomaticKimai/WeeklyCalendar.php
@@ -0,0 +1,130 @@
+modify('-'.((int)$date->format('N')-1).' days');
+ $days=[];
+ for ($i=0;$i<7;$i++)$days[]=$monday->modify('+'.$i.' days')->format('Y-m-d');
+ return [
+ 'days'=>$days,
+ 'start'=>$days[0],
+ 'end'=>$days[6],
+ 'previous'=>$monday->modify('-7 days')->format('Y-m-d'),
+ 'next'=>$monday->modify('+7 days')->format('Y-m-d'),
+ 'today'=>(new DateTimeImmutable('now',$zone))->format('Y-m-d'),
+ ];
+ }
+
+ private static function entity(mixed $value): string
+ {
+ if (is_array($value))return (string)($value['name']??'');
+ return '';
+ }
+
+ public static function entries(array $remote, array $report, array $days, DateTimeZone $zone): array
+ {
+ if ($days===[])return [];
+ $weekStart=TimeMath::dayStart($days[0],$zone);
+ $weekEnd=TimeMath::dayStart(end($days),$zone)->modify('+1 day');
+ $events=[];
+ $add=static function(string $type,string $start,string $end,string $title,string $details='') use (&$events,$zone,$weekStart,$weekEnd): void {
+ try {
+ $a=(new DateTimeImmutable($start,$zone))->setTimezone($zone);
+ $b=(new DateTimeImmutable($end,$zone))->setTimezone($zone);
+ } catch (Throwable) {return;}
+ if ($b <= $a || $b <= $weekStart || $a >= $weekEnd)return;
+ if ($a < $weekStart)$a=$weekStart;
+ if ($b > $weekEnd)$b=$weekEnd;
+ // Split midnight-crossing entries, accounting for local DST boundaries.
+ while ($a < $b) {
+ $midnight=TimeMath::dayStart($a->modify('+1 day')->format('Y-m-d'),$zone);
+ $stop=$b < $midnight ? $b : $midnight;
+ if ($stop <= $a)break;
+ $day=$a->format('Y-m-d');
+ $minutes=(int)$a->format('H')*60+(int)$a->format('i');
+ $finish=$stop===$midnight ? 1440 : (int)$stop->format('H')*60+(int)$stop->format('i');
+ if ($stop->format('Y-m-d')!==$day)$finish=1440;
+ $events[]=[
+ 'type'=>$type,'day'=>$day,'start'=>$a->format('H:i'),
+ 'end'=>$stop->format('Y-m-d')!==$day?'24:00':$stop->format('H:i'),
+ 'title'=>$title,'details'=>$details,
+ 'top'=>round($minutes/1440*100,4),
+ 'height'=>round(max(1,$finish-$minutes)/1440*100,4),
+ 'seconds'=>(int)($stop->getTimestamp()-$a->getTimestamp()),
+ 'start_ts'=>$a->getTimestamp(),'end_ts'=>$stop->getTimestamp(),
+ ];
+ $a=$stop;
+ }
+ };
+ foreach ($remote as $entry) {
+ if (!is_array($entry) || !is_string($entry['begin']??null))continue;
+ $end=$entry['end']??null;
+ if (!is_string($end)||$end==='')continue; // Running timer cannot be presented as a completed interval.
+ $project=self::entity($entry['project']??null);
+ $activity=self::entity($entry['activity']??null);
+ $customer=self::entity($entry['customer']??null);
+ $title=trim($project.' · '.$activity,' ·') ?: 'Atividade registrada';
+ $detail=trim($customer.' — '.(string)($entry['description']??''),' —');
+ $add('registered',$entry['begin'],$end,$title,$detail);
+ }
+ foreach ($report['days']??[] as $day) {
+ if (!is_array($day)||!in_array($day['day']??null,$days,true))continue;
+ foreach ($day['review_intervals']??[] as $row) {
+ if (is_string($row['start']??null)&&is_string($row['end']??null))
+ $add('observed',$row['start'],$row['end'],'Atividade observada','Duração de trabalho não confirmada');
+ }
+ foreach ($day['calendar_gap_alerts']??[] as $row) {
+ if (is_string($row['start']??null)&&is_string($row['end']??null))
+ $add('scheduled',$row['start'],$row['end'],'Sinal de agenda','Compromisso previsto; presença não comprovada');
+ }
+ }
+ usort($events,static fn($x,$y)=>[$x['start_ts'],$x['type']]<=>[$y['start_ts'],$y['type']]);
+ return $events;
+ }
+
+ public static function decorate(array $calendar): array
+ {
+ $total=0;
+ $counts=['registered'=>0,'observed'=>0,'scheduled'=>0];
+ $daily=[];
+ foreach ($calendar['days'] as $day) {
+ $spans=[];$seen=['registered'=>0,'observed'=>0,'scheduled'=>0];
+ foreach ($calendar['events'] as $event) {
+ if ($event['day']!==$day)continue;
+ $seen[$event['type']]++;
+ if ($event['type']==='registered')$spans[]=[$event['start_ts'],$event['end_ts']];
+ }
+ usort($spans,static fn($a,$b)=>$a[0]<=>$b[0]);
+ $merged=[];
+ foreach ($spans as [$a,$b]) {
+ $i=count($merged)-1;
+ if ($i<0||$a>$merged[$i][1])$merged[]=[$a,$b];
+ elseif ($b>$merged[$i][1])$merged[$i][1]=$b;
+ }
+ $seconds=array_sum(array_map(static fn($v)=>$v[1]-$v[0],$merged));
+ $total+=$seconds;
+ foreach ($seen as $key=>$value)$counts[$key]+=$value;
+ $daily[$day]=['seconds'=>$seconds,'counts'=>$seen];
+ }
+ $calendar['total_seconds']=$total;
+ $calendar['counts']=$counts;
+ $calendar['daily']=$daily;
+ return $calendar;
+ }
+
+ public static function hours(int $seconds): string
+ {
+ return sprintf('%dh%02d',intdiv($seconds,3600),intdiv($seconds%3600,60));
+ }
+}
diff --git a/app/Http/Controllers/AutomaticKimaiController.php b/app/Http/Controllers/AutomaticKimaiController.php
index cb28fff..4151872 100644
--- a/app/Http/Controllers/AutomaticKimaiController.php
+++ b/app/Http/Controllers/AutomaticKimaiController.php
@@ -5,6 +5,7 @@
use App\AutomaticKimai\ActivityWatchClient;
use App\AutomaticKimai\KimaiClient;
+use App\AutomaticKimai\WeeklyCalendar;
use App\AutomaticKimai\LocalStore;
use App\AutomaticKimai\NextcloudDesktopDiscovery;
use App\AutomaticKimai\NextcloudLoginFlow;
@@ -33,16 +34,17 @@ private function local(Request $request): void
}
}
- public function home(Request $request): View
+ public function home(Request $request): View|RedirectResponse
{
$this->local($request);
$view=(string)$request->query('view','overview');
if ($view==='settings')$view='kimai'; // Existing bookmarks.
+ if ($view==='attendance')return redirect()->route('kimai.home',['view'=>'manual']); // Old bookmarks.
if ($view==='about')$view='overview'; // Old migration-page links.
$titles=[
'overview'=>'Visão geral',
'review'=>'Conciliação de horas',
- 'attendance'=>'Trabalho presencial',
+ 'calendar'=>'Calendário semanal',
'manual'=>'Informar horas',
'kimai'=>'Conta Kimai',
'sources'=>'Fontes de dados',
@@ -54,7 +56,7 @@ public function home(Request $request): View
$hints=[
'overview'=>'Acompanhe seu monitoramento e veja o que precisa de atenção.',
'review'=>'Acompanhe horas reconciliadas e observações monitoradas automaticamente.',
- 'attendance'=>'Revise compromissos presenciais e desconte as pausas.',
+ 'calendar'=>'Compare lançamentos confirmados e evidências que ainda precisam de revisão.',
'manual'=>'Informe atividades realizadas fora da coleta automática.',
'kimai'=>'Visualize sua conta e altere a conexão apenas se necessário.',
'sources'=>'Controle quais informações o aplicativo pode consultar.',
@@ -105,8 +107,41 @@ public function home(Request $request): View
try {$reviewRows=$queue->rows();}
finally {$queue->close();}
}
+ $calendar=null;
+ if ($view==='calendar') {
+ $day=(string)$request->query('week','');
+ if ($day!=='' && !preg_match('/^\d{4}-\d{2}-\d{2}$/D',$day)) {
+ abort(422,'Semana inválida');
+ }
+ $profile=$this->store->profile();
+ $zone=new \DateTimeZone((string)($profile?->get('timezone')??'UTC'));
+ try {
+ $calendar=WeeklyCalendar::week($day==='' ? (new DateTimeImmutable('now',$zone))->format('Y-m-d') : $day,$zone);
+ } catch (\Throwable) {abort(422,'Semana inválida');}
+ $calendar['events']=[];
+ $calendar['error']=null;
+ $calendar['outdated']=false;
+ if ($profile===null) {
+ $calendar['error']='Conecte uma conta Kimai para consultar as horas registradas.';
+ } else {
+ try {
+ $creds=$this->store->credentials();
+ $api=new KimaiClient($creds['KIMAI_BASE_URL']??'', $creds['KIMAI_API_TOKEN']??'');
+ $me=$api->me();
+ if (!is_int($me['id']??null))throw new RuntimeException('Conta Kimai sem identificação');
+ $remote=$api->timesheets($me['id'],$calendar['days'],$zone);
+ $calendar['events']=WeeklyCalendar::entries($remote,$this->store->report(),$calendar['days'],$zone);
+ } catch (Throwable) {
+ $calendar['error']='Não foi possível consultar os lançamentos do Kimai. Confira a conexão e tente novamente.';
+ $calendar['outdated']=true;
+ $calendar['events']=WeeklyCalendar::entries([],$this->store->report(),$calendar['days'],$zone);
+ }
+ }
+ $calendar=WeeklyCalendar::decorate($calendar);
+ }
return view('automatic-kimai.dashboard',[
'reviewRows'=>$reviewRows,
+ 'calendar'=>$calendar,
'view'=>$view,
'statusLabel'=>$statusLabel,
'lastAnalysis'=>$lastAnalysis,
@@ -361,6 +396,8 @@ public function manual(Request $request): RedirectResponse
'start'=>'required|date_format:H:i',
'end'=>'required|date_format:H:i',
'task'=>'required|string|min:3|max:64',
+ 'pause_start'=>'nullable|date_format:H:i|required_with:pause_end',
+ 'pause_end'=>'nullable|date_format:H:i|required_with:pause_start',
'confirmed'=>'accepted',
]);
$profile=$this->store->profile();
@@ -372,11 +409,24 @@ public function manual(Request $request): RedirectResponse
if (!is_int($user)||$user<1)throw new RuntimeException('Kimai account unavailable');
\App\AutomaticKimai\PublicationGate::assertManualReady(
$this->store,$profile,$creds,$user);
- $result=(new ManualTime())->submit($profile,$api,$this->store->ledgerFile(),
- true,
- $data['day'],$data['start'],$data['end'],$data['task'],true,
- new DateTimeImmutable('now',$profile->zone));
- return back()->with('ok','Kimai worklog entry #'.$result['remote_id'].' verified.');
+ $now=new DateTimeImmutable('now',$profile->zone);
+ $segments=[[$data['start'],$data['end']]];
+ if (!empty($data['pause_start']) && !empty($data['pause_end'])) {
+ $segments=ManualTime::attendanceSegments($profile,[
+ 'day'=>$data['day'],'start'=>$data['start'],'end'=>$data['end'],
+ 'label'=>$data['task'],
+ 'breaks'=>[[$data['pause_start'],$data['pause_end']]],
+ 'schedule_source'=>'Horários declarados pelo usuário',
+ 'attendance_attested'=>true,
+ ],$now);
+ }
+ $ids=[];$manual=new ManualTime();
+ foreach ($segments as [$start,$end]) {
+ $result=$manual->submit($profile,$api,$this->store->ledgerFile(),
+ true,$data['day'],$start,$end,$data['task'],true,$now);
+ $ids[]=(int)$result['remote_id'];
+ }
+ return back()->with('ok','Horas registradas no Kimai. IDs: '.implode(', ',$ids));
} catch(Throwable $e) {
return back()->withErrors(['manual'=>$e->getMessage()]);
}
diff --git a/docs/GETTING_STARTED.md b/docs/GETTING_STARTED.md
index 4238856..4b26af8 100644
--- a/docs/GETTING_STARTED.md
+++ b/docs/GETTING_STARTED.md
@@ -46,7 +46,7 @@ credenciais diretamente no serviço de origem se não forem mais necessárias.
## Acompanhar suas horas
-Na **Visão geral**, execute **Atualizar análise**. Abra **Conciliação de horas**
+Na **Visão geral**, execute **Atualizar análise**. Na tela **Calendário semanal** (prova de conceito somente leitura), navegue entre semanas para visualizar os horários confirmados no Kimai ao lado das observações locais; blocos de agenda e atividade observada não são somados às horas registradas. Utilize **Atualizar do Kimai** para consultar novamente os lançamentos da semana e selecione blocos, inclusive os curtos, para visualizar seus horários e detalhes. Abra **Conciliação de horas**
para ver três situações distintas:
- **Já registrado:** o Kimai possui um lançamento correspondente; a
@@ -58,8 +58,7 @@ para ver três situações distintas:
uma aprovação que tenha perdido validade pode exigir tratamento específico.
Uma fila de revisão vazia não garante que toda a jornada foi registrada.
-Para trabalho comprovado fora do computador, utilize **Trabalho presencial**
-ou **Informar horas**, com horários reais e pausas. A publicação em servidor
+Para trabalho comprovado fora do computador, utilize **Informar horas**, com data, horários reais e descrição. Se houver pausa, abra **Informar pausa (opcional)** para descontá-la. A publicação em servidor
depende da política autorizada para a instalação.
## Problemas comuns
diff --git a/docs/images/calendar-week-poc.png b/docs/images/calendar-week-poc.png
new file mode 100644
index 0000000..fe54d5b
Binary files /dev/null and b/docs/images/calendar-week-poc.png differ
diff --git a/public/css/automatic-kimai.css b/public/css/automatic-kimai.css
index 8313516..3957f76 100644
--- a/public/css/automatic-kimai.css
+++ b/public/css/automatic-kimai.css
@@ -611,3 +611,75 @@ a.button:hover { background:var(--primary-hover); }
.updates-actions button { margin: 0; }
.updates-panel progress { width: 100%; height: 12px; margin: 6px 0 14px; }
.updates-note { font-size: 12px; margin: 14px 0 0; }
+
+/* Weekly read-only calendar POC */
+.calendar-toolbar{display:flex;align-items:flex-start;justify-content:space-between;gap:1rem;flex-wrap:wrap}
+.calendar-toolbar h2{margin:0 0 .35rem}
+.calendar-controls,.calendar-legend,.calendar-actions{display:flex;align-items:center;flex-wrap:wrap;gap:.55rem}
+.calendar-controls a{min-width:2.6rem;text-align:center;text-decoration:none}
+.calendar-summary{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:.7rem;margin:1.3rem 0}
+.calendar-summary>div{border:1px solid var(--line);border-radius:12px;padding:.8rem;display:flex;flex-direction:column;gap:.5rem}
+.calendar-summary strong{font-size:1.35rem}
+.calendar-legend{gap:1.2rem;margin:.7rem 0 1rem;font-size:.9rem}
+.calendar-legend>span{display:flex;align-items:center;gap:.35rem}
+.calendar-dot{display:inline-block;width:11px;height:11px;border-radius:3px;background:#2563eb}
+.calendar-dot.observed{background:#d97706}
+.calendar-dot.scheduled{background:#64748b}
+.calendar-scroller{overflow-x:auto;border:1px solid var(--line);border-radius:13px}
+.calendar-grid{display:grid;grid-template-columns:64px repeat(7,minmax(126px,1fr));min-width:960px}
+.calendar-axis,.calendar-day{min-width:0;border-right:1px solid var(--line)}
+.calendar-day:last-child{border-right:0}
+.calendar-axis-title,.calendar-day-heading{height:61px;display:flex;flex-direction:column;justify-content:center;padding:.45rem .55rem;border-bottom:1px solid var(--line);background:var(--raised)}
+.calendar-day-heading small{font-size:.72rem;opacity:.78;margin-top:.25rem}
+.calendar-day.today .calendar-day-heading{box-shadow:inset 0 3px #2563eb}
+.calendar-axis-body,.calendar-day-body{height:960px;position:relative}
+.calendar-axis-body span{position:absolute;left:.6rem;transform:translateY(-50%);font-size:.73rem;opacity:.68}
+.calendar-hour{position:absolute;left:0;right:0;border-top:1px solid var(--line);opacity:.43}
+.calendar-event{position:absolute;z-index:1;left:3px;right:3px;min-height:2px;padding:3px 5px;border-radius:5px;overflow:hidden;display:flex;flex-direction:column;gap:2px;line-height:1.25;font-size:.73rem;box-sizing:border-box;box-shadow:0 1px 2px #0002}
+.calendar-event.registered{background:#dbeafe;color:#163879;border-left:3px solid #2563eb;z-index:3}
+.calendar-event.observed{background:repeating-linear-gradient(135deg,#fef3c7,#fef3c7 7px,#fffbeb 7px,#fffbeb 14px);color:#78350f;border-left:3px solid #d97706;z-index:2;right:8%}
+.calendar-event.scheduled{background:rgba(100,116,139,.14);color:var(--fg);border-left:3px dashed #64748b;z-index:1;left:8%;box-shadow:none}
+.calendar-event span{overflow-wrap:anywhere}
+.calendar-footnote{margin:1rem 0}
+@media(max-width:720px){.calendar-summary{grid-template-columns:repeat(2,minmax(0,1fr))}.calendar-grid{min-width:900px}}
+[data-theme="dark"] .calendar-event.registered{background:#17335a;color:#e4f0ff}
+[data-theme="dark"] .calendar-event.observed{background:#584219;color:#ffedbd}
+[data-theme="dark"] .calendar-event.scheduled{background:#334155;color:#e2e8f0}
+
+.calendar-summary>div{background:var(--raised)}
+.calendar-day-body{background:var(--card)}
+.calendar-legend{color:var(--fg)}
+.calendar-event:focus-visible{outline:3px solid var(--focus);outline-offset:1px}
+
+/* Match system dark mode when no explicit theme preference is stored. */
+@media (prefers-color-scheme: dark) {
+ :root:not([data-theme]) .calendar-event.registered{background:#17335a;color:#e4f0ff}
+ :root:not([data-theme]) .calendar-event.observed{background:#584219;color:#ffedbd}
+ :root:not([data-theme]) .calendar-event.scheduled{background:rgba(148,163,184,.16);color:var(--fg)}
+}
+
+
+/* Compact calendar entries: retain real start position and elapsed time, but
+ give 1–15 minute entries a readable click/focus target. */
+.calendar-event{cursor:pointer;text-align:left;align-items:flex-start;justify-content:flex-start;font-family:inherit;font-weight:400;margin:0}
+.calendar-event:focus-visible{outline:3px solid var(--focus);outline-offset:2px}
+.calendar-event-short{min-height:30px!important;flex-direction:row;align-items:center;justify-content:flex-start;gap:4px;font-size:.7rem;padding:3px 4px;overflow:hidden;z-index:5}
+.calendar-event-short b{white-space:nowrap;font-variant-numeric:tabular-nums}
+.calendar-event-short .calendar-event-name{display:none}
+.calendar-event:hover{filter:brightness(.94)}
+.calendar-dialog-close{float:right}
+.calendar-detail-dialog{width:min(92vw,450px);max-height:80vh;padding:22px;border-radius:16px;border:1px solid var(--line);background:var(--card);color:var(--fg);box-shadow:0 24px 60px #0005}
+.calendar-detail-dialog::backdrop{background:rgba(8,15,26,.55)}
+.calendar-detail-dialog h3{font-size:1.1rem;clear:both}
+.calendar-detail-time{font-weight:750;font-variant-numeric:tabular-nums}
+.calendar-detail-dialog form{margin:0}
+.calendar-refresh{display:inline-flex;align-items:center;gap:7px}
+.calendar-refresh .icon{width:17px;height:17px}
+.page-loading-overlay[hidden]{display:none!important}
+.page-loading-overlay{position:fixed;inset:0;background:rgba(9,22,42,.45);backdrop-filter:blur(2px);z-index:1000;display:grid;place-items:center;padding:18px}
+.page-loading-card{display:flex;flex-direction:column;align-items:center;gap:11px;min-width:min(92vw,270px);max-width:380px;text-align:center;background:var(--card);color:var(--fg);padding:28px 32px;border-radius:18px;box-shadow:0 18px 50px #0005;border:1px solid var(--line)}
+.page-loading-card strong{font-size:1rem;line-height:1.35}
+.page-loading-card small{font-size:.8rem}
+.page-loading-spinner{width:43px;height:43px;border:4px solid var(--line);border-top-color:var(--focus);border-radius:50%;animation:calendar-spin .75s linear infinite}
+@keyframes calendar-spin{to{transform:rotate(360deg)}}
+@media(prefers-reduced-motion:reduce){.page-loading-spinner{animation-duration:2.5s}}
diff --git a/public/icons/lucide.svg b/public/icons/lucide.svg
index abd2cd9..12c5d33 100644
--- a/public/icons/lucide.svg
+++ b/public/icons/lucide.svg
@@ -59,4 +59,4 @@