From 488dbd2949cc1cbbc0e57feba9e5d45802c79ce9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 24 Apr 2019 07:35:40 +0530
Subject: [PATCH] fix: Pass from date to energy_point_history

- So that it can only show logs of current point
---
 .../social/components/EnergyPointHistory.vue  | 47 ++++++++++---------
 .../js/frappe/social/pages/UserList.vue       |  1 +
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
index 87b9a3e339..bf9b765a4c 100644
--- a/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
+++ b/frappe/public/js/frappe/social/components/EnergyPointHistory.vue
@@ -22,13 +22,13 @@
 </template>
 <script>
 export default {
-	props: ['user'],
+	props: ['user', 'from_date'],
 	data() {
 		return {
 			history_logs: [],
 			fetching: false,
 			has_more_logs: true
-		}
+		};
 	},
 	created() {
 		this.get_logs();
@@ -37,34 +37,37 @@ export default {
 		get_logs() {
 			this.fetching = true;
 			const pull_limit = 10;
-			frappe.db.get_list('Energy Point Log', {
-				filters: {
-					user: this.user,
-					type: ['!=', 'Review']
-				},
-				fields: ['*'],
-				limit: pull_limit,
-				limit_start: this.history_logs.length
-			}).then(data => {
-				this.history_logs = this.history_logs.concat(data);
-				this.has_more_logs = data.length === pull_limit;
-			}).finally(() => {
-				this.fetching = false;
-			})
+			frappe.db
+				.get_list('Energy Point Log', {
+					filters: {
+						user: this.user,
+						type: ['!=', 'Review'],
+						creation: ['>=',  this.from_date]
+					},
+					fields: ['*'],
+					limit: pull_limit,
+					limit_start: this.history_logs.length
+				})
+				.then(data => {
+					this.history_logs = this.history_logs.concat(data);
+					this.has_more_logs = data.length === pull_limit;
+				})
+				.finally(() => {
+					this.fetching = false;
+				});
 		}
-	},
-
-}
+	}
+};
 </script>
 <style lang="less">
-@import "frappe/public/less/common";
+@import 'frappe/public/less/common';
 .log-list {
 	padding: 15px;
 	padding-left: 0px;
 	position: relative;
 }
 .log-list:before {
-	content: " ";
+	content: ' ';
 	border-left: 1px solid @border-color;
 	position: absolute;
 	top: 0px;
@@ -82,7 +85,7 @@ export default {
 	position: relative;
 }
 .history-log:before {
-	content: " ";
+	content: ' ';
 	width: 7px;
 	height: 7px;
 	background-color: @border-color;
diff --git a/frappe/public/js/frappe/social/pages/UserList.vue b/frappe/public/js/frappe/social/pages/UserList.vue
index 90cb0716ac..3983d39aa8 100644
--- a/frappe/public/js/frappe/social/pages/UserList.vue
+++ b/frappe/public/js/frappe/social/pages/UserList.vue
@@ -47,6 +47,7 @@
 					v-show="show_log_for===user.name"
 					class="energy-point-history"
 					:user="user.name"
+					:from_date="from_date"
 					:key="user.name + user.energy_points"
 				></energy-point-history>
 			</li>