Merge branch 'apiserver' into 'master'

slice Names changed

See merge request !63

src/components/accordion/index.jsx

@@ -6,7 +6,7 @@ import { useSelector ,useDispatch} from "react-redux";
 import { useEffect } from "react";
 import {useParams} from 'react-router'
 import { fetchReportees } from "../../redux/reducers/reporteesSlice";
-import { calculateDefaultScore,calculateInitiativeScore } from "../../redux/reducers/reportSlice";
+import { calculateDefaultScore,calculateInitiativeScore } from "../../redux/reducers/viewreporteeSlice";
 import Loading from "../loading Component/Loading";
 
 

src/components/leftSidebar/index.jsx

@@ -37,7 +37,7 @@ function LeftSidebar() {
     <div className="  w-[33%] flex flex-col px-[5px]">
       <div className="flex mt-3 items-center justify-between">
         <p className="text-xl text-blue-400 font-semibold pl-4">
-          My Reportees
+        Reportees
         </p>
         <input 
           placeholder="Search Reportees"
@@ -53,7 +53,7 @@ function LeftSidebar() {
             {reportees?.map(({ empName, score, empId }) => (
               <button onClick={() => dispatch(setViewReportee(empId))}
                 // to={`/viewreportee`}
-                className={`flex items-center hover:bg-blue-400 hover:text-white  bg-${viewReportee.empId == empId ? "blue-400 text-white rounded-2xl" : "white"
+                className={`flex items-center hover:bg-blue-400 hover:text-white  bg-${viewReportee.empId == empId ? "blue-400 text-white" : "white"
                   } p-2 justify-between mb-1 w-full`}
                 key={empId}
               >

src/components/modal/index.jsx

@@ -39,8 +39,8 @@ export default function MyModal({ visible, onClose, type, handleAddActivity }) {
   }
 
   const handlePerformance=(value)=> {
-    let appreciateScores = [0, 1, 2, 3, 4, 5]
-    let depreciateScores = [-0, -1, -2, -3, -4, -5]
+    let appreciateScores = [1, 2, 3, 4, 5]
+    let depreciateScores = [ -1, -2, -3, -4, -5]
     if (value == 1) {
       setActivityData({ ...activityData, score: 0 })
       setScoreRender(appreciateScores)

src/pages/viewReportee/index.jsx

@@ -3,20 +3,16 @@ import { useSelector, useDispatch } from "react-redux";
 import { useParams, useNavigate } from "react-router";
 import { base_url } from "../../utils/constants";
 import axios from 'axios';
-import { fetchReports } from "../../redux/reducers/reportSlice";
 import { fetchReportees } from "../../redux/reducers/reporteesSlice";
 import Accordion from "../../components/accordion";
 import {scoreColor} from '../../utils/commonFunctions';
-import DateRangePicker from "../../components/dateRangePicker/DateRangePicker";
+
 
 function Viewreportee() {
   const dispatch = useDispatch();
   const navigate = useNavigate();
-  // const { id } = useParams();
-  // const empId = Number(id)
   const {reportees, viewReportee } = useSelector((state) => state.reportees);
   const user = useSelector((state) => state.userDetails.user)
-  // const [empDetails, setEmpDetails] = useState(null);
   const { reports, loading, error } = useSelector((state) => state.reports);
   const [open, setOpen] = useState({ "accordianOne": false, "accordianTwo": false });
 
@@ -78,21 +74,7 @@ function Viewreportee() {
     }
   }
 
-  useEffect(() => {
-    // if (viewReportee !== undefined || null && reportees.length > 0) {
-    //   const emp = reportees?.filter((item) => item.empId === Number(viewReportee.empId));
-    //   setEmpDetails(emp[0]);
-    //   const data = {
-    //     "empId": Number(viewReportee.empId),
-    //     "fromDate": "",
-    //     "toDate": ""
-    //   }
-    //   dispatch(fetchReports(data))
-    // }
-    // return (() => {
-    //   setEmpDetails(null)
-    // })
-  }, [viewReportee, reportees]);
+
 
   useEffect(() => {
     if (user) {

src/redux/reducers/rootReducer.js

 import { combineReducers } from 'redux';
 import reporteesReducer from './reporteesSlice';
 import userReducer from './userSlice';
-import reportReducer from './reportSlice';
+import reportReducer from './viewreporteeSlice';
 
 
 const rootReducer = combineReducers({

src/utils/clearStore.js

 import {resetUser} from '../redux/reducers/userSlice';
 import {resetReportees} from '../redux/reducers/reporteesSlice';
-import { resetReports } from '../redux/reducers/reportSlice';
+import { resetReports } from '../redux/reducers/viewreporteeSlice';
 
 const clearStore = (dispatch) => {
     dispatch(resetUser());