From 5af15fe2198b32a671c0555a369fffdaec75df12 Mon Sep 17 00:00:00 2001 From: Minal Shah Date: Wed, 8 Feb 2017 18:39:30 +0530 Subject: [PATCH] sort and search --- login/app.js | 42 ++++++++++++++++++++---------------- login/js/app.js | 48 ++++++++++++++++++++++++++---------------- login/views/list.html | 27 +++++++++++++++++++++--- login/views/login.html | 4 ++-- login/views/modal.html | 8 +++---- 5 files changed, 84 insertions(+), 45 deletions(-) diff --git a/login/app.js b/login/app.js index ae20f6c..5410901 100644 --- a/login/app.js +++ b/login/app.js @@ -9,8 +9,9 @@ var app = express(); app.use(urlencodedParser); var router = express.Router(); var multer=require('multer'); -var id; + app.use('/uploads',express.static(__dirname+"/upload")); + var upload=multer({dest:"./uploads/"}).array('name',1); app.use(cors({ allowedOrigins: [ @@ -33,7 +34,7 @@ router.get("/employeename",function(req,res){ Employee.find({},"-_id Name",function(err,employees){ res.json(employees) }) -}) +}); var storage = multer.diskStorage({ @@ -51,21 +52,29 @@ var upload = multer({ //multer settings storage: storage }).single('file'); router.post("/employee", upload,function(req,res) { - console.log("it is here"); - var emp3 = new Employee(); - emp3.Name = req.body.name; + Employee.findOne({Name:req.body.employee},"_id",function(err,id1){ - id=id1; -}) - emp3.EmployeeId = id; - emp3.File = req.body.file; - emp3.save(function (err, emp3) { - if (err) { - console.log(err); + //console.log(id1); + var emp3 = new Employee(); + emp3.Name = req.body.name; + emp3.EmployeeId = id1; + emp3.File = req.body.file; + emp3.save(function (err, emp3) { + if (err) { + console.log(err); + } + else{ + console.log(emp3); + } + }) + }); + /*upload(req,res,function(err){ + if(err) { + return res.end(err); } - console.log(emp3); - }) -}) + })*/ + +}); /* @@ -74,8 +83,5 @@ router.put();*/ router.delete("/employee/:id",function(req,res){ Employee.findByIdAndRemove(req.params.id,function(err,emp){console.log(emp);}); }); - - - app.use('/api',router); app.listen(8001); \ No newline at end of file diff --git a/login/js/app.js b/login/js/app.js index e12ca36..3cd0c3a 100644 --- a/login/js/app.js +++ b/login/js/app.js @@ -12,6 +12,7 @@ angular.module('myapp',['ngRoute','ui.bootstrap','angularModalService','ngAnimat templateUrl:'views/list.html', controller:'listController' }) + }) .controller('mainController',function($scope,$location){ $scope.submit=function(){ @@ -20,6 +21,10 @@ angular.module('myapp',['ngRoute','ui.bootstrap','angularModalService','ngAnimat }) .controller('listController',function($scope,$http){ $scope.emp = []; + $scope.sortBy = function(propertyName) { + $scope.reverse = ($scope.propertyName === propertyName) ? !$scope.reverse : false; + $scope.propertyName = propertyName; + }; $scope.getEmp=function (){ $http .get('http://localhost:8001/api/employee') @@ -29,13 +34,17 @@ angular.module('myapp',['ngRoute','ui.bootstrap','angularModalService','ngAnimat //$scope.emp=d; })}}) .controller('ComplexController', [ - '$scope', '$element', 'title','emp', 'close','Upload', - function($scope, $element, title,emp,close,Upload) { + '$scope', '$element', 'close','Upload', + function($scope, $element, close, Upload) { + + //$scope.name = null; + //$scope.title = title; + + console.log($scope.getUser1); + //console.log($scope.emp2); + //$scope.employee=$scope.$parent.getUser1(); + console.log($scope.$parent.emp2); - $scope.name = null; - $scope.employee = null; - $scope.title = title; - $scope.emp2=emp; // This close function doesn't need to use jQuery or bootstrap, because // the button has the 'data-dismiss' attribute. $scope.close = function() { @@ -57,6 +66,7 @@ angular.module('myapp',['ngRoute','ui.bootstrap','angularModalService','ngAnimat .error(function(data){ console.log(data); }) + } add(); close({ @@ -64,6 +74,7 @@ angular.module('myapp',['ngRoute','ui.bootstrap','angularModalService','ngAnimat employee: $scope.employee, file:$scope.file }, 500); // close, but give 500ms for bootstrap to animate + }; // This cancel function must use the bootstrap, 'modal' function because @@ -85,29 +96,30 @@ angular.module('myapp',['ngRoute','ui.bootstrap','angularModalService','ngAnimat }] ) .controller('SampleController', ['$scope', 'ModalService','$http', function($scope, ModalService,$http){ - $scope.getUser1= function() { - $scope.emp2=[]; + $scope.emp2=[]; + $scope.getUser1= function() { $http .get('http://localhost:8001/api/employeename') .then(function (d) { $scope.emp2 = d.data; - console.log($scope.emp2) + console.log(emp2); + return $scope.emp2; }) - } + + }; $scope.showComplex = function() { - $scope.getUser1(); + //emp2= getUser1(); + console.log($scope.emp2); ModalService.showModal({ templateUrl: "views/modal.html", controller: "ComplexController", - inputs: { - title: "A More Complex Example", - emp: $scope.emp2 - } + resolve: { + getUser1: function () { + return $scope.getUser1(); + }} }).then(function(modal) { modal.close.then(function(result) { }); }); - } -}]); - +}]); \ No newline at end of file diff --git a/login/views/list.html b/login/views/list.html index 4caf26b..545c425 100644 --- a/login/views/list.html +++ b/login/views/list.html @@ -1,19 +1,40 @@
+
+ + + Search: + +
- + + + + + + +
+ + + + + + + + +
{{e.Name}} - Smiley face + {{e.EmployeeId}}
-
+

Show Complex

diff --git a/login/views/login.html b/login/views/login.html index fc85007..a740cb6 100644 --- a/login/views/login.html +++ b/login/views/login.html @@ -2,9 +2,9 @@ -
+ - +
diff --git a/login/views/modal.html b/login/views/modal.html index 7d85147..387b84f 100644 --- a/login/views/modal.html +++ b/login/views/modal.html @@ -1,9 +1,9 @@ -
+
-

{{title}}

+

Ads the details

@@ -33,8 +33,8 @@

{{title}}

- - + +