Skip to content

Commit 311c3e2

Browse files
committed
Resolved some errors
1 parent 96f35fe commit 311c3e2

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

public/controllers/dashboard-controller.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
notes.controller('dashboardCtrl', function dashboardCtrl($scope, $window, $http) {
22

33
$scope.editNote = false;
4-
$scope.createNote = true;
4+
$scope.saveNote = true;
55
$http.post('/getNote', {"email": sessionStorage.user_email})
66
.success(function(data) {
77
$scope.notes = data;
@@ -62,7 +62,7 @@ notes.controller('dashboardCtrl', function dashboardCtrl($scope, $window, $http)
6262

6363
$scope.getNoteById = function(noteId) {
6464
$scope.editNote = true;
65-
$scope.createNote = false;
65+
$scope.saveNote = false;
6666
$http.post('/getNoteById', {"noteId": noteId})
6767
.success(function(data) {
6868
$scope.noteId = data[0]._id;
@@ -82,12 +82,19 @@ notes.controller('dashboardCtrl', function dashboardCtrl($scope, $window, $http)
8282
angular.element('#'+$scope.noteId).children('h1').html($scope.noteHeading);
8383
angular.element('#'+$scope.noteId).children('#noteBody').html($scope.note);
8484
$scope.editNote = true;
85-
$scope.createNote = false;
85+
$scope.saveNote = false;
8686
})
8787
.error(function(data) {
8888
alert("Cannot be updated");
8989
$scope.editNote = true;
90-
$scope.createNote = false;
90+
$scope.saveNote = false;
9191
});
9292
}
93+
94+
$scope.initializeModal = function() {
95+
$scope.noteHeading = '';
96+
$scope.note = '';
97+
$scope.editNote = false;
98+
$scope.saveNote = true;
99+
}
93100
});

public/views/dashboard.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<h2 style="color: #fff">Welcome <span ng-bind="name.firstname"></span>!</h2>
2626
<div class="panel panel-default">
2727
<div class="panel-heading">
28-
<button type="button" class="btn" id="createNote" data-toggle="modal" data-target="#myModal">Create Note</button>
28+
<button type="button" class="btn" id="createNote" ng-click="initializeModal()" data-toggle="modal" data-target="#myModal">Create Note</button>
2929
<button type="button" class="btn" id="logout" ng-click="logout()">Logout</button>
3030
</div>
3131
<div class="panel-body" id="notes">
3232
<div class="col-md-3 currentNote" id={{note._id}} ng-repeat="note in notes">
3333
<div class="row">
34-
<a class="col-md-2" id="editNotedeleteNote" ng-click="getNoteById(note._id)" data-target="#myModal">Edit</a>
34+
<a class="col-md-2" id="editNote" ng-click="getNoteById(note._id)" data-target="#pModal">Edit</a>
3535
<a class="col-md-2" id="deleteNote" ng-click="deleteNote(note._id)">Delete</a>
3636
</div>
3737
<h1>{{note.noteTitle}}</h1>
@@ -57,7 +57,7 @@ <h4 class="modal-title">Create a new note</h4>
5757
</div>
5858
<div class="modal-footer">
5959
<button type="button" class="btn btn-primary" ng-show="editNote" ng-click="updateNote()">Update</button>
60-
<button type="button" class="btn btn-primary" ng-show="createNote" ng-click="createNote()">Create</button>
60+
<button type="button" class="btn btn-primary" ng-show="saveNote" ng-click="createNote()">Create</button>
6161
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
6262
</div>
6363
</div>

0 commit comments

Comments
 (0)