Hospitality sample and skill changes

skills/src/csharp/experimental/eventskill/Content/EventCard.1.0.json

@@ -0,0 +1,77 @@
+{
+  "type": "AdaptiveCard",
+  "id": "EventCard",
+  "body": [
+    {
+      "type": "Container",
+      "items": [
+        {
+          "type": "ColumnSet",
+          "columns": [
+            {
+              "type": "Column",
+              "verticalContentAlignment": "Center",
+              "items": [
+                {
+                  "type": "TextBlock",
+                  "id": "title",
+                  "size": "Large",
+                  "weight": "Bolder",
+                  "color": "Dark",
+                  "text": "Local Event"
+                }
+              ],
+              "width": "stretch"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "type": "Image",
+      "url": "{ImageUrl}"
+    },
+    {
+      "type": "TextBlock",
+      "text": "**{Title}**",
+      "size": "Medium",
+      "weight": "Bolder"
+    },
+    {
+      "type": "Container",
+      "items": [
+        {
+          "type": "TextBlock",
+          "text": "{StartDate}",
+          "spacing": "Small"
+        },
+        {
+          "type": "TextBlock",
+          "text": "{Location}",
+          "spacing": "Small"
+        },
+        {
+          "type": "TextBlock",
+          "text": "{Price}",
+          "spacing": "Small"
+        }
+      ]
+    },
+    {
+      "type": "TextBlock",
+      "text": "Powered by **Eventbrite**",
+      "horizontalAlignment": "Right",
+      "size": "Small"
+    }
+  ],
+  "actions": [
+    {
+      "type": "Action.OpenUrl",
+      "title": "Get Tickets",
+      "url": "{Url}"
+    }
+  ],
+  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+  "version": "1.0",
+  "speak": "{Speak}"
+}

skills/src/csharp/experimental/eventskill/Dialogs/EventDialogBase.cs

@@ -12,10 +12,12 @@
 using Luis;
 using Microsoft.Bot.Builder;
 using Microsoft.Bot.Builder.Dialogs;
+using Microsoft.Bot.Builder.Dialogs.Choices;
 using Microsoft.Bot.Builder.Skills;
 using Microsoft.Bot.Builder.Solutions.Authentication;
 using Microsoft.Bot.Builder.Solutions.Responses;
 using Microsoft.Bot.Builder.Solutions.Util;
+using Microsoft.Bot.Connector;
 using Microsoft.Bot.Schema;
 
 namespace EventSkill.Dialogs
@@ -175,5 +177,16 @@ protected async Task HandleDialogExceptions(WaterfallStepContext sc, Exception e
             var state = await StateAccessor.GetAsync(sc.Context);
             state.Clear();
         }
+
+        // Get card that renders for adaptive card 1.0
+        protected string GetCardName(ITurnContext context, string name)
+        {
+            if (Channel.GetChannelId(context) == Channels.Msteams)
+            {
+                name += ".1.0";
+            }
+
+            return name;
+        }
     }
 }

skills/src/csharp/experimental/eventskill/Dialogs/FindEventsDialog.cs

@@ -95,7 +95,7 @@ private async Task<DialogTurnResult> FindEvents(WaterfallStepContext sc, Cancell
                     Url = item.Url
                 };
 
-                cards.Add(new Card("EventCard", eventCardData));
+                cards.Add(new Card(GetCardName(sc.Context, "EventCard"), eventCardData));
             }
 
             await sc.Context.SendActivityAsync(ResponseManager.GetCardResponse(FindEventsResponses.FoundEvents, cards, null));

skills/src/csharp/experimental/eventskill/Dialogs/MainDialog.cs

@@ -237,7 +237,7 @@ private async Task<InterruptionAction> OnLogout(DialogContext dc)
 
         private async Task PopulateStateFromSemanticAction(ITurnContext context)
         {
-            // Example of populating local state with data passed through semanticAction out of Activity
+            // Populating local state with data passed through semanticAction out of Activity
             var activity = context.Activity;
             var semanticAction = activity.SemanticAction;
             if (semanticAction != null && semanticAction.Entities.ContainsKey("location"))

skills/src/csharp/experimental/eventskill/EventSkill.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Remove="Content\EventCard.1.0.json" />
     <Content Remove="Content\EventCard.json" />
     <Content Remove="Responses\FindEvents\FindEventsResponses.json" />
     <Content Remove="Responses\Main\MainResponses.de.json" />
@@ -24,6 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Content\EventCard.1.0.json" />
     <EmbeddedResource Include="Content\EventCard.json" />
     <EmbeddedResource Include="Responses\FindEvents\FindEventsResponses.json" />
     <EmbeddedResource Include="Responses\Main\MainResponses.de.json" />

skills/src/csharp/experimental/eventskill/Models/EventSkillState.cs

@@ -11,7 +11,7 @@ public class EventSkillState
 
         public EventLuis LuisResult { get; set; }
 
-        public string CurrentCoordinates { get; internal set; }
+        public string CurrentCoordinates { get; set; }
 
         public void Clear()
         {

skills/src/csharp/experimental/hospitalityskill/Content/FoodItemCard.1.0.json

@@ -0,0 +1,51 @@
+{
+  "type": "AdaptiveCard",
+  "id": "FoodItemCard",
+  "body": [
+    {
+      "type": "ColumnSet",
+      "columns": [
+        {
+          "type": "Column",
+          "items": [
+            {
+              "type": "TextBlock",
+              "text": "{Quantity}",
+              "horizontalAlignment": "Center"
+            }
+          ],
+          "width": "auto"
+        },
+        {
+          "type": "Column",
+          "items": [
+            {
+              "type": "TextBlock",
+              "text": "{Name}"
+            },
+            {
+              "type": "TextBlock",
+              "text": "{SpecialRequest}",
+              "spacing": "None"
+            }
+          ],
+          "width": "stretch"
+        },
+        {
+          "type": "Column",
+          "items": [
+            {
+              "type": "TextBlock",
+              "text": "${Price}",
+              "horizontalAlignment": "Right"
+            }
+          ],
+          "width": "auto"
+        }
+      ]
+    }
+  ],
+  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+  "version": "1.0",
+  "speak": "{Speak}"
+}

skills/src/csharp/experimental/hospitalityskill/Content/FoodItemCard.json

@@ -14,7 +14,7 @@
               "horizontalAlignment": "Center"
             }
           ],
-          "width": "40px"
+          "width": 10
         },
         {
           "type": "Column",
@@ -30,7 +30,7 @@
               "spacing": "None"
             }
           ],
-          "width": "stretch"
+          "width": 70
         },
         {
           "type": "Column",
@@ -41,7 +41,7 @@
               "horizontalAlignment": "Right"
             }
           ],
-          "width": "auto"
+          "width": 20
         }
       ]
     }

skills/src/csharp/experimental/hospitalityskill/Content/FoodOrderCard.1.0.json

@@ -0,0 +1,71 @@
+{
+    "type": "AdaptiveCard",
+  "version": "1.0",
+    "id": "FoodOrderCard",
+    "body": [
+        {
+            "type": "Container",
+            "items": [
+                {
+                    "type": "ColumnSet",
+                    "columns": [
+                        {
+                            "type": "Column",
+                            "verticalContentAlignment": "Center",
+                            "items": [
+                                {
+                                    "type": "TextBlock",
+                                    "id": "title",
+                                    "size": "Large",
+                                    "weight": "Bolder",
+                                    "color": "Dark",
+                                    "text": "Current Order"
+                                }
+                            ],
+                            "width": "stretch"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+          "type": "Container",
+          "id":  "items",
+            "items": []
+        },
+        {
+            "type": "Container",
+            "items": [
+                {
+                    "type": "ColumnSet",
+                    "columns": [
+                        {
+                            "type": "Column",
+                            "items": [
+                                {
+                                    "type": "TextBlock",
+                                    "text": "Bill Total",
+                                    "horizontalAlignment": "Right"
+                                }
+                            ],
+                            "width": "stretch"
+                        },
+                        {
+                            "type": "Column",
+                            "items": [
+                                {
+                                    "type": "TextBlock",
+                                    "weight": "Bolder",
+                                    "text": "${BillTotal}",
+                                    "horizontalAlignment": "Right"
+                                }
+                            ],
+                            "width": "auto"
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "$schema": "http://adaptivecards.io/schemas/adaptive-card.json"
+}

skills/src/csharp/experimental/hospitalityskill/Content/FoodOrderCard.json

@@ -60,7 +60,7 @@
                                     "horizontalAlignment": "Center"
                                 }
                             ],
-                            "width": "40px"
+                            "width": 10
                         },
                         {
                             "type": "Column",
@@ -71,7 +71,7 @@
                                     "text": "Item"
                                 }
                             ],
-                            "width": "stretch"
+                            "width": 70
                         },
                         {
                             "type": "Column",
@@ -83,7 +83,7 @@
                                     "horizontalAlignment": "Right"
                                 }
                             ],
-                            "width": "auto"
+                            "width": 20
                         }
                     ]
                 }

skills/src/csharp/experimental/hospitalityskill/Content/MenuCard.1.0.json

@@ -0,0 +1,45 @@
+{
+  "type": "AdaptiveCard",
+  "id": "MenuCard",
+  "body": [
+    {
+      "type": "Container",
+      "items": [
+        {
+          "type": "ColumnSet",
+          "columns": [
+            {
+              "type": "Column",
+              "verticalContentAlignment": "Center",
+              "items": [
+                {
+                  "type": "TextBlock",
+                  "id": "title",
+                  "size": "Large",
+                  "weight": "Bolder",
+                  "color": "Dark",
+                  "text": "{Type} Menu"
+                }
+              ],
+              "width": "stretch"
+            }
+          ]
+        },
+        {
+          "type": "TextBlock",
+          "text": "{TimeAvailable}",
+          "weight": "Bolder",
+          "color": "Dark"
+        }
+      ]
+    },
+    {
+      "type": "Container",
+      "id": "items",
+      "items": []
+    }
+  ],
+  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+  "version": "1.0",
+  "speak": "{Speak}"
+}