Merge pull request #25 from GGrouppFoundation/feature/improve-date-steps

Feature/improve date steps

Author: pmosk

src/Application/Application.csproj

@@ -8,7 +8,7 @@
     <InvariantGlobalization>false</InvariantGlobalization>
     <RootNamespace>GGroupp.Internal.Timesheet</RootNamespace>
     <AssemblyName>GGroupp.Internal.Timesheet.Bot.Application</AssemblyName>
-    <Version>1.5.1-preview.2</Version>
+    <Version>1.5.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Application' " />

src/Utility.Date.Get/TimesheetDateGetFlowStep.cs

@@ -9,6 +9,8 @@ namespace GGroupp.Internal.Timesheet;
 
 public static class TimesheetDateGetFlowStep
 {
+    private const int DaySuggestionsCount = 7;
+
     public static ChatFlow<TFlowState> AwaitTimesheetDate<TFlowState>(
         this ChatFlow<TFlowState> chatFlow, string propertyDisplayName, Func<TFlowState, DateOnly, TFlowState> mapFlowState)
     {
@@ -30,7 +32,7 @@ private static DateStepOption InnerCreateOptions<TFlowState>(IChatFlowContext<TF
             invalidDateText: "Не удалось распознать дату",
             DateOnly.FromDateTime(DateTime.Now),
             placeholder: "дд.мм.гг",
-            suggestions: context.CreateSuggestions(7));
+            suggestions: context.CreateSuggestions(DaySuggestionsCount));
 
     private static string GetDateText(ITurnContext context)
     {
@@ -43,10 +45,15 @@ private static string GetDateText(ITurnContext context)
 
         if (context.IsTelegramChannel())
         {
-            textBuilder.Append(' ').Append("или выберите день недели");
+            var lastDay = DateOnly.FromDateTime(DateTime.Now);
+            var firstDay = lastDay.AddDays(1 - DaySuggestionsCount);
+
+            textBuilder.Append(' ').Append($"или выберите день недели с {ToString(firstDay)} по {ToString(lastDay)}");
         }
 
         return textBuilder.ToString();
+
+        static string ToString(DateOnly date) => date.ToStringRussianCulture("dd.MM");
     }
 
     private static IReadOnlyCollection<KeyValuePair<string, DateOnly>> CreateSuggestions(this ITurnContext context, int count)
@@ -61,6 +68,6 @@ private static IReadOnlyCollection<KeyValuePair<string, DateOnly>> CreateSuggest
 
         static KeyValuePair<string, DateOnly> CreateSuggestion(DateOnly date)
             =>
-            new(date.GetRussianCultureDayOfWeekName(), date);
+            new(date.ToStringRussianCulture("ddd"), date);
     }
 }

src/Utility.Date.Get/TimesheetDateGetUIHelper.cs

@@ -15,7 +15,7 @@ public static string ToStringRussianCulture(this DateOnly date)
         =>
         date.ToString("d MMMM yyyy", RussianCultureInfo);
 
-    public static string GetRussianCultureDayOfWeekName(this DateOnly date)
+    internal static string ToStringRussianCulture(this DateOnly date, string format)
         =>
-        date.ToString("ddd", RussianCultureInfo);
+        date.ToString(format, RussianCultureInfo);
 }