From 9963e92880dac96f205f329401cb10eac660655a Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Mon, 19 Aug 2024 07:02:13 +0200
Subject: [PATCH] TransferToDriver Price fix

---
 .../User/Drivers/DriverManageTransfers.razor  | 47 ++++++++++---------
 .../TransferToDriverGridComponent.razor       |  4 +-
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
index bead1e87..a9e02353 100644
--- a/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
@@ -91,6 +91,30 @@
                         </Items>
                     </DxAccordion>
                 </DxTabPage>
+                
+                <DxTabPage Text="Calendar">
+                    <div class="d-flex flex-column mb-4 pb-2">
+                        <DxScheduler @bind-StartDate="@StartDate"
+                                     DataStorage="@_dataStorage"
+                                     CssClass="w-100">
+                            <DxSchedulerTimelineView Duration="@TimeSpan.FromHours(48)" CellMinWidth="80">
+                                <Scales>
+                                    <DxSchedulerTimeScale Unit="@SchedulerTimeScaleUnit.Day" UnitCount="1"></DxSchedulerTimeScale>
+                                    <DxSchedulerTimeScale Unit="@SchedulerTimeScaleUnit.Hour" UnitCount="2"></DxSchedulerTimeScale>
+                                </Scales>
+                            </DxSchedulerTimelineView>
+                            <DxSchedulerWeekView ShowWorkTimeOnly="false"></DxSchedulerWeekView>
+                            <DxSchedulerDayView DayCount="1" ShowWorkTimeOnly="false"></DxSchedulerDayView>
+                        </DxScheduler>
+                    </div>
+                </DxTabPage>
+                
+                <DxTabPage Text="Messages">
+                    <div class="d-flex flex-column mb-4 pb-2">
+                        <MessageDetailGridComponent ContextId="driverId" GetAllMessageTag="SignalRTags.GetTransfersMessagesByDriverId" IsSenderEmailVisible="false" IsMessageTextVisible="false"></MessageDetailGridComponent>
+                    </div>
+                </DxTabPage>
+
                 <DxTabPage Text="Problems">
                     <DxAccordion ExpandMode="ExpandMode"
                                  ExpandCollapseAction="ExpandCollapseAction"
@@ -112,22 +136,7 @@
                 </DxTabPage>
 
 
-                <DxTabPage Text="Calendar">
-                    <div class="d-flex flex-column mb-4 pb-2">
-                        <DxScheduler @bind-StartDate="@StartDate"
-                                     DataStorage="@_dataStorage"
-                                     CssClass="w-100">
-                            <DxSchedulerTimelineView Duration="@TimeSpan.FromHours(48)" CellMinWidth="80">
-                                <Scales>
-                                    <DxSchedulerTimeScale Unit="@SchedulerTimeScaleUnit.Day" UnitCount="1"></DxSchedulerTimeScale>
-                                    <DxSchedulerTimeScale Unit="@SchedulerTimeScaleUnit.Hour" UnitCount="2"></DxSchedulerTimeScale>
-                                </Scales>
-                            </DxSchedulerTimelineView>
-                            <DxSchedulerWeekView ShowWorkTimeOnly="false"></DxSchedulerWeekView>
-                            <DxSchedulerDayView DayCount="1" ShowWorkTimeOnly="false"></DxSchedulerDayView>
-                        </DxScheduler>
-                    </div>
-                </DxTabPage>
+
 
                 <DxTabPage Text="History">
                     <div class="d-flex flex-column mb-4 pb-2">
@@ -159,12 +168,6 @@
                     </div>
                 </DxTabPage>
 
-                <DxTabPage Text="Messages">
-                    <div class="d-flex flex-column mb-4 pb-2">
-                        <MessageDetailGridComponent ContextId="driverId" GetAllMessageTag="SignalRTags.GetTransfersMessagesByDriverId" IsSenderEmailVisible="false" IsMessageTextVisible="false"></MessageDetailGridComponent>
-                    </div>
-                </DxTabPage>
-
             </DxTabs>
 
         </div>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
index 30f9af80..8cd522fe 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
@@ -237,10 +237,10 @@
         var transferToDriverEditModel = (TransferToDriver)args.EditModel;
 
         if (transferToDriverEditModel.UserProductMappingId.IsNullOrEmpty() || transferToDriverEditModel.CarId.IsNullOrEmpty() ||
-            transferToDriverEditModel.LicencePlate.IsNullOrWhiteSpace() || transferToDriverEditModel.Price <= 0)
+            transferToDriverEditModel.LicencePlate.IsNullOrWhiteSpace())// || transferToDriverEditModel.Price <= 0)
         {
             args.Cancel = true;
-            _logger.Error($"transferToDriverEditModel.UserProductMappingId.IsNullOrEmpty() || transferToDriverEditModel.CarId.IsNullOrEmpty() || transferToDriverEditModel.LicencePlate.IsNullOrWhiteSpace() || transferToDriverEditModel.Price <= 0");
+            _logger.Error($"transferToDriverEditModel.UserProductMappingId.IsNullOrEmpty() || transferToDriverEditModel.CarId.IsNullOrEmpty() || transferToDriverEditModel.LicencePlate.IsNullOrWhiteSpace()");// || transferToDriverEditModel.Price <= 0");
         }
 
         if (args.IsNew)