Merge pull request #29 from GGrouppFoundation/feature/improve-date-timesheets-flow

Change timesheet set message

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.4</Version>
+    <Version>1.5.5</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Application' " />

src/DateTimesheet.Get/Step.DrawTimesheetSet/DrawActivity.cs

@@ -76,7 +76,7 @@ private static List<AdaptiveElement> CreateAdaptiveBody(IChatFlowContext<DateTim
     {
         var adaptiveElements = new List<AdaptiveElement>
         {
-            CreateAdaptiveTimesheetRow(context.FlowState.GetDurationSum(), $"Всего {context.FlowState.Date.ToStringRussianCulture()}")
+            CreateAdaptiveTimesheetRow(context.FlowState.GetDurationSum(), $"Всего за {context.FlowState.Date.ToStringRussianCulture()}")
         };
 
         if (context.FlowState.Timesheets is null)
@@ -169,7 +169,8 @@ private static string BuildText(IChatFlowContext<DateTimesheetFlowState> context
         var flowState = context.FlowState;
 
         var textBuilder = new StringBuilder().AppendRow(
-            flowState.GetDurationSum().ToDurationStringRussianCulture(true), context.EncodeTextWithStyle(flowState.Date.ToStringRussianCulture(), BotTextStyle.Bold));
+            flowState.GetDurationSum().ToDurationStringRussianCulture(true),
+            context.EncodeTextWithStyle($"Всего за {context.FlowState.Date.ToStringRussianCulture()}", BotTextStyle.Bold));
 
         if (context.FlowState.Timesheets?.Count is not > 0)
         {
@@ -204,7 +205,7 @@ private static string BuildTelegramText(IChatFlowContext<DateTimesheetFlowState>
         var flowState = context.FlowState;
 
         var textBuilder = new StringBuilder().AppendRow(
-            flowState.GetDurationSum().ToDurationStringRussianCulture(true), $"<b>{flowState.Date.ToStringRussianCulture()}</b>");
+            flowState.GetDurationSum().ToDurationStringRussianCulture(true), $"<b>Всего за {flowState.Date.ToStringRussianCulture()}</b>");
 
         if (context.FlowState.Timesheets?.Count is not > 0)
         {