mirror of
https://github.com/nikolassv/bartib
synced 2024-12-12 21:12:32 +00:00
Merge remote-tracking branch 'origin/master' into dev/report
This commit is contained in:
commit
09cdcb95fe
2 changed files with 1 additions and 3 deletions
|
@ -21,7 +21,7 @@ pub fn list(file_name: &str, filter: getter::ActivityFilter, do_group_activities
|
||||||
let file_content = bartib_file::get_file_content(file_name)?;
|
let file_content = bartib_file::get_file_content(file_name)?;
|
||||||
let activities = getter::get_activities(&file_content);
|
let activities = getter::get_activities(&file_content);
|
||||||
let mut filtered_activities: Vec<&activity::Activity> =
|
let mut filtered_activities: Vec<&activity::Activity> =
|
||||||
getter::filter_activities(activities, &filter).collect();
|
getter::filter_activities(activities, &filter).collect();
|
||||||
|
|
||||||
filtered_activities.sort_by_key(|activity| activity.start);
|
filtered_activities.sort_by_key(|activity| activity.start);
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,6 @@ fn main() -> Result<()> {
|
||||||
.long("from")
|
.long("from")
|
||||||
.value_name("FROM_DATE")
|
.value_name("FROM_DATE")
|
||||||
.help("begin of date range (inclusive)")
|
.help("begin of date range (inclusive)")
|
||||||
.requires("to_date")
|
|
||||||
.takes_value(true),
|
.takes_value(true),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
|
@ -105,7 +104,6 @@ fn main() -> Result<()> {
|
||||||
.long("to")
|
.long("to")
|
||||||
.value_name("TO_DATE")
|
.value_name("TO_DATE")
|
||||||
.help("end of date range (inclusive)")
|
.help("end of date range (inclusive)")
|
||||||
.requires("from_date")
|
|
||||||
.takes_value(true),
|
.takes_value(true),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
|
|
Loading…
Reference in a new issue