From 2fb8d4c29675c74300f3b737ab986cf872ab9330 Mon Sep 17 00:00:00 2001 From: Mohammadreza Ghorbani Date: Thu, 27 Jun 2019 15:30:11 +0430 Subject: [PATCH] Add sensible default for date_to --- src/javascript/app/Stores/Modules/Profit/profit-store.js | 6 +++--- .../app/Stores/Modules/Statement/statement-store.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/javascript/app/Stores/Modules/Profit/profit-store.js b/src/javascript/app/Stores/Modules/Profit/profit-store.js index 72ee99af8346..11d57e892fc6 100644 --- a/src/javascript/app/Stores/Modules/Profit/profit-store.js +++ b/src/javascript/app/Stores/Modules/Profit/profit-store.js @@ -16,7 +16,7 @@ const delay_on_scroll_time = 150; export default class ProfitTableStore extends BaseStore { @observable data = []; @observable date_from = 0; - @observable date_to = 0; + @observable date_to = toMoment().startOf('day').add(1, 'd').subtract(1, 's').unix(); @observable error = ''; @observable has_loaded_all = false; @observable is_loading = false; @@ -48,7 +48,7 @@ export default class ProfitTableStore extends BaseStore { shouldFetchNextBatch(should_load_partially) { if (!should_load_partially && (this.has_loaded_all || this.is_loading)) return false; const today = toMoment().startOf('day').add(1, 'd').subtract(1, 's').unix(); - if (this.date_to && this.date_to < today) return !should_load_partially; + if (this.date_to < today) return should_load_partially; return true; } @@ -159,7 +159,7 @@ export default class ProfitTableStore extends BaseStore { @action.bound clearDateFilter() { this.date_from = 0; - this.date_to = 0; + this.date_to = toMoment().startOf('day').add(1, 'd').subtract(1, 's').unix(); this.partial_fetch_time = false; } diff --git a/src/javascript/app/Stores/Modules/Statement/statement-store.js b/src/javascript/app/Stores/Modules/Statement/statement-store.js index 4e4e0c928f08..7e4b7a8ec937 100644 --- a/src/javascript/app/Stores/Modules/Statement/statement-store.js +++ b/src/javascript/app/Stores/Modules/Statement/statement-store.js @@ -18,7 +18,7 @@ export default class StatementStore extends BaseStore { @observable is_loading = false; @observable has_loaded_all = false; @observable date_from = 0; - @observable date_to = 0; + @observable date_to = toMoment().startOf('day').add(1, 'd').subtract(1, 's').unix(); @observable error = ''; // `client_loginid` is only used to detect if this is in sync with the client-store, don't rely on @@ -46,13 +46,13 @@ export default class StatementStore extends BaseStore { @action.bound clearDateFilter() { this.date_from = 0; - this.date_to = 0; + this.date_to = toMoment().startOf('day').add(1, 'd').subtract(1, 's').unix(); } shouldFetchNextBatch(should_load_partially) { if (!should_load_partially && (this.has_loaded_all || this.is_loading)) return false; const today = toMoment().startOf('day').add(1, 'd').subtract(1, 's').unix(); - if (this.date_to && this.date_to < today) return !should_load_partially; + if (this.date_to < today) return should_load_partially; return true; }