diff --git a/Dialogflow/WaterLog.zip b/Dialogflow/WaterLog.zip index 839f1fa..5c976f2 100644 Binary files a/Dialogflow/WaterLog.zip and b/Dialogflow/WaterLog.zip differ diff --git a/Dialogflow/WaterLog/agent.json b/Dialogflow/WaterLog/agent.json index e02c8bc..c138f0a 100755 --- a/Dialogflow/WaterLog/agent.json +++ b/Dialogflow/WaterLog/agent.json @@ -8,7 +8,8 @@ "startIntents": [], "systemIntents": [], "endIntentIds": [ - "9d87e786-f42c-40bb-a711-7c8a9df612bb" + "9d87e786-f42c-40bb-a711-7c8a9df612bb", + "5cbc8cea-6ae1-48b7-a7be-95b8f2d76cdc" ], "oAuthLinking": { "required": false, diff --git a/Dialogflow/WaterLog/intents/Default Fallback Intent.json b/Dialogflow/WaterLog/intents/Default Fallback Intent.json index 844c74a..44b4764 100755 --- a/Dialogflow/WaterLog/intents/Default Fallback Intent.json +++ b/Dialogflow/WaterLog/intents/Default Fallback Intent.json @@ -1,7 +1,7 @@ { "id": "321bd139-faa9-4369-bb94-235695171a98", "name": "Default Fallback Intent", - "auto": true, + "auto": false, "contexts": [], "responses": [ { @@ -36,6 +36,7 @@ "priority": 500000, "webhookUsed": false, "webhookForSlotFilling": false, + "lastUpdate": 1509656763429, "fallbackIntent": true, "events": [] } \ No newline at end of file diff --git a/Dialogflow/WaterLog/intents/get_logged_water.json b/Dialogflow/WaterLog/intents/get_logged_water.json index 16623fc..dd0959f 100755 --- a/Dialogflow/WaterLog/intents/get_logged_water.json +++ b/Dialogflow/WaterLog/intents/get_logged_water.json @@ -23,7 +23,7 @@ "priority": 500000, "webhookUsed": true, "webhookForSlotFilling": false, - "lastUpdate": 1508433491, + "lastUpdate": 1509656763434, "fallbackIntent": false, "events": [] } \ No newline at end of file diff --git a/Dialogflow/WaterLog/intents/get_logged_water_usersays_en.json b/Dialogflow/WaterLog/intents/get_logged_water_usersays_en.json index 3756abf..cb813d4 100755 --- a/Dialogflow/WaterLog/intents/get_logged_water_usersays_en.json +++ b/Dialogflow/WaterLog/intents/get_logged_water_usersays_en.json @@ -1,6 +1,6 @@ [ { - "id": "f3fd2a0a-173d-4b24-bfa0-c2ce76c5caad", + "id": "05a93d71-d651-4a30-8d25-050ffe6627bf", "data": [ { "text": "How much did I drink?", @@ -12,7 +12,7 @@ "updated": 0 }, { - "id": "c0b103f2-dbba-46bc-8c0a-3284165149fd", + "id": "383b6ea1-230e-4fad-b628-28bf9bc10802", "data": [ { "text": "How much water have I drunk ", @@ -33,7 +33,7 @@ "updated": 0 }, { - "id": "d0b592c3-b46a-4836-86ff-1d80abc7535b", + "id": "16e5c747-feb1-485a-ab05-b6c844445f64", "data": [ { "text": "How much water did I drink ", @@ -54,7 +54,7 @@ "updated": 0 }, { - "id": "b2f8c850-5c3e-4229-9644-33c11352f84b", + "id": "50eb1ea9-fd8f-42e2-a4da-62fd3fe33b88", "data": [ { "text": "Did I drink any water ", diff --git a/Dialogflow/WaterLog/intents/log_water.json b/Dialogflow/WaterLog/intents/log_water.json index 5ec3923..54c5cd5 100755 --- a/Dialogflow/WaterLog/intents/log_water.json +++ b/Dialogflow/WaterLog/intents/log_water.json @@ -42,7 +42,7 @@ "priority": 500000, "webhookUsed": true, "webhookForSlotFilling": false, - "lastUpdate": 1508442034, + "lastUpdate": 1509656763429, "fallbackIntent": false, "events": [] } \ No newline at end of file diff --git a/Dialogflow/WaterLog/intents/log_water_usersays_en.json b/Dialogflow/WaterLog/intents/log_water_usersays_en.json index 4f9edab..cb47456 100755 --- a/Dialogflow/WaterLog/intents/log_water_usersays_en.json +++ b/Dialogflow/WaterLog/intents/log_water_usersays_en.json @@ -1,6 +1,20 @@ [ { - "id": "dc227fa6-5ff0-4d72-ab9f-687d14fba54c", + "id": "77208699-f8b6-41ff-b556-d7ae8051eb45", + "data": [ + { + "text": "500ml", + "alias": "water_volume", + "meta": "@sys.unit-volume", + "userDefined": false + } + ], + "isTemplate": false, + "count": 0, + "updated": 1509041430 + }, + { + "id": "7a6796d6-ce4c-4929-9c2f-efe2b7385027", "data": [ { "text": "I have drunk ", @@ -22,7 +36,7 @@ "updated": 1508067206 }, { - "id": "57dcac55-a8d9-4a95-9eb9-35e259ce9a2f", + "id": "db0b5d4c-796c-40b0-acec-d256a9e20e07", "data": [ { "text": "Log 1 ", @@ -44,7 +58,7 @@ "updated": 1508442034 }, { - "id": "724057c5-065d-4c1e-9eec-5e0448601348", + "id": "9ce5940e-d5ca-4fac-9421-86a519379bc9", "data": [ { "text": "Save ", diff --git a/Dialogflow/WaterLog/intents/update_settings.json b/Dialogflow/WaterLog/intents/update_settings.json new file mode 100755 index 0000000..3f8a7e2 --- /dev/null +++ b/Dialogflow/WaterLog/intents/update_settings.json @@ -0,0 +1,29 @@ +{ + "id": "3a53433e-407e-4a11-84ab-235975a9683e", + "name": "update_settings", + "auto": true, + "contexts": [], + "responses": [ + { + "resetContexts": false, + "action": "update_settings", + "affectedContexts": [], + "parameters": [], + "messages": [ + { + "type": 0, + "lang": "en", + "speech": [] + } + ], + "defaultResponsePlatforms": {}, + "speech": [] + } + ], + "priority": 500000, + "webhookUsed": true, + "webhookForSlotFilling": false, + "lastUpdate": 1509890949787, + "fallbackIntent": false, + "events": [] +} \ No newline at end of file diff --git a/Dialogflow/WaterLog/intents/update_settings_usersays_en.json b/Dialogflow/WaterLog/intents/update_settings_usersays_en.json new file mode 100755 index 0000000..6cd45a7 --- /dev/null +++ b/Dialogflow/WaterLog/intents/update_settings_usersays_en.json @@ -0,0 +1,74 @@ +[ + { + "id": "048303f0-f6dd-4108-bd29-70e26545b116", + "data": [ + { + "text": "Personalise experience", + "userDefined": false + } + ], + "isTemplate": false, + "count": 0, + "updated": 1509698507 + }, + { + "id": "26ddff28-74c1-4899-b239-e02456cf3350", + "data": [ + { + "text": "Personalise", + "userDefined": false + } + ], + "isTemplate": false, + "count": 0, + "updated": 1509698507 + }, + { + "id": "91981ef6-dedc-49e3-a308-3e7361423f69", + "data": [ + { + "text": "Update settings", + "userDefined": false + } + ], + "isTemplate": false, + "count": 0, + "updated": 1509698507 + }, + { + "id": "f57be89c-7d9d-40a9-b79d-ce3b723bffa5", + "data": [ + { + "text": "Setup", + "userDefined": false + } + ], + "isTemplate": false, + "count": 0, + "updated": 1509698507 + }, + { + "id": "c380f5c8-42f0-46ed-af06-999321835905", + "data": [ + { + "text": "Personalise settings", + "userDefined": false + } + ], + "isTemplate": false, + "count": 0, + "updated": 1509698507 + }, + { + "id": "b6c4d83b-08a1-417d-b75e-4e9bcdefaa4e", + "data": [ + { + "text": "Change settings", + "userDefined": false + } + ], + "isTemplate": false, + "count": 0, + "updated": 1509698507 + } +] \ No newline at end of file diff --git a/Dialogflow/WaterLog/intents/user_data.json b/Dialogflow/WaterLog/intents/user_data.json new file mode 100755 index 0000000..da3c8fb --- /dev/null +++ b/Dialogflow/WaterLog/intents/user_data.json @@ -0,0 +1,33 @@ +{ + "id": "01c85c57-6c8d-480c-a017-ddfad8812c65", + "name": "user_data", + "auto": true, + "contexts": [], + "responses": [ + { + "resetContexts": false, + "action": "user_data", + "affectedContexts": [], + "parameters": [], + "messages": [ + { + "type": 0, + "lang": "en", + "speech": [] + } + ], + "defaultResponsePlatforms": {}, + "speech": [] + } + ], + "priority": 500000, + "webhookUsed": true, + "webhookForSlotFilling": false, + "lastUpdate": 1509890949787, + "fallbackIntent": false, + "events": [ + { + "name": "actions_intent_PERMISSION" + } + ] +} \ No newline at end of file diff --git a/Dialogflow/WaterLog/intents/Default Welcome Intent.json b/Dialogflow/WaterLog/intents/welcome_user.json similarity index 90% rename from Dialogflow/WaterLog/intents/Default Welcome Intent.json rename to Dialogflow/WaterLog/intents/welcome_user.json index 1d69c9e..4cf744f 100755 --- a/Dialogflow/WaterLog/intents/Default Welcome Intent.json +++ b/Dialogflow/WaterLog/intents/welcome_user.json @@ -1,6 +1,6 @@ { "id": "883cceb6-2005-4b04-adeb-7febd81f1a24", - "name": "Default Welcome Intent", + "name": "welcome_user", "auto": true, "contexts": [], "responses": [ @@ -23,7 +23,7 @@ "priority": 500000, "webhookUsed": true, "webhookForSlotFilling": false, - "lastUpdate": 1508308657, + "lastUpdate": 1509656763429, "fallbackIntent": false, "events": [ {