Skip to content

Commit

Permalink
Render modal and show it
Browse files Browse the repository at this point in the history
  • Loading branch information
hlcfan committed Jan 28, 2019
1 parent 39d8475 commit a537082
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 5 deletions.
11 changes: 8 additions & 3 deletions app/controllers/rooms_controller.rb
Expand Up @@ -13,10 +13,15 @@ def index
end

def set_room_status
if valid_room_status.present? && (@room.status != valid_room_status)
@room.update_attribute :status, valid_room_status
# binding.pry
# if valid_room_status.present? && (@room.status != valid_room_status)
# @room.update_attribute :status, valid_room_status
# end

respond_to do |format|
format.json { head :no_content }
format.js
end
head :no_content
end

def story_list
Expand Down
20 changes: 20 additions & 0 deletions app/views/rooms/leaflets/_board_ticket_list.html.erb
@@ -0,0 +1,20 @@
<% total = 0 %>
<tbody>
<tr>
<th>Story</th>
<th>Point</th>
</tr>
<% tickets.each do |ticket| %>
<% total += ticket[2].to_i %>
<tr>
<td><%= ticket[1] %></td>
<td><%= ticket[2] %></td>
</tr>
<% end %>
<tfoot>
<tr>
<td>Total</td>
<td><%= total %></td>
</tr>
</tfoot>
</tbody>
26 changes: 24 additions & 2 deletions app/views/rooms/leaflets/view.html.erb
Expand Up @@ -17,9 +17,10 @@
<a href="<%= edit_room_path(@room.slug) %>" class="btn btn-default">✏️ Edit room</a>
<button type="button" onClick="copyToClipboard()" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" data-original-title="" title="">📻 Share link</button>
<a href="<%= summary_room_path(@room.slug)%>" class="btn btn-default ">📊 Summary</a>
<div id="tooltip-area"></div>
<input type="text" id="hiddenField" class="leaflet__room-share-link" value="<%= room_url(@room.slug) %>" />
<%= link_to "🏁 Close room", set_room_status_room_path(@room.slug, status: "draw"), remote: true, method: "post", class: "btn btn-default"%>
</div>
<div id="tooltip-area"></div>
<input type="text" id="hiddenField" class="leaflet__room-share-link" value="<%= room_url(@room.slug) %>" />
</div>
<hr class="leaflet__view-split"/>
<% @story_points.each do |story_item| %>
Expand Down Expand Up @@ -65,3 +66,24 @@
</div>
</div>

<div class="modal fade" tabindex="-1" role="dialog" id="board-modal">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">C'est la vie</h4>
</div>
<div class="modal-body">
<table class="table table-bordered">
</table>
</div>
<div class="modal-footer">
<a href="<%= summary_room_path(@room.slug)%>" target="_blank" class="pull-left">View summary</a>
<a href="<%= room_path(@room.slug, format: "xlsx")%>" target="_blank" class="pull-left" style="margin-left: 10px;">Download report</a>
<button type="button" class="btn btn-info" id="synk-button">Update to JIRA</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->

2 changes: 2 additions & 0 deletions app/views/rooms/set_room_status.js.erb
@@ -0,0 +1,2 @@
$('#board-modal table').empty().append("<%= escape_javascript(render partial: 'rooms/leaflets/board_ticket_list', locals: {tickets: @room.groomed_stories}) %>");
$('#board-modal').modal({keyboard: false, backdrop: 'static'})

0 comments on commit a537082

Please sign in to comment.