done

mezod · Mar 5, 2015 · de782b0 · de782b0
1 parent a996fe5
commit de782b0
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 64 deletions.
diff --git a/app/scripts/apps/kanban/show/show_controller.js b/app/scripts/apps/kanban/show/show_controller.js
@@ -247,74 +247,77 @@ define([
 
             	//frontend
             	//model right state and index (by default when PUT)
-
+            	var that = this;
             	//rerender task view to show date completed
             	$.when(model.save(data)).done(function(){
             		console.log(model);
+            		console.log(ChildView);
             		ChildView.render();
-            	});
 
-            	//other tasks in to and from update index
-            	switch(from){
-            		case 'backlog':
-            			backlogTasks.remove(model);
-            			break;
-            		case 'todo':
-            			todoTasks.remove(model);
-            			break;
-            		case 'doing':
-            			doingTasks.remove(model);
-            			break;
-            		case 'onhold':
-            			onholdTasks.remove(model);
-            			break;
-            		case 'done':
-            			doneTasks.remove(model);
-            			break;
-            		case 'archive':
-            			archiveTasks.remove(model);
-            			break;
-            	}
+            		//other tasks in to and from update index
+	            	switch(from){
+	            		case 'backlog':
+	            			backlogTasks.remove(model);
+	            			break;
+	            		case 'todo':
+	            			todoTasks.remove(model);
+	            			break;
+	            		case 'doing':
+	            			doingTasks.remove(model);
+	            			break;
+	            		case 'onhold':
+	            			onholdTasks.remove(model);
+	            			break;
+	            		case 'done':
+	            			doneTasks.remove(model);
+	            			break;
+	            		case 'archive':
+	            			archiveTasks.remove(model);
+	            			break;
+	            	}
+
+
+	            	switch(to){
+	            		case 'backlog':	
+	            			that.updatePosition(backlogTasks, oldIndex, index);
+					        backlogTasks.add(model);
+	            			break;
+	            		case 'todo':
+	            			that.updatePosition(todoTasks, oldIndex, index);
+	            			todoTasks.add(model);
+	            			break;
+	            		case 'doing':
+	            			that.updatePosition(doingTasks, oldIndex, index);
+	            			doingTasks.add(model);
+	            			break;
+	            		case 'onhold':
+	            			that.updatePosition(onholdTasks, oldIndex, index);
+	            			onholdTasks.add(model);
+	            			break;
+	            		case 'done':
+	            			that.updatePosition(doneTasks, oldIndex, index);
+	            			doneTasks.add(model);
+	            			break;
+	            		case 'archive':
+	            			that.updatePosition(archiveTasks, oldIndex, index);
+	            			archiveTasks.add(model);
+	            			break;
+	            	}
+
+	            	//update numElems
+	            	if(from != to){
+	            		//console.log($('#'+from+"-column").find('#counter'));
+	            		var counter = $('#'+from+"-column").find('#counter').get([0]).textContent;
+	            		counter = parseInt(counter)-1;
+	            		$('#'+from+"-column").find('#counter').text(counter);
+
+	            		counter = $('#'+to+"-column").find('#counter').get([0]).textContent;
+	            		counter = parseInt(counter)+1;
+	            		$('#'+to+"-column").find('#counter').text(counter);
+	            	}
+            	});
 
 
-            	switch(to){
-            		case 'backlog':	
-            			this.updatePosition(backlogTasks, oldIndex, index);
-				        backlogTasks.add(model);
-            			break;
-            		case 'todo':
-            			this.updatePosition(todoTasks, oldIndex, index);
-            			todoTasks.add(model);
-            			break;
-            		case 'doing':
-            			this.updatePosition(doingTasks, oldIndex, index);
-            			doingTasks.add(model);
-            			break;
-            		case 'onhold':
-            			this.updatePosition(onholdTasks, oldIndex, index);
-            			onholdTasks.add(model);
-            			break;
-            		case 'done':
-            			this.updatePosition(doneTasks, oldIndex, index);
-            			doneTasks.add(model);
-            			break;
-            		case 'archive':
-            			this.updatePosition(archiveTasks, oldIndex, index);
-            			archiveTasks.add(model);
-            			break;
-            	}
-
-            	//update numElems
-            	if(from != to){
-            		//console.log($('#'+from+"-column").find('#counter'));
-            		var counter = $('#'+from+"-column").find('#counter').get([0]).textContent;
-            		counter = parseInt(counter)-1;
-            		$('#'+from+"-column").find('#counter').text(counter);
-
-            		counter = $('#'+to+"-column").find('#counter').get([0]).textContent;
-            		counter = parseInt(counter)+1;
-            		$('#'+to+"-column").find('#counter').text(counter);
-            	}
 
             },
 

diff --git a/app/scripts/apps/kanban/show/show_view.js b/app/scripts/apps/kanban/show/show_view.js
@@ -419,7 +419,10 @@ define([
 
 				require(["bootstrap"], function(){
 
-					$('[data-toggle="tooltip"]').tooltip();
+					$('body').tooltip({   
+					   selector: '[data-toggle=tooltip]',
+					   container: 'body'
+					 });
 				});
 
 

diff --git a/app/scripts/apps/kanban/show/templates/column.tpl b/app/scripts/apps/kanban/show/templates/column.tpl
@@ -1,13 +1,13 @@
 <div class="column-header">
-	<span class="glyphicon glyphicon-sort dateCreatedSort" aria-hidden="true" data-toggle="tooltip" data-placement="right" title="Sort by Date Created"></span>
+	<span class="glyphicon glyphicon-sort dateCreatedSort" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="Sort by Date Created (asc/desc)"></span>
 	<div>
 		<a><%= columnName %></a>
 		(<a id="counter"></a>)
 	</div>
 	<% if (sortType == "list") { %>
 		<span class="glyphicon glyphicon-th-list customSort selected" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="Sort by Custom Sort"></span>
 	<% } else { %>
-		<span class="glyphicon glyphicon-sort dateCompletedSort selected" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="Sort by Date Completed"></span>
+		<span class="glyphicon glyphicon-sort dateCompletedSort selected" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="Sort by Date Completed (asc/desc)"></span>
 	<% } %>
 </div>
 <ul id="<%= columnId %>" class="column-list">