sort

mezod · Mar 2, 2015 · e4f800c · e4f800c
1 parent c101279
commit e4f800c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 27 deletions.
diff --git a/app/scripts/apps/kanban/show/show_controller.js b/app/scripts/apps/kanban/show/show_controller.js
@@ -271,9 +271,10 @@ define([
 
             	//update numElems
             	if(from != to){
-            		var counter = $('#'+from).find('#counter').get([0]).textContent;
+            		console.log($('#'+from+"-column").find('#counter'));
+            		var counter = $('#'+from+"-column").find('#counter').get([0]).textContent;
             		counter = parseInt(counter)-1;
-            		$('#'+from).find('#counter').text(counter);
+            		$('#'+from+"-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
@@ -310,55 +310,54 @@ define([
 
 		    customSort: function(e){
 		    	console.log("column:customsort");
+		    	var column = this.columnId;
 		    	this.options.viewComparator = 'position';
 		    	this.collection.sort();
-		    	this.activateStyles(e,'.customSort');
+		    	this.activateStyles(column,'.customSort');
 		    },
 
 		    dateCreatedSort: function(e){
 		    	console.log("column:datecreatedsort");
+		    	var column = this.columnId;
 		    	this.options.viewComparator = 'dateCreated';
 		    	this.collection.sort();
-		    	this.activateStyles(e,'.dateCreatedSort');
-		    	$(e.currentTarget).addClass("dateCreatedSortInverse").removeClass("dateCreatedSort");
+		    	this.activateStyles(column,'.dateCreatedSort');
+		    	$('#'+column+'-column span.dateCreatedSort').addClass("dateCreatedSortInverse").removeClass("dateCreatedSort");
 		    },
 
 		    dateCreatedSortInverse: function(e){
 		    	console.log("column:datecreatedsortinverse");
+		    	var column = this.columnId;
 		    	this.options.viewComparator = 'dateCreated';
 		    	this.collection.sort();
-		    	this.activateStyles(e,'.dateCreatedSort');
-		    	$(e.currentTarget).addClass("dateCreatedSort").removeClass("dateCreatedSortInverse");
+		    	this.activateStyles(column,'.dateCreatedSortInverse');
+		    	// this.collection.reverse();
+		    	// this.collection.sort();
+		    	$('#'+column+'-column span.dateCreatedSortInverse').addClass("dateCreatedSort").removeClass("dateCreatedSortInverse");
 		    },
 
 		    dateCompletedSort: function(e){
 		    	console.log("column:datecompletedsort");
+		    	var column = this.columnId;
 		    	this.options.viewComparator = 'dateCompleted';
 		    	this.collection.sort();
-		    	this.activateStyles(e,'.dateCompletedSort');
+		    	this.activateStyles(column,'.dateCompletedSort');
+				$('#'+column+'-column span.dateCompletedSort').addClass("dateCompletedSortInverse").removeClass("dateCompletedSort");
 		    },
 
 		    dateCompletedSortInverse: function(e){
 		    	console.log("column:datecompletedsortinverse");
+		    	var column = this.columnId;
 		    	this.options.viewComparator = 'dateCompleted';
 		    	this.collection.sort();
-		    	this.activateStyles(e,'.dateCompletedSort');
-		    },
-
-		    activateStyles: function(e, id){
-		    	//console.log(e.currentTarget.parentNode);
-		    	//console.log(e.currentTarget.parentNode.parentNode);
 
-				console.log('wololo');
-		    	console.log($(e.currentTarget));
-		    	console.log($(e.currentTarget).siblings("span"));
-
-		    	$(e.currentTarget).siblings("span").removeClass("selected");
-				$(e.currentTarget).addClass("selected");
+		    	this.activateStyles(column,'.dateCompletedSortInverse');
+		    	$('#'+column+'-column span.dateCompletedSortInverse').addClass("dateCompletedSort").removeClass("dateCompletedSortInverse");
+		    },
 
-		    	// var column = e.currentTarget.parentNode.parentNode.parentNode.id;
-		    	// $('#'+column+' span').removeClass("active");
-		    	// $('#'+column+' span'+id).addClass("active");
+		    activateStyles: function(column, id){
+		    	$('#'+column+'-column span').removeClass("selected");
+		    	$('#'+column+'-column span'+id).addClass("selected");
 		    },
 
 			onRender: function(){
@@ -394,6 +393,9 @@ define([
 			   	});
 
 			   	console.log(this.columnId);
+			   	console.log(this.cid);
+			   	console.log(this);
+			   	//debugger;
 			}
 
 		});

diff --git a/app/styles/styles.css b/app/styles/styles.css
@@ -6979,7 +6979,7 @@ body,
 }
 #main-region #kanban-board .column ul {
   list-style: none;
-  height: 100%;
+  height: calc(100% - 40px);
 }
 #main-region #kanban-board .column ul .inputTask {
   height: 80px;
@@ -7082,7 +7082,7 @@ body,
 #main-region #kanban-board #onhold-column {
   display: inline-block;
   width: 100%;
-  height: calc(100% - 200px);
+  height: calc(100% - 240px);
 }
 #main-region #kanban-board #onhold-column .column-header {
   border-top: 1px solid #dddddd;

diff --git a/app/styles/styles.less b/app/styles/styles.less
@@ -378,7 +378,7 @@ html, body, #content, #layout{
 
     		ul{
     			list-style: none;
-                height: 100%;
+                height: calc(100% - 40px);
 
                 .inputTask{
                     height: 80px;
@@ -511,7 +511,7 @@ html, body, #content, #layout{
     	#onhold-column{
     		display:inline-block;
     		width:100%;
-    		height:calc(100% - 200px);
+    		height:calc(100% - 240px);
 
     		.column-header{
     			border-top: 1px solid @grey;