Merge pull request #3015 from MetaPhase-Consulting/pv-fix

Projected Vacancy Updated New Fields
MetaPhase-Consulting · Jun 11, 2024 · b4b9a10 · b4b9a10
2 parents ccd91d3 + 48d5c7a
commit b4b9a10
Showing 1 changed file with 27 additions and 7 deletions.
diff --git a/src/Components/ProjectedVacancyCard/ProjectedVacancyCard.jsx b/src/Components/ProjectedVacancyCard/ProjectedVacancyCard.jsx
@@ -140,10 +140,20 @@ const ProjectedVacancyCard = (props) => {
       { 'Position Title': result?.postitledesc || NO_POSITION_TITLE },
     ],
     bodyPrimary: [
-      { 'Assignee TED': displayTedEmp(result?.assignee_tour_end_date, result?.assignee) },
-      { 'Incumbent TED': displayTedEmp(result?.incumbent_tour_end_date, result?.incumbent) },
-      { 'Bid Season': result?.fvbsnid ? bidSeasons.find(s => s.code === result.fvbsnid).description : DEFAULT_TEXT },
-      { 'Tour of Duty': result?.tour_of_duty_description || NO_TOUR_OF_DUTY },
+      {
+        'Assignee TED': displayTedEmp(
+          result?.assigneeAssignment[0]?.asgdetdteddate,
+          result?.assigneeAssignment[0]?.perpiifullname,
+        ),
+      },
+      {
+        'Incumbent TED': displayTedEmp(
+          result?.incumbentAssignment[0]?.asgdetdteddate,
+          result?.incumbentAssignment[0]?.perpiifullname,
+        ),
+      },
+      { 'Bid Season': result?.bsndescrtext || DEFAULT_TEXT },
+      { 'Tour of Duty': result?.assigneeAssignment[0]?.toddesctext || NO_TOUR_OF_DUTY },
       { 'Languages': displayLangs() },
       { 'Included': result?.fvexclimportind === 'Y' ? 'Yes' : 'No' },
     ],
@@ -172,9 +182,19 @@ const ProjectedVacancyCard = (props) => {
   };
   const form = {
     staticBody: [
-      { 'Assignee TED': displayTedEmp(result?.assignee_tour_end_date, result?.assignee) },
-      { 'Incumbent TED': displayTedEmp(result?.incumbent_tour_end_date, result?.incumbent) },
-      { 'Tour of Duty': result?.tour_of_duty_description || NO_TOUR_OF_DUTY },
+      {
+        'Assignee TED': displayTedEmp(
+          result?.assigneeAssignment[0]?.asgdetdteddate,
+          result?.assigneeAssignment[0]?.perpiifullname,
+        ),
+      },
+      {
+        'Incumbent TED': displayTedEmp(
+          result?.incumbentAssignment[0]?.asgdetdteddate,
+          result?.incumbentAssignment[0]?.perpiifullname,
+        ),
+      },
+      { 'Tour of Duty': result?.assigneeAssignment[0]?.toddesctext || NO_TOUR_OF_DUTY },
       { 'Languages': displayLangs() },
       { 'Bureau': result?.posbureaushortdesc || NO_BUREAU },
       { 'Location': result?.poslocationcode || NO_POST },