Quellcode durchsuchen

Fixed some issues with Direct Edit grids

frogsoftware vor 1 Jahr
Ursprung
Commit
5d6d8a32bd

+ 3 - 3
prs.classes/Entities/Bill/BillLine.cs

@@ -30,7 +30,7 @@ namespace Comal.Classes
         [EditorSequence(4)]
         public CostCentreLink CostCentre { get; set; }
 
-        [DoubleEditor(Summary = Summary.Sum)]
+        [CurrencyEditor(Summary = Summary.Sum)]
         [EditorSequence(5)]
         public double ExTax { get; set; }
 
@@ -41,10 +41,10 @@ namespace Comal.Classes
         [DoubleEditor(Editable = Editable.Hidden)]
         public double TaxRate { get; set; }
 
-        [DoubleEditor(Editable = Editable.Hidden, Summary = Summary.Sum)]
+        [CurrencyEditor(Editable = Editable.Hidden, Summary = Summary.Sum)]
         public double Tax { get; set; }
 
-        [DoubleEditor(Summary = Summary.Sum)]
+        [CurrencyEditor(Summary = Summary.Sum)]
         [EditorSequence(7)]
         public double IncTax { get; set; }
 

+ 1 - 0
prs.classes/Entities/PurchaseOrder/PurchaseOrderItem.cs

@@ -207,6 +207,7 @@ namespace Comal.Classes
 
         static PurchaseOrderItem()
         {
+
             LinkedProperties.Register<PurchaseOrderItem, ProductLink, String>(x => x.Product, x => x.Code, x => x.SupplierCode);
             LinkedProperties.Register<PurchaseOrderItem, ProductLink, String>(x => x.Product, x => x.Name, x => x.Description);
             LinkedProperties.Register<PurchaseOrderItem, ProductLink, double>(x => x.Product, x => x.NettCost,

+ 1 - 1
prs.desktop/Panels/Employees/EmployeePanel.xaml.cs

@@ -222,7 +222,7 @@ namespace PRSDesktop
 
         private void Rosters_OnOnChanged(object sender, EventArgs args)
         {
-            Employees.Refresh(false, true);
+            //Employees.Refresh(false, true);
         }
 
         private void Rosters_OnSizeChanged(object sender, SizeChangedEventArgs e)

+ 8 - 7
prs.desktop/Panels/Employees/Rosters/BaseEmployeeRosterItemGrid.cs

@@ -14,6 +14,7 @@ public abstract class BaseEmployeeRosterItemGrid<TParent,TItem> : DynamicOneToMa
     {
         base.DoReconfigure(options);
         options.Add(DynamicGridOption.DirectEdit);
+        options.Remove(DynamicGridOption.SelectColumns);
     }
 
     protected override BaseEditor? GetEditor(object item, DynamicGridColumn column)
@@ -37,19 +38,19 @@ public abstract class BaseEmployeeRosterItemGrid<TParent,TItem> : DynamicOneToMa
         result.Add<TItem,String>(x => x.Description, 0, "Description", "", Alignment.MiddleCenter);
         
         result.Add<TItem,bool>(x => x.Enabled,50, "On?", "", Alignment.MiddleCenter);
-        result.Add<TItem,TimeSpan>(x => x.Start, 60, "Start", "hh:mm", Alignment.MiddleCenter);
-        result.Add<TItem,TimeSpan>(x => x.Finish, 60, "Finish", "hh:mm", Alignment.MiddleCenter);
-        result.Add<TItem,TimeSpan>(x => x.Break, 60, "Break", "hh:mm", Alignment.MiddleCenter);
+        result.Add<TItem,TimeSpan>(x => x.Start, 80, "Start", "hh:mm", Alignment.MiddleCenter);
+        result.Add<TItem,TimeSpan>(x => x.Finish, 80, "Finish", "hh:mm", Alignment.MiddleCenter);
+        result.Add<TItem,TimeSpan>(x => x.Break, 100, "Break", "hh:mm", Alignment.MiddleCenter);
         
         if (Security.IsAllowed<AllowEmployeeRosterSplitShifts>())
         {
             result.Add<TItem,bool>(x => x.Enabled,50, "2nd?", "", Alignment.MiddleCenter);
-            result.Add<TItem,TimeSpan>(x => x.Start2, 60, "Start", "hh:mm", Alignment.MiddleCenter);
-            result.Add<TItem,TimeSpan>(x => x.Finish2, 60, "Finish", "hh:mm", Alignment.MiddleCenter);
-            result.Add<TItem,TimeSpan>(x => x.Finish2, 60, " Break", "hh:mm", Alignment.MiddleCenter);
+            result.Add<TItem,TimeSpan>(x => x.Start2, 80, "Start", "hh:mm", Alignment.MiddleCenter);
+            result.Add<TItem,TimeSpan>(x => x.Finish2, 80, "Finish", "hh:mm", Alignment.MiddleCenter);
+            result.Add<TItem,TimeSpan>(x => x.Finish2, 100, " Break", "hh:mm", Alignment.MiddleCenter);
         }       
         
-        result.Add<TItem,double>(x => x.Duration, 50, "Total", "F2", Alignment.MiddleCenter);
+        result.Add<TItem,double>(x => x.Duration, 60, "Total", "F2", Alignment.MiddleCenter);
         result.Add<TItem,Guid>(x => x.Overtime.ID, 150, "Overtime", "", Alignment.MiddleLeft);
         
         return result;