Ver Fonte

Fixed JobRequisition problems

Kenric Nugteren há 1 ano atrás
pai
commit
e3839d6a7e

+ 2 - 2
prs.desktop/Panels/Jobs/JobRequisitionGrid.cs

@@ -139,8 +139,8 @@ namespace PRSDesktop
             Progress.Close();
         }
         
-        protected override void Reload(Filters<JobRequisition> criteria, Columns<JobRequisition> columns, ref SortOrder<JobRequisition> sort,
-            Action<CoreTable, Exception> action)
+        protected override void Reload(Filters<JobRequisition> criteria, Columns<JobRequisition> columns, ref SortOrder<JobRequisition>? sort,
+            Action<CoreTable?, Exception?> action)
         {
             if (!Security.IsAllowed<CanApproveJobRequisitions>())
                 criteria.Add(new Filter<JobRequisition>(x => x.Approved).IsNotEqualTo(DateTime.MinValue));

+ 5 - 5
prs.desktop/Panels/Jobs/JobRequisitionItemGrid.cs

@@ -18,11 +18,11 @@ namespace PRSDesktop
                 );
         }
         
-        public Requisition Requisition { get; set; }
+        public JobRequisition Requisition { get; set; }
 
         protected override void Reload(Filters<JobRequisitionItem> criteria, Columns<JobRequisitionItem> columns,
-            ref SortOrder<JobRequisitionItem> sort,
-            Action<CoreTable, Exception> action)
+            ref SortOrder<JobRequisitionItem>? sort,
+            Action<CoreTable?, Exception?> action)
         {
             criteria.Add(new Filter<JobRequisitionItem>(x => x.Requisition.ID).IsEqualTo(Requisition.ID));
             base.Reload(criteria, columns, ref sort, action);
@@ -33,8 +33,8 @@ namespace PRSDesktop
             var result = base.CreateItem();
             result.Requisition.ID = Requisition.ID;
             result.Requisition.Synchronise(Requisition);
-            result.Job.ID = Requisition.JobLink.ID;
-            result.Job.Synchronise(Requisition.JobLink);
+            result.Job.ID = Requisition.Job.ID;
+            result.Job.Synchronise(Requisition.Job);
             return result;
         }
 

+ 2 - 2
prs.desktop/Panels/Jobs/JobRequisitionPanel.xaml.cs

@@ -25,7 +25,7 @@ namespace PRSDesktop
         public JobRequisitionPanel()
         {
             InitializeComponent();
-            Items.Requisition = new Requisition();
+            Items.Requisition = new JobRequisition();
         }
 
         public Job Job
@@ -79,7 +79,7 @@ namespace PRSDesktop
 
         private void Requisitions_OnSelectItem(object sender, DynamicGridSelectionEventArgs e)
         {
-            Items.Requisition = e.Rows?.FirstOrDefault()?.ToObject<Requisition>() ?? new Requisition();
+            Items.Requisition = e.Rows?.FirstOrDefault()?.ToObject<JobRequisition>() ?? new JobRequisition();
             Items.Refresh(false, true);
         }
     }