Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1de02ade1e | ||
|
|
ef69462e06 | ||
|
|
cbc8ba8ce0 | ||
|
|
46d2596813 | ||
|
|
63ddfd39d9 |
No files matched your search
@@ -31,8 +31,8 @@ Aucune authentification : le service est prévu pour tourner en local.
|
||||
|--------------|----------------------------------------------------|
|
||||
| GET, POST | `/clients` (`?archived=true` pour inclure les archivés) — `{"name", "color"?}` |
|
||||
| PATCH, DELETE| `/clients/{id}` — `{"name"?, "archived"?, "color"?}` |
|
||||
| GET, POST | `/clients/{id}/projects` — `{"name", "color"?}` |
|
||||
| PATCH, DELETE| `/projects/{id}` — `"color": null` pour reprendre celle du client |
|
||||
| GET, POST | `/clients/{id}/projects` — `{"name", "color"?, "repo_url"?}` |
|
||||
| PATCH, DELETE| `/projects/{id}` — `"color": null` pour reprendre celle du client, `"repo_url": ""` pour l'effacer |
|
||||
| GET | `/timer` — entrée en cours ou `null` |
|
||||
| POST | `/timer/start` `{"project_id", "note"?}` · `/timer/stop` |
|
||||
| GET, POST | `/entries` (`?from&to&client_id&project_id`) |
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
-- Optional link to the project's source repository (http(s) URL).
|
||||
ALTER TABLE projects ADD COLUMN repo_url TEXT;
|
||||
@@ -25,6 +25,8 @@ pub struct Project {
|
||||
pub color: Option<String>,
|
||||
/// `color`, or the client's color.
|
||||
pub effective_color: String,
|
||||
/// Link to the source repository.
|
||||
pub repo_url: Option<String>,
|
||||
pub archived: bool,
|
||||
pub created_at: DateTime<Utc>,
|
||||
}
|
||||
@@ -39,6 +41,8 @@ pub struct Entry {
|
||||
/// The project's effective color.
|
||||
pub color: String,
|
||||
pub client_color: String,
|
||||
/// The project's repository link.
|
||||
pub repo_url: Option<String>,
|
||||
pub started_at: DateTime<Utc>,
|
||||
/// `None` while the timer is running.
|
||||
pub ended_at: Option<DateTime<Utc>>,
|
||||
@@ -97,6 +101,9 @@ pub struct NameInput {
|
||||
/// `#rrggbb`. Clients get one from the palette, projects inherit their client's.
|
||||
#[serde(default)]
|
||||
pub color: Option<String>,
|
||||
/// Projects only: `http(s)://` link to the source repository.
|
||||
#[serde(default)]
|
||||
pub repo_url: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Default, Deserialize)]
|
||||
@@ -106,6 +113,9 @@ pub struct UpdateInput {
|
||||
/// Absent: unchanged. `null`: reset to the client's color (projects only).
|
||||
#[serde(default, deserialize_with = "present")]
|
||||
pub color: Option<Option<String>>,
|
||||
/// Projects only. Absent: unchanged. `null` or `""`: removed.
|
||||
#[serde(default, deserialize_with = "present")]
|
||||
pub repo_url: Option<Option<String>>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ use crate::models::{Entry, EntryFilter, NewEntry, UpdateEntry};
|
||||
/// `?1` is always "now", used to measure running entries.
|
||||
const SELECT: &str =
|
||||
"SELECT e.id, e.project_id, p.name AS project_name, p.client_id, c.name AS client_name,
|
||||
COALESCE(p.color, c.color) AS color, c.color AS client_color,
|
||||
COALESCE(p.color, c.color) AS color, c.color AS client_color, p.repo_url,
|
||||
e.started_at, e.ended_at, e.note,
|
||||
strftime('%s', COALESCE(e.ended_at, ?1)) - strftime('%s', e.started_at) AS seconds,
|
||||
EXISTS (SELECT 1 FROM time_entries o
|
||||
|
||||
@@ -33,6 +33,22 @@ fn clean_color(color: &str) -> AppResult<String> {
|
||||
Ok(color.to_ascii_lowercase())
|
||||
}
|
||||
|
||||
/// Validates an optional repository URL; blank means none.
|
||||
fn clean_repo_url(url: &str) -> AppResult<Option<String>> {
|
||||
let url = url.trim();
|
||||
if url.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
let valid = (url.starts_with("https://") || url.starts_with("http://"))
|
||||
&& !url.contains(char::is_whitespace);
|
||||
if !valid {
|
||||
return Err(AppError::Validation(format!(
|
||||
"URL du repo invalide « {url} » (doit commencer par http:// ou https://)"
|
||||
)));
|
||||
}
|
||||
Ok(Some(url.to_owned()))
|
||||
}
|
||||
|
||||
/// Maps "zero rows affected" to `NotFound`.
|
||||
fn affected(result: sqlx::sqlite::SqliteQueryResult) -> AppResult<()> {
|
||||
if result.rows_affected() == 0 {
|
||||
|
||||
+16
-4
@@ -1,12 +1,13 @@
|
||||
use sqlx::SqlitePool;
|
||||
|
||||
use super::{affected, clean_color, clean_name};
|
||||
use super::{affected, clean_color, clean_name, clean_repo_url};
|
||||
use crate::clock;
|
||||
use crate::error::{AppError, AppResult};
|
||||
use crate::models::{Project, UpdateInput};
|
||||
|
||||
const SELECT: &str = "SELECT p.id, p.client_id, c.name AS client_name, p.name,
|
||||
p.color, COALESCE(p.color, c.color) AS effective_color, p.archived, p.created_at
|
||||
p.color, COALESCE(p.color, c.color) AS effective_color, p.repo_url, p.archived,
|
||||
p.created_at
|
||||
FROM projects p JOIN clients c ON c.id = p.client_id";
|
||||
|
||||
/// Lists projects, optionally for one client. Archived projects (or projects of
|
||||
@@ -40,17 +41,21 @@ pub async fn create(
|
||||
client_id: i64,
|
||||
name: &str,
|
||||
color: Option<&str>,
|
||||
repo_url: Option<&str>,
|
||||
) -> AppResult<Project> {
|
||||
let name = clean_name(name)?;
|
||||
let color = color.map(clean_color).transpose()?;
|
||||
let repo_url = repo_url.map(clean_repo_url).transpose()?.flatten();
|
||||
// Surface a missing client as 404 rather than a foreign key error.
|
||||
super::clients::get(pool, client_id).await?;
|
||||
let id = sqlx::query(
|
||||
"INSERT INTO projects (client_id, name, color, created_at) VALUES (?1, ?2, ?3, ?4)",
|
||||
"INSERT INTO projects (client_id, name, color, repo_url, created_at)
|
||||
VALUES (?1, ?2, ?3, ?4, ?5)",
|
||||
)
|
||||
.bind(client_id)
|
||||
.bind(name)
|
||||
.bind(color)
|
||||
.bind(repo_url)
|
||||
.bind(clock::ts(&clock::now()))
|
||||
.execute(pool)
|
||||
.await?
|
||||
@@ -64,10 +69,15 @@ pub async fn update(pool: &SqlitePool, id: i64, input: &UpdateInput) -> AppResul
|
||||
Some(Some(c)) => Some(clean_color(c)?),
|
||||
_ => None,
|
||||
};
|
||||
let repo_url = match &input.repo_url {
|
||||
Some(Some(u)) => clean_repo_url(u)?,
|
||||
_ => None,
|
||||
};
|
||||
affected(
|
||||
sqlx::query(
|
||||
"UPDATE projects SET name = COALESCE(?2, name), archived = COALESCE(?3, archived),
|
||||
color = CASE WHEN ?4 THEN ?5 ELSE color END
|
||||
color = CASE WHEN ?4 THEN ?5 ELSE color END,
|
||||
repo_url = CASE WHEN ?6 THEN ?7 ELSE repo_url END
|
||||
WHERE id = ?1",
|
||||
)
|
||||
.bind(id)
|
||||
@@ -75,6 +85,8 @@ pub async fn update(pool: &SqlitePool, id: i64, input: &UpdateInput) -> AppResul
|
||||
.bind(input.archived)
|
||||
.bind(input.color.is_some())
|
||||
.bind(color)
|
||||
.bind(input.repo_url.is_some())
|
||||
.bind(repo_url)
|
||||
.execute(pool)
|
||||
.await?,
|
||||
)?;
|
||||
|
||||
+10
-1
@@ -90,7 +90,16 @@ async fn create_project(
|
||||
) -> AppResult<(StatusCode, Json<Project>)> {
|
||||
Ok((
|
||||
StatusCode::CREATED,
|
||||
Json(projects::create(&pool, client_id, &input.name, input.color.as_deref()).await?),
|
||||
Json(
|
||||
projects::create(
|
||||
&pool,
|
||||
client_id,
|
||||
&input.name,
|
||||
input.color.as_deref(),
|
||||
input.repo_url.as_deref(),
|
||||
)
|
||||
.await?,
|
||||
),
|
||||
))
|
||||
}
|
||||
|
||||
|
||||
+38
-2
@@ -27,6 +27,8 @@ pub fn router() -> Router<SqlitePool> {
|
||||
.route("/reports", get(reports_page))
|
||||
.route("/ui/today", get(today_fragment))
|
||||
.route("/ui/dernieres-entrees", get(recent_fragment))
|
||||
.route("/ui/timer", get(timer_fragment))
|
||||
.route("/ui/timer/entete", get(mini_timer))
|
||||
.route("/ui/timer/start", post(start_timer))
|
||||
.route("/ui/timer/stop", post(stop_timer))
|
||||
.route("/ui/timer/debut", post(set_timer_start))
|
||||
@@ -222,6 +224,13 @@ struct TimerTpl {
|
||||
groups: Vec<ProjectGroup>,
|
||||
}
|
||||
|
||||
/// Compact running timer shown in the header of every page.
|
||||
#[derive(Template)]
|
||||
#[template(path = "_mini_timer.html")]
|
||||
struct MiniTimerTpl {
|
||||
running: Option<Entry>,
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path = "_today.html")]
|
||||
struct TodayTpl {
|
||||
@@ -318,6 +327,16 @@ async fn dashboard(State(pool): State<SqlitePool>) -> PageResult {
|
||||
})
|
||||
}
|
||||
|
||||
async fn timer_fragment(State(pool): State<SqlitePool>) -> PageResult {
|
||||
render(timer_state(&pool).await?)
|
||||
}
|
||||
|
||||
async fn mini_timer(State(pool): State<SqlitePool>) -> PageResult {
|
||||
render(MiniTimerTpl {
|
||||
running: entries::running(&pool).await?,
|
||||
})
|
||||
}
|
||||
|
||||
async fn today_fragment(State(pool): State<SqlitePool>) -> PageResult {
|
||||
render(today_state(&pool).await?)
|
||||
}
|
||||
@@ -344,7 +363,13 @@ async fn stop_timer(State(pool): State<SqlitePool>) -> PageResult {
|
||||
Ok(_) | Err(AppError::Conflict(_)) => {}
|
||||
Err(e) => return Err(e.into()),
|
||||
}
|
||||
Ok(with_entries_changed(render(timer_state(&pool).await?)?))
|
||||
// `timer-changed` refreshes the dashboard timer when stopped from the header.
|
||||
let resp = render(timer_state(&pool).await?)?;
|
||||
Ok((
|
||||
AppendHeaders([("HX-Trigger", "entries-changed, timer-changed")]),
|
||||
resp,
|
||||
)
|
||||
.into_response())
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
@@ -417,6 +442,9 @@ struct ItemForm {
|
||||
/// Projects only: go back to the client's color.
|
||||
#[serde(default)]
|
||||
inherit: bool,
|
||||
/// Projects only; blank removes it.
|
||||
#[serde(default)]
|
||||
repo_url: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
@@ -476,7 +504,14 @@ async fn create_project(
|
||||
// The color picker is prefilled with the client's color: keeping it means inheriting.
|
||||
let client = clients::get(&pool, client_id).await?;
|
||||
let color = f.color.filter(|c| !c.eq_ignore_ascii_case(&client.color));
|
||||
projects::create(&pool, client_id, &f.name, color.as_deref()).await?;
|
||||
projects::create(
|
||||
&pool,
|
||||
client_id,
|
||||
&f.name,
|
||||
color.as_deref(),
|
||||
f.repo_url.as_deref(),
|
||||
)
|
||||
.await?;
|
||||
back_to_clients()
|
||||
}
|
||||
|
||||
@@ -497,6 +532,7 @@ async fn save_project(
|
||||
let input = UpdateInput {
|
||||
name: Some(f.name),
|
||||
color,
|
||||
repo_url: f.repo_url.map(Some),
|
||||
..Default::default()
|
||||
};
|
||||
projects::update(&pool, id, &input).await?;
|
||||
|
||||
@@ -52,6 +52,14 @@ h2 { font-size: 1.1rem; }
|
||||
padding: .35rem .75rem; border-radius: 999px; color: var(--muted); text-decoration: none;
|
||||
}
|
||||
.topbar nav a[aria-current="page"] { background: var(--bg); color: var(--text); font-weight: 600; }
|
||||
#mini-timer { margin-left: auto; }
|
||||
.mini-timer {
|
||||
display: flex; align-items: center; gap: .6rem; min-width: 0;
|
||||
border: 2px solid var(--color); border-radius: 999px; padding: .2rem .25rem .2rem .85rem;
|
||||
}
|
||||
.mini-timer-label { max-width: 14rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--muted); }
|
||||
.mini-timer .clock { font-size: 1rem; }
|
||||
.mini-timer .btn { border-radius: 50%; }
|
||||
|
||||
main { max-width: 960px; margin: 1.5rem auto; padding: 0 16px; display: grid; gap: 1rem; }
|
||||
|
||||
@@ -87,6 +95,7 @@ label { display: flex; align-items: center; gap: .35rem; color: var(--muted); }
|
||||
border: 1px solid var(--border); background: var(--surface); border-radius: 8px;
|
||||
padding: .45rem .9rem; cursor: pointer; white-space: nowrap;
|
||||
}
|
||||
a.btn { color: var(--text); text-decoration: none; }
|
||||
.btn:hover { border-color: var(--muted); }
|
||||
.btn.primary { background: var(--accent); border-color: var(--accent); color: var(--accent-text); font-weight: 600; }
|
||||
.btn.danger { color: var(--danger); }
|
||||
@@ -126,6 +135,8 @@ tr:last-child td { border-bottom: 0; }
|
||||
.num { text-align: right; font-variant-numeric: tabular-nums; white-space: nowrap; }
|
||||
.time { white-space: nowrap; font-variant-numeric: tabular-nums; color: var(--muted); }
|
||||
.client { color: var(--muted); }
|
||||
.project-link { color: inherit; text-decoration: underline dotted var(--muted); text-underline-offset: 3px; }
|
||||
.project-link:hover { color: var(--accent); text-decoration-color: currentColor; }
|
||||
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; }
|
||||
@@ -153,6 +164,7 @@ input[type="color"] {
|
||||
padding: .4rem 0; border-bottom: 1px solid var(--border);
|
||||
}
|
||||
.projects li.archived { opacity: .6; }
|
||||
.row.grow input.repo-url { flex: 1.3; }
|
||||
.projects li > form::before { content: "-"; color: var(--muted); flex: none; }
|
||||
|
||||
/* Periods & reports */
|
||||
|
||||
+4
-2
@@ -3,13 +3,15 @@ function tick() {
|
||||
for (const el of document.querySelectorAll(".clock[data-started]")) {
|
||||
const secs = Math.max(0, Math.floor((Date.now() - Date.parse(el.dataset.started)) / 1000));
|
||||
const h = Math.floor(secs / 3600);
|
||||
const m = String(Math.floor((secs % 3600) / 60)).padStart(2, "0");
|
||||
const m = Math.floor((secs % 3600) / 60);
|
||||
const s = String(secs % 60).padStart(2, "0");
|
||||
el.textContent = `${h}:${m}:${s}`;
|
||||
// Pas d'heures à zéro : 4:07, puis 1:04:07.
|
||||
el.textContent = h ? `${h}:${String(m).padStart(2, "0")}:${s}` : `${m}:${s}`;
|
||||
}
|
||||
}
|
||||
tick();
|
||||
setInterval(tick, 1000);
|
||||
htmx.onLoad(tick); // horloges arrivées par htmx (ex. header)
|
||||
|
||||
// Show server errors from htmx requests in a toast.
|
||||
let toastTimer;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
{{ e.start_time() }} – {{ e.end_time() }}
|
||||
{% if e.overlaps %}<span class="warn" title="Chevauche une autre entrée">⚠</span>{% endif %}
|
||||
</td>
|
||||
<td><span class="dot" style="--color: {{ e.color }}"></span><span class="client">{{ e.client_name }}</span> / {{ e.project_name }}</td>
|
||||
<td><span class="dot" style="--color: {{ e.color }}"></span><span class="client">{{ e.client_name }}</span> / {% if let Some(u) = e.repo_url %}<a class="project-link" href="{{ u }}" target="_blank" rel="noopener noreferrer" title="Ouvrir le repo">{{ e.project_name }}</a>{% else %}{{ e.project_name }}{% endif %}</td>
|
||||
<td class="note">{{ e.note }}</td>
|
||||
<td class="num">{{ e.duration() }}</td>
|
||||
<td class="actions">
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
{%- else if name == "check" -%}<path d="M20 6 9 17l-5-5"/>
|
||||
{%- 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 == "stop" -%}<rect x="6" y="6" width="12" height="12" rx="1.5" fill="currentColor"/>
|
||||
{%- else if name == "link" -%}<path d="M15 3h6v6"/><path d="M10 14 21 3"/><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/>
|
||||
{%- else if name == "archive" -%}<rect x="2" y="3" width="20" height="5" rx="1"/><path d="M4 8v11a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8"/><path d="M10 12h4"/>
|
||||
{%- else if name == "unarchive" -%}<rect x="2" y="3" width="20" height="5" rx="1"/><path d="M4 8v11a2 2 0 0 0 2 2h2"/><path d="M20 8v11a2 2 0 0 1-2 2h-2"/><path d="m9 15 3-3 3 3"/><path d="M12 12v9"/>
|
||||
{%- endif -%}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
{% import "_icons.html" as icons %}
|
||||
<div id="mini-timer" hx-get="/ui/timer/entete" hx-trigger="entries-changed from:body, every 30s" hx-swap="outerHTML">
|
||||
{% if let Some(e) = running %}
|
||||
<div class="mini-timer" style="--color: {{ e.color }}" title="{{ e.client_name }} / {{ e.project_name }}">
|
||||
<span class="mini-timer-label">{% if e.note.is_empty() %}{{ e.project_name }}{% else %}{{ e.note }}{% endif %}</span>
|
||||
<span class="clock" data-started="{{ e.started_rfc3339() }}">{{ e.duration() }}</span>
|
||||
<button class="btn small icon danger" hx-post="/ui/timer/stop" hx-swap="none" title="Arrêter" aria-label="Arrêter le timer">{% call icons::icon("stop") %}{% endcall %}</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
@@ -1,4 +1,4 @@
|
||||
<section id="timer" class="card timer{% if running.is_some() %} is-running{% endif %}"{% if let Some(e) = running %} style="--color: {{ e.color }}"{% endif %}>
|
||||
<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 %}>
|
||||
{% if let Some(e) = running %}
|
||||
<div class="current">
|
||||
<div class="current-label">
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
<a href="/reports" {% if nav == "reports" %}aria-current="page"{% endif %}>Rapports</a>
|
||||
<a href="/clients" {% if nav == "clients" %}aria-current="page"{% endif %}>Clients</a>
|
||||
</nav>
|
||||
<div id="mini-timer" hx-get="/ui/timer/entete" hx-trigger="load" hx-swap="outerHTML"></div>
|
||||
</header>
|
||||
<main>
|
||||
{% block content %}{% endblock %}
|
||||
|
||||
@@ -47,6 +47,7 @@
|
||||
<input type="color" name="color" value="{{ p.effective_color }}" aria-label="Couleur du projet"
|
||||
title="{% if p.color.is_some() %}Couleur propre au projet{% else %}Couleur du client{% endif %}">
|
||||
<input name="name" value="{{ p.name }}" required aria-label="Nom du projet">
|
||||
<input type="url" name="repo_url" value="{% if let Some(u) = p.repo_url %}{{ u }}{% endif %}" placeholder="URL du repo" aria-label="URL du repo" class="repo-url">
|
||||
<div class="btn-group">
|
||||
<button class="btn small icon primary" title="Enregistrer" aria-label="Enregistrer">{% call icons::icon("check") %}{% endcall %}</button>
|
||||
{% if p.color.is_some() %}
|
||||
@@ -61,6 +62,9 @@
|
||||
</form>
|
||||
<form id="delete-project-{{ p.id }}" method="post" action="/ui/projects/{{ p.id }}/delete" data-confirm="Supprimer ce projet et tout le temps saisi dessus ?" hidden></form>
|
||||
<div class="btn-group">
|
||||
{% if let Some(u) = p.repo_url %}
|
||||
<a class="btn small icon" href="{{ u }}" target="_blank" rel="noopener noreferrer" title="Ouvrir le repo" aria-label="Ouvrir le repo">{% call icons::icon("link") %}{% endcall %}</a>
|
||||
{% endif %}
|
||||
{% if p.archived %}
|
||||
<button class="btn small icon" form="archive-project-{{ p.id }}" title="Réactiver" aria-label="Réactiver">{% call icons::icon("unarchive") %}{% endcall %}</button>
|
||||
{% else %}
|
||||
@@ -76,6 +80,7 @@
|
||||
<form method="post" action="/ui/clients/{{ c.client.id }}/projects" class="row">
|
||||
<input type="color" name="color" value="{{ c.client.color }}" aria-label="Couleur du projet" title="Garder la couleur du client ou en choisir une autre">
|
||||
<input name="name" required placeholder="Nouveau projet" aria-label="Nouveau projet" class="grow">
|
||||
<input type="url" name="repo_url" placeholder="URL du repo (facultatif)" aria-label="URL du repo" class="grow">
|
||||
<button class="btn icon primary" title="Ajouter le projet" aria-label="Ajouter le projet">{% call icons::icon("plus") %}{% endcall %}</button>
|
||||
</form>
|
||||
</section>
|
||||
|
||||
@@ -707,3 +707,98 @@ async fn move_timer_start() {
|
||||
let (status, _) = send_form(&app, "/ui/timer/debut", &format!("started_at={future}")).await;
|
||||
assert_eq!(status, StatusCode::UNPROCESSABLE_ENTITY);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn project_repo_url() {
|
||||
let app = app().await;
|
||||
let (_, c) = send(
|
||||
&app,
|
||||
"POST",
|
||||
"/api/clients",
|
||||
Some(json!({ "name": "Acme" })),
|
||||
)
|
||||
.await;
|
||||
let uri = format!("/api/clients/{}/projects", c["id"]);
|
||||
|
||||
let (status, p) = send(
|
||||
&app,
|
||||
"POST",
|
||||
&uri,
|
||||
Some(json!({ "name": "Site", "repo_url": " https://git.example.com/acme/site " })),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(status, StatusCode::CREATED);
|
||||
assert_eq!(p["repo_url"], "https://git.example.com/acme/site");
|
||||
|
||||
let (status, _) = send(
|
||||
&app,
|
||||
"POST",
|
||||
&uri,
|
||||
Some(json!({ "name": "Bad", "repo_url": "git@example.com:acme/site.git" })),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(status, StatusCode::UNPROCESSABLE_ENTITY);
|
||||
|
||||
// Absent: unchanged; "" clears it.
|
||||
let project = format!("/api/projects/{}", p["id"]);
|
||||
let (_, p) = send(&app, "PATCH", &project, Some(json!({ "name": "Site web" }))).await;
|
||||
assert_eq!(p["repo_url"], "https://git.example.com/acme/site");
|
||||
let (_, html) = get_html(&app, "/clients").await;
|
||||
assert!(html.contains("href=\"https://git.example.com/acme/site\""));
|
||||
// Entry lists link the project name to its repository.
|
||||
let (status, _) = add_entry(
|
||||
&app,
|
||||
p["id"].as_i64().unwrap(),
|
||||
local(2026, 3, 10, 9, 0),
|
||||
local(2026, 3, 10, 10, 0),
|
||||
)
|
||||
.await;
|
||||
assert_eq!(status, StatusCode::CREATED);
|
||||
let (_, html) = get_html(&app, "/entries?from=2026-03-09&to=2026-03-15").await;
|
||||
assert!(html.contains("class=\"project-link\" href=\"https://git.example.com/acme/site\""));
|
||||
let (_, p) = send(&app, "PATCH", &project, Some(json!({ "repo_url": "" }))).await;
|
||||
assert!(p["repo_url"].is_null());
|
||||
|
||||
// HTML form: the URL field is saved with the project.
|
||||
let (status, _) = send_form(
|
||||
&app,
|
||||
&project.replace("/api/", "/ui/"),
|
||||
"name=Site+web&repo_url=https%3A%2F%2Fgit.example.com%2Fx",
|
||||
)
|
||||
.await;
|
||||
assert_eq!(status, StatusCode::SEE_OTHER);
|
||||
let (_, p) = send(&app, "GET", &format!("{uri}?archived=true"), None).await;
|
||||
assert_eq!(p[0]["repo_url"], "https://git.example.com/x");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn header_mini_timer() {
|
||||
let app = app().await;
|
||||
let p = project(&app, "Acme", "Site web").await;
|
||||
|
||||
let (status, html) = get_html(&app, "/ui/timer/entete").await;
|
||||
assert_eq!(status, StatusCode::OK);
|
||||
assert!(!html.contains("mini-timer-label"));
|
||||
|
||||
send(
|
||||
&app,
|
||||
"POST",
|
||||
"/api/timer/start",
|
||||
Some(json!({ "project_id": p, "note": "Refonte" })),
|
||||
)
|
||||
.await;
|
||||
let (_, html) = get_html(&app, "/ui/timer/entete").await;
|
||||
assert!(html.contains("Refonte") && html.contains("data-started"));
|
||||
assert!(html.contains("hx-post=\"/ui/timer/stop\""));
|
||||
|
||||
// Without a note, the project name is shown.
|
||||
send(
|
||||
&app,
|
||||
"POST",
|
||||
"/api/timer/start",
|
||||
Some(json!({ "project_id": p })),
|
||||
)
|
||||
.await;
|
||||
let (_, html) = get_html(&app, "/ui/timer/entete").await;
|
||||
assert!(html.contains("<span class=\"mini-timer-label\">Site web</span>"));
|
||||
}
|
||||
Reference in new issue
Block a user