add version and estimated_hours to popup card and update the card aft…

…er commit

app/controllers/kanban_apis_controller.rb

@@ -84,6 +84,12 @@ def pane_wip_and_limit
 		render :json => {:wip => wip, :wip_limit => wip_limit}
 	end
 
+	def issue_card_detail
+		issue = Issues.find(params[:issue_id])
+		card = KanbanCard.find_by_issue_id(params[:issue_id])
+		render :json => {:issue=> issue, :card => card}
+	end
+
 	def detail_to_desc(journal)
 		prop_keys = ["status_id","priority_id", "fixed_version_id", "done_ratio","category_id","assigned_to_id"]
 		actions = ['Set','Changed',"Set","",'Set', 'Change']
@@ -166,3 +172,5 @@ def kanban_card_journals
 		render :json => {:card_journals => card_journals,:issue_journals => issue_journals}
 	end
 end
+
+

app/controllers/kanban_cards_controller.rb

@@ -42,6 +42,8 @@ def update
     @issue.assigned_to_id = params[:assignee_id]
     @issue.start_date = params[:start_date_]
     @issue.due_date = params[:due_date_]
+    @issue.fixed_version_id = params[:version_id]
+    @issue.estimated_hours = params[:est_hours]
 
     @saved = false
     begin

app/controllers/kanbans_controller.rb

@@ -13,6 +13,7 @@ def index
     @members= @project.members
     @principals = @project.principals
     @user = User.current
+    @versions = @project.versions
 
     @roles = @user.roles_for_project(@project)
 

app/views/kanban_cards/_update.js.haml

@@ -6,6 +6,15 @@ $("#ajax-indicator").hide();
     $("#popupWindow").find("#errorExplanation").hide();
     $("#popupWindow").find("#errorExplanation").text("");
     $("##{@issue.id}").appendTo($("#pane_#{@card.kanban_pane_id}"));
+    $("##{@issue.id}").find("#assignee_id").val("#{@issue.assigned_to_id}")
+    $("##{@issue.id}").find("#developer_id").val("#{@card.developer_id}")
+    $("##{@issue.id}").find("#verifier_id").val("#{@card.verifier_id}")
+    $("##{@issue.id}").find("#issue_status_id").val("#{@issue.status_id}")
+    $("##{@issue.id}").find("#kanban_state_id").val("#{@card.kanban_pane.kanban_state_id}")
+    $("##{@issue.id}").find("#version_id").val("#{@issue.fixed_version_id}")
+    $("##{@issue.id}").find("#est_hours").val("#{@issue.estimated_hours}")
+    $("##{@issue.id}").find("#start_date").val("#{@issue.start_date}")
+    $("##{@issue.id}").find("#due_date").val("#{@issue.due_date}")
 - else
   :plain
     $("#popupWindow").find("#errorExplanation").text("  #{@errors}")

app/views/kanbans/_card_form.html.haml

@@ -17,14 +17,21 @@
       .newline
         = label_tag "Verifier: "
         = select_tag "verifier_id",  options_from_collection_for_select(@principals,"id", "name")
+      .newline  
+        = label_tag "Version: "
+        = select_tag "version_id",  options_from_collection_for_select(@versions,"id", "name")
       .newline
         = label_tag "Start_date: "
         = text_field_tag :start_date_, " ", :size => 10, :type => "date"
         = calendar_for(:start_date_)
       .newline
         = label_tag "Due_date: "
-        = text_field_tag :due_date_, " ", :size => 10, :type => "date"
+        = text_field_tag :due_date_, " ", :size => 10
         = calendar_for(:due_date_)
+      .newline  
+        = label_tag "Est Hours:"
+        = text_field_tag :est_hours, " ", :size => 3
+
       /.newline
       /= label_tag "Keywords: "
       /= text_field_tag "keyword"

app/views/kanbans/_kanban_pane.html.haml

@@ -17,6 +17,8 @@
       = hidden_field_tag :due_date, i.due_date
       = hidden_field_tag :created_on, i.created_on.utc.strftime("%Y/%m/%d %H:%M:%S UTC")
       = hidden_field_tag :tracker_id, i.tracker_id
+      = hidden_field_tag :version_id, i.fixed_version_id
+      = hidden_field_tag :est_hours, i.estimated_hours
       %span.tip{:style => "font-weight: normal; font-size:11px"}
         %strong= link_to "##{i.id} #{i.subject}", issue_path(i)
         %br

assets/javascripts/kanban.js

@@ -420,7 +420,7 @@ function renderPopupCard(popup,card,action,sender,receiver){
       popup.find("select#issue_status_id").val(card.find("#issue_status_id").val());
       popup.find("select#kanban_state_id").val(card.find("#kanban_state_id").val());
       var pane_id = sender.attr("id").match(/\d+$/)[0];
-      popup.find("#kanban_pane_id").val(pane_id);
+      popup.find("#kanban_pane_id").val(pane_id);      
     }else if (action == 'drop'){
       // Change the assignee to me
       var pane_id = receiver.attr("id").match(/\d+$/)[0];
@@ -467,6 +467,9 @@ function renderPopupCard(popup,card,action,sender,receiver){
     popup.find("#issue_id").val(issue_id);
     popup.find("textarea").val("").focus(1);
     popup.find("#indication").hide();
+    popup.find("#version_id").val(card.find("#version_id").val());
+    popup.find("#est_hours").val(card.find("#est_hours").val());
+
   }
 }
 

assets/javascripts/kanban_api.js

@@ -16,6 +16,19 @@ function getUserWipAndLimit(user_id){
                   });
 }
 
+function getIssueDetail(issue_id){
+  kanbanAjaxCall("get",
+                   "/kanban_apis/issue_card_detail",{"card_id":issue_id},
+                   function(data,result){
+                    if (result == 0){
+                      return data;
+                    }else{
+                      return undefined;
+                    }
+                  });
+}
+
+
 function getKanbanStates(){
   kanbanAjaxCall("get",
                    "/kanban_apis/kanban_states",{"id":9999},

assets/stylesheets/kanban.css

@@ -208,6 +208,10 @@ td .kanban-card-form select{
   margin: 4px;
 }
 
+.kanban-card-form .float_left {
+  float:left;	
+}
+
 #popupSubmit input{width:auto;}
 .newline {clear:both;}
 

config/routes.rb

@@ -28,4 +28,5 @@
 	match 'issue_status_kanban_states/update', :controller => 'issue_status_kanban_states', :action => "update", :via => :put
 	match 'kanbans/copy', :controller => 'kanbans', :action => "copy"
 	match 'kanban_reports/index', :controller => 'kanban_reports', :action => "index", :via => :get
+	match 'kanban_apis/issue_card_detail', :controller => 'kanban_apis', :action => 'issue_card_detail', :via => :get
 end