Added mock behaviour for archiving cards in the view layer

qbranchcode · Dec 11, 2009 · a87c5fb · a87c5fb
1 parent 365ef5c
commit a87c5fb
Show file tree

Hide file tree

Showing 12 changed files with 113 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ grails-app/conf/SecurityConfig.groovy
 *.ipr
 *.iws
 .idea
+
diff --git a/grails-app/conf/BootStrap.groovy b/grails-app/conf/BootStrap.groovy
@@ -118,9 +118,10 @@ class BootStrap {
         if( Board.list().size() == 0 ){
             Board board = new Board().save()
 
-            eventService.persist(new PhaseEventCreate(title: "Backlog", phasePos: 0, user: adminUser, board: board))
-            eventService.persist(new PhaseEventCreate(title: "WIP", phasePos: 1, cardLimit: 5, user: adminUser, board: board))
-            eventService.persist(new PhaseEventCreate(title: "Done", phasePos: 2, user: adminUser, board: board))
+            eventService.persist(new PhaseEventCreate(title: "Backlog", position: 0, user: adminUser, board: board))
+            eventService.persist(new PhaseEventCreate(title: "WIP", position: 1, cardLimit: 5, user: adminUser, board: board))
+            eventService.persist(new PhaseEventCreate(title: "Done", position: 2, user: adminUser, board: board))
+            eventService.persist(new PhaseEventCreate(title: "Archive", position: 3, user: adminUser, board: board))
         }
     }
 

diff --git a/grails-app/domain/se/qbranch/qanban/Board.groovy b/grails-app/domain/se/qbranch/qanban/Board.groovy
@@ -22,6 +22,6 @@ class Board {
     }
 
     static hasMany = [phases:Phase]
-
     List phases = []
+
 }
diff --git a/grails-app/domain/se/qbranch/qanban/Phase.groovy b/grails-app/domain/se/qbranch/qanban/Phase.groovy
@@ -27,7 +27,6 @@ class Phase {
         domainId( nullable: false, unique: true, blank: false)
     }
 
-    //TODO: Titta mer på det här!
     static hasMany = [cards:Card]
 
     String title

diff --git a/grails-app/taglib/QanbanTagLib.groovy b/grails-app/taglib/QanbanTagLib.groovy
@@ -22,6 +22,35 @@ class QanbanTagLib {
 
     static namespace = 'qb'
 
+    def renderPhases = { attrs ->
+        if( !attrs.template )
+          return out << "You need to specify a template"
+        if( !attrs.phases )
+          return out << "You need to specify a collection of phases"
+        if( attrs.showArchive &&  attrs.showArchive != "true" && attrs.showArchive != "false"  )
+          return out << "The attribute 'showArchive' can only be true/false"
+
+
+        def output = ""
+        def elementNumber = 0
+
+        attrs.phases.each{
+            elementNumber += 1
+            if( elementNumber < attrs.phases.size() || attrs.showArchive == "true" ) {
+              output += render(template:attrs.template,model:[phase:it])
+            }
+        }
+        out << output
+    }
+
+    def enableArchiveButton = { attrs->
+        if( isSecondLastPhase(attrs.phase) ) out << '<div id="archiveBtn"> </div>'
+    }
+
+    private boolean isSecondLastPhase(phase){
+        phase.board.phases.indexOf(phase) == phase.board.phases.size()-2
+    }
+
     def maxCardCount = { attrs ->
         def maxNumberOfCards = 0
         attrs.phases?.each{

diff --git a/grails-app/views/board/_board.gsp b/grails-app/views/board/_board.gsp
@@ -6,7 +6,9 @@
 	.phaseAutoHeight{ height: <qb:maxCardCount phases="${it.phases}" cardHeight="7" unit="em"/>; } /*7 em*/
     </style>
 </g:if>
-      <g:ifAllGranted role="ROLE_QANBANADMIN">
+
+
+<g:ifAllGranted role="ROLE_QANBANADMIN">
   <div id="adminmenu">
     <ul>
       <li><a href="${createLink(controller:'card',action:'create')}" class="addCardLink"><g:message code="layout.inside.menu.addCard"/></a></li>
@@ -20,10 +22,8 @@
 
 
   <ul id="phaseList">
-
-    <g:each var="phase" in="${it.phases}">	
-	<g:render template="/phase/phase" model="['phase':phase]"/>
-    </g:each>
+
+    <qb:renderPhases phases="${it.phases}" showArchive="false" template="/phase/phase"/>
 
   </ul>
 

diff --git a/grails-app/views/javascript/_board.gsp b/grails-app/views/javascript/_board.gsp
@@ -99,6 +99,16 @@
 
     });
 
+/*    $('#archiveBtn').click(function(event){
+
+      if( $(this).css('background-position') == '3px -94px' ){
+          $(this).css('background-position','-13px -94px');
+      }else{
+          $(this).css('background-position','3px -94px');
+      }
+      event.preventDefault();
+    });
+*/
   }
 
   /* TODO: Change beforeInjection to getNewElementCallback to break out some missplaced logic */

diff --git a/grails-app/views/javascript/_phase.gsp b/grails-app/views/javascript/_phase.gsp
@@ -180,6 +180,7 @@ function phaseFormRefresh(formData,dialogSelector,successTitle,successMessage){
                    }
 
               }).parent().animate({opacity:0.3},300);
+              ui.item.animate({opacity:0.6},300);
 
               var initPos = ui.item.prevAll().length + 1;
               var elementId = ui.item.attr('id');
@@ -191,16 +192,22 @@ function phaseFormRefresh(formData,dialogSelector,successTitle,successMessage){
          });
 
          if ( $nextPhase.is('.phase') ){
-            $currentPhase.sortable('option','connectWith','#'+$nextPhase.attr('id')+'.available')
+
+            $currentPhase.sortable('option','connectWith','#'+$nextPhase.attr('id')+'.available');
+
+         }else if ( $currentPhase.parent().find('#archiveBtn').size() == 1 ){
+
+            $currentPhase.sortable('option','connectWith','#archiveBtn');
          }
+
      });
   }
 
   function enableSortableOnPhase($phase){
      $phase.sortable({
             placeholder: 'placeholder',
             stop: function(event,ui){
-
+                  ui.item.animate({opacity:1},300);
                   recalculateHeightAndUpdateCardCount();
                   $('.phase').parent().animate({opacity: 1},300);
 
@@ -280,6 +287,22 @@ function phaseFormRefresh(formData,dialogSelector,successTitle,successMessage){
 
               }
      });
+
+     var $archiveBtn = $phase.parent().find('#archiveBtn');
+     if( $archiveBtn.size() == 1 ){
+      var acceptSelector = '#' + $phase.attr('id') + ' > .card';
+      $archiveBtn.droppable({
+        hoverClass: 'cardHover',
+        accept: acceptSelector,
+        tolerance: 'pointer',
+        drop: function(event,ui){
+         // $.qPost(${createLink(controller:'card',action:'archive')})
+          ui.draggable.remove();
+        }
+
+      });
+     }
+
   }
 
 
diff --git a/grails-app/views/mainView/view.gsp b/grails-app/views/mainView/view.gsp
@@ -10,6 +10,7 @@
   <g:javascript src="jquery/jquery.ui.core.js"/>
   <g:javascript src="jquery/jquery.ui.sortable.js"/>
   <g:javascript src="jquery/jquery.ui.draggable.js"/>
+  <g:javascript src="jquery/jquery.ui.droppable.js"/>
   <g:javascript src="jquery/jquery.ui.dialog.js"/>
   <g:render template="/javascript/qanbanOnLoad"/>
   <g:render template="/javascript/qanbanFunctions"/>

diff --git a/grails-app/views/phase/_phase.gsp b/grails-app/views/phase/_phase.gsp
@@ -7,15 +7,21 @@
 
             <g:ifAllGranted role="ROLE_QANBANADMIN">
               <a href="#edit" class="editPhaseLink" id="phaseLink_${phase.id}"> </a>
+
             </g:ifAllGranted>
+
+            <qb:enableArchiveButton phase ="${phase}"/>
+
             <h3><g:fieldValue bean="${phase}" field="title" /></h3>
 
-            <div class="limitLine">
+              <div class="limitLine">
 		<g:if test="${phase.cardLimit}">${phase.cards.size()}/${phase.cardLimit}</g:if>
 		<g:else><g:message code="_phase.noLimit"/></g:else>
-	    </div>
+
+              </div>
       	</div>
 
+
         <ul class="phase phaseAutoHeight
 	    <g:if test="${phase.cardLimit && phase.cards.size() > 0 && (phase.cardLimit/phase.cards.size()) != 1 || phase.cardLimit != phase.cards.size()}">
 		available

diff --git a/test/unit/se/qbranch/qanban/BoardTests.groovy b/test/unit/se/qbranch/qanban/BoardTests.groovy
@@ -29,7 +29,7 @@ class BoardTests extends GrailsUnitTestCase {
 
     void testHasPhases() {
         mockDomain(Board)
-        def b = new Board().save()
+        def b = new Board(domainId: 'domainId').save()
         assertEquals 0, b.phases.size()
     }
 }
diff --git a/web-app/css/style.css b/web-app/css/style.css
@@ -33,7 +33,7 @@
  padding: 0 18px;
  line-height: 30px;
  display: inline-block;
- outline: none;
+
 }
 
 #mainmenu a:hover{
@@ -91,6 +91,7 @@ a {
     font-size: 1.2em;
     color: #333;
     text-decoration: none;
+    outline: none;
 }
 
 a:hover {
@@ -235,6 +236,30 @@ h4{}
      background-image: url(custom-theme/images/ui-icons_fd0000_256x240.png);
 }
 
+#archiveBtn {
+    display: block;
+    position: absolute;
+    top: -2px;
+    right: 23px;
+    width: 19px;
+    height: 19px;
+    padding: 1px;
+    background-image: url(custom-theme/images/ui-icons_222222_256x240.png);
+    background-repeat: no-repeat;
+    background-position: 3px -94px;
+}
+
+#archiveBtn:hover {
+    background-image: url(custom-theme/images/ui-icons_fd0000_256x240.png);
+}
+
+#archiveBtn.cardHover {
+    background-image: url(custom-theme/images/ui-icons_fd0000_256x240.png);
+    background-position: -13px -94px;
+}
+
+
+
 ul.phase {
     list-style: none;
     min-height: 30px;
@@ -265,9 +290,7 @@ ul.phase {
     border: 1px solid #2E83FF !important;
 }
 
-.myCard {
 
-}
 .cardTop {
     border-bottom: solid;
     border-width: 1px;
@@ -362,12 +385,13 @@ ul.phase {
 */
 .phaseHeader .limitLine {
     height: 1em;
-    background-color: #bbb;
+    background-image: url(../images/head_fade.png);
     text-align: center;
     line-height: 1em;
     position: absolute;
     width: 100%;
     bottom: 0;
+    color: #fff;
 }
 
 /*******/