Merge branch 'apiserver' into 'master'

'modal-modified'

See merge request !20

src/components/modal/index.jsx

-import React, { useState } from "react";
+import axios from "axios";
+import React, { useMemo, useEffect, useState, useCallback } from "react";
+import { base_url } from "../../utils/constants";
 
 
-export default function MyModal({ visible, onClose }) {
-  const [aId,setAId]=useState("");
-  const [aName,setAName]=useState("");
-  const [valueType,setvalueType]=useState("");
-  const [score,setScore]=useState(0);
-  const [comments,setComments]=useState('');
+export default function MyModal({ visible, onClose ,type}) {
+  const [activitiesList, setActivitiesList] = useState([])
+  const [enableSubmit,setEnableSubmit]=useState(false)
+  const [scoreType,setScoreType]=useState(1)
+  // const [score,setScore]=useState(0)
+  const [activityData,setActivityData]=useState({aName:"",aId:"",type:type,score:0,comments:""})
+
+  const  getActivitysList= async()=>{
+    const activities=await axios.get(`${base_url}/activities`)
+    const response= await activities.data.filter((item)=>item.type==type)
+    setActivitiesList(response)
+  }
+
+  const handleActivityName = (e) => {
+  setActivityData({...activityData,aName:e.target.value,aId:e.target.options[e.target.selectedIndex].id})
+  }
+
+  const handleScoreChange=(value)=>{
+    setActivityData({...activityData,score:(scoreType)*(value)})
+  }
+
+  function handlePerformance (value){   
+    setScoreType(value)
+  }
+
+  const handleComments=(e)=>{
+    setActivityData({...activityData,comments:e.target.value})
+  }
+
+  const handleSubmit=(e)=>{
+  onClose()
+  console.log(activityData)
+  }
+
+  useEffect(()=>{handleScoreChange(activityData.score)},[scoreType])
+
+  useEffect(() => {
+    console.log("activityData changed:", activityData);
+    if (activityData.aName !== "" && activityData.aId !== "" && activityData.comments !== "" && activityData.score != 0 || -0) {
+      console.log("All conditions met. Enabling submit button.");
+      setEnableSubmit(true);
+    } else {
+      console.log("Some conditions not met. Disabling submit button.");
+      setEnableSubmit(false);
+    }
+  }, [activityData]);
+  
+
+  useEffect(()=>{
+    if (visible===false){
+      setActivityData({aName:"",aId:"",type:type,score:0,comments:""})
+    }else{
+      getActivitysList();
+    }
+  },[visible,type])
+
 
   if (!visible) return null;
 
   return (
     <div className="fixed inset-0 bg-black bg-opacity-25 backdrop-blur-sm   flex items-center justify-center">
-      <div className="bg-white rounded w-4/12">
+      <div className="bg-white rounded lg:w-4/12 sm:w-100">
         <div className=" text-white py-3 pl-2 bg-blue-500">Default Activity</div>
         <div>
           <div>
-
-
-            <form class=" p-2 max-w-sm mx-auto">
+            <form className=" p-2 max-w-sm mx-auto">
               <div className="flex items-center  my-5">
-              <label for="countries">Default Activity List : </label>
-              <select id="countries" class="bg-gray-50 ml-2 w-7/12 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
-                <option selected>List Types</option>
-                <option value="US">United States</option>
-                <option value="CA">Canada</option>
-                <option value="FR">France</option>
-                <option value="DE">Germany</option>
+              <label htmlFor="countries">Select Activity: </label>
+              <select  className="bg-gray-50 ml-2 w-7/12 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" onChange={(e)=>handleActivityName(e)}>
+                <option id="" value="" className="text-[16px]">Select</option>
+                {
+                  activitiesList && activitiesList.map((activity)=><option className="text-[16px] w-7/12" key={activity.aId} id={activity.aId} value={activity.aName}>{activity.aName}</option>)
+                }
               </select>
 
               </div>
-              <div class="flex items-center mb-4 ">
-                <label for="default-radio-1" class=" text-sm font-medium text-gray-900 dark:text-gray-300">Appreciation:</label>
-                <input id="default-radio-1" type="radio" value="" name="default-radio" class="w-4 h-4 m-3 text-blue-600 bg-gray-100 border-gray-300  dark:bg-gray-700 dark:border-gray-600" />
-                <label for="default-radio-1" class="ms-2 text-sm font-medium text-gray-900 dark:text-gray-300">Depreciation:</label>
-                <input id="default-radio-1" type="radio" value="" name="default-radio" class="w-4 h-4 m-3 text-blue-600 bg-gray-100 border-gray-300  dark:bg-gray-700 dark:border-gray-600" />
+              <div className="flex items-center mb-4 ">
+                <label htmlFor="appreciate" className=" text-sm font-medium text-gray-900 dark:text-gray-300">Appreciation:</label>
+                <input id="appreciate" type="radio" value="appreciate" name="performance" className="w-4 h-4 m-3 text-blue-600 bg-gray-100 border-gray-300  dark:bg-gray-700 dark:border-gray-600" onChange={()=>handlePerformance(1)}/>
+                <label htmlFor="depreciate" className="ms-2 text-sm font-medium text-gray-900 dark:text-gray-300">Depreciation:</label>
+                <input id="depreciate" type="radio" value="depreciate" name="performance" className="w-4 h-4 m-3 text-blue-600 bg-gray-100 border-gray-300  dark:bg-gray-700 dark:border-gray-600" onChange={()=>handlePerformance(-1)} />
               </div>
               <div className="flex ">
                 <span>Score</span>
-                <select  className="border w-1/5">
-                  <option value={1} selected>1</option>
+                <select  className="border w-1/5" onChange={(e)=>handleScoreChange(e.target.value)}>
+                  <option value={0}>Select</option>
+                  <option value={1}>1</option>
                   <option value={2}>2</option>
                   <option value={3}>3</option>
                   <option value={4}>4</option>
@@ -48,12 +98,16 @@ export default function MyModal({ visible, onClose }) {
               </div>
 
               <div className="flex items-center my-5">
-              <label for="message" class="block w-3/12 mb-20 text-sm font-medium text-gray-900 dark:text-white">Comments :</label>
-              <textarea id="message" rows="4" class="block ml-2 p-2.5 w-9/12 text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="..."></textarea>
+              <label htmlFor="comments" className="block w-3/12 mb-20 text-sm font-medium text-gray-900 dark:text-white">Comments :</label>
+              <textarea id="comments" rows="4" className="block ml-2 p-2.5 w-9/12 text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="activity comments" onChange={(e)=>handleComments(e)}></textarea>
               </div>
               <div className="flex items-center justify-end mb-3">
             <button onClick={onClose} className="px-3 py-2 bg-gray-700 text-white rounded">Cancel</button>
-            <button  className="px-3  py-2 ml-5 bg-gray-700 text-white rounded">Save</button>
+            {
+              enableSubmit?<button type="button"  className="px-3  py-2 ml-5 bg-green-700 text-white rounded" onClick={handleSubmit}>Submit</button>:
+              <button type="button"  className="px-3  py-2 ml-5 bg-gray-400 text-white rounded" disabled={!enableSubmit} title="Please fill all fileds to submit">Submit</button>
+            }
+            
           </div>
 
             </form>

src/components/modal/modalButton.jsx

+import React, { useState } from "react";
+import MyModal from "./index";
+ 
+export default function ModalButton({type}) {
+  const [showMyModal, setShowMyModal] = useState(false);
+ 
+  const handleOnClose = () => setShowMyModal(false);
+  return (
+    <div className="bg-blue-400 bg-opacity-30">
+    {/* //   <div className="max-w-3xl mx-auto">
+    //     <div className="text-center py-3"> */}
+          <button
+          onClick={() => setShowMyModal(true)}
+          className="bg-red-400 text-white px-3 py-2 rounded hover:scale-95 transition text-xl">
+            Add Activity
+          </button>
+    {/* //     </div>
+    //     <p className="text-lg">
+         
+    //     </p>
+    //   </div> */}
+      <MyModal onClose={handleOnClose} visible={showMyModal} type={type}/>
+    </div>
+  );
+}
\ No newline at end of file

src/pages/reports/index.jsx

@@ -2,6 +2,7 @@ import React, {useState, useEffect} from 'react';
 import { useSelector,useDispatch } from 'react-redux';
 import { useParams } from 'react-router';
 import { fetchReports } from "../../redux/reducers/reportSlice";
+import ModalButton from '../../components/modal/modalButton';
 
 function Reports() {
     const {id} = useParams();
@@ -34,10 +35,12 @@ function Reports() {
         })
     },[id]);
 
-    useEffect(()=>{console.log( report, loading, error)},[ report, loading, error])
-
     return (
-        <div>This Perots</div>
+
+        <div>This Perots
+            <ModalButton type={"default"}/>
+        </div>
+        
     )
 }
 

src/redux/reducers/reportSlice.js

@@ -29,7 +29,7 @@ const reportSlice = createSlice({
     });
     builder.addCase(fetchReports.fulfilled, (state, action) => {
       state.loading = false;
-      state.reports = action.payload.activities;
+      state.reports = action.payload?.activities;
       state.error = "";
     });
     builder.addCase(fetchReports.rejected, (state, action) => {