From d8c7a062026ad81c915d046b80946870a6f5168a Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Wed, 19 Apr 2023 12:16:34 +0000
Subject: [PATCH] fix(admin): merge jobs

---
 .../manage-jobs/manage-jobs.component.ts      | 102 +++++++++---------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/app/admin/components/manage-jobs/manage-jobs.component.ts b/src/app/admin/components/manage-jobs/manage-jobs.component.ts
index fa7a05715..9c97fd7d2 100644
--- a/src/app/admin/components/manage-jobs/manage-jobs.component.ts
+++ b/src/app/admin/components/manage-jobs/manage-jobs.component.ts
@@ -33,6 +33,7 @@ export class ManageJobsComponent implements OnInit {
   };
   public contextRow: any;
 
+  public unvalidJobsColumnDefs: ColDef<Job>[];
   public frameworkComponents;
   public defaultColDef: ColDef = {
     editable: true,
@@ -86,56 +87,6 @@ export class ManageJobsComponent implements OnInit {
       },
     },
   ];
-  public unvalidJobsColumnDefs: ColDef<Job>[] = [
-    {
-      headerName: 'Fonction',
-      field: 'name',
-      editable: true,
-      onCellValueChanged: this.onChange.bind(this),
-    },
-    {
-      headerName: 'Offre de service',
-      field: 'hasPersonalOffer',
-      cellRenderer: 'jobPersonalOffer',
-      cellEditor: 'agSelectCellEditor',
-      valueGetter: this.translateBoolean,
-      singleClickEdit: true,
-      cellEditorParams: {
-        values: [true, false],
-        cellEditorPopup: true,
-      },
-      onCellValueChanged: this.onChange.bind(this),
-    },
-    {
-      headerName: 'Acteurs rattachés',
-      cellRenderer: 'attachedUsersComponent',
-      cellRendererParams: {
-        users: 'users',
-      },
-      minWidth: 500,
-    },
-    {
-      headerName: 'Fusionner',
-      field: '_id',
-      cellRenderer: 'jobRenderer',
-      cellEditor: 'agSelectCellEditor',
-      singleClickEdit: true,
-      cellEditorParams: {
-        values: this.validatedJobsName,
-      },
-      onCellValueChanged: this.onMerge.bind(this),
-    },
-    {
-      headerName: 'Valider',
-      editable: false,
-      minWidth: 100,
-      cellRenderer: 'validateJobComponent',
-      cellRendererParams: {
-        onClick: this.onValidateButtonClick.bind(this),
-        label: 'Valider',
-      },
-    },
-  ];
 
   constructor(
     private adminService: AdminService,
@@ -144,7 +95,56 @@ export class ManageJobsComponent implements OnInit {
   ) {
     this.findValidatedJobs();
     this.findUnvalidatedJobs();
-
+    this.unvalidJobsColumnDefs = [
+      {
+        headerName: 'Fonction',
+        field: 'name',
+        editable: true,
+        onCellValueChanged: this.onChange.bind(this),
+      },
+      {
+        headerName: 'Offre de service',
+        field: 'hasPersonalOffer',
+        cellRenderer: 'jobPersonalOffer',
+        cellEditor: 'agSelectCellEditor',
+        valueGetter: this.translateBoolean,
+        singleClickEdit: true,
+        cellEditorParams: {
+          values: [true, false],
+          cellEditorPopup: true,
+        },
+        onCellValueChanged: this.onChange.bind(this),
+      },
+      {
+        headerName: 'Acteurs rattachés',
+        cellRenderer: 'attachedUsersComponent',
+        cellRendererParams: {
+          users: 'users',
+        },
+        minWidth: 500,
+      },
+      {
+        headerName: 'Fusionner',
+        field: '_id',
+        cellRenderer: 'jobRenderer',
+        cellEditor: 'agSelectCellEditor',
+        singleClickEdit: true,
+        cellEditorParams: {
+          values: this.validatedJobsName,
+        },
+        onCellValueChanged: this.onMerge.bind(this),
+      },
+      {
+        headerName: 'Valider',
+        editable: false,
+        minWidth: 100,
+        cellRenderer: 'validateJobComponent',
+        cellRendererParams: {
+          onClick: this.onValidateButtonClick.bind(this),
+          label: 'Valider',
+        },
+      },
+    ];
     this.frameworkComponents = {
       jobRenderer: JobRendererComponent,
       jobPersonalOffer: JobPersonalOfferComponent,
-- 
GitLab