Skip to content
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

Jump to bottom

Adding code to delete a task #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding code to delete a task #2

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
8 changes: 6 additions & 2 deletions css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,12 @@ header p{
/*******************
EXISTING TASK
*******************/
.sort-wrapper select, .filter-wrapper select{
width: 220px;
}

.task-list{
padding: 0;
padding: 25px 0px 0px ; margin: 20px 0px 0px; border-top: 1px solid #a9a1a1;
}
.task-list>li{
font-size: 14px; padding-bottom: 8px;
Expand All @@ -95,7 +99,7 @@ EXISTING TASK
.task-list li .task-body .section{
height: 110px; overflow: hidden;
}
.task-action-date{
.task-header span{
font-size: 12px; color: #a9a1a1; margin: 5px 0px 0px;
}
.task-header h2{
Expand Down
28 changes: 17 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,27 @@ <h1><span>Add some title here</span></h1>
</div>
</header>
<div ng-controller="ctrl_task" class="container content-wrapper">
<div class="sort-wrapper">
<label>Sort by: </label>
<select ng-model="selectedOrder" ng-options="option for option in sort_options"></select>
</div>
<div class="filter-wrapper">
<label>Filter by:</label>
<select ng-model="filterOption" ng-options="option for option in filter_options"></select>
<div class="form-inline">
<!-- <div class="form-group search-wrapper">
<label>Search: </label>
<input type="text" name="txt_search" />
</div> -->
<div class="form-group sort-wrapper">
<label>Sort by: </label>
<select ng-model='sort_parameters.options' ng-options='option.value as option.name for option in sort_options'></select>
</div>
<div class="form-group filter-wrapper">
<label>Filter by:</label>
<select ng-model="filterOption.options" ng-options="option for option in filter_options"></select>
</div>
</div>
<ul class="task-list row">
<li ng-repeat="item in task | orderBy:selectedOrder | filter:filterOption " class="col-md-4 col-sm-6 cols-xs-12">
<li ng-repeat="item in task | orderBy: sort_parameters.options | filter:filterOption.options " class="col-md-4 col-sm-6 cols-xs-12">
<div>
<div class="task-header">
<h2><!--{{$index + 001}}:--> {{item.title}}</h2>
<p class="task-action-date">Created on: {{item.created_at |date :'fullDate'}} |
<span ng-if="item.task_priority">Priority: {{item.task_priority}}</span></p>
<span class="task-action-date">Created on: {{item.created_at |date :'fullDate'}} </span>
<span ng-if="item.task_priority">| Priority: {{item.task_priority}}</span>
</div>
<div class="task-body">
<div class="section">
Expand All @@ -47,7 +53,7 @@ <h2><!--{{$index + 001}}:--> {{item.title}}</h2>
</div>
<p class="links-wrapper">
<a href="javascript:void(0);" class="edit">Edit</a>
<a href="javascript:void(0);" class="delete">Delete</a>
<a href="javascript:void(0);" class="delete" ng-click="delete_task()">Delete</a>
<a href="javascript:void(0);" class="read-more">Read more...</a>
</p>
</li>
Expand Down
36 changes: 28 additions & 8 deletions js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,43 @@ task_manager_app.controller('ctrl_task', function ($scope, $http){
$scope.task = response.data.tasks;
});

$scope.sort_options = ['title', '-task_priority', '-created_at'];
$scope.sort_options = [
{
"name": "Date Created (Descending)", "value" :"-created_at"
},
{
"name": "Date Created (Ascending)", "value": "created_at"
},
{
"name" : "Title", "value": "title"
},
{
"name" : "Priority", "value":"task_priority"
}
];
$scope.sort_parameters = {options : $scope.sort_options[0].value};
$scope.filter_options = ['High', 'Low', 'Normal'];
$scope.add = function(){
// var date = new Date();
// $scope.ddMMMMyyyy = $filter('date')(new Date(), 'dd, MMMM yyyy');
$scope.created_at = new Date();
$scope.task.push({ title: $scope.title, description: $scope.description, created_at: $scope.created_at, task_priority : $scope.task_priority });
$scope.filterOptions = {options : $scope.filter_options[0]};
$scope.add = function(){
// var date = new Date();
// $scope.ddMMMMyyyy = $filter('date')(new Date(), 'dd, MMMM yyyy');
$scope.created_at = new Date();
$scope.task.push({ title: $scope.title, description: $scope.description, created_at: $scope.created_at, task_priority : $scope.task_priority });
$scope.title = '';
$scope.description = '';
$scope.created_at ='';
$scope.task_priority = '';

setTimeout(function(){
setTimeout(function(){
$('.overlay').removeClass('active');
$('.pop-up').hide();
},1500)
}
}

$scope.delete_task = function(task_item){
var index=$scope.task.indexOf(task_item)
$scope.task.splice(index,1);
}
})
/***************************************************
COMMON JS
Expand Down
8 changes: 4 additions & 4 deletions task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title" : "Lorem ipsum dolor sit amet, consectetur adipiscing elit",
"description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed egestas accumsan nunc quis imperdiet. Aenean sodales mi accumsan, porta lorem ac, finibus purus. Fusce et tortor mollis, dignissim nunc non, fringilla risus. Fusce sed mi eu libero efficitur bibendum. Curabitur iaculis, ipsum in commodo consequat, odio neque sodales leo, at iaculis augue leo nec mauris. Aliquam eget nunc ac magna tincidunt luctus. Nunc in turpis augue. Suspendisse potenti. Nunc vehicula, dolor sed interdum ullamcorper, lectus nisl ultricies urna, sed dictum enim mauris eget massa. Donec nec vehicula purus. In ornare lorem eu leo egestas consectetur. Duis efficitur pharetra mauris, quis sollicitudin sem dignissim sit amet. Mauris id metus dapibus, vulputate justo sit amet, tristique lectus.",
"created_at": "2016-01-18T09:38:13.000Z",
"task_priority" : "High",
"task_priority" : "Normal",
"Documents":[
{
"file_name": "Lorem ipsum dolor sit amet.docx",
Expand All @@ -22,7 +22,7 @@
"title" : "Praesent a augue nec augue suscipit auctor",
"description": "Praesent a augue nec augue suscipit auctor. Integer ullamcorper sapien eget mi hendrerit euismod. Morbi eu ullamcorper justo, sit amet porta enim. Nulla ullamcorper dictum consequat. Etiam commodo odio erat, dapibus congue urna vehicula vel. Ut quis blandit dui, posuere malesuada purus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin sed hendrerit justo. Donec feugiat neque erat, at imperdiet sem viverra a. Nunc id ante urna. Vestibulum euismod cursus lacus, porta molestie ex laoreet nec. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Quisque sit amet turpis imperdiet, rutrum arcu eu, semper nunc. Cras eu auctor sem.",
"created_at": "2017-04-18T09:38:13.000Z",
"task_priority" :"Low",
"task_priority" : "Low",
"Documents":[
{
"file_name": "Praesent a augue.docx",
Expand All @@ -40,7 +40,7 @@
"title" : "Integer quis nisi sed ex interdum imperdiet nec eu augue",
"description": "Integer quis nisi sed ex interdum imperdiet nec eu augue. Cras lobortis, felis ac euismod commodo, ante nibh ultricies tortor, non lobortis erat libero sit amet velit. Sed eu ex elit. Vivamus accumsan at magna congue consectetur. Quisque venenatis posuere risus non cursus. Nullam nec tincidunt turpis. Donec lobortis dui non lacus condimentum, sit amet semper tellus rhoncus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Integer vel leo porta, sodales ligula vitae, rutrum lacus.",
"created_at": "2015-12-06T09:38:13.000Z",
"task_priority" :"High",
"task_priority" : "High",
"Documents":[
{
"file_name": "Lorem ipsum dolor sit amet.docx",
Expand All @@ -58,7 +58,7 @@
"title" : "Phasellus tincidunt, nibh et placerat vestibulum",
"description": "Phasellus tincidunt, nibh et placerat vestibulum, tortor turpis tristique purus, sed efficitur enim lectus sed dolor. Ut pulvinar, magna quis fermentum fermentum, nisl nisl mollis tortor, eget tincidunt arcu nisi nec ipsum. Vestibulum vitae semper leo, et dapibus tellus. Sed tincidunt, diam id semper pretium, leo mauris iaculis est, nec laoreet arcu nisi at velit. Suspendisse fermentum lorem vel cursus pulvinar. Fusce sit amet auctor lectus, lacinia tincidunt sapien. Vivamus a tortor ullamcorper mauris cursus consequat in id sapien. Aliquam lacus ipsum, mattis ut neque sed, tempor facilisis nisi. Duis at aliquam nulla. Aliquam erat volutpat. Nam sit amet eros eu dolor dapibus aliquam.",
"created_at": "2016-01-18T09:38:13.000Z",
"task_priority" : "Normal",
"task_priority" : "Normal",
"Documents":[
{
"file_name": "Lorem ipsum dolor sit amet.docx",
Expand Down