Remove toggle from Edit Forecast and related code

uktrade · Feb 10, 2025 · 2eb45e0 · 2eb45e0
1 parent 20e64e4
commit 2eb45e0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 115 deletions.
diff --git a/forecast/templates/forecast/edit/edit.html b/forecast/templates/forecast/edit/edit.html
@@ -41,16 +41,12 @@
     </form>
     {% endblock %}
     {% block scripts %}
-    {{ view.get_payroll_forecast_report|json_script:'payroll_forecast_data' }}
-    {% can_access_edit_payroll user as user_can_access_edit_payroll %}
     <script>
         window.actuals = {{ actuals|safe }};
         window.period_display = {{ period_display|safe }};
         window.table_data = {{ forecast_dump|safe }};
         window.cost_centre = {{ view.cost_centre_details.cost_centre_code|safe }};
         window.financial_year = {{ view.financial_year|safe }};
-        window.payroll_forecast_data = JSON.parse(document.getElementById("payroll_forecast_data").textContent);
-        window.can_access_edit_payroll = "{{ user_can_access_edit_payroll }}";
     </script>
     {% vite_dev_client %}
     {% vite_js 'src/index.jsx' %}

diff --git a/forecast/views/edit_forecast.py b/forecast/views/edit_forecast.py
@@ -7,7 +7,7 @@
 from django.db import transaction
 from django.db.models import Exists, OuterRef, Prefetch, Q, Sum
 from django.http import JsonResponse
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import redirect
 from django.urls import reverse
 from django.views.generic.base import TemplateView
 from django.views.generic.edit import FormView
@@ -53,7 +53,6 @@
     NoCostCentreCodeInURLError,
     NoFinancialYearInURLError,
 )
-from payroll.services import payroll as payroll_service
 
 
 UNAVAILABLE_FORECAST_EDIT_TITLE = "Forecast editing is locked"
@@ -531,16 +530,6 @@ def get_context_data(self, **kwargs):
 
         return context
 
-    def get_payroll_forecast_report(self):
-        cost_centre_obj = get_object_or_404(CostCentre, pk=self.cost_centre_code)
-        financial_year_obj = get_object_or_404(FinancialYear, pk=self.financial_year)
-        queryset = payroll_service.payroll_forecast_report(
-            cost_centre_obj, financial_year_obj
-        )
-        data = list(queryset)
-
-        return data
-
     @cached_property
     def future_year_display(self):
         if self._future_year_display is None:

diff --git a/front_end/src/Components/EditForecast/index.jsx b/front_end/src/Components/EditForecast/index.jsx
@@ -14,7 +14,6 @@ import {
   UNSELECT_ALL,
 } from "../../Reducers/Selected";
 import { getCellId, postData, processForecastData } from "../../Util";
-import ToggleCheckbox from "../Common/ToggleCheckbox";
 
 function EditForecast() {
   const dispatch = useDispatch();
@@ -27,23 +26,12 @@ function EditForecast() {
   const editCellId = useSelector((state) => state.edit.cellId);
 
   const [sheetUpdating, setSheetUpdating] = useState(false);
-  const [isPayrollEnabled, setIsPayrollEnabled] = useState(false);
-
-  const handleIsPayrollEnabled = () => {
-    setIsPayrollEnabled(!isPayrollEnabled);
-
-    localStorage.setItem("isPayrollEnabled", JSON.stringify(!isPayrollEnabled));
-  };
 
   useEffect(() => {
     const timer = () => {
       setTimeout(() => {
         if (window.table_data) {
-          let rows = processForecastData(
-            window.table_data,
-            window.payroll_forecast_data,
-            isPayrollEnabled,
-          );
+          let rows = processForecastData(window.table_data);
           dispatch({
             type: SET_CELLS,
             cells: rows,
@@ -55,7 +43,7 @@ function EditForecast() {
     };
 
     timer();
-  }, [dispatch, isPayrollEnabled]);
+  }, [dispatch]);
 
   useEffect(() => {
     const capturePaste = (event) => {
@@ -334,15 +322,6 @@ function EditForecast() {
 
   return (
     <Fragment>
-      {window.can_access_edit_payroll === "True" && (
-        <ToggleCheckbox
-          toggle={isPayrollEnabled}
-          handler={handleIsPayrollEnabled}
-          id="payroll-forecast"
-          value="payroll"
-          label="Toggle payroll forecast rows"
-        />
-      )}
       {errorMessage != null && (
         <div
           className="govuk-error-summary"
@@ -362,10 +341,7 @@ function EditForecast() {
         </div>
       )}
       <EditActionBar />
-      <Table
-        sheetUpdating={sheetUpdating}
-        payrollData={window.payroll_forecast_data}
-      />
+      <Table sheetUpdating={sheetUpdating} />
     </Fragment>
   );
 }

diff --git a/front_end/src/Components/Table/index.jsx b/front_end/src/Components/Table/index.jsx
@@ -24,7 +24,7 @@ import {
   UNSELECT_ALL,
 } from "../../Reducers/Selected";
 
-function Table({ rowData, sheetUpdating, payrollData }) {
+function Table({ sheetUpdating }) {
   const dispatch = useDispatch();
   const rows = useSelector((state) => state.allCells.cells);
 
@@ -194,7 +194,6 @@ function Table({ rowData, sheetUpdating, payrollData }) {
                     <TableCell
                       key={nanoid()}
                       sheetUpdating={sheetUpdating}
-                      payrollData={payrollData}
                       cellId={getCellId(rowIndex, value)}
                       rowIndex={rowIndex}
                       cellKey={value}

diff --git a/front_end/src/Components/TableCell/index.jsx b/front_end/src/Components/TableCell/index.jsx
@@ -5,15 +5,8 @@ import { postData, processForecastData, formatValue } from "../../Util";
 import { SET_ERROR } from "../../Reducers/Error";
 import { SET_CELLS } from "../../Reducers/Cells";
 
-const TableCell = ({
-  rowIndex,
-  cellId,
-  cellKey,
-  sheetUpdating,
-  payrollData,
-}) => {
+const TableCell = ({ rowIndex, cellId, cellKey, sheetUpdating }) => {
   let editing = false;
-  const isPayrollEnabled = JSON.parse(localStorage.getItem("isPayrollEnabled"));
 
   const checkValue = (val) => {
     if (cellId === val) {
@@ -48,15 +41,6 @@ const TableCell = ({
   const cell = row[cellKey];
   const editCellId = useSelector((state) => state.edit.cellId, checkValue);
 
-  const isOverride = () => {
-    // Is override if cell exists, has an override amount and is not an actual
-    return cell && cell.overrideAmount !== null && cell.isEditable;
-  };
-
-  if (isOverride()) {
-    cell.amount = cell.overrideAmount;
-  }
-
   const [isUpdating, setIsUpdating] = useState(false);
 
   const selectedRow = useSelector(
@@ -110,7 +94,6 @@ const TableCell = ({
     if (!cell) return classes.join(" ");
 
     if (cell && cell.amount < 0) classes.push("negative");
-    if (isOverride()) classes.push("override");
     if (wasEdited()) classes.push("edited");
     isActual ? classes.push("is-actual") : classes.push("is-forecast");
 
@@ -169,11 +152,7 @@ const TableCell = ({
       setIsUpdating(false);
       if (response.status === 200) {
         // TODO (FFT-100): Test paste to excel with locked payroll forecast rows
-        let rows = processForecastData(
-          response.data,
-          payrollData,
-          isPayrollEnabled,
-        );
+        let rows = processForecastData(response.data);
         dispatch({
           type: SET_CELLS,
           cells: rows,
@@ -266,7 +245,7 @@ const TableCell = ({
         className={getClasses()}
         id={getId()}
         onDoubleClick={() => {
-          if (isEditable && !isOverride()) {
+          if (isEditable) {
             dispatch(
               SET_EDITING_CELL({
                 cellId: cellId,

diff --git a/front_end/src/Util.js b/front_end/src/Util.js
@@ -123,17 +123,8 @@ export async function postData(url = "", data = {}) {
   };
 }
 
-export const processForecastData = (
-  forecastData,
-  payrollData = null,
-  isPayrollEnabled = false,
-) => {
+export const processForecastData = (forecastData) => {
   let rows = [];
-  let mappedPayrollData = null;
-
-  if (isPayrollEnabled) {
-    mappedPayrollData = processPayrollData(payrollData);
-  }
 
   let financialCodeCols = [
     "analysis1_code",
@@ -167,35 +158,16 @@ export const processForecastData = (
       colIndex++;
     }
 
-    const forecastKey = makeFinancialCodeKey(
-      "",
-      rowData.programme,
-      rowData.natural_account_code,
-      {
-        analysis1: rowData.analysis1_code,
-        analysis2: rowData.analysis2_code,
-        project: rowData.project_code,
-      },
-    );
-
     // eslint-disable-next-line
     for (const [key, monthlyFigure] of Object.entries(
       rowData["monthly_figures"],
     )) {
-      let overrideAmount = null;
-
-      if (isPayrollEnabled && mappedPayrollData[forecastKey]) {
-        const period = months[parseInt(key)];
-        overrideAmount = mappedPayrollData[forecastKey][period];
-      }
-
       row[monthlyFigure.month] = {
         rowIndex: rowIndex,
         colIndex: colIndex,
         key: monthlyFigure.month,
         amount: monthlyFigure.amount,
         startingAmount: monthlyFigure.starting_amount,
-        overrideAmount: overrideAmount,
       };
 
       colIndex++;
@@ -207,22 +179,6 @@ export const processForecastData = (
   return rows;
 };
 
-const processPayrollData = (payrollData) => {
-  const results = {};
-
-  for (const [key, value] of Object.entries(payrollData)) {
-    const generatedKey = makeFinancialCodeKey(
-      "",
-      value.programme_code,
-      value.natural_account_code,
-    );
-
-    results[generatedKey] = value;
-  }
-
-  return results;
-};
-
 export const makeFinancialCodeKey = (
   costCentre,
   programme,

diff --git a/front_end/styles/styles.scss b/front_end/styles/styles.scss
@@ -223,7 +223,6 @@ th {
   background-color: rgba(86, 148, 202, 0.25);
 }
 
-.override,
 .not-editable.is-forecast {
   background-color: rgba(201, 155, 75, 0.25);