Browse Source

A little code cleanup

Kenric Nugteren 10 months ago
parent
commit
fd43fd488f
1 changed files with 18 additions and 20 deletions
  1. 18 20
      prs.desktop/Panels/Jobs/Requisitions/JobRequisitionGrid.cs

+ 18 - 20
prs.desktop/Panels/Jobs/Requisitions/JobRequisitionGrid.cs

@@ -90,30 +90,28 @@ namespace PRSDesktop
                 return false;
             }
             Progress.Show("Working");
-            JobRequisition jobrequi = rows.First().ToObject<JobRequisition>();
-            Kanban kanban = new Kanban();
-            kanban.ManagerLink.ID = Client.Query(
-                new Filter<Employee>(x => x.UserLink.UserID).IsEqualTo(ClientFactory.UserID),
-                Columns.None<Employee>().Add(x => x.ID))
-                .Rows.First().Get<Employee, Guid>(x => x.ID);
-            string? jobnumber = new Client<Job>()
-                .Query(
-                    new Filter<Job>(x => x.ID).IsEqualTo(Master?.ID ?? Guid.Empty),
-                    Columns.None<Job>().Add(x => x.JobNumber)
-                ).Rows.FirstOrDefault()?.Get<Job, String>(x => x.JobNumber);
+
+            var jobrequi = rows.First().ToObject<JobRequisition>();
+            var kanban = new Kanban();
+
+            kanban.ManagerLink.ID = App.EmployeeID;
+
+            var jobNumber = Client.Query(
+                new Filter<Job>(x => x.ID).IsEqualTo(Master?.ID ?? Guid.Empty),
+                Columns.None<Job>().Add(x => x.JobNumber))
+                .Rows.FirstOrDefault()?.Get<Job, String>(x => x.JobNumber);
             kanban.JobLink.ID = Master?.ID ?? Guid.Empty;
             kanban.JobLink.Synchronise(Master ?? new Job());
-            kanban.Title = $"New Job Requisition Raised for Ordering (Job {jobnumber} ({jobrequi.Number}))";
+
+            kanban.Title = $"New Job Requisition Raised for Ordering (Job {jobNumber} ({jobrequi.Number}))";
             kanban.Status = KanbanStatus.Open;
-            kanban.Description = $"Requisition number: {jobnumber} ({jobrequi.Number}):{System.Environment.NewLine}";
-            CoreTable table = new Client<JobRequisitionItem>().Query
-                (
-                    new Filter<JobRequisitionItem>(x => x.Requisition.ID).IsEqualTo(jobrequi.ID),
-                    Columns.None<JobRequisitionItem>().Add(x => x.ID)
-                    );
-            if (table.Rows.Any())
+            kanban.Description = $"Requisition number: {jobNumber} ({jobrequi.Number}):{System.Environment.NewLine}";
+            var table = Client.Query(
+                new Filter<JobRequisitionItem>(x => x.Requisition.ID).IsEqualTo(jobrequi.ID),
+                Columns.None<JobRequisitionItem>().Add(x => x.ID));
+            if (table.Rows.Count != 0)
             {
-                kanban.Description = kanban.Description + "Requisition contains " + table.Rows.Count + " items.";
+                kanban.Description = $"{kanban.Description} Requisition contains {table.Rows.Count} items.";
             }
             Progress.Close();
             var page = new KanbanGrid();