Commit 7ce62c78 authored by GithubRepositoryPrashanth's avatar GithubRepositoryPrashanth

Merge branch 'master' of https://gitlab.mynisum.com/vsingamchetty/nisum-scorecard into Prashanth

parents ba5d838c 5d09fcc4
...@@ -108,54 +108,53 @@ app.post("/getreportees", (req, res) => { ...@@ -108,54 +108,53 @@ app.post("/getreportees", (req, res) => {
"aName":"timesheet", "aName":"timesheet",
"aId":"D001", "aId":"D001",
"type":"default", "type":"default",
"recorded_date":"2024-03-12",
"score":3, "score":3,
"comments":"very good" "comments":"very good"
} }
} }
*/ */
app.post("/createActivity", (req, res) => { app.post('/createActivity',(req,res)=>{
const empId = req.body.empId || null; const empId = req.body.empId || null;
if (!empId) { if(!empId){
res.status(401).json({ message: "Employee id is missing" }); res.status(401).json({"message":"Employee id is missing"});
return; return
} else { }else{
let { data } = req.body; let {data} = req.body;
data = { ...data, recorded_date: new Date(data["recorded_date"]) }; data = {...data, "recorded_date": new Date() };
let query = { empId: empId }; let query = {empId:empId };
db.collection("performance_master") db.collection('performance_master').findOne(query).then( (result)=>{
.findOne(query) if(result){
.then((result) => { db.collection('performance_master').updateOne(query,{ $push: { "activities":data } })
if (result) { .then(async (updateRes)=>{
db.collection("performance_master") await calculateAverage(query);
.updateOne(query, { $push: { activities: data } }) res.json({"reuslt":updateRes});
.then(async (updateRes) => {
await calculateAverage(query); })
res.json({ reuslt: updateRes }); .catch((error)=>{
}) res.json({"error":error});
.catch((error) => { });
res.json({ error: error }); }else{
}); let insertData = { empId:empId, activities:[]};
} else { insertData.activities.push(data);
let insertData = { empId: empId, activities: [] }; db.collection('performance_master').insertOne(insertData).then(async (result)=>{
insertData.activities.push(data); await calculateAverage(query);
db.collection("performance_master") res.json({"result":result});
.insertOne(insertData)
.then(async (result) => { }).catch((error)=>{
await calculateAverage(query); res.json({"message":error})
res.json({ result: result });
}) })
.catch((error) => { }
res.json({ message: error }); }).catch((error)=>{
}); console.log(error)
} res.send(query)
}) })
.catch((error) => {
console.log(error);
res.send(query); }
});
}
}); })
//calculating average score and updating into employees data //calculating average score and updating into employees data
const calculateAverage = (query) => { const calculateAverage = (query) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment