Author SHA1 Message Date
Romulus21andClaude Opus 5.5 a3902c9662 Ajoute le déploiement en prod locale
Makefile (setup, deploy avec sauvegarde de la base, status, logs, dev),
vhost Apache en reverse proxy sur tempus.loc et service systemd
utilisateur, binaire installé dans /var/www/tempus.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-13 18:27:16 +01:00
Romulus21andClaude Opus 5.5 467293a6bc Groupe les entrées par jour
/entries et « Dernières entrées » affichent un en-tête par jour avec son
total ; la colonne Jour disparaît des lignes. La liste de /entries se
recharge après une modification inline (date déplacée, totaux).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-13 18:27:16 +01:00
Romulus21andClaude Opus 5.5 6307be4f79 Affiche les entrées de l'accueil comme sur /entries
Les tableaux « Aujourd'hui » et « Dernières entrées » réutilisent
_entry_row.html : mêmes colonnes, en-tête et actions (modifier,
dupliquer, supprimer).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-13 18:17:47 +01:00
Romulus21andClaude Opus 5.5 f4c94f9b5b Ajoute un livereload de développement
Feature cargo `livereload` (tower-livereload, désactivée par défaut) :
script injecté dans les pages hors requêtes htmx, assets en no-cache.
À lancer avec watchexec (cf. README).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-13 18:17:47 +01:00
Romulus21andClaude Opus 5.5 fdba078b51 Remplace les boutons des entrées par des pictos groupés
Modifier (crayon, primary), Dupliquer et Supprimer deviennent des icônes
SVG avec title/aria-label, réunies dans un .btn-group.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-13 18:17:47 +01:00
Romulus21andClaude Opus 5.5 3dfe1a5828 Merge branch 'feat/entrees-dupliquer-datepicker-timer'
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 15:49:20 +01:00
Romulus21andClaude Opus 5.5 35df6b52e8 Permet de modifier l'heure de début du chrono en cours
Champ « Début » sur le timer en cours (POST /ui/timer/debut) ; le chrono
continue. Une heure dans le futur est refusée.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 15:49:07 +01:00
Romulus21andClaude Opus 5.5 092bc2fb3e Ajoute un sélecteur de date/heure sur les entrées
flatpickr 4.6.13 (fr, 24 h), embarqué dans le binaire, sur les champs
datetime-local, y compris ceux chargés par htmx. La valeur envoyée au
serveur reste au format YYYY-MM-DDTHH:MM ; couleurs reprises du thème.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 15:49:07 +01:00
Romulus21andClaude Opus 5.5 7c22567b07 Permet de dupliquer une entrée
Bouton « Dupliquer » sur chaque ligne de /entries : ouvre sous l'entrée
un formulaire prérempli (début, fin, projet, note) à ajuster avant de
créer la copie. Une entrée en cours propose « maintenant » comme fin.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 15:49:07 +01:00
24 changed files with 489 additions and 49 deletions

No files matched your search

Generated
+15
View File
@@ -1697,6 +1697,7 @@ dependencies = [
"tokio",
"tower",
"tower-http",
"tower-livereload",
"tracing",
"tracing-subscriber",
]
@@ -1824,6 +1825,20 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
[[package]]
name = "tower-livereload"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7df210bd982165dee3c20e31deed79a3585ee6b255c070d9c73ae015cc40d2f3"
dependencies = [
"bytes",
"http",
"http-body",
"pin-project-lite",
"tokio",
"tower",
]
[[package]]
name = "tower-service"
version = "0.3.3"
+5
View File
@@ -15,9 +15,14 @@ sqlx = { version = "0.8", default-features = false, features = ["runtime-tokio",
thiserror = "2.0.21"
tokio = { version = "1.54.1", features = ["full"] }
tower-http = { version = "0.7.1", features = ["trace"] }
tower-livereload = { version = "0.10.3", optional = true }
tracing = "0.1.44"
tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
[features]
# Recharge le navigateur au redémarrage du serveur (dev uniquement).
livereload = ["dep:tower-livereload"]
[dev-dependencies]
http-body-util = "0.1.5"
tower = { version = "0.5.3", features = ["util"] }
+53
View File
@@ -0,0 +1,53 @@
DEPLOY_DIR ?= /var/www/tempus
SERVICE ?= tempus
HOST ?= tempus.loc
ADDR ?= 127.0.0.1:3110
UNIT := $(HOME)/.config/systemd/user/$(SERVICE).service
SUBST := sed -e 's|@HOST@|$(HOST)|g' -e 's|@ADDR@|$(ADDR)|g' -e 's|@DEPLOY_DIR@|$(DEPLOY_DIR)|g'
.PHONY: build setup deploy backup status logs dev
## Compile le binaire (templates, CSS/JS et migrations sont embarqués).
build:
cargo build --release
## Une seule fois : dossier, vhost Apache et /etc/hosts (sudo), service systemd utilisateur.
setup:
sudo install -d -o $(USER) -g www-data -m 755 $(DEPLOY_DIR)
$(SUBST) deploy/vh_tempus.conf | sudo tee /etc/apache2/sites-available/vh_tempus.conf >/dev/null
sudo a2ensite -q vh_tempus
sudo systemctl reload apache2
grep -qw '$(HOST)' /etc/hosts || printf '127.0.0.1\t$(HOST)\n' | sudo tee -a /etc/hosts >/dev/null
install -d $(dir $(UNIT))
$(SUBST) deploy/tempus.service > $(UNIT)
systemctl --user daemon-reload
systemctl --user enable $(SERVICE)
## Sauvegarde la base, installe le nouveau binaire et redémarre le service.
deploy: build
systemctl --user stop $(SERVICE)
$(MAKE) --no-print-directory backup
install -m 755 target/release/tempus $(DEPLOY_DIR)/tempus
systemctl --user start $(SERVICE)
@for i in $$(seq 1 50); do \
curl -sf -o /dev/null http://$(ADDR)/health && echo "Déployé : http://$(HOST)" && exit 0; \
sleep 0.1; \
done; echo "Le service ne répond pas : make logs" >&2; exit 1
## Copie la base (service arrêté) dans $(DEPLOY_DIR)/backups, garde les 10 dernières.
backup:
@if [ -f $(DEPLOY_DIR)/tempus.db ]; then \
d=$(DEPLOY_DIR)/backups/$$(date +%Y%m%d-%H%M%S); mkdir -p $$d; \
cp $(DEPLOY_DIR)/tempus.db* $$d/ && echo "Sauvegarde : $$d"; \
ls -1dt $(DEPLOY_DIR)/backups/*/ | tail -n +11 | xargs -r rm -r; \
fi
status:
systemctl --user status $(SERVICE) --no-pager
logs:
journalctl --user -u $(SERVICE) -f
## Dev : recompile, redémarre et recharge le navigateur à chaque modif.
dev:
watchexec -r -e rs,html,css,js,sql -- cargo run --features livereload
+25
View File
@@ -51,8 +51,33 @@ curl -XPOST localhost:7878/api/clients -H 'content-type: application/json' -d '{
curl -XPOST localhost:7878/api/timer/start -H 'content-type: application/json' -d '{"project_id":1}'
```
## Production locale
Binaire dans `/var/www/tempus`, service systemd utilisateur, vhost Apache
(reverse proxy) sur http://tempus.loc → `127.0.0.1:3110`.
```sh
make setup # une fois (sudo) : dossier, vhost, /etc/hosts, service
make deploy # compile, sauvegarde la base, installe, redémarre
make status # / make logs
```
La base de prod est `/var/www/tempus/tempus.db` ; chaque `make deploy` la copie
dans `/var/www/tempus/backups/` (10 dernières conservées). Variables
surchargeables : `DEPLOY_DIR`, `HOST`, `ADDR`, `SERVICE`.
## Développement
Rechargement automatique (recompile, redémarre et rafraîchit le navigateur) :
```sh
cargo install watchexec-cli # une fois
make dev
```
La feature `livereload` injecte un script dans les pages (pas dans les fragments
htmx) et désactive le cache des assets ; elle n'est jamais active par défaut.
```sh
cargo test
cargo clippy --all-targets -- -D warnings
+15
View File
@@ -0,0 +1,15 @@
[Unit]
Description=Tempus (suivi du temps)
After=network.target
[Service]
Type=simple
WorkingDirectory=@DEPLOY_DIR@
Environment=TEMPUS_DB=@DEPLOY_DIR@/tempus.db
Environment=TEMPUS_ADDR=@ADDR@
ExecStart=@DEPLOY_DIR@/tempus
Restart=on-failure
RestartSec=3
[Install]
WantedBy=default.target
+8
View File
@@ -0,0 +1,8 @@
<VirtualHost *:80>
ServerName @HOST@
ProxyPreserveHost On
ProxyPass / http://@ADDR@/
ProxyPassReverse / http://@ADDR@/
ErrorLog /var/log/apache2/error.@HOST@.log
CustomLog /var/log/apache2/access.@HOST@.log combined
</VirtualHost>
+9 -1
View File
@@ -20,7 +20,15 @@ async fn main() -> anyhow::Result<()> {
.await
.with_context(|| format!("cannot listen on {}", config.addr))?;
tracing::info!(db = %config.database_url, "Tempus disponible sur http://{}", config.addr);
axum::serve(listener, routes::app(pool))
let app = routes::app(pool);
#[cfg(feature = "livereload")]
let app = app.layer(
// Les fragments htmx ne doivent pas recevoir le script injecté.
tower_livereload::LiveReloadLayer::new().request_predicate(
|req: &axum::http::Request<axum::body::Body>| !req.headers().contains_key("hx-request"),
),
);
axum::serve(listener, app)
.with_graceful_shutdown(async {
let _ = tokio::signal::ctrl_c().await;
})
+35 -1
View File
@@ -17,6 +17,33 @@ pub fn app(pool: SqlitePool) -> Router {
"/static/htmx.min.js",
get(|| asset("text/javascript", include_str!("../../static/htmx.min.js"))),
)
.route(
"/static/flatpickr/flatpickr.min.js",
get(|| {
asset(
"text/javascript",
include_str!("../../static/flatpickr/flatpickr.min.js"),
)
}),
)
.route(
"/static/flatpickr/fr.min.js",
get(|| {
asset(
"text/javascript",
include_str!("../../static/flatpickr/fr.min.js"),
)
}),
)
.route(
"/static/flatpickr/flatpickr.min.css",
get(|| {
asset(
"text/css",
include_str!("../../static/flatpickr/flatpickr.min.css"),
)
}),
)
.route(
"/static/app.js",
get(|| asset("text/javascript", include_str!("../../static/app.js"))),
@@ -29,11 +56,18 @@ pub fn app(pool: SqlitePool) -> Router {
.with_state(pool)
}
// En livereload, le CSS/JS doit être relu à chaque rechargement.
const CACHE_CONTROL: &str = if cfg!(feature = "livereload") {
"no-cache"
} else {
"public, max-age=3600"
};
async fn asset(content_type: &'static str, body: &'static str) -> impl IntoResponse {
(
[
(header::CONTENT_TYPE, content_type),
(header::CACHE_CONTROL, "public, max-age=3600"),
(header::CACHE_CONTROL, CACHE_CONTROL),
],
body,
)
+107 -8
View File
@@ -29,6 +29,7 @@ pub fn router() -> Router<SqlitePool> {
.route("/ui/dernieres-entrees", get(recent_fragment))
.route("/ui/timer/start", post(start_timer))
.route("/ui/timer/stop", post(stop_timer))
.route("/ui/timer/debut", post(set_timer_start))
.route("/ui/clients", post(create_client))
.route("/ui/clients/{id}", post(save_client))
.route("/ui/clients/{id}/archive", post(archive_client))
@@ -43,6 +44,10 @@ pub fn router() -> Router<SqlitePool> {
get(entry_row).put(update_entry).delete(delete_entry),
)
.route("/ui/entries/{id}/edit", get(entry_edit))
.route(
"/ui/entries/{id}/dupliquer",
get(entry_duplicate).post(duplicate_entry),
)
}
// --- Plumbing ---------------------------------------------------------------
@@ -207,7 +212,7 @@ struct DashboardTpl {
groups: Vec<ProjectGroup>,
today_entries: Vec<Entry>,
today_total: String,
recent_entries: Vec<Entry>,
recent_days: Vec<DayGroup>,
}
#[derive(Template)]
@@ -227,7 +232,36 @@ struct TodayTpl {
#[derive(Template)]
#[template(path = "_recent.html")]
struct RecentTpl {
recent_entries: Vec<Entry>,
recent_days: Vec<DayGroup>,
}
/// Entries started on the same local day, with their total.
struct DayGroup {
day: String,
total: String,
entries: Vec<Entry>,
}
/// Groups a list sorted by start time into consecutive days.
fn group_by_day(list: Vec<Entry>) -> Vec<DayGroup> {
let mut days: Vec<(NaiveDate, i64, Vec<Entry>)> = Vec::new();
for e in list {
let date = clock::local_date(&e.started_at);
match days.last_mut() {
Some((d, secs, entries)) if *d == date => {
*secs += e.seconds;
entries.push(e);
}
_ => days.push((date, e.seconds, vec![e])),
}
}
days.into_iter()
.map(|(date, secs, entries)| DayGroup {
day: clock::fmt_day(date),
total: clock::hhmm(secs),
entries,
})
.collect()
}
/// How many entries the dashboard lists under "Dernières entrées".
@@ -261,8 +295,10 @@ async fn today_state(pool: &SqlitePool) -> PageResult<TodayTpl> {
}
async fn recent_state(pool: &SqlitePool) -> PageResult<RecentTpl> {
let recent_entries = entries::recent(pool, RECENT_LIMIT, clock::now()).await?;
Ok(RecentTpl { recent_entries })
let recent = entries::recent(pool, RECENT_LIMIT, clock::now()).await?;
Ok(RecentTpl {
recent_days: group_by_day(recent),
})
}
async fn dashboard(State(pool): State<SqlitePool>) -> PageResult {
@@ -271,14 +307,14 @@ async fn dashboard(State(pool): State<SqlitePool>) -> PageResult {
today_entries,
today_total,
} = today_state(&pool).await?;
let RecentTpl { recent_entries } = recent_state(&pool).await?;
let RecentTpl { recent_days } = recent_state(&pool).await?;
render(DashboardTpl {
nav: "dashboard",
running,
groups,
today_entries,
today_total,
recent_entries,
recent_days,
})
}
@@ -311,6 +347,32 @@ async fn stop_timer(State(pool): State<SqlitePool>) -> PageResult {
Ok(with_entries_changed(render(timer_state(&pool).await?)?))
}
#[derive(Deserialize)]
struct TimerStartForm {
started_at: String,
}
/// Moves the start of the running timer (e.g. started a bit late).
async fn set_timer_start(
State(pool): State<SqlitePool>,
Form(f): Form<TimerStartForm>,
) -> PageResult {
let started = parse_datetime(&f.started_at, "début")?;
let running = entries::running(&pool)
.await?
.ok_or_else(|| AppError::Conflict("aucun timer en cours".into()))?;
entries::update(
&pool,
running.id,
&UpdateEntry {
started_at: Some(started.fixed_offset()),
..Default::default()
},
)
.await?;
Ok(with_entries_changed(render(timer_state(&pool).await?)?))
}
// --- Clients & projects -----------------------------------------------------
struct ClientCard {
@@ -468,7 +530,7 @@ struct EntriesTpl {
clients: Vec<ClientOption>,
filter_groups: Vec<ProjectGroup>,
groups: Vec<ProjectGroup>,
entries: Vec<Entry>,
days: Vec<DayGroup>,
total: String,
default_start: String,
default_end: String,
@@ -487,6 +549,15 @@ struct EntryEditTpl {
groups: Vec<ProjectGroup>,
}
#[derive(Template)]
#[template(path = "_entry_duplicate.html")]
struct EntryDuplicateTpl {
e: Entry,
/// A running entry has no end yet: offer "now".
end: String,
groups: Vec<ProjectGroup>,
}
async fn entries_page(
State(pool): State<SqlitePool>,
Query(filter): Query<EntryFilter>,
@@ -512,7 +583,7 @@ async fn entries_page(
clients: client_options(clients::list(&pool, true).await?, filter.client_id),
filter_groups: group_projects(projects::list(&pool, None, true).await?, filter.project_id),
groups: group_projects(projects::list(&pool, None, false).await?, last_project),
entries: list,
days: group_by_day(list),
total,
default_start: format!("{today}T09:00"),
default_end: format!("{today}T10:00"),
@@ -568,6 +639,34 @@ async fn entry_edit(State(pool): State<SqlitePool>, Path(id): Path<i64>) -> Page
render(EntryEditTpl { e, groups })
}
/// Form to create a copy of an entry, prefilled with its values.
async fn entry_duplicate(State(pool): State<SqlitePool>, Path(id): Path<i64>) -> PageResult {
let e = entries::get(&pool, id).await?;
let end = clock::input_value(&e.ended_at.unwrap_or_else(clock::now));
let groups = group_projects(
projects::list(&pool, None, false).await?,
Some(e.project_id),
);
render(EntryDuplicateTpl { e, end, groups })
}
/// Creates the copy and swaps the form for its row.
async fn duplicate_entry(State(pool): State<SqlitePool>, Form(f): Form<EntryForm>) -> PageResult {
let started = parse_datetime(&f.started_at, "début")?;
let ended = parse_datetime(&f.ended_at, "fin")?;
let e = entries::create(
&pool,
&NewEntry {
project_id: f.project_id,
started_at: started.fixed_offset(),
ended_at: ended.fixed_offset(),
note: f.note,
},
)
.await?;
Ok(with_entries_changed(render(EntryRowTpl { e })?))
}
async fn update_entry(
State(pool): State<SqlitePool>,
Path(id): Path<i64>,
+32
View File
@@ -87,6 +87,14 @@ label { display: flex; align-items: center; gap: .35rem; color: var(--muted); }
.btn.primary { background: var(--accent); border-color: var(--accent); color: var(--accent-text); font-weight: 600; }
.btn.danger { color: var(--danger); }
.btn.small { padding: .2rem .55rem; font-size: .85rem; }
.btn.icon { display: inline-flex; align-items: center; justify-content: center; padding: .3rem; line-height: 0; }
.btn.icon svg { display: block; }
.btn-group { display: inline-flex; }
.btn-group > .btn { border-radius: 0; }
.btn-group > .btn + .btn { margin-left: -1px; }
.btn-group > .btn:first-child { border-radius: 8px 0 0 8px; }
.btn-group > .btn:last-child { border-radius: 0 8px 8px 0; }
.btn-group > .btn:hover { position: relative; z-index: 1; }
.htmx-request .btn, .btn.htmx-request { opacity: .6; }
.badge { font-size: .75rem; padding: .1rem .5rem; border-radius: 999px; background: var(--bg); color: var(--muted); }
@@ -95,6 +103,8 @@ label { display: flex; align-items: center; gap: .35rem; color: var(--muted); }
.timer.is-running { background: var(--running); border-color: var(--color, var(--accent)); border-left-width: 6px; }
.current { display: grid; grid-template-columns: 1fr auto auto; gap: 1rem; align-items: center; margin-bottom: 1rem; }
.current-project { font-size: 1.3rem; font-weight: 600; }
.timer-start { margin-top: .35rem; font-size: .9rem; }
.timer-start input { width: 11rem; }
.clock { font-size: 2rem; font-weight: 600; font-variant-numeric: tabular-nums; }
.start { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1.5fr) auto; gap: .5rem; }
.note { color: var(--muted); font-size: .9rem; }
@@ -109,6 +119,8 @@ tr:last-child td { border-bottom: 0; }
.time { white-space: nowrap; font-variant-numeric: tabular-nums; color: var(--muted); }
.client { color: var(--muted); }
tr.running { background: var(--running); }
tr.day-head th { color: var(--text); font-weight: 600; font-size: .9rem; padding-top: 1.1rem; }
tbody:first-of-type tr.day-head th { padding-top: .6rem; }
tr.editing td { background: var(--bg); }
tr.editing input, tr.editing select { width: 100%; }
td.actions { text-align: right; white-space: nowrap; }
@@ -159,3 +171,23 @@ input[type="color"] {
.report .label { width: auto; }
.bar-cell { width: 30%; }
}
/* Date pickers (flatpickr), themed with the app tokens */
.flatpickr-calendar { background: var(--surface); border: 1px solid var(--border); box-shadow: 0 6px 24px rgb(0 0 0 / .15); }
.flatpickr-calendar.arrowTop:before, .flatpickr-calendar.arrowTop:after { border-bottom-color: var(--border); }
.flatpickr-calendar.arrowBottom:before, .flatpickr-calendar.arrowBottom:after { border-top-color: var(--border); }
.flatpickr-months .flatpickr-month, .flatpickr-months .flatpickr-prev-month, .flatpickr-months .flatpickr-next-month,
.flatpickr-current-month .flatpickr-monthDropdown-months, .flatpickr-current-month input.cur-year,
span.flatpickr-weekday, .flatpickr-day, .flatpickr-time input, .flatpickr-time .flatpickr-time-separator {
color: var(--text); fill: var(--text); background: transparent;
}
.flatpickr-current-month .flatpickr-monthDropdown-months option { background: var(--surface); }
.flatpickr-months .flatpickr-prev-month:hover svg, .flatpickr-months .flatpickr-next-month:hover svg { fill: var(--accent); }
.flatpickr-day.prevMonthDay, .flatpickr-day.nextMonthDay, .flatpickr-day.flatpickr-disabled { color: var(--muted); }
.flatpickr-day:hover, .flatpickr-day:focus, .flatpickr-time input:hover, .flatpickr-time input:focus,
.flatpickr-time .numInputWrapper:hover { background: var(--bg); border-color: var(--bg); }
.flatpickr-day.today { border-color: var(--accent); }
.flatpickr-day.selected, .flatpickr-day.selected:hover, .flatpickr-day.selected:focus {
background: var(--accent); border-color: var(--accent); color: var(--accent-text);
}
.flatpickr-calendar.hasTime .flatpickr-time { border-top-color: var(--border); }
+30
View File
@@ -31,3 +31,33 @@ document.addEventListener("submit", (event) => {
const message = event.target.dataset.confirm;
if (message && !confirm(message)) event.preventDefault();
});
// Date/time pickers on entry fields, including rows swapped in by htmx.
// The original input keeps the `YYYY-MM-DDTHH:MM` value sent to the server.
htmx.onLoad((root) => {
for (const input of root.querySelectorAll('input[type="datetime-local"]')) {
flatpickr(input, {
locale: "fr",
enableTime: true,
time_24hr: true,
dateFormat: "Y-m-d\\TH:i",
altInput: true,
altFormat: "d/m/Y H:i",
allowInput: true,
onReady: (_dates, _str, fp) =>
fp.altInput.setAttribute("aria-label", input.getAttribute("aria-label")),
});
}
});
// The calendars live in <body>: drop them with the inputs htmx removes.
document.body.addEventListener("htmx:beforeCleanupElement", (event) => {
event.target._flatpickr?.destroy();
});
// Removes a row without a request (e.g. cancelling a duplicate).
function removeRow(button) {
const row = button.closest("tr");
for (const input of row.querySelectorAll("input")) input._flatpickr?.destroy();
row.remove();
}
+13
View File
@@ -0,0 +1,13 @@
.flatpickr-calendar{background:transparent;opacity:0;display:none;text-align:center;visibility:hidden;padding:0;-webkit-animation:none;animation:none;direction:ltr;border:0;font-size:14px;line-height:24px;border-radius:5px;position:absolute;width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-touch-action:manipulation;touch-action:manipulation;background:#fff;-webkit-box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08)}.flatpickr-calendar.open,.flatpickr-calendar.inline{opacity:1;max-height:640px;visibility:visible}.flatpickr-calendar.open{display:inline-block;z-index:99999}.flatpickr-calendar.animate.open{-webkit-animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1);animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1)}.flatpickr-calendar.inline{display:block;position:relative;top:2px}.flatpickr-calendar.static{position:absolute;top:calc(100% + 2px)}.flatpickr-calendar.static.open{z-index:999;display:block}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7){-webkit-box-shadow:none !important;box-shadow:none !important}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1){-webkit-box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6}.flatpickr-calendar .hasWeeks .dayContainer,.flatpickr-calendar .hasTime .dayContainer{border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.flatpickr-calendar .hasWeeks .dayContainer{border-left:0}.flatpickr-calendar.hasTime .flatpickr-time{height:40px;border-top:1px solid #e6e6e6}.flatpickr-calendar.noCalendar.hasTime .flatpickr-time{height:auto}.flatpickr-calendar:before,.flatpickr-calendar:after{position:absolute;display:block;pointer-events:none;border:solid transparent;content:'';height:0;width:0;left:22px}.flatpickr-calendar.rightMost:before,.flatpickr-calendar.arrowRight:before,.flatpickr-calendar.rightMost:after,.flatpickr-calendar.arrowRight:after{left:auto;right:22px}.flatpickr-calendar.arrowCenter:before,.flatpickr-calendar.arrowCenter:after{left:50%;right:50%}.flatpickr-calendar:before{border-width:5px;margin:0 -5px}.flatpickr-calendar:after{border-width:4px;margin:0 -4px}.flatpickr-calendar.arrowTop:before,.flatpickr-calendar.arrowTop:after{bottom:100%}.flatpickr-calendar.arrowTop:before{border-bottom-color:#e6e6e6}.flatpickr-calendar.arrowTop:after{border-bottom-color:#fff}.flatpickr-calendar.arrowBottom:before,.flatpickr-calendar.arrowBottom:after{top:100%}.flatpickr-calendar.arrowBottom:before{border-top-color:#e6e6e6}.flatpickr-calendar.arrowBottom:after{border-top-color:#fff}.flatpickr-calendar:focus{outline:0}.flatpickr-wrapper{position:relative;display:inline-block}.flatpickr-months{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.flatpickr-months .flatpickr-month{background:transparent;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9);height:34px;line-height:1;text-align:center;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:hidden;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.flatpickr-months .flatpickr-prev-month,.flatpickr-months .flatpickr-next-month{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;text-decoration:none;cursor:pointer;position:absolute;top:0;height:34px;padding:10px;z-index:3;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9)}.flatpickr-months .flatpickr-prev-month.flatpickr-disabled,.flatpickr-months .flatpickr-next-month.flatpickr-disabled{display:none}.flatpickr-months .flatpickr-prev-month i,.flatpickr-months .flatpickr-next-month i{position:relative}.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,.flatpickr-months .flatpickr-next-month.flatpickr-prev-month{/*
/*rtl:begin:ignore*/left:0/*
/*rtl:end:ignore*/}/*
/*rtl:begin:ignore*/
/*
/*rtl:end:ignore*/
.flatpickr-months .flatpickr-prev-month.flatpickr-next-month,.flatpickr-months .flatpickr-next-month.flatpickr-next-month{/*
/*rtl:begin:ignore*/right:0/*
/*rtl:end:ignore*/}/*
/*rtl:begin:ignore*/
/*
/*rtl:end:ignore*/
.flatpickr-months .flatpickr-prev-month:hover,.flatpickr-months .flatpickr-next-month:hover{color:#959ea9}.flatpickr-months .flatpickr-prev-month:hover svg,.flatpickr-months .flatpickr-next-month:hover svg{fill:#f64747}.flatpickr-months .flatpickr-prev-month svg,.flatpickr-months .flatpickr-next-month svg{width:14px;height:14px}.flatpickr-months .flatpickr-prev-month svg path,.flatpickr-months .flatpickr-next-month svg path{-webkit-transition:fill .1s;transition:fill .1s;fill:inherit}.numInputWrapper{position:relative;height:auto}.numInputWrapper input,.numInputWrapper span{display:inline-block}.numInputWrapper input{width:100%}.numInputWrapper input::-ms-clear{display:none}.numInputWrapper input::-webkit-outer-spin-button,.numInputWrapper input::-webkit-inner-spin-button{margin:0;-webkit-appearance:none}.numInputWrapper span{position:absolute;right:0;width:14px;padding:0 4px 0 2px;height:50%;line-height:50%;opacity:0;cursor:pointer;border:1px solid rgba(57,57,57,0.15);-webkit-box-sizing:border-box;box-sizing:border-box}.numInputWrapper span:hover{background:rgba(0,0,0,0.1)}.numInputWrapper span:active{background:rgba(0,0,0,0.2)}.numInputWrapper span:after{display:block;content:"";position:absolute}.numInputWrapper span.arrowUp{top:0;border-bottom:0}.numInputWrapper span.arrowUp:after{border-left:4px solid transparent;border-right:4px solid transparent;border-bottom:4px solid rgba(57,57,57,0.6);top:26%}.numInputWrapper span.arrowDown{top:50%}.numInputWrapper span.arrowDown:after{border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid rgba(57,57,57,0.6);top:40%}.numInputWrapper span svg{width:inherit;height:auto}.numInputWrapper span svg path{fill:rgba(0,0,0,0.5)}.numInputWrapper:hover{background:rgba(0,0,0,0.05)}.numInputWrapper:hover span{opacity:1}.flatpickr-current-month{font-size:135%;line-height:inherit;font-weight:300;color:inherit;position:absolute;width:75%;left:12.5%;padding:7.48px 0 0 0;line-height:1;height:34px;display:inline-block;text-align:center;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.flatpickr-current-month span.cur-month{font-family:inherit;font-weight:700;color:inherit;display:inline-block;margin-left:.5ch;padding:0}.flatpickr-current-month span.cur-month:hover{background:rgba(0,0,0,0.05)}.flatpickr-current-month .numInputWrapper{width:6ch;width:7ch\0;display:inline-block}.flatpickr-current-month .numInputWrapper span.arrowUp:after{border-bottom-color:rgba(0,0,0,0.9)}.flatpickr-current-month .numInputWrapper span.arrowDown:after{border-top-color:rgba(0,0,0,0.9)}.flatpickr-current-month input.cur-year{background:transparent;-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;cursor:text;padding:0 0 0 .5ch;margin:0;display:inline-block;font-size:inherit;font-family:inherit;font-weight:300;line-height:inherit;height:auto;border:0;border-radius:0;vertical-align:initial;-webkit-appearance:textfield;-moz-appearance:textfield;appearance:textfield}.flatpickr-current-month input.cur-year:focus{outline:0}.flatpickr-current-month input.cur-year[disabled],.flatpickr-current-month input.cur-year[disabled]:hover{font-size:100%;color:rgba(0,0,0,0.5);background:transparent;pointer-events:none}.flatpickr-current-month .flatpickr-monthDropdown-months{appearance:menulist;background:transparent;border:none;border-radius:0;box-sizing:border-box;color:inherit;cursor:pointer;font-size:inherit;font-family:inherit;font-weight:300;height:auto;line-height:inherit;margin:-1px 0 0 0;outline:none;padding:0 0 0 .5ch;position:relative;vertical-align:initial;-webkit-box-sizing:border-box;-webkit-appearance:menulist;-moz-appearance:menulist;width:auto}.flatpickr-current-month .flatpickr-monthDropdown-months:focus,.flatpickr-current-month .flatpickr-monthDropdown-months:active{outline:none}.flatpickr-current-month .flatpickr-monthDropdown-months:hover{background:rgba(0,0,0,0.05)}.flatpickr-current-month .flatpickr-monthDropdown-months .flatpickr-monthDropdown-month{background-color:transparent;outline:none;padding:0}.flatpickr-weekdays{background:transparent;text-align:center;overflow:hidden;width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:28px}.flatpickr-weekdays .flatpickr-weekdaycontainer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}span.flatpickr-weekday{cursor:default;font-size:90%;background:transparent;color:rgba(0,0,0,0.54);line-height:1;margin:0;text-align:center;display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;font-weight:bolder}.dayContainer,.flatpickr-weeks{padding:1px 0 0 0}.flatpickr-days{position:relative;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;width:307.875pLine truncated
+2
View File
@@ -0,0 +1,2 @@
/* flatpickr v4.6.13,, @license MIT */
!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).flatpickr=n()}(this,(function(){"use strict";var e=function(){return(e=Object.assign||function(e){for(var n,t=1,a=arguments.length;t<a;t++)for(var i in n=arguments[t])Object.prototype.hasOwnProperty.call(n,i)&&(e[i]=n[i]);return e}).apply(this,arguments)};function n(){for(var e=0,n=0,t=arguments.length;n<t;n++)e+=arguments[n].length;var a=Array(e),i=0;for(n=0;n<t;n++)for(var o=arguments[n],r=0,l=o.length;r<l;r++,i++)a[i]=o[r];return a}var t=["onChange","onClose","onDayCreate","onDestroy","onKeyDown","onMonthChange","onOpen","onParseConfig","onReady","onValueUpdate","onYearChange","onPreCalendarPosition"],a={_disable:[],allowInput:!1,allowInvalidPreload:!1,altFormat:"F j, Y",altInput:!1,altInputClass:"form-control input",animate:"object"==typeof window&&-1===window.navigator.userAgent.indexOf("MSIE"),ariaDateFormat:"F j, Y",autoFillDefaultTime:!0,clickOpens:!0,closeOnSelect:!0,conjunction:", ",dateFormat:"Y-m-d",defaultHour:12,defaultMinute:0,defaultSeconds:0,disable:[],disableMobile:!1,enableSeconds:!1,enableTime:!1,errorHandler:function(e){return"undefined"!=typeof console&&console.warn(e)},getWeek:function(e){var n=new Date(e.getTime());n.setHours(0,0,0,0),n.setDate(n.getDate()+3-(n.getDay()+6)%7);var t=new Date(n.getFullYear(),0,4);return 1+Math.round(((n.getTime()-t.getTime())/864e5-3+(t.getDay()+6)%7)/7)},hourIncrement:1,ignoredFocusElements:[],inline:!1,locale:"default",minuteIncrement:5,mode:"single",monthSelectorType:"dropdown",nextArrow:"<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M13.207 8.472l-7.854 7.854-0.707-0.707 7.146-7.146-7.146-7.148 0.707-0.707 7.854 7.854z' /></svg>",noCalendar:!1,now:new Date,onChange:[],onClose:[],onDayCreate:[],onDestroy:[],onKeyDown:[],onMonthChange:[],onOpen:[],onParseConfig:[],onReady:[],onValueUpdate:[],onYearChange:[],onPreCalendarPosition:[],plugins:[],position:"auto",positionElement:void 0,prevArrow:"<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 17 17'><g></g><path d='M5.207 8.471l7.146 7.147-0.707 0.707-7.853-7.854 7.854-7.853 0.707 0.707-7.147 7.146z' /></svg>",shorthandCurrentMonth:!1,showMonths:1,static:!1,time_24hr:!1,weekNumbers:!1,wrap:!1},i={weekdays:{shorthand:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],longhand:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]},months:{shorthand:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],longhand:["January","February","March","April","May","June","July","August","September","October","November","December"]},daysInMonth:[31,28,31,30,31,30,31,31,30,31,30,31],firstDayOfWeek:0,ordinal:function(e){var n=e%100;if(n>3&&n<21)return"th";switch(n%10){case 1:return"st";case 2:return"nd";case 3:return"rd";default:return"th"}},rangeSeparator:" to ",weekAbbreviation:"Wk",scrollTitle:"Scroll to increment",toggleTitle:"Click to toggle",amPM:["AM","PM"],yearAriaLabel:"Year",monthAriaLabel:"Month",hourAriaLabel:"Hour",minuteAriaLabel:"Minute",time_24hr:!1},o=function(e,n){return void 0===n&&(n=2),("000"+e).slice(-1*n)},r=function(e){return!0===e?1:0};function l(e,n){var t;return function(){var a=this,i=arguments;clearTimeout(t),t=setTimeout((function(){return e.apply(a,i)}),n)}}var c=function(e){return e instanceof Array?e:[e]};function s(e,n,t){if(!0===t)return e.classList.add(n);e.classList.remove(n)}function d(e,n,t){var a=window.document.createElement(e);return n=n||"",t=t||"",a.className=n,void 0!==t&&(a.textContent=t),a}function u(e){for(;e.firstChild;)e.removeChild(e.firstChild)}function f(e,n){return n(e)?e:e.parentNode?f(e.parentNode,n):void 0}function m(e,n){var t=d("div","numInputWrapper"),a=d("input","numInput "+e),i=d("span","arrowUp"),o=d("span","arrowDown");if(-1===navigator.userAgent.indexOf("MSIE 9.0")?a.type="number":(a.type="text",a.pattern="\\d*"),void 0!==n)for(var r in n)a.setAttribute(r,n[r]);return t.appendChild(a),t.appendChild(i),t.appendChild(o),t}function g(e){try{return"function"==typeof e.composedPath?e.composedPath()[0]:e.target}catch(n){return e.target}}var p=function(){},h=function(e,n,t){return t.months[n?"shorthand":"longhand"][e]},v={D:p,F:function(e,n,t){e.setMonth(t.months.longhand.indexOf(n))},G:function(e,n){e.setHours((e.getHours()>=12?12:0)+parseFloat(n))},H:function(e,n){e.setHours(parseFloat(n))},J:function(e,n){e.setDate(parseFloat(n))},K:function(e,n,t){e.setHours(e.getHours()%12+12*r(new RegExp(t.amPM[1],"i").test(n)))},M:function(e,n,t){e.setMonth(t.months.shorthand.indexOf(n))},S:function(e,n){e.setSeconds(parseFloat(n))},U:function(e,n){return new Date(1e3*parseFloat(n))},W:function(e,n,t){var a=parseInt(n),i=new Date(e.getFullYear(),0,2+7*(a-1),0,0,0,0);return i.setDate(i.getDate()-i.getDay()+t.fLine truncated
+1
View File
@@ -0,0 +1 @@
!function(e,r){"object"==typeof exports&&"undefined"!=typeof module?r(exports):"function"==typeof define&&define.amd?define(["exports"],r):r((e="undefined"!=typeof globalThis?globalThis:e||self).fr={})}(this,function(e){"use strict";var r="undefined"!=typeof window&&void 0!==window.flatpickr?window.flatpickr:{l10ns:{}},n={firstDayOfWeek:1,weekdays:{shorthand:["dim","lun","mar","mer","jeu","ven","sam"],longhand:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"]},months:{shorthand:["janv","févr","mars","avr","mai","juin","juil","août","sept","oct","nov","déc"],longhand:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"]},ordinal:function(e){return 1<e?"":"er"},rangeSeparator:" au ",weekAbbreviation:"Sem",scrollTitle:"Défiler pour augmenter la valeur",toggleTitle:"Cliquer pour basculer",time_24hr:!0};r.l10ns.fr=n;r=r.l10ns;e.French=n,e.default=r,Object.defineProperty(e,"__esModule",{value:!0})});
+6
View File
@@ -0,0 +1,6 @@
{% for d in days %}
<tbody>
<tr class="day-head"><th colspan="3">{{ d.day }}</th><th class="num">{{ d.total }}</th><th></th></tr>
{% for e in d.entries %}{% include "_entry_row.html" %}{% endfor %}
</tbody>
{% endfor %}
+15
View File
@@ -0,0 +1,15 @@
<tr class="editing">
<td>
<div class="stack">
<input type="datetime-local" name="started_at" value="{{ e.start_input() }}" required aria-label="Début">
<input type="datetime-local" name="ended_at" value="{{ end }}" required aria-label="Fin">
</div>
</td>
<td><select name="project_id" aria-label="Projet">{% include "_project_select.html" %}</select></td>
<td><input name="note" value="{{ e.note }}" aria-label="Note"></td>
<td></td>
<td class="actions">
<button class="btn small primary" hx-post="/ui/entries/{{ e.id }}/dupliquer" hx-include="closest tr" hx-target="closest tr" hx-swap="outerHTML">Créer</button>
<button class="btn small" hx-on:click="removeRow(this)">Annuler</button>
</td>
</tr>
+1 -1
View File
@@ -1,5 +1,5 @@
<tr id="entry-{{ e.id }}" class="editing">
<td colspan="2">
<td>
<div class="stack">
<input type="datetime-local" name="started_at" value="{{ e.start_input() }}" required aria-label="Début">
{% if e.running() %}
+5 -3
View File
@@ -1,5 +1,4 @@
<tr id="entry-{{ e.id }}"{% if e.running() %} class="running"{% endif %}>
<td class="nowrap">{{ e.day() }}</td>
<td class="time">
{{ e.start_time() }} – {{ e.end_time() }}
{% if e.overlaps %}<span class="warn" title="Chevauche une autre entrée">⚠</span>{% endif %}
@@ -8,7 +7,10 @@
<td class="note">{{ e.note }}</td>
<td class="num">{{ e.duration() }}</td>
<td class="actions">
<button class="btn small" hx-get="/ui/entries/{{ e.id }}/edit" hx-target="closest tr" hx-swap="outerHTML">Modifier</button>
<button class="btn small danger" hx-delete="/ui/entries/{{ e.id }}" hx-target="closest tr" hx-swap="outerHTML" hx-confirm="Supprimer cette entrée ?">Suppr.</button>
<div class="btn-group">
<button class="btn small icon primary" title="Modifier" aria-label="Modifier" hx-get="/ui/entries/{{ e.id }}/edit" hx-target="closest tr" hx-swap="outerHTML"><svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12 20h9"/><path d="M16.5 3.5a2.1 2.1 0 0 1 3 3L7 19l-4 1 1-4Z"/></svg></button>
<button class="btn small icon" title="Dupliquer" aria-label="Dupliquer" hx-get="/ui/entries/{{ e.id }}/dupliquer" hx-target="closest tr" hx-swap="afterend"><svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="9" y="9" width="13" height="13" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/></svg></button>
<button class="btn small icon danger" title="Supprimer" aria-label="Supprimer" hx-delete="/ui/entries/{{ e.id }}" hx-target="closest tr" hx-swap="outerHTML" hx-confirm="Supprimer cette entrée ?"><svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M3 6h18"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/><path d="M10 11v6"/><path d="M14 11v6"/></svg></button>
</div>
</td>
</tr>
+3 -14
View File
@@ -3,24 +3,13 @@
<h2>Dernières entrées</h2>
<a href="/entries">Tout voir</a>
</div>
{% if recent_entries.is_empty() %}
{% if recent_days.is_empty() %}
<p class="empty">Aucune entrée pour l'instant.</p>
{% else %}
<div class="table-wrap">
<table class="entries">
<tbody>
{% for e in recent_entries %}
<tr{% if e.running() %} class="running"{% endif %}>
<td class="nowrap">{{ e.day() }}</td>
<td class="time">{{ e.start_time() }} – {{ e.end_time() }}</td>
<td>
<span class="dot" style="--color: {{ e.color }}"></span><span class="client">{{ e.client_name }}</span> / {{ e.project_name }}
{% if !e.note.is_empty() %}<div class="note">{{ e.note }}</div>{% endif %}
</td>
<td class="num">{{ e.duration() }}</td>
</tr>
{% endfor %}
</tbody>
<thead><tr><th>Horaire</th><th>Projet</th><th>Note</th><th class="num">Durée</th><th></th></tr></thead>
{% let days = recent_days %}{% include "_entry_days.html" %}
</table>
</div>
{% endif %}
+4
View File
@@ -5,6 +5,10 @@
<div class="muted"><span class="dot" style="--color: {{ e.client_color }}"></span>{{ e.client_name }}</div>
<div class="current-project">{{ e.project_name }}</div>
{% if !e.note.is_empty() %}<div class="note">{{ e.note }}</div>{% endif %}
<form class="row timer-start" hx-post="/ui/timer/debut" hx-target="#timer" hx-swap="outerHTML">
<label>Début <input type="datetime-local" name="started_at" value="{{ e.start_input() }}" required aria-label="Heure de début"></label>
<button class="btn small">Modifier</button>
</form>
</div>
<div class="clock" data-started="{{ e.started_rfc3339() }}">{{ e.duration() }}</div>
<button class="btn danger" hx-post="/ui/timer/stop" hx-target="#timer" hx-swap="outerHTML">Arrêter</button>
+8 -14
View File
@@ -6,19 +6,13 @@
{% if today_entries.is_empty() %}
<p class="empty">Rien de saisi pour l'instant.</p>
{% else %}
<table class="entries">
<tbody>
{% for e in today_entries %}
<tr{% if e.running() %} class="running"{% endif %}>
<td class="time">{{ e.start_time() }} – {{ e.end_time() }}</td>
<td>
<span class="dot" style="--color: {{ e.color }}"></span><span class="client">{{ e.client_name }}</span> / {{ e.project_name }}
{% if !e.note.is_empty() %}<div class="note">{{ e.note }}</div>{% endif %}
</td>
<td class="num">{{ e.duration() }}</td>
</tr>
{% endfor %}
</tbody>
</table>
<div class="table-wrap">
<table class="entries">
<thead><tr><th>Horaire</th><th>Projet</th><th>Note</th><th class="num">Durée</th><th></th></tr></thead>
<tbody>
{% for e in today_entries %}{% include "_entry_row.html" %}{% endfor %}
</tbody>
</table>
</div>
{% endif %}
</section>
+3
View File
@@ -4,8 +4,11 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% block title %}Tempus{% endblock %} · Tempus</title>
<link rel="stylesheet" href="/static/flatpickr/flatpickr.min.css">
<link rel="stylesheet" href="/static/app.css">
<script src="/static/htmx.min.js" defer></script>
<script src="/static/flatpickr/flatpickr.min.js" defer></script>
<script src="/static/flatpickr/fr.min.js" defer></script>
<script src="/static/app.js" defer></script>
</head>
<body>
+4 -6
View File
@@ -16,7 +16,7 @@
{% endif %}
</section>
<section class="card">
<section id="entries-list" class="card" hx-get="/entries?from={{ from }}&to={{ to }}{{ extra_query }}" hx-select="#entries-list" hx-trigger="entries-changed from:body" hx-swap="outerHTML">
<div class="card-head">
<h2>Entrées</h2>
<span class="total">{{ total }}</span>
@@ -40,15 +40,13 @@
<button class="btn">Filtrer</button>
</form>
{% if entries.is_empty() %}
{% if days.is_empty() %}
<p class="empty">Aucune entrée sur cette période.</p>
{% else %}
<div class="table-wrap">
<table class="entries">
<thead><tr><th>Jour</th><th>Horaire</th><th>Projet</th><th>Note</th><th class="num">Durée</th><th></th></tr></thead>
<tbody>
{% for e in entries %}{% include "_entry_row.html" %}{% endfor %}
</tbody>
<thead><tr><th>Horaire</th><th>Projet</th><th>Note</th><th class="num">Durée</th><th></th></tr></thead>
{% include "_entry_days.html" %}
</table>
</div>
{% endif %}
+90 -1
View File
@@ -467,7 +467,7 @@ async fn dashboard_lists_20_most_recent_entries() {
let (status, html) = get_html(&app, "/ui/dernieres-entrees").await;
assert_eq!(status, StatusCode::OK);
assert_eq!(html.matches("<tr").count(), 20);
assert_eq!(html.matches("<tr id=\"entry-").count(), 20);
assert!(html.contains("25/03/2026") && html.contains("06/03/2026"));
assert!(!html.contains("05/03/2026"));
}
@@ -618,3 +618,92 @@ async fn colors() {
assert_eq!(status, StatusCode::OK);
assert!(html.contains("--color: #000000"));
}
#[tokio::test]
async fn duplicate_entry() {
let app = app().await;
let p = project(&app, "Acme", "Site web").await;
let (status, _) = send(
&app,
"POST",
"/api/entries",
Some(json!({
"project_id": p,
"started_at": local(2026, 3, 10, 9, 0),
"ended_at": local(2026, 3, 10, 10, 15),
"note": "réunion",
})),
)
.await;
assert_eq!(status, StatusCode::CREATED);
let (status, html) = get_html(&app, "/ui/entries/1/dupliquer").await;
assert_eq!(status, StatusCode::OK);
assert!(html.contains("2026-03-10T09:00") && html.contains("2026-03-10T10:15"));
assert!(html.contains("réunion"));
let (status, html) = send_form(
&app,
"/ui/entries/1/dupliquer",
&format!("project_id={p}&started_at=2026-03-11T09%3A00&ended_at=2026-03-11T10%3A15&note=r%C3%A9union"),
)
.await;
assert_eq!(status, StatusCode::OK);
assert!(html.contains("id=\"entry-2\"") && html.contains("09:00 – 10:15"));
// /entries groups rows under one header per day, with the day total.
let (_, html) = get_html(&app, "/entries?from=2026-03-09&to=2026-03-15").await;
assert_eq!(html.matches("class=\"day-head\"").count(), 2);
assert!(html.contains("mer. 11/03/2026") && html.contains("mar. 10/03/2026"));
let (_, list) = send(
&app,
"GET",
"/api/entries?from=2026-03-09&to=2026-03-15",
None,
)
.await;
let list = list.as_array().unwrap();
assert_eq!(list.len(), 2);
assert!(list.iter().all(|e| e["note"] == "réunion"));
let (status, _) = get_html(&app, "/ui/entries/99/dupliquer").await;
assert_eq!(status, StatusCode::NOT_FOUND);
}
#[tokio::test]
async fn move_timer_start() {
let app = app().await;
let p = project(&app, "Acme", "Site web").await;
let (status, _) = send_form(&app, "/ui/timer/debut", "started_at=2026-03-10T09%3A00").await;
assert_eq!(status, StatusCode::CONFLICT, "no running timer");
let (status, _) = send_form(&app, "/ui/timer/start", &format!("project_id={p}")).await;
assert_eq!(status, StatusCode::OK);
let earlier = (Local::now() - chrono::Duration::minutes(90))
.format("%Y-%m-%dT%H:%M")
.to_string();
let (status, html) = send_form(&app, "/ui/timer/debut", &format!("started_at={earlier}")).await;
assert_eq!(status, StatusCode::OK);
assert!(html.contains(&earlier) && html.contains("Arrêter"));
let (_, timer) = send(&app, "GET", "/api/timer", None).await;
let started =
chrono::DateTime::parse_from_rfc3339(timer["started_at"].as_str().unwrap()).unwrap();
assert_eq!(
started
.with_timezone(&Local)
.format("%Y-%m-%dT%H:%M")
.to_string(),
earlier
);
assert!(timer["ended_at"].is_null(), "still running");
let future = (Local::now() + chrono::Duration::hours(1))
.format("%Y-%m-%dT%H:%M")
.to_string();
let (status, _) = send_form(&app, "/ui/timer/debut", &format!("started_at={future}")).await;
assert_eq!(status, StatusCode::UNPROCESSABLE_ENTITY);
}