Dev #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

gcc-Kushagra wants to merge 70 commits into master from dev

app.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,9 +7,13 @@ var express                 = require("express"),
  
        LocalStrategy           = require("passport-local"),

        attendanceLib           = require("./lib/attendance.lib.js"),

        userLib                 = require('./lib/user.lib.js'),  

        DateLib               = require('./lib/date.js'),  

        async                   = require("async"),

        passportLocalMongoose   = require("passport-local-mongoose");

    var _= require("lodash");

    const moment = require("moment");

    const attendance = require("./models/attendance");

    const PORT=2000;

    const MONGO_URL="mongodb://localhost/attendance";

    @@ -41,33 +45,203 @@ passport.deserializeUser(User.deserializeUser());
  
    app.get("/",function(req,res){

        res.render("signup");

        res.render("login");

    });

    app.get("/home",isLoggedIn, function(req, res){

    let filter={};

    filter={

        'username':req.user.username,

    }

       attendanceLib.findbyId(filter,function(err,docs){

       attendanceLib.find(filter,function(err,docs){

          if(err){

              return res.send(err)

          }else if(_.isEmpty(docs)){

            return res.render("home",{"attendanceData":""});

            return res.render("home",{"attendanceData":"",username:req.user.username, moment:moment});

          }

          else{

              console.log(docs);

           // return res.render("home",{"attendanceData":docs});

             return res.json(docs)

          //    console.log(moment(docs[0].attendance_date).format("DD/MM/YYYY"));

            return res.render("home",{attendanceData:docs,username:req.user.username, moment:moment});

            // return res.json(docs)

          }

       });

    });

    app.get("/home/:id/details",isLoggedIn, function(req, res){

        const filter ={

            _id: req.params.id

        }

        attendanceLib.findbyId(filter, function(err, attendance){

            if(err){

                console.log(err);

                return res.json(err);

            }else{

               //  console.log(moment(attendance[0].attendance_date).format("DD/MM/YYYY"));

              return  res.render("meetDetails", {attendanceDataID: attendance[0], moment:moment});

            }

        })

    });

    app.post("/home/:id/addParticipant",isLoggedIn, function(req, res){

    if(1){

        const filter ={

        _id: req.params.id

    }

    let new_data = [];

    async.series([

        (callback)=> {

    attendanceLib.findbyId(filter, function(err, attendance){

        if(err){

            console.log(err);

            return callback(err);

        }else{

            new_data = attendance[0].data;       

            return callback(null);

        }

    });

    },

    (callback)=> {

        new_data.push(req.body.name);

    const newVal={

       data: new_data

    }

    attendanceLib.updateOne(filter,  newVal, function(err){

        if(err){

            callback(err);

        }else{

            return callback(null);

        }

    });

    }

    ],

    (err)=> {

        if(err){

            return console.log(err)//

        }

        else{

          return  res.redirect("/home/"+req.params.id+"/details");//change this to normal

        }

    });

    }

    else{

        res.send("empty body");

    }

    });

    app.post("/home/:id/details/delete/:idx",isLoggedIn, function(req, res){

        const filter ={

            _id: req.params.id

        }

        var new_data = [];

        async.series([

            (callback)=> {

        attendanceLib.findbyId(filter, function(err, attendance){

            if(err){

                return callback(err);

               // return res.json(err);

            }else{

             //  console.log(attendance);

                new_data = attendance[0].data;

                return callback(null);

            }

        });

    },

    (callback)=> {

        const index = req.params.idx;

        new_data.splice(index,1);

        const newVal={

           data: new_data

        }

        attendanceLib.updateOne(filter,  newVal, function(err){

            if(err){

                return callback(err);

            }else{

                 return callback(null);

            }

        });

    }

    ],

    (err)=> {

        if(err){

            return console.log(err)//

        }

        else{

          return res.redirect("/home/"+req.params.id+"/details");

        }

    });

    });

    app.post("/home/:id/delete", isLoggedIn,function(req, res){

        const filter ={

            _id: req.params.id

        }

        attendanceLib.deleteOne(filter, function (err) {

            if(err){

                return res.json(err);

            }else{

                return res.redirect("/home");

            }

        });

    })

    app.post("/home/edit", isLoggedIn,function(req, res){

        const filter ={

            _id:req.body.atten_id

        }

        const newVal={

            attendance_date: DateLib.getDate(req),

            taker:req.body.entered_taker

        }

        attendanceLib.updateOne(filter, newVal, function(err){

            if(err){

                return res.json(err);

            }else{

                return res.redirect("/home");

            }

        });

    })

    app.post("/home",isLoggedIn, function(req, res){

     //   console.log(req.body);

        const Attendance = {

            username:req.body.user_name,

            attendance_date:DateLib.getDate(req),

            data:[],

            url:req.body.meet_url,

            taker:req.body.entered_taker,

        };

        attendanceLib.save(Attendance,function(err){

            if(err){

               return res.json(err);

            }else{

               return res.redirect("/home"); 

            }

        });

    }); 

    app.post("/username/:user/password/:pass/save",function(req,res){

        console.log(req.body)

      //  console.log(req.body)

        if(1){//

                let result={};

                let filter={

    @@ -92,13 +266,20 @@ app.post("/username/:user/password/:pass/save",function(req,res){
  
                        });

                    },

                    (callback)=> {

                        let attendees = req.body.data.split("@");

                        attendees.pop();

                        let new_attendance={

                            username:req.params.id,

                            username:req.params.user,

                            attendance_date:req.body.date,

                            data:[req.body.data],

                            data:attendees,

                            url:req.body.url,

                            taker:req.body.taker,

                            you: req.body.you,

                        };    

                  //     console.log(new_attendance);

                        attendanceLib.save(new_attendance,function(err){

                            if(err){

                                console.log(err);

    @@ -124,7 +305,7 @@ app.post("/username/:user/password/:pass/save",function(req,res){
  
        }

    });

    // Auth Routes

    @@ -149,6 +330,10 @@ app.get("/login", function(req, res){
  
        res.render("login");

    })

    app.get("/signup", function(req, res){

        res.render("signup");

    })

    // middleware

    app.post("/login", passport.authenticate("local",{

        successRedirect:"/home",

    @@ -172,4 +357,6 @@ function isLoggedIn(req, res, next){
  
    app.listen(PORT, function(){

        console.log("connected to "+PORT);

    });
      
    });

document.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,7 +3,25 @@ const { fromPairs } = require("lodash");
  
       // for saving to database

        let c="";let dateMeet="";dateMeet+=new Date().toLocaleString("en-US");document.getElementsByClassName('uArJ5e UQuaGc kCyAyd QU4Gid foXzLb IeuGXd')[0].click();

        let taker=document.getElementsByClassName('GvcuGe')[0].childNodes[0].innerText;

        for(var i=1;i<document.getElementsByClassName('GvcuGe')[0].childNodes.length;++i){c+=(document.getElementsByClassName('GvcuGe')[0].childNodes[i].innerText)+"@";};function copyToClipboard(text) {

        taker=taker.substring(0, taker.length-6);

        let you = document.getElementsByClassName('GvcuGe')[0].childNodes[1].innerText;

        var index = you.indexOf("Your presentation");

        if(index!=-1){

          you=you.substring(0, index-1);

        }

        c+=you+"@";

        for(var i=2;i<document.getElementsByClassName('GvcuGe')[0].childNodes.length;++i){

        var attendee=(document.getElementsByClassName('GvcuGe')[0].childNodes[i].innerText);

        // for handling \r\n (You)

        var idx = attendee.indexOf(`Presentation`)

        if(idx!=-1){

          attendee=attendee.substring(0, idx-1);

     //     console.log(attendee);

        }

        c+=attendee+"@";

       }

       function copyToClipboard(text) {

            var dummy = document.createElement("textarea");

            document.body.appendChild(dummy);

             dummy.value = text;

    @@ -16,9 +34,9 @@ const { fromPairs } = require("lodash");
  
        iframe.setAttribute("style","display:none");

        var form = document.createElement("FORM"); 

            form.setAttribute("method", "post"); 

            form.setAttribute("action", "http://localhost:2000/username/sam/password/sam/save"); 

            form.setAttribute("action", "http://localhost:2000/username/admin/password/admin/save"); 

            form.setAttribute("target","formTarget");

         form.innerHTML='<input type="hidden" name="taker" value="'+taker+'"/>+<input type="hidden" name="date" value="'+dateMeet+'"/> <input type="hidden" name="data" value="'+c+'"/><input type="hidden" name="url" value="'+window.location.href+'" />'

         form.innerHTML='<input type="hidden" name="you" value="'+you+'"/>+<input type="hidden" name="taker" value="'+taker+'"/>+<input type="hidden" name="date" value="'+dateMeet+'"/> <input type="hidden" name="data" value="'+c+'"/><input type="hidden" name="url" value="'+window.location.href+'" />'

        document.body.appendChild(form);

        form.submit();

    @@ -39,11 +57,11 @@ const { fromPairs } = require("lodash");
  
        // form.submit();

        //for copy

          // let c="";c+=new Date().toLocaleString("en-US");document.getElementsByClassName('uArJ5e UQuaGc kCyAyd QU4Gid foXzLb IeuGXd')[0].click();c+='\n'; for(var i=0;i<document.getElementsByClassName('GvcuGe')[0].childNodes.length;++i){c+=Number(i+1)+" "+document.getElementsByClassName('GvcuGe')[0].childNodes[i].innerText+'\n';};function copyToClipboard(text) {

        //     var dummy = document.createElement("textarea");

        //     document.body.appendChild(dummy);

        //      dummy.value = text;

        //      dummy.select();

        //      document.execCommand("copy");

        //      document.body.removeChild(dummy);

        //  };copyToClipboard(c);
      
       //    let c="";c+=new Date().toLocaleString("en-US");document.getElementsByClassName('uArJ5e UQuaGc kCyAyd QU4Gid foXzLb IeuGXd')[0].click();c+='\n'; for(var i=0;i<document.getElementsByClassName('GvcuGe')[0].childNodes.length;++i){c+=Number(i+1)+" "+document.getElementsByClassName('GvcuGe')[0].childNodes[i].innerText+'\n';};function copyToClipboard(text) {

       //      var dummy = document.createElement("textarea");

       //      document.body.appendChild(dummy);

       //       dummy.value = text;

       //       dummy.select();

       //       document.execCommand("copy");

       //       document.body.removeChild(dummy);

       //   };copyToClipboard(c);

lib/attendance.lib.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,17 @@ function findbyId(filter,cb){ @@
          });
     }
+    function find(filter,cb){
+        attendance.find(filter).sort({attendance_date: -1}).exec(function(err, docs) {
+            if(err){
+                cb(err)
+            }
+            else{
+              cb(null,docs)
+            }
+         });
+    }
     function save(data,cb){
         let new_attendance=new attendance(data);
         new_attendance.save(data,function(err){
@@ Expand All / @@ -24,8 +35,32 @@ function save(data,cb){ @@
          });
     }
+    function deleteOne(filter, cb){
+        attendance.deleteOne(filter, function (err) {
+            if(err){
+                cb(err)
+            }
+            else{
+              cb(null)
+            }
+        });
+    }
+    function Updateone(filter, newVal, cb){
+    attendance.findByIdAndUpdate(filter, {$set: newVal}, function(err){
+        if(err){
+            cb(err)
+        }
+        else{
+          cb(null)
+        }
+    });
+    }
     module.exports={
         findbyId:findbyId,
         save:save,
+        deleteOne:deleteOne,
+        updateOne:Updateone,
+        find:find
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dev #19

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Dev #19

Are you sure you want to change the base?

Uh oh!

Dev #19

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!