diff --git a/view/app-jarvis.js b/view/app-jarvis.js index f4d0c49..482b0b8 100644 --- 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 index fe7d7ab..345a9f1 100644 --- a/view/components/main.html +++ b/view/components/main.html @@ -152,7 +152,8 @@

{{$index + 1}}. {{objectQuery.head}}

{{objectQuery.id}}. {{objectQuery.title}}

{{objectQuery.description}}

-

{{objectQuery.time}}

+
+

Due: {{objectQuery.time}}