Merge branch 'master' of https://tfs.nuvolar.hu:8443/tfs/AtomERP/_git/WorkFlowCheck

src/WorkFlowCheck.API/appsettings.Development.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=WS2016DC\\SQLEXPRESS;Initial Catalog=WFCUAT;Integrated Security=True;Connect Timeout=30;Encrypt=False;Trust Server Certificate=False;Application Intent=ReadWrite;Multi Subnet Failover=False"
+    "DefaultConnection": "Data Source=WS2016DC\\SQLEXPRESS;Initial Catalog=WFC;Integrated Security=True;Connect Timeout=30;Encrypt=False;Trust Server Certificate=False;Application Intent=ReadWrite;Multi Subnet Failover=False"
   },
   "Logging": {
     "LogLevel": {

src/WorkFlowCheck.BL/Services/CheckListService.cs

@@ -262,6 +262,7 @@ namespace WorkFlowCheck.BL.Services
                 SablonGenerator gen = new SablonGenerator(byteArray);
 
                 gen.SimpleReplace("#DocumentNumber#", checkListHeader.DocumentNumber);
+                gen.SimpleReplace("#Description#", checkListHeader.Description);
                 gen.SimpleReplace("#DateExecution#", checkListHeader.DateExecution.ToString("yyyy.MM.dd HH:mm"));
                 gen.SimpleReplace("#WorkUser#", $"{checkListHeader.UserDTO?.LastName} {checkListHeader.UserDTO?.FirstName}");
                 gen.SimpleReplace("#AcceptUser#", $"{checkListHeader.AcceptUserDTO?.LastName} {checkListHeader.AcceptUserDTO?.FirstName}");

src/WorkFlowCheck.BL/Services/MessageService.cs

@@ -70,7 +70,7 @@ namespace WorkFlowCheck.BL.Services
                     }
                     else
                     {
-                        FCMToken.LastModAt = DateTime.UtcNow;  
+                        FCMToken.LastModAt = DateTime.UtcNow;
                     }
                     await _dbContext.SaveChangesAsync();
                 }
@@ -130,6 +130,13 @@ namespace WorkFlowCheck.BL.Services
                         {
                             title = fCMMessageDTO.Title,
                             body = fCMMessageDTO.Body,
+                        },
+                        android = new
+                        {
+                            notification = new
+                            {
+                                channel_id = "com.nuvolar.wfcapp.general"
+                            }
                         }
                     }
                 };

src/WorkFlowCheck.Web/Helpers/SystemHelper.cs

@@ -7,7 +7,7 @@ namespace WorkFlowCheck.Web.Helpers
     public static class SystemHelper
     {
         public static string DatabaseName = "";
-        public static string ProgramVersion = "v1.1.023";
+        public static string ProgramVersion = "v1.1.024";
 
         public async static Task GetAPIInfoAsync(IConfiguration configuration)
         {

src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderEditPage.cshtml.cs

@@ -52,7 +52,7 @@ namespace WorkFlowCheck.Web.Pages.CheckList.CheckListHeader
                 CheckListHeaderInfoDTO.EmptyAnswerCount = result.EmptyAnswerCount;
                 if (CheckListHeaderInfoDTO.TotalRowCount > 0)
                 {
-                    CheckListHeaderInfoDTO.ReadyPercent = ((CheckListHeaderInfoDTO.TotalRowCount - CheckListHeaderInfoDTO.EmptyAnswerCount) / CheckListHeaderInfoDTO.TotalRowCount * 100)
+                    CheckListHeaderInfoDTO.ReadyPercent = ((double)(CheckListHeaderInfoDTO.TotalRowCount - CheckListHeaderInfoDTO.EmptyAnswerCount) / CheckListHeaderInfoDTO.TotalRowCount * 100)
                                                                .ToString("0.00", new CultureInfo("hu-HU")) + " %"; ;
                 }
             }