Dev rook

forms-flow-web/src/actions/FOI/foiActionConstants.js

@@ -89,6 +89,11 @@ const FOI_ACTION_CONSTANTS = {
     "FOI_PDF_STITCHED_STATUS_FOR_RESPONSEPACKAGE",
   FOI_PDF_STITCHED_RECORD_FOR_RESPONSEPACKAGE:
     "FOI_PDF_STITCHED_RECORD_FOR_RESPONSEPACKAGE",
+
+  OIPC_OUTCOMES: "OIPC_OUTCOMES",
+  OIPC_STATUSES: "OIPC_STATUSES",
+  OIPC_REVIEWTYPES: "OIPC_REVIEWTYPES",
+  OIPC_INQUIRYOUTCOMES:  "OIPC_INQUIRYOUTCOMES",
 };
 
 export default FOI_ACTION_CONSTANTS;

forms-flow-web/src/actions/FOI/foiRequestActions.js

@@ -425,3 +425,31 @@ export const setConversionFormats = (data) => (dispatch) => {
     payload: data,
   });
 };
+
+export const setOIPCOutcomes = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.OIPC_OUTCOMES,
+    payload: data,
+  });
+};
+
+export const setOIPCStatuses = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.OIPC_STATUSES,
+    payload: data,
+  });
+};
+
+export const setOIPCReviewtypes = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.OIPC_REVIEWTYPES,
+    payload: data,
+  });
+};
+
+export const setOIPCInquiryoutcomes = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.OIPC_INQUIRYOUTCOMES,
+    payload: data,
+  });
+};

forms-flow-web/src/apiManager/endpoints/index.js

@@ -133,5 +133,10 @@ const API = {
 
   FOI_DOWNLOAD_RECORDS_FOR_RESPONSEPACKAGE: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/download/responsepackage`,
   FOI_PDF_STITCH_STATUS_FOR_RESPONSEPACKAGE: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/responsepackage/pdfstitchjobstatus`,
+
+  FOI_GET_OIPC_OUTCOMES: `${FOI_BASE_API_URL}/api/foiflow/oipc/outcomes`,
+  FOI_GET_OIPC_STATUSES: `${FOI_BASE_API_URL}/api/foiflow/oipc/statuses`,
+  FOI_GET_OIPC_REVIEWTYPES: `${FOI_BASE_API_URL}/api/foiflow/oipc/reviewtypes`,
+  FOI_GET_OIPC_INQUIRYOUTCOMES: `${FOI_BASE_API_URL}/api/foiflow/oipc/inquiryoutcomes`,
 };
 export default API;

forms-flow-web/src/apiManager/services/FOI/foiMasterDataServices.js

@@ -22,6 +22,10 @@ import {
     setFOISubjectCodeList,  
     setCommentTagListLoader, 
     setFOIAdminProgramAreaList,
+    setOIPCOutcomes,
+    setOIPCStatuses,
+    setOIPCReviewtypes,
+    setOIPCInquiryoutcomes,
   } from "../../../actions/FOI/foiRequestActions";
   import { fnDone, catchError } from "./foiServicesUtil";
   import UserService from "../../../services/UserService";
@@ -508,4 +512,92 @@ import {
         });
     };
   };
+
+  export const fetchOIPCOutcomes = () => {    
+    return (dispatch) => {
+      httpGETRequest(API.FOI_GET_OIPC_OUTCOMES, {}, UserService.getToken())
+        .then((res) => {
+          if (res.data) {
+            const oipcOutcomes = res.data;
+            dispatch(setOIPCOutcomes(oipcOutcomes));
+            dispatch(setFOILoader(false));
+          } else {
+            console.log("Error while fetching OIPC outcomes master data", res);
+            dispatch(serviceActionError(res));
+            dispatch(setFOILoader(false));
+          }
+        })
+        .catch((error) => {
+          console.log("Error while fetching OIPC outcomes master data", error);
+          dispatch(serviceActionError(error));
+          dispatch(setFOILoader(false));
+        });
+    };
+  };
+
+  export const fetchOIPCStatuses = () => {    
+    return (dispatch) => {
+      httpGETRequest(API.FOI_GET_OIPC_STATUSES, {}, UserService.getToken())
+        .then((res) => {
+          if (res.data) {
+            const oipcStatuses = res.data;
+            dispatch(setOIPCStatuses(oipcStatuses));
+            dispatch(setFOILoader(false));
+          } else {
+            console.log("Error while fetching OIPC statuses master data", res);
+            dispatch(serviceActionError(res));
+            dispatch(setFOILoader(false));
+          }
+        })
+        .catch((error) => {
+          console.log("Error while fetching OIPC statuses master data", error);
+          dispatch(serviceActionError(error));
+          dispatch(setFOILoader(false));
+        });
+    };
+  };
+
+  export const fetchOIPCReviewtypes = () => {    
+    return (dispatch) => {
+      httpGETRequest(API.FOI_GET_OIPC_REVIEWTYPES, {}, UserService.getToken())
+        .then((res) => {
+          if (res.data) {
+            const oipcReviewtypes = res.data;
+            dispatch(setOIPCReviewtypes(oipcReviewtypes));
+            dispatch(setFOILoader(false));
+          } else {
+            console.log("Error while fetching OIPC reviewtypes master data", res);
+            dispatch(serviceActionError(res));
+            dispatch(setFOILoader(false));
+          }
+        })
+        .catch((error) => {
+          console.log("Error while fetching OIPC reviewtypes master data", error);
+          dispatch(serviceActionError(error));
+          dispatch(setFOILoader(false));
+        });
+    };
+  };
+
+  export const fetchOIPCInquiryoutcomes = () => {    
+    return (dispatch) => {
+      httpGETRequest(API.FOI_GET_OIPC_INQUIRYOUTCOMES, {}, UserService.getToken())
+        .then((res) => {
+          if (res.data) {
+            const oipcInquiryoutcomes = res.data;
+            dispatch(setOIPCInquiryoutcomes(oipcInquiryoutcomes));
+            dispatch(setFOILoader(false));
+          } else {
+            console.log("Error while fetching OIPC inqiuryoutcomes master data", res);
+            dispatch(serviceActionError(res));
+            dispatch(setFOILoader(false));
+          }
+        })
+        .catch((error) => {
+          console.log("Error while fetching OIPC inqiuryoutcomes master data", error);
+          dispatch(serviceActionError(error));
+          dispatch(setFOILoader(false));
+        });
+    };
+  };
 

forms-flow-web/src/components/FOI/Dashboard/IAO/columns.js

@@ -5,6 +5,7 @@ import {
   // onBehalfFullName,
   displayIcon,
   displayHeaderIcon,
+  displayQueueFlagIcons,
   cellTooltipRender
 } from "../utils";
 import {
@@ -15,6 +16,15 @@ import {
 } from "../../../../helper/FOI/helper";
 
 const ProcessingTeamColumns = [
+  {
+    field: "flags",
+    // renderHeader: displayHeaderIcon,
+    headerName: "FLAGS",
+    headerAlign: "left",
+    renderCell: displayQueueFlagIcons,
+    // cellClassName: 'foi-dashboard-',
+    // flex: 1,
+  },
   {
     field: "axisRequestId",
     headerName: "ID NUMBER",
@@ -89,12 +99,10 @@ const ProcessingTeamColumns = [
 
 const IntakeTeamColumns = [
   {
-    field: "isiaorestricted",
-    renderHeader: displayHeaderIcon,
+    field: "flags",
+    headerName: "FLAGS",
     headerAlign: "left",
-    renderCell:displayIcon,
-    cellClassName: 'foi-dashboard-restricted',
-    width: 60,
+    renderCell: displayQueueFlagIcons,
   },
   {
     field: "axisRequestId",
@@ -161,12 +169,10 @@ const IntakeTeamColumns = [
 
 const FlexTeamColumns = [
   {
-    field: "isiaorestricted",
-    renderHeader: displayHeaderIcon,
+    field: "flags",
+    headerName: "FLAGS",
     headerAlign: "left",
-    renderCell:displayIcon,
-    cellClassName: 'foi-dashboard-restricted',
-    width: 60,
+    renderCell: displayQueueFlagIcons,
   },
   {
     field: "axisRequestId",

forms-flow-web/src/components/FOI/Dashboard/Ministry/AdvancedSearch/DataGridAdvancedSearch.js

@@ -8,7 +8,8 @@ import {
   updateSortModel,
   getLDD,
   getRecordsDue,
-  LightTooltip
+  LightTooltip,
+  displayQueueFlagIcons
 } from "../../utils";
 import { ActionContext } from "./ActionContext";
 import { ConditionalComponent } from "../../../../../helper/FOI/helper";
@@ -94,6 +95,12 @@ const DataGridAdvancedSearch = ({ userDetail }) => {
   };
 
   const columns = React.useRef([
+    {
+      field: "flags",
+      headerName: "FLAGS",
+      headerAlign: "left",
+      renderCell: displayQueueFlagIcons,
+    },
     {
       field: "axisRequestId",
       headerName: "ID NUMBER",

forms-flow-web/src/components/FOI/Dashboard/Ministry/Queue.js

@@ -6,7 +6,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { push } from "connected-react-router";
 import { fetchFOIMinistryRequestListByPage } from "../../../../apiManager/services/FOI/foiRequestServices";
 import Loading from "../../../../containers/Loading";
-import { debounce, ClickableChip, displayIconMinistry, displayHeaderIcon, cellTooltipRender } from "../utils";
+import { debounce, ClickableChip, cellTooltipRender, displayQueueFlagIcons } from "../utils";
 import Grid from "@mui/material/Grid";
 import Stack from "@mui/material/Stack";
 import SearchIcon from "@material-ui/icons/Search";
@@ -112,6 +112,12 @@ const Queue = ({ userDetail, tableInfo }) => {
   }
 
   const columns = React.useRef([
+    {
+      field: "flags",
+      headerName: "FLAGS",
+      headerAlign: "left",
+      renderCell: displayQueueFlagIcons,
+    },
     {
       field: "axisRequestId",
       headerName: "ID NUMBER",
@@ -165,14 +171,6 @@ const Queue = ({ userDetail, tableInfo }) => {
       width: 0,
       hide: true,
       renderCell: (_params) => <span></span>,
-    },
-    {
-      field: "isministryrestricted",
-      renderHeader: displayHeaderIcon,
-      headerAlign: "left",
-      renderCell: displayIconMinistry,
-      cellClassName: 'foi-dashboard-restricted',
-      flex: 1,
     }
   ]);
 

forms-flow-web/src/components/FOI/Dashboard/dashboard.scss

@@ -246,9 +246,28 @@ nav.MuiPagination-root {
     padding-right: 15px !important;
 }
 
-.foi-dashboard-restricted {
+.dashboard-flag-restricted {
     font-size: 10px;
     color: #A0192F;
+    padding: 2px;
+}
+
+.dashboard-flag-oipcreview {
+    font-size: 10px;
+    color: #fa7c16;
+    padding: 2px;
+}
+
+.dashboard-flag-phasedrelease {
+    font-size: 10px;
+    color: #9207b7;
+    padding: 2px;
+}
+
+.dashboard-flag-placeholder {
+    font-size: 10px;
+    color: #c1bfbf;
+    padding: 2px;
 }
 
 .table-cell-truncate {

forms-flow-web/src/components/FOI/Dashboard/utils.js

@@ -219,9 +219,48 @@ export const displayIconMinistry = (params) => {
   );
 };
 
+export const displayQueueFlagIcons = (params) => {
+  let restricted = <span></span>
+
+  if (params?.row?.isiaorestricted || params?.row?.isministryrestricted) {
+    restricted = <LightTooltip placement="top-end" title={
+      <div style={{whiteSpace: "pre-line"}}>
+        Restricted
+      </div>
+    }>
+      <span className="dashboard-flag-restricted"><FontAwesomeIcon icon={faFlag} size='2x' /></span>
+    </LightTooltip>
+  } else {
+    restricted = <span className="dashboard-flag-placeholder"><FontAwesomeIcon icon={faFlag} size='2x' /></span>
+  }
+
+  const oipcreview = params?.row?.isoipcreview ?
+  <LightTooltip placement="top-end" title={
+    <div style={{whiteSpace: "pre-line"}}>
+      OIPC
+    </div>
+  }><span className="dashboard-flag-oipcreview"><FontAwesomeIcon icon={faFlag} size='2x' /></span>
+  </LightTooltip> :
+  <span className="dashboard-flag-placeholder"><FontAwesomeIcon icon={faFlag} size='2x' /></span>
+
+  const phasedrelease = params?.row?.isphasedrelease ?
+  <LightTooltip placement="top-end" title={
+    <div style={{whiteSpace: "pre-line"}}>
+      Phased Release
+    </div>
+  }><span className="dashboard-flag-phasedrelease"><FontAwesomeIcon icon={faFlag} size='2x' /></span>
+  </LightTooltip> :
+  <span className="dashboard-flag-placeholder"><FontAwesomeIcon icon={faFlag} size='2x' /></span>
+
+  return  <div>
+            {restricted}
+            {oipcreview}
+          </div>
+}
+
 export const displayHeaderIcon = (params) => {
   return (
-    <span className="foi-dashboard-restricted"><FontAwesomeIcon icon={faFlag} size='2x' className='restrict-icon' />
+    <span className="dashboard-flag-restricted"><FontAwesomeIcon icon={faFlag} size='2x' className='restrict-icon' />
     </span> 
   );
 };

forms-flow-web/src/components/FOI/FOIRequest/BottomButtonGroup/index.js

@@ -75,7 +75,8 @@ const BottomButtonGroup = React.memo(
     requestState,
     axisSyncedData,
     axisMessage,
-    attachmentsArray
+    attachmentsArray,
+    oipcData,
   }) => {
     /**
      * Bottom Button Group of Review request Page
@@ -117,7 +118,18 @@ const BottomButtonGroup = React.memo(
       if (urlIndexCreateRequest > -1) {
         saveRequestObject.requeststatusid = StateEnum.intakeinprogress.id;
         setIsAddRequest(false);
-      }      
+      }
+
+      //add oipc Data to save request object and sync/validate isoipcreview attribute
+      if (requestState.toLowerCase() !== StateEnum.intakeinprogress.name.toLowerCase() && requestState.toLowerCase() !== StateEnum.unopened.name.toLowerCase()) {
+        saveRequestObject.oipcdetails = oipcData ? oipcData : [];
+        // if (oipcData?.length > 0) {
+        //   saveRequestObject.isoipcreview = true;
+        // } else {
+        //   saveRequestObject.isoipcreview = false;
+        // }
+      }
+
       dispatch(setFOILoader(setLoader))
       dispatch(
         saveRequestDetails(