Merge pull request #96 from Jayashree-panda/general-conv

general conversation updated 1

service/messages/messages.json

@@ -4,7 +4,8 @@
         "hello",
         "hey",
         "whats up",
-        "yo"
+        "yo",
+        "hey there"
     ],
     "initial-greetings-name": [
         "hi jarvis",
@@ -32,7 +33,13 @@
         "whats your work",
         "what is your work",
         "your work",
-        "work"
+        "work",
+        "i need your help",
+	    "i need your help please help me",
+        "how you work",
+        "how you work please guide me",
+        "how you work let me know"
+
     ],
     "about": [
         "whats your name",
@@ -41,15 +48,31 @@
         "who are you",
         "tell me about yourself",
         "about you",
-        "about"
+        "about",
+        "may i know something about you",
+	    "can you say something about you",
+        "would you bother to introduce yourself",
+        "would you please bother to introduce yourself",
+	    "introduce yourself",
+	    "can you please introduce yourself",
+	    "i wanna know something about you can you introduce yourself",
+        "i would like to know something about you can you introduce yourself",
+        "i would like to know something about you would you please bother to introduce yourself"
+
     ],
     "age": [
         "how old are you",
         "your age",
-        "how many years are you old",
         "how long have a been",
         "jarvis age",
-        "jarvis years"
+        "jarvis years",
+        "whats your age",
+        "whats your age, jarvis",
+        "hey jarvis whats your age now",
+        "hey jarvis whats your age",
+        "hey jarvis how old are you",
+        "hey whats your age"
+
     ],
     "birthday": [
         "when is your birthday",

service/messages/messages_replies.json

@@ -5,7 +5,10 @@
         "hi! whats up?",
         "hello! whats up?",
         "hey there!",
-        "hey there! Anything I can help you with?"
+        "hey there! Anything I can help you with?",
+        "Hey! I am Jarvis here. Anything I may help you with?",
+	    "Hello! I am very excited to talk with you. Is there anything I may serve you with?"
+
     ],
     "initial-greetings-name": [
         "hi %s! How can i help you?",
@@ -14,19 +17,22 @@
         "hey %s! What can i help you with?",
         "hey %s!",
         "hi %s!",
-        "hello %s!"
+        "hello %s!",
+        "hey %s! I am ready here. Anything I may help you with?"
     ],
     "help": [
-        "I can do lots of things! You can ask for web search, specific google/yahoo/bing search, images, videos and also find answers for any of your queries!",
-        "You can ask for web search, specific google/yahoo/bing search, images, videos and also find answers for any of your queries!",
-        "I can help you with web search, specific google/yahoo/bing search, images, videos and also find answers for any of your queries!",
-        "My work is to help you with the web search, specific google/yahoo/bing search, images, videos and also find answers for any of your queries!"
+        "I can do lots of things! You can ask for web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder, tasklist and also find answers for any of your queries!",
+        "You can ask for web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder, tasklist and also find answers for any of your queries!",
+        "I can help you with web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder, tasklist and also find answers for any of your queries!",
+        "My work is to help you with the web search, specific google/yahoo/bing search, images, videos, search for medicines specifications, set reminder, tasklist and also find answers for any of your queries!"
     ],
     "about": [
         "I am Jarvis, your personal assistant. How can I help you?",
         "Jarvis is my name",
         "My name is jarvis! Anything I can help you with?",
-        "I am your assistant, Jarvis. Anything I can help you with?"
+        "I am your assistant, Jarvis. Anything I can help you with?",
+        "I am Jarvis, your personal assistant. Feels great to talk with you. May I help you with anything?",
+        "I am Jarvis, your personal assistant. Nice to talk with you. May I serve you with anything?"
     ],
     "age": [
         "I am 2 months old",

view/app-jarvis.js

@@ -95,7 +95,7 @@ app.controller('MainController', function($scope,$location,$rootScope,$http) {
 					show: false,
 					length: null
 				};
-				console.log(messageObj)
+				console.log(messageObj);
 				console.log(res);
 				setTimeout(() => {
 					$scope.scrollDown();
@@ -139,14 +139,12 @@ app.controller('MainController', function($scope,$location,$rootScope,$http) {
 					messageObj.message = message;
 					$scope.messageStack.push(messageObj);
 				} 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);
-					console.log(messageObj);
 				} else if ((status === 'success' || status) && (message === 'Information about the medicine : ' || message === 'Help on the given symptoms : ')) {
 					messageObj.sender = 'jarvis-bot';
 					messageObj.time = String(hrs2 + ':' + mins2);
@@ -245,7 +243,7 @@ app.controller('MainController', function($scope,$location,$rootScope,$http) {
 		});
 		$scope.formData.remTitle = '';
 		$scope.formData.remDescription = '';
-	}
+	};
 
 	$scope.scrollDown = function() {
 		var elem = document.getElementById('stackArea-parent');