corrected show message error

Harkishen-Singh · Apr 10, 2019 · 6b85163 · 6b85163
1 parent e7f4246
commit 6b85163
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/view/app-jarvis.js b/view/app-jarvis.js
@@ -132,27 +132,28 @@ app.controller('MainController', function($scope,$location,$rootScope,$http) {
 					messageObj.result = result;
 					$scope.messageStack.push(messageObj);
 					$scope.showLoading = false;
-				} else if ((status === 'success' || status) && !show) {
+				} else if ((status === 'success' || status) && message === 'Enter Reminder details : ') {
 					messageObj.sender = 'jarvis-bot';
 					messageObj.time = String(new Date().getHours() + ':' + new Date().getMinutes());
 					messageObj.length = message.length;
 					messageObj.message = message;
 					$scope.messageStack.push(messageObj);
-					$scope.showLoading = false;
-				} else if ((status === 'success' || status) && message === 'Enter Reminder details : ') {
+				} else if ((status === 'success' || status) && message === 'Here are your reminders : ') {
+					console.log("In show reminder");
 					messageObj.sender = 'jarvis-bot';
 					messageObj.time = String(new Date().getHours() + ':' + new Date().getMinutes());
 					messageObj.length = message.length;
 					messageObj.message = message;
+					messageObj.result = result;
 					$scope.messageStack.push(messageObj);
-				} else if ((status === 'success' || status) && message === 'Here are your reminders : ') {
+					console.log(messageObj);
+				} else if ((status === 'success' || status) && !show) {
 					messageObj.sender = 'jarvis-bot';
 					messageObj.time = String(new Date().getHours() + ':' + new Date().getMinutes());
 					messageObj.length = message.length;
 					messageObj.message = message;
-					messageObj.result = result;
 					$scope.messageStack.push(messageObj);
-					console.log(messageObj);
+					$scope.showLoading = false;
 				} else if (show) {
 					messageObj.sender = 'jarvis-bot';
 					messageObj.time = String(new Date().getHours() + ':' + new Date().getMinutes());

diff --git a/view/components/main.html b/view/components/main.html
@@ -152,7 +152,8 @@ <h4 class="head-query-data">{{$index + 1}}. {{objectQuery.head}}</h4>
                                 <div data-ng-repeat="objectQuery in message.result" id="queried-info">
                                     <h4 class="head-query-data">{{objectQuery.id}}. {{objectQuery.title}}</h4>
                                     <p>{{objectQuery.description}}</p>
-                                    <p>{{objectQuery.time}}</p>
+                                    <br/>
+                                    <p><b>Due: </b>{{objectQuery.time}}</p>
                                 </div>
                             </div>
                         </div>