Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85bd3294b8 | ||
|
|
e6a1dd7e4b | ||
|
|
3164fa8048 |
No files matched your search
+38
-1
@@ -1,4 +1,4 @@
|
|||||||
use chrono::{DateTime, Duration, Utc};
|
use chrono::{DateTime, Duration, Local, Utc};
|
||||||
use sqlx::SqlitePool;
|
use sqlx::SqlitePool;
|
||||||
|
|
||||||
use super::affected;
|
use super::affected;
|
||||||
@@ -102,6 +102,43 @@ pub async fn start(pool: &SqlitePool, project_id: i64, note: &str) -> AppResult<
|
|||||||
get(pool, id).await
|
get(pool, id).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Copies finished entries `days` days later (or earlier), keeping their local
|
||||||
|
/// wall-clock times, project and note. The running entry is skipped. All or
|
||||||
|
/// nothing: an archived project rejects the whole copy. Returns the count.
|
||||||
|
pub async fn duplicate(pool: &SqlitePool, ids: &[i64], days: i64) -> AppResult<usize> {
|
||||||
|
let shift = |dt: &DateTime<Utc>| {
|
||||||
|
clock::local_to_utc(dt.with_timezone(&Local).naive_local() + Duration::days(days))
|
||||||
|
};
|
||||||
|
let mut copies = Vec::new();
|
||||||
|
for &id in ids {
|
||||||
|
let e = get(pool, id).await?;
|
||||||
|
let Some(ended) = e.ended_at else { continue };
|
||||||
|
super::projects::get_active(pool, e.project_id).await?;
|
||||||
|
let (started, ended) = (shift(&e.started_at), shift(&ended));
|
||||||
|
validate_span(&started, Some(&ended))?;
|
||||||
|
copies.push((e.project_id, started, ended, e.note));
|
||||||
|
}
|
||||||
|
if copies.is_empty() {
|
||||||
|
return Err(AppError::Validation(
|
||||||
|
"aucune entrée terminée à copier".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let mut tx = pool.begin().await?;
|
||||||
|
for (project_id, started, ended, note) in &copies {
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO time_entries (project_id, started_at, ended_at, note) VALUES (?1, ?2, ?3, ?4)",
|
||||||
|
)
|
||||||
|
.bind(project_id)
|
||||||
|
.bind(clock::ts(started))
|
||||||
|
.bind(clock::ts(ended))
|
||||||
|
.bind(note)
|
||||||
|
.execute(&mut *tx)
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
tx.commit().await?;
|
||||||
|
Ok(copies.len())
|
||||||
|
}
|
||||||
|
|
||||||
/// Stops the running timer.
|
/// Stops the running timer.
|
||||||
pub async fn stop(pool: &SqlitePool) -> AppResult<Entry> {
|
pub async fn stop(pool: &SqlitePool) -> AppResult<Entry> {
|
||||||
let entry = running(pool)
|
let entry = running(pool)
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ pub fn router() -> Router<SqlitePool> {
|
|||||||
)
|
)
|
||||||
.route("/ui/entries/{id}/edit", get(entry_edit))
|
.route("/ui/entries/{id}/edit", get(entry_edit))
|
||||||
.route("/ui/entries/{id}/relancer", post(restart_entry))
|
.route("/ui/entries/{id}/relancer", post(restart_entry))
|
||||||
|
.route("/ui/jours/{date}/dupliquer", post(duplicate_day))
|
||||||
.route(
|
.route(
|
||||||
"/ui/entries/{id}/dupliquer",
|
"/ui/entries/{id}/dupliquer",
|
||||||
get(entry_duplicate).post(duplicate_entry),
|
get(entry_duplicate).post(duplicate_entry),
|
||||||
@@ -257,11 +258,33 @@ struct RecentTpl {
|
|||||||
|
|
||||||
/// Entries started on the same local day, with their total.
|
/// Entries started on the same local day, with their total.
|
||||||
struct DayGroup {
|
struct DayGroup {
|
||||||
|
date: NaiveDate,
|
||||||
day: String,
|
day: String,
|
||||||
total: String,
|
total: String,
|
||||||
entries: Vec<Entry>,
|
entries: Vec<Entry>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl DayGroup {
|
||||||
|
/// Comma-separated ids of the listed entries, for "copy this day".
|
||||||
|
fn ids(&self) -> String {
|
||||||
|
self.entries
|
||||||
|
.iter()
|
||||||
|
.map(|e| e.id.to_string())
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(",")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Default target of "copy this day": today, or tomorrow for today itself.
|
||||||
|
fn copy_to(&self) -> NaiveDate {
|
||||||
|
let today = clock::today();
|
||||||
|
if self.date == today {
|
||||||
|
today + Duration::days(1)
|
||||||
|
} else {
|
||||||
|
today
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Groups a list sorted by start time into consecutive days.
|
/// Groups a list sorted by start time into consecutive days.
|
||||||
fn group_by_day(list: Vec<Entry>) -> Vec<DayGroup> {
|
fn group_by_day(list: Vec<Entry>) -> Vec<DayGroup> {
|
||||||
let mut days: Vec<(NaiveDate, i64, Vec<Entry>)> = Vec::new();
|
let mut days: Vec<(NaiveDate, i64, Vec<Entry>)> = Vec::new();
|
||||||
@@ -277,6 +300,7 @@ fn group_by_day(list: Vec<Entry>) -> Vec<DayGroup> {
|
|||||||
}
|
}
|
||||||
days.into_iter()
|
days.into_iter()
|
||||||
.map(|(date, secs, entries)| DayGroup {
|
.map(|(date, secs, entries)| DayGroup {
|
||||||
|
date,
|
||||||
day: clock::fmt_day(date),
|
day: clock::fmt_day(date),
|
||||||
total: clock::hhmm(secs),
|
total: clock::hhmm(secs),
|
||||||
entries,
|
entries,
|
||||||
@@ -739,6 +763,33 @@ async fn restart_entry(State(pool): State<SqlitePool>, Path(id): Path<i64>) -> P
|
|||||||
Ok(with_timer_changed(StatusCode::OK.into_response()))
|
Ok(with_timer_changed(StatusCode::OK.into_response()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct DuplicateDayForm {
|
||||||
|
/// Comma-separated entry ids.
|
||||||
|
ids: String,
|
||||||
|
vers: NaiveDate,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Copies the listed entries of `date` to another day, same times.
|
||||||
|
async fn duplicate_day(
|
||||||
|
State(pool): State<SqlitePool>,
|
||||||
|
Path(date): Path<NaiveDate>,
|
||||||
|
Form(f): Form<DuplicateDayForm>,
|
||||||
|
) -> PageResult {
|
||||||
|
if f.vers == date {
|
||||||
|
return Err(AppError::Validation("choisis un autre jour que celui copié".into()).into());
|
||||||
|
}
|
||||||
|
let ids = f
|
||||||
|
.ids
|
||||||
|
.split(',')
|
||||||
|
.filter(|s| !s.is_empty())
|
||||||
|
.map(|s| s.trim().parse::<i64>())
|
||||||
|
.collect::<Result<Vec<_>, _>>()
|
||||||
|
.map_err(|_| AppError::Validation("liste d'entrées invalide".into()))?;
|
||||||
|
entries::duplicate(&pool, &ids, (f.vers - date).num_days()).await?;
|
||||||
|
Ok(with_entries_changed(StatusCode::OK.into_response()))
|
||||||
|
}
|
||||||
|
|
||||||
async fn delete_entry(State(pool): State<SqlitePool>, Path(id): Path<i64>) -> PageResult {
|
async fn delete_entry(State(pool): State<SqlitePool>, Path(id): Path<i64>) -> PageResult {
|
||||||
entries::delete(&pool, id).await?;
|
entries::delete(&pool, id).await?;
|
||||||
// htmx swaps the row with this empty body, removing it.
|
// htmx swaps the row with this empty body, removing it.
|
||||||
|
|||||||
@@ -142,6 +142,9 @@ tr:last-child td { border-bottom: 0; }
|
|||||||
.project-link:hover { color: var(--accent); text-decoration-color: currentColor; }
|
.project-link:hover { color: var(--accent); text-decoration-color: currentColor; }
|
||||||
tr.running { background: var(--running); }
|
tr.running { background: var(--running); }
|
||||||
tr.day-head th { color: var(--text); font-weight: 600; font-size: .9rem; padding-top: 1.1rem; }
|
tr.day-head th { color: var(--text); font-weight: 600; font-size: .9rem; padding-top: 1.1rem; }
|
||||||
|
tr.day-head th.actions { padding-top: .6rem; text-align: right; }
|
||||||
|
tr.day-copy td { background: var(--bg); }
|
||||||
|
tr.day-copy .row { justify-content: flex-end; flex-wrap: wrap; }
|
||||||
tbody:first-of-type tr.day-head th { padding-top: .6rem; }
|
tbody:first-of-type tr.day-head th { padding-top: .6rem; }
|
||||||
tr.editing td { background: var(--bg); }
|
tr.editing td { background: var(--bg); }
|
||||||
tr.editing input, tr.editing select { width: 100%; }
|
tr.editing input, tr.editing select { width: 100%; }
|
||||||
|
|||||||
@@ -57,6 +57,13 @@ document.body.addEventListener("htmx:beforeCleanupElement", (event) => {
|
|||||||
event.target._flatpickr?.destroy();
|
event.target._flatpickr?.destroy();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Shows/hides the "copy this day" form under a day header.
|
||||||
|
function toggleDayCopy(button) {
|
||||||
|
const row = button.closest("tbody").querySelector(".day-copy");
|
||||||
|
row.hidden = !row.hidden;
|
||||||
|
if (!row.hidden) row.querySelector('input[type="date"]').focus();
|
||||||
|
}
|
||||||
|
|
||||||
// Removes a row without a request (e.g. cancelling a duplicate).
|
// Removes a row without a request (e.g. cancelling a duplicate).
|
||||||
function removeRow(button) {
|
function removeRow(button) {
|
||||||
const row = button.closest("tr");
|
const row = button.closest("tr");
|
||||||
|
|||||||
@@ -1,6 +1,25 @@
|
|||||||
|
{% import "_icons.html" as icons %}
|
||||||
{% for d in days %}
|
{% for d in days %}
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr class="day-head"><th colspan="3">{{ d.day }}</th><th class="num">{{ d.total }}</th><th></th></tr>
|
<tr class="day-head">
|
||||||
|
<th colspan="3">{{ d.day }}</th>
|
||||||
|
<th class="num">{{ d.total }}</th>
|
||||||
|
<th class="actions">
|
||||||
|
<button class="btn small icon" title="Copier cette journée vers un autre jour" aria-label="Copier cette journée vers un autre jour" hx-on:click="toggleDayCopy(this)">{% call icons::icon("copy") %}{% endcall %}</button>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr class="day-copy" hidden>
|
||||||
|
<td colspan="5">
|
||||||
|
<form class="row" hx-post="/ui/jours/{{ d.date }}/dupliquer" hx-swap="none">
|
||||||
|
<input type="hidden" name="ids" value="{{ d.ids() }}">
|
||||||
|
<label>Copier les entrées du {{ d.day }} vers le <input type="date" name="vers" value="{{ d.copy_to() }}" required></label>
|
||||||
|
<div class="btn-group">
|
||||||
|
<button class="btn small icon primary" title="Copier" aria-label="Copier">{% call icons::icon("check") %}{% endcall %}</button>
|
||||||
|
<button type="button" class="btn small icon" title="Annuler" aria-label="Annuler" hx-on:click="toggleDayCopy(this)">{% call icons::icon("close") %}{% endcall %}</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
{% for e in d.entries %}{% include "_entry_row.html" %}{% endfor %}
|
{% for e in d.entries %}{% include "_entry_row.html" %}{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -4,6 +4,7 @@
|
|||||||
{%- else if name == "copy" -%}<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"/>
|
{%- else if name == "copy" -%}<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"/>
|
||||||
{%- else if name == "trash" -%}<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"/>
|
{%- else if name == "trash" -%}<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"/>
|
||||||
{%- else if name == "check" -%}<path d="M20 6 9 17l-5-5"/>
|
{%- else if name == "check" -%}<path d="M20 6 9 17l-5-5"/>
|
||||||
|
{%- else if name == "close" -%}<path d="M18 6 6 18"/><path d="m6 6 12 12"/>
|
||||||
{%- else if name == "plus" -%}<path d="M5 12h14"/><path d="M12 5v14"/>
|
{%- else if name == "plus" -%}<path d="M5 12h14"/><path d="M12 5v14"/>
|
||||||
{%- else if name == "reset" -%}<path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/>
|
{%- else if name == "reset" -%}<path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/>
|
||||||
{%- else if name == "play" -%}<path d="M7 4.5v15l12.5-7.5z" fill="currentColor"/>
|
{%- else if name == "play" -%}<path d="M7 4.5v15l12.5-7.5z" fill="currentColor"/>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<section id="recent" class="card" hx-get="/ui/dernieres-entrees" hx-trigger="entries-changed from:body" hx-swap="outerHTML">
|
<section id="recent" hx-disinherit="*" class="card" hx-get="/ui/dernieres-entrees" hx-trigger="entries-changed from:body" hx-swap="outerHTML">
|
||||||
<div class="card-head">
|
<div class="card-head">
|
||||||
<h2>Dernières entrées</h2>
|
<h2>Dernières entrées</h2>
|
||||||
<a href="/entries">Tout voir</a>
|
<a href="/entries">Tout voir</a>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{% import "_icons.html" as icons %}
|
{% import "_icons.html" as icons %}
|
||||||
<section id="timer" hx-get="/ui/timer" hx-trigger="timer-changed from:body" hx-swap="outerHTML" class="card timer{% if running.is_some() %} is-running{% endif %}"{% if let Some(e) = running %} style="--color: {{ e.color }}"{% endif %}>
|
<section id="timer" hx-disinherit="*" hx-get="/ui/timer" hx-trigger="timer-changed from:body" hx-swap="outerHTML" class="card timer{% if running.is_some() %} is-running{% endif %}"{% if let Some(e) = running %} style="--color: {{ e.color }}"{% endif %}>
|
||||||
{% if let Some(e) = running %}
|
{% if let Some(e) = running %}
|
||||||
<div class="current">
|
<div class="current">
|
||||||
<div class="current-label">
|
<div class="current-label">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<section id="today" class="card" hx-get="/ui/today" hx-trigger="entries-changed from:body" hx-swap="outerHTML">
|
<section id="today" hx-disinherit="*" class="card" hx-get="/ui/today" hx-trigger="entries-changed from:body" hx-swap="outerHTML">
|
||||||
<div class="card-head">
|
<div class="card-head">
|
||||||
<h2>Aujourd'hui</h2>
|
<h2>Aujourd'hui</h2>
|
||||||
<span class="total">{{ today_total }}</span>
|
<span class="total">{{ today_total }}</span>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<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">
|
<section id="entries-list" hx-disinherit="*" 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">
|
<div class="card-head">
|
||||||
<h2>Entrées</h2>
|
<h2>Entrées</h2>
|
||||||
<span class="total">{{ total }}</span>
|
<span class="total">{{ total }}</span>
|
||||||
|
|||||||
@@ -845,3 +845,87 @@ async fn restart_entry_from_list() {
|
|||||||
.count();
|
.count();
|
||||||
assert_eq!(open, 1);
|
assert_eq!(open, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn duplicate_day() {
|
||||||
|
let app = app().await;
|
||||||
|
let a = project(&app, "Acme", "Site web").await;
|
||||||
|
let b = project(&app, "Globex", "API").await;
|
||||||
|
add_entry(
|
||||||
|
&app,
|
||||||
|
a,
|
||||||
|
local(2026, 3, 10, 9, 0),
|
||||||
|
local(2026, 3, 10, 10, 15),
|
||||||
|
)
|
||||||
|
.await; // 1
|
||||||
|
add_entry(
|
||||||
|
&app,
|
||||||
|
b,
|
||||||
|
local(2026, 3, 10, 14, 0),
|
||||||
|
local(2026, 3, 10, 16, 0),
|
||||||
|
)
|
||||||
|
.await; // 2
|
||||||
|
|
||||||
|
// The day header carries the listed ids and posts to the copy route.
|
||||||
|
let (_, html) = get_html(&app, "/entries?from=2026-03-10&to=2026-03-10").await;
|
||||||
|
assert!(html.contains("hx-post=\"/ui/jours/2026-03-10/dupliquer\""));
|
||||||
|
// The self-refreshing list must not pass hx-select & co. down to row buttons
|
||||||
|
// (inline edit would swap in an empty row).
|
||||||
|
assert!(html.contains("id=\"entries-list\" hx-disinherit=\"*\""));
|
||||||
|
assert!(html.contains("name=\"ids\" value=\"2,1\""));
|
||||||
|
|
||||||
|
let (status, _) = send_form(
|
||||||
|
&app,
|
||||||
|
"/ui/jours/2026-03-10/dupliquer",
|
||||||
|
"ids=2,1&vers=2026-03-12",
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(status, StatusCode::OK);
|
||||||
|
let (_, list) = send(
|
||||||
|
&app,
|
||||||
|
"GET",
|
||||||
|
"/api/entries?from=2026-03-12&to=2026-03-12",
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let list = list.as_array().unwrap();
|
||||||
|
assert_eq!(list.len(), 2);
|
||||||
|
assert_eq!(list[0]["project_id"], b);
|
||||||
|
let parse = |v: &Value| chrono::DateTime::parse_from_rfc3339(v.as_str().unwrap()).unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
parse(&list[1]["started_at"]),
|
||||||
|
parse(&json!(local(2026, 3, 12, 9, 0)))
|
||||||
|
);
|
||||||
|
assert_eq!(list[1]["seconds"], 4500);
|
||||||
|
|
||||||
|
// Same day, or an archived project: refused, nothing copied.
|
||||||
|
let (status, _) = send_form(
|
||||||
|
&app,
|
||||||
|
"/ui/jours/2026-03-10/dupliquer",
|
||||||
|
"ids=1&vers=2026-03-10",
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(status, StatusCode::UNPROCESSABLE_ENTITY);
|
||||||
|
send(
|
||||||
|
&app,
|
||||||
|
"PATCH",
|
||||||
|
&format!("/api/projects/{b}"),
|
||||||
|
Some(json!({ "archived": true })),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
let (status, _) = send_form(
|
||||||
|
&app,
|
||||||
|
"/ui/jours/2026-03-10/dupliquer",
|
||||||
|
"ids=2,1&vers=2026-03-13",
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert_eq!(status, StatusCode::UNPROCESSABLE_ENTITY);
|
||||||
|
let (_, list) = send(
|
||||||
|
&app,
|
||||||
|
"GET",
|
||||||
|
"/api/entries?from=2026-03-13&to=2026-03-13",
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
assert!(list.as_array().unwrap().is_empty());
|
||||||
|
}
|
||||||
Reference in new issue
Block a user