Merge pull request #629 from SSWConsulting/610_who_is_in_office_now

Enhance "Who is in office now?"
SSWConsulting · Sep 11, 2023 · ac41c1b · ac41c1b
2 parents e336456 + 1691178
commit ac41c1b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 13 deletions.
diff --git a/...ot/dialogs/GetCurrentEmployeesOnLocationDialog/GetCurrentEmployeesOnLocationDialog.dialog b/...ot/dialogs/GetCurrentEmployeesOnLocationDialog/GetCurrentEmployeesOnLocationDialog.dialog
@@ -253,11 +253,29 @@
               "condition": "=exists(turn.employees) && count(turn.employees) > 0",
               "elseActions": [
                 {
-                  "$kind": "Microsoft.SendActivity",
+                  "$kind": "Microsoft.IfCondition",
                   "$designer": {
-                    "id": "MfjfA1"
+                    "id": "s2MaxH"
                   },
-                  "activity": "${SendActivity_MfjfA1()}"
+                  "condition": "=exists(dialog.locationEntitty)",
+                  "actions": [
+                    {
+                      "$kind": "Microsoft.SendActivity",
+                      "$designer": {
+                        "id": "xUKqy3"
+                      },
+                      "activity": "${SendActivity_xUKqy3()}"
+                    }
+                  ],
+                  "elseActions": [
+                    {
+                      "$kind": "Microsoft.SendActivity",
+                      "$designer": {
+                        "id": "1H6iXy"
+                      },
+                      "activity": "${SendActivity_1H6iXy()}"
+                    }
+                  ]
                 }
               ],
               "actions": [

diff --git a/...esOnLocationDialog/language-generation/en-us/GetCurrentEmployeesOnLocationDialog.en-us.lg b/...esOnLocationDialog/language-generation/en-us/GetCurrentEmployeesOnLocationDialog.en-us.lg
@@ -9,13 +9,6 @@
 # SendActivity_5SdoY2_text()
 - ${ErrorMessage()}
 
-# SendActivity_MfjfA1()
-[Activity
-    Text = ${SendActivity_MfjfA1_text()}
-]
-
-# SendActivity_MfjfA1_text()
-- I couldn't find anyone in the **${dialog.locationEntity}** office at this time.
 # SendActivity_WXpguy()
 [Activity
     Attachments = ${json(PeopleListByBilled(
@@ -46,4 +39,18 @@
 ]
 
 # LogAction_Text_X1smd9_text()
-- [Debug] - dialog.locationEntity = ${dialog.locationEntity}
+- [Debug] - dialog.locationEntity = ${dialog.locationEntity}
+
+# SendActivity_xUKqy3_text()
+- I couldn't find anyone in the **${dialog.locationEntity}** office at this time.
+# SendActivity_xUKqy3()
+[Activity
+    Text = ${SendActivity_xUKqy3_text()}
+]
+
+# SendActivity_1H6iXy_text()
+- I couldn't find anyone in any of the offices at this time.
+# SendActivity_1H6iXy()
+[Activity
+    Text = ${SendActivity_1H6iXy_text()}
+]
diff --git a/bots/employee-finder/src/SSW.SophieBot/language-understanding/en-us/SSWSophieBot.en-us.lu b/bots/employee-finder/src/SSW.SophieBot/language-understanding/en-us/SSWSophieBot.en-us.lu
@@ -3,8 +3,6 @@
 		- on
 	- for:
 		- for
-	- in:
-		- in
 
 @ list goodbye = 
 	- goodbye:
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,6 @@ @@
     		- on
     	- for:
     		- for
-    	- in:
-    		- in
     @ list goodbye =
     	- goodbye:
@@ Expand Down @@