server/AyaNova/DataList/PMItemTravelDataList.cs

@@ -37,6 +37,7 @@ namespace AyaNova.DataList
                     //------
                     "WorkOrderItemTravelUserID",
                     "WorkOrderItemTravelRateQuantity",
+                    "WorkOrderItemTravelDistance",
                     "WorkOrderItemTravelServiceRateID"
 
                   };
@@ -74,6 +75,16 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "apmitemtravel.travelratequantity"
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemTravelDistance",
+                FieldKey = "WorkOrderItemTravelDistance",
+                AType = (int)AyaType.PMItemTravel,
+                UiFieldDataType = (int)UiFieldDataType.Decimal,
+                SqlIdColumnName = "apmitemtravel.id",
+                SqlValueColumnName = "apmitemtravel.distance"
+            });
+
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "WorkOrderItemTravelServiceRateID",

server/AyaNova/DataList/QuoteItemTravelDataList.cs

@@ -9,24 +9,24 @@ namespace AyaNova.DataList
         public QuoteItemTravelDataList()
         {
             DefaultListAType = AyaType.Quote;
-             SQLFrom = "from aquote "
-            + "left join aquotestatus on (aquote.laststatusid = aquotestatus.id) "
-            + "left join acustomer on (aquote.customerid = acustomer.id) "
-            + "left join aheadoffice on (acustomer.headofficeid = aheadoffice.id) "
-            + "left join aproject on (aquote.projectid = aproject.id) "
-            + "left join auser as aprepuser on (aquote.preparedbyid = aprepuser.id) "
-            + "left join acontract on (aquote.contractid = acontract.id)"
-            + "left join aquoteitem on aquote.id=aquoteitem.quoteid "
-            + "left join aworkorderitemstatus on (aquoteitem.workorderitemstatusid = aworkorderitemstatus.id) "
-            + "left join aworkorderitempriority on (aquoteitem.workorderitempriorityid = aworkorderitempriority.id) "
+            SQLFrom = "from aquote "
+           + "left join aquotestatus on (aquote.laststatusid = aquotestatus.id) "
+           + "left join acustomer on (aquote.customerid = acustomer.id) "
+           + "left join aheadoffice on (acustomer.headofficeid = aheadoffice.id) "
+           + "left join aproject on (aquote.projectid = aproject.id) "
+           + "left join auser as aprepuser on (aquote.preparedbyid = aprepuser.id) "
+           + "left join acontract on (aquote.contractid = acontract.id)"
+           + "left join aquoteitem on aquote.id=aquoteitem.quoteid "
+           + "left join aworkorderitemstatus on (aquoteitem.workorderitemstatusid = aworkorderitemstatus.id) "
+           + "left join aworkorderitempriority on (aquoteitem.workorderitempriorityid = aworkorderitempriority.id) "
 
 
-            //workorder item travel
-            + "left join aquoteitemtravel on aquoteitem.id=aquoteitemtravel.quoteitemid "
-            + "left join auser on (aquoteitemtravel.userid=auser.id) "
-            + "left join atravelrate on (aquoteitemtravel.travelrateid=atravelrate.id) "
-            + "left join ataxcode on (aquoteitemtravel.taxcodesaleid=ataxcode.id) "
-            ;
+           //workorder item travel
+           + "left join aquoteitemtravel on aquoteitem.id=aquoteitemtravel.quoteitemid "
+           + "left join auser on (aquoteitemtravel.userid=auser.id) "
+           + "left join atravelrate on (aquoteitemtravel.travelrateid=atravelrate.id) "
+           + "left join ataxcode on (aquoteitemtravel.taxcodesaleid=ataxcode.id) "
+           ;
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
@@ -38,6 +38,7 @@ namespace AyaNova.DataList
                     "QuoteQuoteRequestDate",
                     "WorkOrderItemTravelUserID",
                     "WorkOrderItemTravelRateQuantity",
+                    "WorkOrderItemTravelDistance",
                     "WorkOrderItemTravelServiceRateID"
 
                   };
@@ -75,6 +76,16 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aquoteitemtravel.travelratequantity"
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemTravelDistance",
+                FieldKey = "WorkOrderItemTravelDistance",
+                AType = (int)AyaType.QuoteItemTravel,
+                UiFieldDataType = (int)UiFieldDataType.Decimal,
+                SqlIdColumnName = "aquoteitemtravel.id",
+                SqlValueColumnName = "aquoteitemtravel.distance"
+            });
+
             FieldDefinitions.Add(new DataListFieldDefinition
             {
                 TKey = "WorkOrderItemTravelServiceRateID",

server/AyaNova/biz/FormFieldReference.cs

@@ -1284,6 +1284,7 @@ namespace AyaNova.Biz
                     l.Add(new FormField { TKey = "WorkOrderItemTravelStartDate", FieldKey = "WorkOrderItemTravelStartDate", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelStopDate", FieldKey = "WorkOrderItemTravelStopDate", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelRateQuantity", FieldKey = "WorkOrderItemTravelRateQuantity", TKeySection = "WorkOrderItemTravels" });
+                    l.Add(new FormField { TKey = "WorkOrderItemTravelDistance", FieldKey = "WorkOrderItemTravelDistance", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelServiceRateID", FieldKey = "WorkOrderItemTravelServiceRateID", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelDetails", FieldKey = "WorkOrderItemTravelDetails", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelUserID", FieldKey = "WorkOrderItemTravelUserID", TKeySection = "WorkOrderItemTravels" });
@@ -1576,6 +1577,7 @@ namespace AyaNova.Biz
                     l.Add(new FormField { TKey = "WorkOrderItemTravelStartDate", FieldKey = "WorkOrderItemTravelStartDate", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelStopDate", FieldKey = "WorkOrderItemTravelStopDate", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelRateQuantity", FieldKey = "WorkOrderItemTravelRateQuantity", TKeySection = "WorkOrderItemTravels" });
+                    l.Add(new FormField { TKey = "WorkOrderItemTravelDistance", FieldKey = "WorkOrderItemTravelDistance", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelServiceRateID", FieldKey = "WorkOrderItemTravelServiceRateID", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelDetails", FieldKey = "WorkOrderItemTravelDetails", TKeySection = "WorkOrderItemTravels" });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelUserID", FieldKey = "WorkOrderItemTravelUserID", TKeySection = "WorkOrderItemTravels" });

server/AyaNova/util/Seeder.cs

@@ -3020,7 +3020,7 @@ namespace AyaNova.Util
                         TravelStopDate = woDate.AddHours(1),
                         TravelRateId = Fake.Random.Long(1, TotalSeededTravelRates),
                         TravelDetails = Fake.Lorem.Sentence(),
-                        Distance = Fake.Random.Decimal(1.0m, 20.0m)
+                        Distance = Fake.Random.Int(1, 20)
                     };
                     woItem.Travels.Add(woItemTravel);
 
@@ -3032,7 +3032,7 @@ namespace AyaNova.Util
                         TravelStopDate = woDate.AddHours(1),
                         TravelRateId = Fake.Random.Long(1, TotalSeededTravelRates),
                         TravelDetails = Fake.Lorem.Sentence(),
-                        Distance = Fake.Random.Decimal(1.0m, 20.0m)
+                        Distance = Fake.Random.Int(1, 20)
                     };
                     woItem.Travels.Add(woItemTravel);
 
@@ -3478,7 +3478,7 @@ namespace AyaNova.Util
                         TravelStopDate = woDate.AddHours(1),
                         TravelRateId = Fake.Random.Long(1, TotalSeededTravelRates),
                         TravelDetails = Fake.Lorem.Sentence(),
-                        Distance = Fake.Random.Decimal(1.0m, 20.0m)
+                        Distance = Fake.Random.Int(1, 20)
                     };
                     woItem.Travels.Add(woItemTravel);
 
@@ -3490,7 +3490,7 @@ namespace AyaNova.Util
                         TravelStopDate = woDate.AddHours(1),
                         TravelRateId = Fake.Random.Long(1, TotalSeededTravelRates),
                         TravelDetails = Fake.Lorem.Sentence(),
-                        Distance = Fake.Random.Decimal(1.0m, 20.0m)
+                        Distance = Fake.Random.Int(1, 20)
                     };
                     woItem.Travels.Add(woItemTravel);
 
@@ -3907,7 +3907,7 @@ namespace AyaNova.Util
                         TravelStopDate = woDate.AddHours(1),
                         TravelRateId = Fake.Random.Long(1, TotalSeededTravelRates),
                         TravelDetails = Fake.Lorem.Sentence(),
-                        Distance = Fake.Random.Decimal(1.0m, 20.0m)
+                        Distance = Fake.Random.Int(1, 20)
                     };
                     woItem.Travels.Add(woItemTravel);
 
@@ -3919,7 +3919,7 @@ namespace AyaNova.Util
                         TravelStopDate = woDate.AddHours(1),
                         TravelRateId = Fake.Random.Long(1, TotalSeededTravelRates),
                         TravelDetails = Fake.Lorem.Sentence(),
-                        Distance = Fake.Random.Decimal(1.0m, 20.0m)
+                        Distance = Fake.Random.Int(1, 20)
                     };
                     woItem.Travels.Add(woItemTravel);