Merge branch 'apiserver' into 'master'

'objectId-logic-added

See merge request !21

server.js

 const express = require("express");
 const { connectToDb, getDb } = require("./db");
 const cors = require("cors");
+const moment = require("moment");
+const { ObjectId } = require("mongodb");
 const app = express();
 const _ = require('lodash');
 
@@ -101,6 +103,7 @@ app.post("/getreportees", (req, res) => {
     .catch((error) => res.status(401).send(error));
 });
 
+
 //Example of post Data
 /*
 {
@@ -122,6 +125,7 @@ app.post('/createActivity',(req,res)=>{
     }else{
         let {data} = req.body;
         data = {...data, "recorded_date": new Date() };
+        data = Object.assign(data, {"_id":new ObjectId()})   
         
         if(!_.get(data,"aName", "") || !_.get(data,"aId", "")  ||  !_.get(data,"type", "") ||  !_.get(data,"score", "")  ){
             res.json({"error":"Invalied Activity data"});
@@ -142,6 +146,7 @@ app.post('/createActivity',(req,res)=>{
                 });             
             }else{
                 let insertData =  { empId:empId, activities:[]}; 
+                          
                 insertData.activities.push(data);
                 db.collection('performance_master').insertOne(insertData).then(async (result)=>{
                     await calculateAverage(query);
@@ -195,8 +200,6 @@ const calculateAverage = (query) => {
 };
 
 //sending filtered activities data
-const moment = require("moment");
-
 /*Example post data
 {
     "empId":41689,

src/components/modal/index.jsx

@@ -7,7 +7,6 @@ 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()=>{
@@ -40,12 +39,9 @@ export default function MyModal({ visible, onClose ,type}) {
   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]);