Browse Source

Improving lookups on employees

Kenric Nugteren 1 năm trước cách đây
mục cha
commit
d9c2190a3e

+ 0 - 2
prs.classes/Entities/Employee/EmployeeLink.cs

@@ -11,11 +11,9 @@ namespace Comal.Classes
         public override Guid ID { get; set; }
 
         [EditorSequence(2)]
-        [RequiredColumn]
         [CodeEditor(Visible = Visible.Default, Editable = Editable.Hidden)]
         public string Code { get; set; }
 
-        [RequiredColumn]
         [TextBoxEditor(Visible = Visible.Optional, Editable = Editable.Hidden)]
         public string Name { get; set; }
 

+ 0 - 1
prs.classes/Entities/Employee/EmployeeLookups.cs

@@ -10,7 +10,6 @@ namespace Comal.Classes
         {
             return Columns.None<Employee>().Add(
                 x => x.ID,
-                x => x.Code,
                 x => x.Name
             );
         }

+ 8 - 1
prs.classes/Entities/PurchaseOrder/PurchaseOrder.cs

@@ -144,10 +144,17 @@ namespace Comal.Classes
         [EditorSequence(6)]
         public DateTime IssuedDate { get; set; }
         
+        private class EmployeeLookup : LookupDefinitionGenerator<Employee, PurchaseOrder>
+        {
+            public override Columns<Employee> DefineColumns()
+            {
+                return base.DefineColumns().Add(x => x.Name);
+            }
+        }
         // This information might be printed out on the PO report, so we store this in the database
         // Other properties uch as Closed/Cancelled/Checked etc are simply logged in the Audit Trail
-        [RequiredColumn]
         [NullEditor]
+        [LookupDefinition(typeof(EmployeeLookup))]
         public EmployeeLink IssuedBy { get; set; }
         
         [DoubleEditor(Editable = Editable.Hidden, Summary = Summary.Sum)]

+ 1 - 1
prs.desktop/Panels/PurchaseOrders/SupplierPurchaseOrderPanel.xaml.cs

@@ -32,7 +32,7 @@ public partial class SupplierPurchaseOrderPanel : UserControl, IPanel<PurchaseOr
         Orders.HiddenColumns.Add(x => x.SupplierLink.Name);
         Orders.HiddenColumns.Add(x => x.Description);
         Orders.HiddenColumns.Add(x => x.IssuedDate);
-        Orders.HiddenColumns.Add(x => x.IssuedBy.Name);
+        //Orders.HiddenColumns.Add(x => x.IssuedBy.Name);
         Orders.HiddenColumns.Add(x => x.DueDate);
         Orders.HiddenColumns.Add(x => x.ClosedDate);