improve formatting of shifts
This commit is contained in:
parent
ea2cfa4bea
commit
7736a70eb9
1 changed files with 8 additions and 4 deletions
12
src/grist.rs
12
src/grist.rs
|
|
@ -40,7 +40,7 @@ impl Display for Priority {
|
||||||
Self::Prioritaire => write!(f, "<b>Prioritaire</b>"),
|
Self::Prioritaire => write!(f, "<b>Prioritaire</b>"),
|
||||||
Self::Secondaire => write!(f, "Secondaire"),
|
Self::Secondaire => write!(f, "Secondaire"),
|
||||||
Self::Bonus => write!(f, "Bonus"),
|
Self::Bonus => write!(f, "Bonus"),
|
||||||
Self::Urgent => write!(f, "<font color=\"red\">Urgent</font>"),
|
Self::Urgent => write!(f, "<font color=\"red\"><b>Urgent</b></font>"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -251,15 +251,19 @@ impl Shift {
|
||||||
impl Display for Shift {
|
impl Display for Shift {
|
||||||
fn fmt(&self, f: &mut Fmt<'_>) -> FmtRes {
|
fn fmt(&self, f: &mut Fmt<'_>) -> FmtRes {
|
||||||
let start_time = self.start_time.format("le %d à %H:%M");
|
let start_time = self.start_time.format("le %d à %H:%M");
|
||||||
|
let inscriptions = if self.inscriptions.len() < self.persons() as usize {
|
||||||
|
format!("<b>{}/{}</b>", self.inscriptions.len(), self.persons())
|
||||||
|
} else {
|
||||||
|
format!("{}/{}", self.inscriptions.len(), self.persons())
|
||||||
|
};
|
||||||
write!(
|
write!(
|
||||||
f,
|
f,
|
||||||
"<i>{}</i> ({}): {}, durée {} h, inscrit·es : {}/{}",
|
"<i>{}</i> ({}): {}, durée {} h, inscrit·es : {}",
|
||||||
self.name(),
|
self.name(),
|
||||||
self.priority(),
|
self.priority(),
|
||||||
start_time,
|
start_time,
|
||||||
self.duration(),
|
self.duration(),
|
||||||
self.inscriptions.len(),
|
inscriptions
|
||||||
self.persons()
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue