Skip to content

sort and search #24

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.

Sign up for GitHub

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

Merged
rupalitomar5 merged 1 commit into from
Feb 8, 2017
Merged

sort and search #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions login/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand All @@ -33,7 +34,7 @@ router.get("/employeename",function(req,res){
Employee.find({},"-_id Name",function(err,employees){
res.json(employees)
})
})
});


var storage = multer.diskStorage({
Expand All @@ -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);
})
})
})*/

});


/*
Expand All @@ -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);
48 changes: 30 additions & 18 deletions login/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(){
Expand All @@ -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')
Expand All @@ -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() {
Expand All @@ -57,13 +66,15 @@ angular.module('myapp',['ngRoute','ui.bootstrap','angularModalService','ngAnimat
.error(function(data){
console.log(data);
})

}
add();
close({
name: $scope.name,
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
Expand All @@ -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) {
});
});

}
}]);

}]);
27 changes: 24 additions & 3 deletions login/views/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,40 @@
<div>
<div ng-controller="listController" data-ng-init="getEmp()">
<div class="col-md-2">
<!--Sidebar content-->

Search: <input ng-model="query">

</div>
<table>
<tr ng-repeat="e in emp">
<tr>
<th>
<button ng-click="sortBy('Name')">Name</button>
<span class="sortorder" ng-show="propertyName === 'name'" ng-class="{reverse: reverse}"></span>
</th>
<th>
<button ng-click="sortBy('File')">File</button>
<span class="sortorder" ng-show="propertyName === 'file'" ng-class="{reverse: reverse}"></span>
</th>
<th>
<button ng-click="sortBy('EmployeeId')">Employee Id</button>
<span class="sortorder" ng-show="propertyName === 'employee'" ng-class="{reverse: reverse}"></span>
</th>
</tr>

<tr ng-repeat="e in emp| orderBy:propertyName:reverse|filter:query">
<td>
{{e.Name}}
</td>
<td>
<img src="../uploads/{{e.File}}" alt="Smiley face" height="42" width="42">
<img ng-src="uploads/{{e.File}}" height="42" width="42">
</td>
<td>
{{e.EmployeeId}}
</td>
</tr>
</table>
<div ng-controller="SampleController" data-spy="scroll" data-target="#mainNav">
<div ng-controller="SampleController as sc" data-spy="scroll" data-target="#mainNav">
<p><a href class="btn btn-default btn-lg " ng-click="showComplex()">Show Complex</a></p>
<!--<pre ng-show="complexResult">{{complexResult}}</pre>-->
</div>
Expand Down
4 changes: 2 additions & 2 deletions login/views/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<script src="../bower_components/angular/angular.js"></script>
<script src="../bower_components/angular-route/angular-route.js"></script>
<script src="../js/app.js"></script>
<form ng-controller="mainController" ng-click="submit()">
<form ng-controller="mainController" >
<input type="text" placeholder="login"/>
<input type="text" placeholder="password"/>
<input type="submit" id="Submit" value="Submit"/>
<input type="button" id="Submit" value="Submit" ng-click="submit()"/>
</form>
</div>
8 changes: 4 additions & 4 deletions login/views/modal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="modal fade" >
<div class="modal fade" data-ng-init="getUser1()" >
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" ng-click="close()" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{title}}</h4>
<!--<h4 class="modal-title">{{title}}</h4>-->
</div>
<div class="modal-body" >
<p>Ads the details</p>
Expand Down Expand Up @@ -33,8 +33,8 @@ <h4 class="modal-title">{{title}}</h4>
<label for="employee" class="col-sm-2 control-label">Employee </label>
<div class="col-sm-10">
<input list="employee1" id="employee" ng-model="employee">
<datalist id="employee1" ng-repeat="empl in emp2">
<option value="{{empl.Name}}">{{empl.Name}}</option>
<datalist id="employee1" >
<option ng-repeat="empl in employee track by $index" value="{{empl.Name}}" >{{empl.Name}}</option>
</datalist>
</div>
</div>
Expand Down