matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Do not create comment in habit instance

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-06-30 11:33:57 +02:00
parent 62d6b54542
commit f3c41915fd
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/domain/libimaghabit/src/habit.rs
View file

@ -99,13 +99,12 @@ impl HabitTemplate for Entry {
fn create_instance_with_date<'a>(&mut self, store: &'a Store, date: &NaiveDate) -> Result<FileLockEntry<'a>> { fn create_instance_with_date<'a>(&mut self, store: &'a Store, date: &NaiveDate) -> Result<FileLockEntry<'a>> {
let name = self.habit_name()?; let name = self.habit_name()?;
let comment = self.habit_comment()?;
let date = date_to_string(date); let date = date_to_string(date);
let id = instance_id_for_name_and_datestr(&name, &date)?; let id = instance_id_for_name_and_datestr(&name, &date)?;
store.create(id) store.create(id)
.map_err(From::from) .map_err(From::from)
.and_then(|entry| postprocess_instance(entry, name, date, comment, self)) .and_then(|entry| postprocess_instance(entry, name, date, self))
} }
fn create_instance_today<'a>(&mut self, store: &'a Store) -> Result<FileLockEntry<'a>> { fn create_instance_today<'a>(&mut self, store: &'a Store) -> Result<FileLockEntry<'a>> {
@ -114,13 +113,12 @@ impl HabitTemplate for Entry {
fn retrieve_instance_with_date<'a>(&mut self, store: &'a Store, date: &NaiveDate) -> Result<FileLockEntry<'a>> { fn retrieve_instance_with_date<'a>(&mut self, store: &'a Store, date: &NaiveDate) -> Result<FileLockEntry<'a>> {
let name = self.habit_name()?; let name = self.habit_name()?;
let comment = self.habit_comment()?;
let date = date_to_string(date); let date = date_to_string(date);
let id = instance_id_for_name_and_datestr(&name, &date)?; let id = instance_id_for_name_and_datestr(&name, &date)?;
store.retrieve(id) store.retrieve(id)
.map_err(From::from) .map_err(From::from)
.and_then(|entry| postprocess_instance(entry, name, date, comment, self)) .and_then(|entry| postprocess_instance(entry, name, date, self))
} }
fn retrieve_instance_today<'a>(&mut self, store: &'a Store) -> Result<FileLockEntry<'a>> { fn retrieve_instance_today<'a>(&mut self, store: &'a Store) -> Result<FileLockEntry<'a>> {
@ -398,7 +396,6 @@ pub mod builder {
fn postprocess_instance<'a>(mut entry: FileLockEntry<'a>, fn postprocess_instance<'a>(mut entry: FileLockEntry<'a>,
name: String, name: String,
date: String, date: String,
comment: String,
template: &mut Entry) template: &mut Entry)
-> Result<FileLockEntry<'a>> -> Result<FileLockEntry<'a>>
{ {
@ -407,7 +404,6 @@ fn postprocess_instance<'a>(mut entry: FileLockEntry<'a>,
let hdr = entry.get_header_mut(); let hdr = entry.get_header_mut();
let _ = hdr.insert("habit.instance.name", Value::String(name))?; let _ = hdr.insert("habit.instance.name", Value::String(name))?;
let _ = hdr.insert("habit.instance.date", Value::String(date))?; let _ = hdr.insert("habit.instance.date", Value::String(date))?;
let _ = hdr.insert("habit.instance.comment", Value::String(comment))?;
} }
entry.add_link(template)?; entry.add_link(template)?;