[Calendar] Merge next meeting flow into summary flow (#478)

* merge next and summary flow

* update luis model

* fix exception

* fix summary and next meeting test

Author: KayMKM

solutions/Virtual-Assistant/src/csharp/skills/calendarskill/CalendarSkill.csproj

@@ -56,11 +56,6 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>CalendarMainResponses.tt</DependentUpon>
     </Compile>
-    <Compile Update="Dialogs\NextMeeting\Resources\NextMeetingResponses.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>NextMeetingResponses.tt</DependentUpon>
-    </Compile>
     <Compile Update="Dialogs\Shared\Resources\CalendarSharedResponses.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -122,10 +117,6 @@
       <LastGenOutput>CalendarMainResponses.cs</LastGenOutput>
       <Generator>TextTemplatingFileGenerator</Generator>
     </None>
-    <None Update="Dialogs\NextMeeting\Resources\NextMeetingResponses.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>NextMeetingResponses.cs</LastGenOutput>
-    </None>
     <None Update="Dialogs\Shared\Resources\CalendarSharedResponses.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>CalendarSharedResponses.cs</LastGenOutput>
@@ -172,12 +163,6 @@
     <Content Update="Dialogs\Main\Resources\CalendarMainResponses.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Update="Dialogs\NextMeeting\Resources\NextMeetingResponses.zh.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Dialogs\NextMeeting\Resources\NextMeetingResponses.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Update="Dialogs\Shared\Resources\CalendarSharedResponses.zh.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

solutions/Virtual-Assistant/src/csharp/skills/calendarskill/CognitiveModels/LUIS/de/calendar.lu

@@ -1,4 +1,4 @@
-> ! Automatically generated by [LUDown CLI](https://github.com/Microsoft/botbuilder-tools/tree/master/Ludown), Mon Dec 10 2018 11:31:06 GMT+0800 (China Standard Time)
+> ! Automatically generated by [LUDown CLI](https://github.com/Microsoft/botbuilder-tools/tree/master/Ludown), Wed Dec 19 2018 19:35:25 GMT+0800 (China Standard Time)
 
 > ! Source LUIS JSON file: .\calendar.json
 
@@ -545,6 +545,7 @@
 - check my {DestinationCalendar=family} calendar
 - check my {RelationshipName=mom} 's schedule
 - check {ContactName=sally} 's calendar for {FromDate=this weekend}
+- {AskParameter=detailed information about} the {OrderReference=next} meeting
 - do i have any appointments {FromDate=today}
 - do i have any meetings {FromDate=today}
 - do i have anything from {FromTime=11} to {ToTime=2}
@@ -553,22 +554,41 @@
 - do i have events {FromDate=tomorrow} {FromTime=night}
 - find the meeting {FromTime=around 5 to 8pm}
 - find the meeting with {ContactName=jennifer}
+- find the {OrderReference=next} meeting
 - get my meetings {FromDate=tomorrow}
+- get to my {OrderReference=next} event
+- give me details of the {OrderReference=next} appointment
+- {AskParameter=how long is} my {OrderReference=next} appointment
+- {AskParameter=how long is} my {OrderReference=next} event
+- {AskParameter=how long is} my {OrderReference=next} meeting
+- i need to know about my {OrderReference=next} appointment
+- is {ContactName=jenny} going to be at the {OrderReference=next} meeting
+- is {ContactName=tony} participating {OrderReference=next} meeting
+- list the attendees of the {OrderReference=next} meeting
+- locate the {OrderReference=next} appointment
+- location of the {OrderReference=next} appointment
+- look up my {OrderReference=next} appointment for me
+- my {OrderReference=next} meeting with {ContactName=tony} {AskParameter=is when}
+- {OrderReference=next} meeting
 - obtain the appointment with {ContactName=sarah}
 - show {ContactName=cheyennes} calendar
 - show me {ContactName=karen} 's calendar for {FromDate=monday}
 - show me {ContactName=mitch} 's schedule for {FromDate=friday}
 - show me my calendar
 - show me my calendar for {FromDate=monday}
 - show me my {DestinationCalendar=google} calendar
+- show me my {OrderReference=next} meeting
 - show me my schedule
 - show me {ContactName=steve} 's calendar
 - show me the calendar
+- show me where my {OrderReference=next} appointment is
 - show my calendar
 - show my meeting
 - show my meetings {FromDate=tomorrow}
 - show my schedule at {FromTime=night}
+- tell me about my {OrderReference=next} meeting
 - tell me the events scheduled at calendar {Location=constitution hall}
+- the {OrderReference=next} appointment after that
 - view {ContactName=bob} calendar
 - view {ContactName=lisa} 's calendar
 - what ' s after that on my calendar
@@ -577,12 +597,16 @@
 - what ' s in my calendar for {FromDate=today}
 - what ' s my {PositionReference=1st} appointment {FromDate=tomorrow}
 - what ' s my {PositionReference=1st} meeting {FromDate=tomorrow}
+- what ' s my {OrderReference=next} appointment
+- what ' s my {OrderReference=next} meeting
 - what ' s my schedule for {FromDate=tomorrow}
 - what ' s my schedule like {FromDate=tomorrow}
 - what ' s my schedule {FromDate=tomorrow}
+- what ' s {OrderReference=next} on my calendar
 - what ' s on my calendar
 - what ' s on my calendar for {FromDate=today}
 - what ' s on my calendar {FromDate=today}
+- what ' s on my {OrderReference=next} meeting
 - what ' s on my schedule
 - what ' s on my schedule for {FromDate=tomorrow}
 - what ' s on my schedule {FromDate=today}
@@ -594,6 +618,8 @@
 - what are my appointments for {FromDate=this week}
 - what are my appointments {FromDate=today}
 - what are my meetings at {FromTime=night}
+- what are my meetings today
+- what can i accomplish today
 - what do i have for {FromDate=today}
 - what do i have from {FromTime=2} to {ToTime=4} on {ToDate=saturday}
 - what do i have from {FromDate=monday} through {ToDate=wednesday}
@@ -612,17 +638,64 @@
 - what is {ContactName=clarence} doing on {FromDate=monday} at {FromTime=noon}
 - what is {ContactName=jim} 's schedule {FromDate=this week}
 - what is my {PositionReference=1st} meeting {FromDate=today}
+- what is my meeting summary today
+- what is my meeting today
+- what is my {OrderReference=next} appointment
+- what is my {OrderReference=next} event
+- what is my {OrderReference=next} meeting
+- what is my {OrderReference=next} schedule
 - what is my schedule for {FromDate=tomorrow}
 - what is my schedule {FromDate=tomorrow}
+- what is {OrderReference=next} in calendar
+- what is on my calendar
 - what is on my calendar {FromDate=today}
 - what is {ContactName=paul} doing {FromDate=today}
+- {AskParameter=what is} the location of {OrderReference=next} meeting
 - what is the schedule before that
 - what meetings do i have {FromDate=next week}
+- what should i do today
+- {AskParameter=what time is} my {OrderReference=next} appointment
 - what was my {PositionReference=first} appointment
 - what's going on {FromDate=this week}
 - what's happening {FromDate=tomorrow}
 - what's my {PositionReference=first} meeting {FromDate=tomorrow}
 - what's on my schedule {FromDate=next week}
+- {AskParameter=when ' s} my {OrderReference=next} appointment
+- when ' s my {OrderReference=next} {Subject=doctors appointment}
+- {AskParameter=when ' s} my {OrderReference=next} meeting
+- {AskParameter=when and where is} my {OrderReference=next} meeting
+- {AskParameter=when is} my {OrderReference=next} appointment
+- {AskParameter=when is} my {OrderReference=next} appointment with {ContactName=lucas}
+- {AskParameter=when is} my {OrderReference=next} event
+- when is my {OrderReference=next} {Subject=hair cut} appointment
+- {AskParameter=when is} my {OrderReference=next} meeting
+- {AskParameter=when is} my {OrderReference=next} meeting with miss {ContactName=pierre}
+- when is my {OrderReference=next} meeting with ms {ContactName=pierre}
+- {AskParameter=when is} my {OrderReference=next} meeting with {ContactName=paul}
+- {AskParameter=when is} my {OrderReference=next} {Subject=trip to kew garde}
+- {AskParameter=when is} the {OrderReference=next} {Subject=dentist appointment}
+- when's my {OrderReference=next} appointment
+- {AskParameter=when's} my {OrderReference=next} {Subject=trip}
+- {AskParameter=where ' s} my {OrderReference=next} appointment
+- where ' s my {OrderReference=next} meeting
+- where do i have to be {OrderReference=next}
+- where do i need to be {OrderReference=next}
+- {AskParameter=where is} my {OrderReference=next} appointment
+- {AskParameter=where is} my {OrderReference=next} appointment with miss {ContactName=pierre}
+- where is my {OrderReference=next} appointment with {ContactName=ms pierre}
+- where is my {OrderReference=next} {Subject=dentist appointment}
+- {AskParameter=where is} my {OrderReference=next} event
+- {AskParameter=where is} my {OrderReference=next} meeting
+- {AskParameter=where is} my {OrderReference=next} meeting with ms {ContactName=pierre}
+- {AskParameter=where's} my {OrderReference=next} meeting
+- which is my {OrderReference=next} event
+- which will be my {OrderReference=next} {Subject=flight}
+- {AskParameter=who all will be present} at the {OrderReference=next 5} meetings
+- {AskParameter=who do i have} {OrderReference=next}
+- who is in my {OrderReference=next} meeting
+- will {ContactName=tony} be at my {OrderReference=next} meeting
+- will {ContactName=tony} be at {OrderReference=next} meeting
+- will {ContactName=tony} be attending my {OrderReference=next} meeting
 
 
 ## FindCalendarWhen
@@ -875,76 +948,6 @@
 - we should go back
 
 
-## NextMeeting
-- {AskParameter=detailed information about} the {OrderReference=next} meeting
-- find the {OrderReference=next} meeting
-- get to my {OrderReference=next} event
-- give me details of the {OrderReference=next} appointment
-- {AskParameter=how long is} my {OrderReference=next} appointment
-- {AskParameter=how long is} my {OrderReference=next} event
-- {AskParameter=how long is} my {OrderReference=next} meeting
-- i need to know about my {OrderReference=next} appointment
-- is {ContactName=jenny} going to be at the {OrderReference=next} meeting
-- is {ContactName=tony} participating next meeting
-- list the attendees of the {OrderReference=next} meeting
-- locate the {OrderReference=next} appointment
-- location of the {OrderReference=next} appointment
-- look up my {OrderReference=next} appointment for me
-- my {OrderReference=next} meeting with {ContactName=tony} {AskParameter=is when}
-- {OrderReference=next} meeting
-- show me my {OrderReference=next} meeting
-- show me where my {OrderReference=next} appointment is
-- tell me about my {OrderReference=next} meeting
-- the {OrderReference=next} appointment after that
-- what ' s my {OrderReference=next} appointment
-- what ' s my {OrderReference=next} meeting
-- what ' s {OrderReference=next} on my calendar
-- what ' s on my {OrderReference=next} meeting
-- what is my {OrderReference=next} appointment
-- what is my next event
-- what is my next meeting
-- what is my next schedule
-- what is {OrderReference=next} in calendar
-- {AskParameter=what is} the location of {OrderReference=next} meeting
-- {AskParameter=what time is} my {OrderReference=next} appointment
-- {AskParameter=when ' s} my {OrderReference=next} appointment
-- when ' s my {OrderReference=next} {Subject=doctors appointment}
-- {AskParameter=when ' s} my {OrderReference=next} meeting
-- {AskParameter=when and where is} my {OrderReference=next} meeting
-- {AskParameter=when is} my {OrderReference=next} appointment
-- {AskParameter=when is} my {OrderReference=next} appointment with {ContactName=lucas}
-- {AskParameter=when is} my {OrderReference=next} event
-- when is my {OrderReference=next} {Subject=hair cut} appointment
-- {AskParameter=when is} my {OrderReference=next} meeting
-- {AskParameter=when is} my {OrderReference=next} meeting with miss {ContactName=pierre}
-- when is my {OrderReference=next} meeting with ms {ContactName=pierre}
-- {AskParameter=when is} my {OrderReference=next} meeting with {ContactName=paul}
-- {AskParameter=when is} my {OrderReference=next} {Subject=trip to kew garde}
-- {AskParameter=when is} the {OrderReference=next} {Subject=dentist appointment}
-- when's my {OrderReference=next} appointment
-- {AskParameter=when's} my {OrderReference=next} {Subject=trip}
-- {AskParameter=where ' s} my {OrderReference=next} appointment
-- where ' s my {OrderReference=next} meeting
-- where do i have to be {OrderReference=next}
-- where do i need to be {OrderReference=next}
-- {AskParameter=where is} my {OrderReference=next} appointment
-- {AskParameter=where is} my {OrderReference=next} appointment with miss {ContactName=pierre}
-- where is my {OrderReference=next} appointment with {ContactName=ms pierre}
-- where is my {OrderReference=next} {Subject=dentist appointment}
-- {AskParameter=where is} my {OrderReference=next} event
-- {AskParameter=where is} my {OrderReference=next} meeting
-- {AskParameter=where is} my {OrderReference=next} meeting with ms {ContactName=pierre}
-- {AskParameter=where's} my {OrderReference=next} meeting
-- which is my {OrderReference=next} event
-- which will be my {OrderReference=next} {Subject=flight}
-- {AskParameter=who all will be present} at the {OrderReference=next 5} meetings
-- {AskParameter=who do i have} {OrderReference=next}
-- who is in my {OrderReference=next} meeting
-- will {ContactName=tony} be at my {OrderReference=next} meeting
-- will {ContactName=tony} be at {OrderReference=next} meeting
-- will {ContactName=tony} be attending my {OrderReference=next} meeting
-
-
 ## NoLocation
 - no location
 - none
@@ -993,15 +996,6 @@
 - third one
 
 
-## Summary
-- what are my meetings today
-- what can i accomplish today
-- what is my meeting summary today
-- what is my meeting today
-- what is on my calendar
-- what should i do today
-
-
 ## TimeRemaining
 - can you show me the time remaining before my {OrderReference=next} appointment
 - check on the time to see when i go to {Location=school} and {Subject=pick up luca}