diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e9c0622..79bc95e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,6 +4,7 @@ + @@ -20,7 +21,7 @@ - + @@ -31,7 +32,7 @@ - + @@ -40,7 +41,7 @@ - + @@ -50,7 +51,7 @@ - + @@ -60,8 +61,8 @@ - - + + @@ -107,9 +108,9 @@ - + @@ -167,6 +168,7 @@ + @@ -230,7 +232,6 @@ - @@ -303,7 +304,8 @@ - + + 1517404011461 @@ -557,11 +559,18 @@ 1519889017331 - + + 1519903342472 + + + + 1519903342472 + + - + @@ -579,7 +588,6 @@ - @@ -591,6 +599,7 @@ + @@ -648,7 +657,6 @@ - @@ -673,7 +681,8 @@ - + + @@ -715,7 +724,6 @@ - @@ -744,7 +752,6 @@ - @@ -889,9 +896,6 @@ - - - @@ -931,7 +935,6 @@ - @@ -939,7 +942,6 @@ - @@ -977,46 +979,45 @@ - - + - + - - + + - + - - + + - + - - + + - - + + diff --git a/Client/src/components/Projects/ViewProjects.vue b/Client/src/components/Projects/ViewProjects.vue index f9e3adf..6ecb889 100644 --- a/Client/src/components/Projects/ViewProjects.vue +++ b/Client/src/components/Projects/ViewProjects.vue @@ -45,14 +45,23 @@ :key="`${index}`" > - + {{task.taskName}} - - - mdi-check + + {{new Date(task.deadline).toDateString()}} + + + Assigned user: {{task.user}} + + + + Mark as completed + + mdi-check-circle + diff --git a/Server/routes/project.js b/Server/routes/project.js index 2b951ee..0b676e3 100644 --- a/Server/routes/project.js +++ b/Server/routes/project.js @@ -10,7 +10,7 @@ const firebase = require('../database/database'); //getting the details of all the users in the system router.get('/getUsers', (req, res, next) => { var userRef = firebase.database.ref('users'); - userRef.orderByChild("Type").equalTo('Admin').on("value", (snapshot) => { + userRef.orderByChild("Type").equalTo('Admin').once("value", (snapshot) => { // console.log(snapshot.val()); res.send(snapshot.val()) }) @@ -42,14 +42,14 @@ router.post('/addProject', (req, res, next) => { //getting the list of all the projects available in the system router.get('/getProjects', (req, res, next) => { var projRef = firebase.database.ref('projects'); - projRef.on("value", (snapshot) => { + projRef.once("value", (snapshot) => { res.send(snapshot.val()); }); }); router.post('/getCurrentProject', (req, res, next) => { var projRef = firebase.database.ref('projects'); - projRef.orderByChild('Name').equalTo(req.body.name).on("value", (snapshot) => { + projRef.orderByChild('Name').equalTo(req.body.name).once("value", (snapshot) => { var key = Object.keys(snapshot.val())[0]; res.json({successs: true, project: snapshot.val(), key: key}); })
{{new Date(task.deadline).toDateString()}}
Assigned user: {{task.user}}