From 8cb760e4a40bd09c7434519acfee4a8f73c689e2 Mon Sep 17 00:00:00 2001
From: Nguyen Dinh Thuan <thuan.nguyendinh@hust.edu.vn>
Date: Fri, 20 Sep 2024 19:50:58 +0700
Subject: [PATCH] =?UTF-8?q?-=20T=C4=83ng=20th=E1=BB=9Di=20gian=20hi?=
 =?UTF-8?q?=E1=BB=87n=20Reset=20Counter=20-=20S=E1=BB=ADa=20l=E1=BA=A1i=20?=
 =?UTF-8?q?Task=20g=E1=BB=ADi=20d=E1=BB=AF=20li=E1=BB=87u?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 API/APIModels.cs                   | 1 -
 Admin/AdminConfigurationUC.xaml.cs | 4 ++--
 Admin/UserManageUC.xaml            | 4 ++--
 DepositSMUCv2.xaml.cs              | 5 ++++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/API/APIModels.cs b/API/APIModels.cs
index 1f193ce..b86a4cd 100644
--- a/API/APIModels.cs
+++ b/API/APIModels.cs
@@ -171,7 +171,6 @@ namespace SafeBagDE70.API
                 {
                     var json = JsonConvert.SerializeObject(deviceStatus);
                     var _deviceStatus = JsonConvert.DeserializeObject<DeviceStatus>(json);
-                    _deviceStatus.DeviceTime = DateTime.Now;
 
                     HttpClientHandler clientHandler = new HttpClientHandler();
                     clientHandler.ServerCertificateCustomValidationCallback = (sender, cert, chain, sslPolicyErrors) => { return true; };
diff --git a/Admin/AdminConfigurationUC.xaml.cs b/Admin/AdminConfigurationUC.xaml.cs
index 499f5e0..54ca162 100644
--- a/Admin/AdminConfigurationUC.xaml.cs
+++ b/Admin/AdminConfigurationUC.xaml.cs
@@ -43,7 +43,7 @@ namespace SafeBagDE70.Admin
                 ((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen();
                 Task.Run(() =>
                 {
-                    Thread.Sleep(5000);
+                    Thread.Sleep(30000);
                     Dispatcher.Invoke(() =>
                     {
                         lblCounterStatus.Text = "";
@@ -83,7 +83,7 @@ namespace SafeBagDE70.Admin
                     ((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen();
                     Task.Run(() =>
                     {
-                        Thread.Sleep(2000);
+                        Thread.Sleep(10000);
                         Dispatcher.Invoke(() =>
                         {
                             lblCounterStatus.Text = "";
diff --git a/Admin/UserManageUC.xaml b/Admin/UserManageUC.xaml
index 8c98663..cf53d49 100644
--- a/Admin/UserManageUC.xaml
+++ b/Admin/UserManageUC.xaml
@@ -8,8 +8,8 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <Button Content="TẢI D/S GIAN HÀNG" Width="200" Margin="10" x:Name="btnGetUsers" Click="btnGetUsers_Click"/>
-            <Button Content="ĐỒNG BỘ GIAO DỊCH LÊN SERVER" Width="200" Margin="10" x:Name="btnSyncTransaction" Click="btnSyncTransaction_Click"/>
+            <Button Content="TẢI D/S GIAN HÀNG" Width="300" Margin="10" x:Name="btnGetUsers" Click="btnGetUsers_Click"/>
+            <Button Content="ĐỒNG BỘ GIAO DỊCH LÊN SERVER" Width="300" Margin="10" x:Name="btnSyncTransaction" Click="btnSyncTransaction_Click"/>
             <Label x:Name="lblStatus"/>
         </StackPanel>
     </Grid>
diff --git a/DepositSMUCv2.xaml.cs b/DepositSMUCv2.xaml.cs
index 0a243df..fcdc5d8 100644
--- a/DepositSMUCv2.xaml.cs
+++ b/DepositSMUCv2.xaml.cs
@@ -1064,7 +1064,10 @@ namespace SafeBagDE70
                     }
                     else
                     {
-                         str = $"PHIÊN GIAO DỊCH KHÔNG HỢP LỆ (SỐ TIỀN GIAO DỊCH KHÔNG KHỚP), VUI LÒNG BÁO CÁO LẠI CHI NHÁNH\r\n MÃ GD: {AppData.GetTransactionCode}";
+                         str = $"PHIÊN GIAO DỊCH KHÔNG HỢP LỆ (SỐ TIỀN GIAO DỊCH KHÔNG KHỚP), VUI LÒNG BÁO CÁO LẠI CHI NHÁNH" +
+                            $"\r\n MÃ GD: {AppData.GetTransactionCode()} " +
+                            $"\r\nMÁY: {Environment.MachineName}" +
+                            $"\r\nMÃ NV: {AppData.CurrentCustomerAccount.CustomerId}";
                         Log.Information(str);
                         ShowError(str);
                     }