Simplification - collapse bookings in a single view

pmuir · May 28, 2012 · d202864 · d202864
1 parent 41a46db
commit d202864
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 41 deletions.
diff --git a/src/main/webapp/resources/js/app/views/desktop/bookings.js b/src/main/webapp/resources/js/app/views/desktop/bookings.js
@@ -1,48 +1,23 @@
 define([
     'backbone',
     'utilities',
-    'text!../../../../templates/desktop/booking-row.html',
-    'text!../../../../templates/desktop/booking-table.html',
-    'require',
-    'bootstrap'
+    'text!../../../../templates/desktop/booking-table.html'
 ],function (Backbone,
             utilities,
-            bookingRowTemplate,
-            bookingTableTemplate,
-            require) {
+            bookingTableTemplate) {
 
-
-    // A subview of the BookingsView
-    var BookingRowView = Backbone.View.extend({
-        tagName:'tr',
+    var BookingsView = Backbone.View.extend({
         events:{
-            "click i[data-tm-role='delete']":"deleteBooking",
-            "click a":"showDetails"
+            "click i[data-tm-role='delete']":"deleteBooking"
         },
         render:function () {
-            utilities.applyTemplate($(this.el), bookingRowTemplate, this.model.attributes);
-            return this;
+            utilities.applyTemplate($(this.el), bookingTableTemplate, {model:this.model});
         },
         deleteBooking:function (event) {
-            if (confirm("Are you sure you want to delete booking " + this.model.get('id'))) {
-                this.model.destroy({wait:true});
-            }
-            event.stopPropagation();
-            event.stopImmediatePropagation();
-        },
-        showDetails:function () {
-            require('router').navigate("#bookings/" + this.model.get('id'), true);
-        }
-    });
-
-
-    var BookingsView = Backbone.View.extend({
-        render:function () {
-            utilities.applyTemplate($(this.el), bookingTableTemplate, {});
-            _.each(this.model.models, function (booking) {
-                var bookingView = new BookingRowView({model:booking});
-                $("#bookingList").append(bookingView.render().el);
-            });
+            var id = $(event.currentTarget).data("tm-id");
+            if (confirm("Are you sure you want to delete booking " + this.model.get(id).get('id'))) {
+                this.model.get(id).destroy({wait:true});
+            };
         }
     });
 

diff --git a/src/main/webapp/resources/templates/desktop/booking-row.html b/src/main/webapp/resources/templates/desktop/booking-row.html
diff --git a/src/main/webapp/resources/templates/desktop/booking-table.html b/src/main/webapp/resources/templates/desktop/booking-table.html
@@ -13,7 +13,16 @@ <h3 class="page-header">Current bookings</h3>
             </tr>
             </thead>
             <tbody id='bookingList'>
-
+            <% _.each(model.models, function (booking) { %>
+                <tr>
+                    <td><a href="#bookings/<%=booking.id%>"><%=booking.attributes.id%></a></td>
+                    <td><%=booking.attributes.contactEmail%></td>
+                    <td><%=new Date(booking.attributes.createdOn).toPrettyString()%></td>
+                    <td><%=booking.attributes.tickets.length%></td>
+                    <td>$<%=booking.attributes.totalTicketPrice%></td>
+                    <td><i data-tm-role='delete' data-tm-id="<%=booking.attributes.id%>" class="icon-trash" title="Delete booking"></i></td>
+                </tr>
+            <% }); %>
             </tbody>
         </table>
     </div>