Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/AutomaticKimai/MadelineTelegramAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
11 changes: 2 additions & 9 deletions app/AutomaticKimai/TelegramWebLogin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
130 changes: 130 additions & 0 deletions app/AutomaticKimai/WeeklyCalendar.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?php
declare(strict_types=1);

namespace App\AutomaticKimai;

use DateTimeImmutable;
use DateTimeZone;
use Throwable;

/** Pure, read-only projection of remote timesheets and locally observed signals. */
final class WeeklyCalendar
{
public static function week(string $day, DateTimeZone $zone): array
{
$date=TimeMath::dayStart($day,$zone);
$monday=$date->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));
}
}
66 changes: 58 additions & 8 deletions app/Http/Controllers/AutomaticKimaiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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',
Expand All @@ -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.',
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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();
Expand All @@ -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()]);
}
Expand Down
5 changes: 2 additions & 3 deletions docs/GETTING_STARTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file added docs/images/calendar-week-poc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading