Merge branch 'apiserver' into 'master'

display changes added for viewreportee page

See merge request !95

src/assets/icons/downloadIcon.js

@@ -3,9 +3,9 @@ import React from 'react'
 function DownloadIcon() {
     return (
         <svg width="25px" height="25px" viewBox="0 0 24 24" fill="none" className='mr-2'>
-        <path d="M12 7L12 14M12 14L15 11M12 14L9 11" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-        <path d="M16 17H12H8" stroke="white" stroke-width="1.5" stroke-linecap="round"/>
-        <path d="M2 12C2 7.28595 2 4.92893 3.46447 3.46447C4.92893 2 7.28595 2 12 2C16.714 2 19.0711 2 20.5355 3.46447C22 4.92893 22 7.28595 22 12C22 16.714 22 19.0711 20.5355 20.5355C19.0711 22 16.714 22 12 22C7.28595 22 4.92893 22 3.46447 20.5355C2 19.0711 2 16.714 2 12Z" stroke="white" stroke-width="1.5"/>
+        <path d="M12 7L12 14M12 14L15 11M12 14L9 11" stroke="white" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round"/>
+        <path d="M16 17H12H8" stroke="white" strokeWidth="1.5" strokeLinecap="round"/>
+        <path d="M2 12C2 7.28595 2 4.92893 3.46447 3.46447C4.92893 2 7.28595 2 12 2C16.714 2 19.0711 2 20.5355 3.46447C22 4.92893 22 7.28595 22 12C22 16.714 22 19.0711 20.5355 20.5355C19.0711 22 16.714 22 12 22C7.28595 22 4.92893 22 3.46447 20.5355C2 19.0711 2 16.714 2 12Z" stroke="white" strokeWidth="1.5"/>
         </svg>
     )
 }

src/components/accordion/index.jsx

@@ -59,7 +59,7 @@ function Accordion({ title, data ,handleAddActivity,open,handleAccordian}) {
           className="flex items-center rounded-lg  w-full py-2 px-2 mt-4 font-medium rtl:text-right bg-white text-gray-500 border border-[#B7B7B7] focus:ring-4   hover:bg-gray-100 gap-3" data-accordion-target="#accordion-collapse-body-2" aria-expanded="false" aria-controls="accordion-collapse-body-2" >
           <span className="w-1/2 text-start ms-2">{title}</span>
           <span className="w-1/2 flex justify-between">
-            Score :{title === "Duties" ? defaultAvgScore : initiativeAvgScore}
+            Score :  {title === "Duties" ? defaultAvgScore : initiativeAvgScore}
           <ModalButton type={`${title === "Duties" ? "duties" : "initiative"}`} handleAddActivity={handleAddActivity}/>
           </span>
           <svg data-accordion-icon className="w-3 h-3 rotate-180 shrink-0" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">

src/pages/reportexport/index.jsx

@@ -174,7 +174,7 @@ function Exporttable() {
           return true;
         }
       } else {
-        if((preEmployee !== selectedEmployee && fromDate !== preFromDate && toDate !== preToDate) || activitiesData.length === 0) {
+        if((preEmployee !== selectedEmployee && fromDate !== preFromDate && toDate !== preToDate) || activitiesData?.length === 0) {
           return true;
         }
       }
@@ -258,8 +258,9 @@ function Exporttable() {
                     type="button"
                     className="px-3  py-2 ml-5 min-w-[100px] disabled:bg-gray-400  h-[40px] bg-blue-500 font-semibold text-white rounded-md flex items-center justify-center"  
                   >
+                    <span>{pdfLoading ? "Downloading... " : "Download "}  </span>
                     <DownloadIcon />
-                    <span>{pdfLoading ? "Downloading..." : "Download"}</span>
+
                     { pdfLoading && <div className="loading ml-2 "></div>}
                   </button>
                 </div>

src/pages/viewReportee/index.jsx

@@ -106,7 +106,7 @@ function Viewreportee() {
                 <span className="font-medium">Role : </span> {viewReportee?.techStack}
               </p>
               <p>
-                <span className="font-medium">Employee Id:  </span> {viewReportee?.empId}
+                <span className="font-medium">Employee Id :  </span> {viewReportee?.empId}
               </p>
             </div>
             <div className="flex flex-col justify-center items-center">

src/redux/reducers/exporttableslice.js

@@ -36,7 +36,7 @@ const exporttableSlice = createSlice({
       state.error = "pending";
     });
     builder.addCase(fetchReportesActivitiesData.fulfilled, (state, action) => {
-      console.log(action.payload.activities)
+      // console.log(action.payload.activities)
       state.loading = false;
       state.activitiesData = action.payload.activities      ;
       state.error = "";