Fix pay uplift after refactor and account for no attrition on save

uktrade · Feb 12, 2025 · 09d4c68 · 09d4c68
1 parent c8ad124
commit 09d4c68
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/front_end/src/Apps/Payroll.jsx b/front_end/src/Apps/Payroll.jsx
@@ -199,7 +199,7 @@ export default function Payroll() {
             onInputChange={handleUpdatePayModifier}
             onCreate={handleCreatePayModifiers}
           />
-          {/* <DisplayPayModifier data={allPayroll.pay_modifiers.pay_uplift} /> */}
+          <DisplayPayModifier data={allPayroll.pay_modifiers.pay_uplift} />
         </Tab>
       </Tabs>
       <button className="govuk-button" onClick={handleSavePayroll}>

diff --git a/front_end/src/Components/EditPayroll/DisplayPayModifier/index.jsx b/front_end/src/Components/EditPayroll/DisplayPayModifier/index.jsx
@@ -1,7 +1,7 @@
 import PayModifierHeaders from "../PayModifierHeaders";
 
 const DisplayPayModifier = ({ data }) => {
-  if (!data) {
+  if (!data || data <= 0) {
     return (
       <>
         <h3 className="govuk-heading-s">Pay uplift</h3>
@@ -10,14 +10,14 @@ const DisplayPayModifier = ({ data }) => {
     );
   }
 
-  return data.map((row, index) => (
-    <div className="govuk-form-group" key={index}>
-      <h3 className="govuk-heading-s">{row.name}</h3>
+  return (
+    <div className="govuk-form-group">
+      <h3 className="govuk-heading-s">Pay Uplift</h3>
       <table className="govuk-table">
         <PayModifierHeaders />
         <tbody className="govuk-table__body">
           <tr className="govuk-table__row">
-            {row.pay_modifiers.map((value, index) => {
+            {data.map((value, index) => {
               return (
                 <td className="govuk-table__cell" key={index}>
                   {value}
@@ -28,7 +28,7 @@ const DisplayPayModifier = ({ data }) => {
         </tbody>
       </table>
     </div>
-  ));
+  );
 };
 
 export default DisplayPayModifier;
diff --git a/front_end/src/Components/EditPayroll/EditPayModifier/index.jsx b/front_end/src/Components/EditPayroll/EditPayModifier/index.jsx
@@ -1,7 +1,7 @@
 import PayModifierHeaders from "../PayModifierHeaders";
 
 const EditPayModifier = ({ data, onInputChange, onCreate }) => {
-  if (!data) {
+  if (!data || data <= 0) {
     return (
       <>
         <h3 className="govuk-heading-s">Attrition</h3>

diff --git a/payroll/api.py b/payroll/api.py
@@ -61,11 +61,12 @@ def post(self, request, *args, **kwargs):
             self.financial_year,
             data["vacancies"],
         )
-        payroll_service.update_pay_modifier_data(
-            self.cost_centre,
-            self.financial_year,
-            data["pay_modifiers"]["attrition"],
-        )
+        if data["pay_modifiers"]["attrition"]:
+            payroll_service.update_pay_modifier_data(
+                self.cost_centre,
+                self.financial_year,
+                data["pay_modifiers"]["attrition"],
+            )
 
         if settings.PAYROLL.ENABLE_FORECAST is True:
             payroll_service.update_payroll_forecast(