Skip to content

Task6 #104

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

Open
hsiungwilliam wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Task6 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
15b557f
Add files via upload
SishunWang Sep 20, 2017
c8db820
Added checkbox
tristanmillman Sep 20, 2017
fa80694
Delete 2(a).png
SishunWang Sep 20, 2017
5853bf7
Merge branch 'task4''
Sep 20, 2017
6d8aad5
Added Success button
Sep 20, 2017
6024070
task2
YazanMansour Sep 20, 2017
ec7eb49
Merge pull request #1 from Group6c/task2
tristanmillman Sep 20, 2017
a3eb992
Added deleting checked tasks functionality
hsiungwilliam Sep 20, 2017
0a73ee9
Update to master
hsiungwilliam Sep 20, 2017
d6912c1
Merge issues
hsiungwilliam Sep 20, 2017
2df5b47
Merge branch 'task6' of https://github.com/Group6c/workflow into task6
hsiungwilliam Sep 20, 2017
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
22 changes: 16 additions & 6 deletions todo-src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<body ng-app="app">
<h1 class="text-center">My little to do app!</h1>

<div id="todo" class="col-xs-6 col-xs-offset-3" ng-controller="MainCtrl">

<div class="input-group">
<input type="text" class="form-control" placeholder="Item to add to todo list" ng-model="newItem">
<span class="input-group-btn">
Expand All @@ -23,22 +23,32 @@ <h1 class="text-center">My little to do app!</h1>
</button>
</span>
</div><!-- /input-group -->

<h2>stuff i gotta do asap</h2>

<ul class="list-group">
<!-- http://www.w3schools.com/css/css_float.asp -->
<li class="list-group-item clearfix" ng-repeat="do in todos">

<span>{{do}}</span>
<input ng-model="do.isChecked" id = "checkBox" name="todolist" type="checkbox" value="ON" >

<span>{{do.name}}</span>

<input type="button" ng-click = "deleteItem(do)" value="NOW" class="btn btn-success"/>
<input type="button" ng-click = "later(do)" value="LATER" class="btn btn-success"/>
<input type="button" ng-click = "tom(do)" value="TOMORROW" class="btn btn-success"/>

<button class="btn btn-danger pull-right" type="button" ng-click="deleteItem(do)">
<span class="glyphicon glyphicon-trash " aria-hidden="true"></span>
</button>

<button type="button" class="btn btn-success">Success</button>

</li>
</ul>
<button type="button" class="btn btn-success" ng-click="deleteCheckedItems()">Clear Checked Items</button>
</div>

</body>

</html>
35 changes: 26 additions & 9 deletions todo-src/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,43 @@
var myApp = angular.module('app', []);

myApp.controller('MainCtrl', function ($scope){
$scope.todos = ["Learn Angular", "Learn node"];
$scope.todos = [{name: "Learn Angular", isChecked: false }, {name: "Learn node", isChecked: false }];
$scope.newItem = "";

$scope.addItem = function(){
console.log("in add");
if ($scope.newItem !== ""){
$scope.todos.push($scope.newItem);
$scope.todos.push({name: $scope.newItem, isChecked: false });
$scope.newItem = "";
}
}

$scope.deleteItem = function(item){
console.log("in delete");
var index = $scope.todos.indexOf(item);
$scope.todos.splice(index, 1);
}


});

$scope.deleteCheckedItems = function(){
for(var i = 0; i < $scope.todos.length; i++){
if($scope.todos[i].isChecked){
$scope.todos.splice(i,1);
i--;
}
}

}

$scope.later = function(item){
console.log("Task Set to be done later");
alert("Task set to be done Later");
}
$scope.tom = function(item){
console.log("Task set to be done Tomorrow");
alert("Task set to be done Tomorrow");
}

});
/*************************
* Homework (not rly):
* - "enter" button functionality instead of clicking button
Expand All @@ -32,5 +49,5 @@ myApp.controller('MainCtrl', function ($scope){
* - make it prettier
* - add a due date
* - add reminder (setInterval)
*
* *********************/
*
* *********************/