Merge pull request #596 from SSWConsulting/561-new_fields_on_calendar…

…_card Add end date field
SSWConsulting · Aug 2, 2023 · 8b43155 · 8b43155
2 parents 2b907f5 + b0b5ab5
commit 8b43155
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 56 deletions.
diff --git a/.github/workflows/SSW.SophieBot.test.yml b/.github/workflows/SSW.SophieBot.test.yml
diff --git a/.../src/SSW.SophieBot.HttpClientComponents.PersonQuery/Actions/GetProfileWithStatusAction.cs b/.../src/SSW.SophieBot.HttpClientComponents.PersonQuery/Actions/GetProfileWithStatusAction.cs
@@ -7,6 +7,7 @@
 using SSW.SophieBot.HttpClientComponents.PersonQuery.Models;
 using System;
 using System.Linq;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -68,16 +69,7 @@ private EmployeeProfileWithStatusModel ConvertToProfile(GetEmployeeModel employe
                 LastName = employee.LastName,
                 BillableRate = employee.BillableRate,
                 BookedDays = EmployeesHelper.GetBookedDays(employee, date),
-                Appointments = EmployeesHelper.GetAppointments(employee.NormalizedAppointments, date, 10)
-                    .Select(a => new EmployeeProfileAppointment
-                    {
-                        Start = a.Start.DateTime.ToUserFriendlyDate(date),
-                        Duration = (a.End - a.Start).ToUserFriendlyDuration(),
-                        BookingStatus = EmployeesHelper.GetBookingStatus(a),
-                        Subject = a.Subject.Trim(),
-                        Regarding = a.Regarding.Trim()
-                    })
-                    .ToList()
+                Appointments = GetDisplayAppointments(EmployeesHelper.GetAppointments(employee.NormalizedAppointments, date, 10), date)
             };
 
             if (profile.BookingStatus == BookingStatus.Leave)
@@ -99,5 +91,40 @@ private EmployeeProfileWithStatusModel ConvertToProfile(GetEmployeeModel employe
 
             return profile;
         }
+
+        private List<EmployeeProfileAppointment> GetDisplayAppointments(IEnumerable<GetAppointmentModel> sourceAppointments, DateTime date)
+        {
+            var result = new List<EmployeeProfileAppointment>();
+            var appointment = new EmployeeProfileAppointment();
+            if (!sourceAppointments.Any())
+            {
+                return result;
+            }
+
+            foreach (var sourceAppointment in sourceAppointments.OrderBy(sa => sa.Start.DateTime))
+            {
+                if (appointment.Subject != sourceAppointment.Subject)
+                {
+                    appointment = new EmployeeProfileAppointment
+                    {
+                        Start = sourceAppointment.Start.DateTime.ToUserFriendlyDate(date),
+                        End = sourceAppointment.End.DateTime.ToUserFriendlyDate(date),
+                        Duration = (sourceAppointment.End - sourceAppointment.Start).ToUserFriendlyDuration(),
+                        BookingStatus = EmployeesHelper.GetBookingStatus(sourceAppointment),
+                        Subject = sourceAppointment.Subject.Trim(),
+                        Regarding = sourceAppointment.Regarding.Trim()
+                    };
+
+                    result.Add(appointment);
+                }
+                else
+                {
+                    appointment.End = sourceAppointment.End.DateTime.ToUserFriendlyDate(date);
+                    appointment.Duration = (sourceAppointment.End - sourceAppointment.Start).ToUserFriendlyDuration();
+                }
+            }
+
+            return result;
+        }
     }
 }
diff --git a/...-finder/src/SSW.SophieBot.HttpClientComponents.PersonQuery/Models/EmployeeProfileModel.cs b/...-finder/src/SSW.SophieBot.HttpClientComponents.PersonQuery/Models/EmployeeProfileModel.cs
@@ -65,6 +65,9 @@ public class EmployeeProfileAppointment
     {
         [JsonProperty("start")]
         public string Start { get; set; }
+
+        [JsonProperty("end")]
+        public string End { get; set; }
 
         [JsonProperty("duration")]
         public string Duration { get; set; }

diff --git a/bots/employee-finder/src/SSW.SophieBot/language-generation/en-us/agenda.en-us.lg b/bots/employee-finder/src/SSW.SophieBot/language-generation/en-us/agenda.en-us.lg
@@ -65,7 +65,20 @@
                     "items": [
                         {
                             "type": "TextBlock",
-                            "text": "Date",
+                            "text": "Start",
+                            "wrap": true,
+                            "weight": "Bolder"
+                        }
+                    ],
+                    "verticalContentAlignment": "Center"
+                },
+                {
+                    "type": "Column",
+                    "width": "stretch",
+                    "items": [
+                        {
+                            "type": "TextBlock",
+                            "text": "End",
                             "wrap": true,
                             "weight": "Bolder"
                         }
@@ -128,6 +141,19 @@
             ],
             "verticalContentAlignment": "Center"
         },
+        {
+            "type": "Column",
+            "width": "stretch",
+            "items": [
+                {
+                    "type": "TextBlock",
+                    "text": "${appointment.end}",
+                    "wrap": true,
+                    "size": "${ContentTextSize()}"
+                }
+            ],
+            "verticalContentAlignment": "Center"
+        },
         {
             "type": "Column",
             "width": "stretch",