bookingsync_portal 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c409dc3f373173cf63975b3e7deea34767d19a3d
-  data.tar.gz: bea7083a6fb9bde9eeeb60da4101db6b1d501206
+  metadata.gz: 90a5f5b87509d851d09d5adecfe7aefbe2a3d9c0
+  data.tar.gz: 6cfa15d7ab2a8bdccafbf4ce77eb667a6fdb1a6f
 SHA512:
-  metadata.gz: b86598c7bca993d3105cbb5518f22cbce58c90355dc2f09c16b4ac65168423e389f4b60f07897b7ec6921f48fdc5f315f6f9efc58934c1c0a1af54bbd4195da4
-  data.tar.gz: 30dbf6577ba6ddfcaf4206c0e96c2f7bddcc264fe2ae4b0a99a96c0e93dd35fa2095b82a6c4af1b1a715de5e8096cb64a46c0fd78774ba5c574799595481113c
+  metadata.gz: 0b43d1c7f39fc7b5b8ee0e618dbe6c2be81a9122e24449aa8feed9928fccc6b331b4d55cf3b882153b472e29f37227f2d6e119d879025090da5dc46b6ac7ac78
+  data.tar.gz: 61c627baccb81333491250cf8e9129e1fb02e8e30c7807831151f252950972c4162bafb114a6cad6568df483c0eb28a054db5c99e1e71997b59a1cfaf80a44ba

data/app/assets/javascripts/bookingsync_portal/admin/application.js.coffee

@@ -27,3 +27,58 @@
 window.extractIdFromDomId = (attribute) ->
   if attribute
     attribute.split("_").pop()
+$.fn.extend
+  draggableRental: ->
+    settings =
+      revert: "invalid"
+      zIndex: 50
+      revertDuration: 100
+      cursor: "move"
+      containment: '.rentals-container'
+      appendTo: '.rentals-container'
+      helper: "clone"
+      scroll: false
+
+      start: (e, ui) ->
+        $(ui.helper).addClass "ui-draggable-helper"
+
+    @each () ->
+      $(this).draggable(settings)
+
+  droppableRemoteRental: ->
+    settings =
+      accept: ".bookingsync-rental"
+      activeClass: "dropzone-active"
+      hoverClass: "dropzone-hover"
+      greedy: true
+      tolerance: "pointer"
+      drop: (event, ui) ->
+        remoteRentalDropZone = $(@)
+
+        rentalId = extractIdFromDomId($(ui.draggable).attr("id"))
+        remoteRentalId = extractIdFromDomId(remoteRentalDropZone.attr("id"))
+        remoteAccountId = remoteRentalDropZone.data("remote-account-id")
+        remoteRentalUid = remoteRentalDropZone.data("uid")
+
+        if remoteRentalId
+          postData = { "rental_id": rentalId, "remote_rental_id": remoteRentalId }
+        else
+          postData = { "rental_id": rentalId, "remote_account_id": remoteAccountId }
+          # clone new remote rental drop zone and append to the end
+          remoteRentalDropZone.clone().insertBefore(remoteRentalDropZone).addClass('new_rental_placeholder');
+
+        $(ui.draggable).remove()
+
+        connect_url = $('.remote-rentals-list.rentals-list').data('connect-url')
+
+        $.ajax
+          url: connect_url
+          type: "POST"
+          data: postData
+          dataType: 'script'
+          beforeSend: ->
+            $(@).addClass('loading')
+          success: ->
+            $(@).removeClass('loading')
+    @each () ->
+      $(this).droppable(settings)

data/app/assets/javascripts/bookingsync_portal/admin/connections.js.coffee

@@ -1,48 +1,3 @@
 $ ->
-  $(".bookingsync-rental").draggable
-    revert: "invalid"
-    zIndex: 50
-    revertDuration: 100
-    cursor: "move"
-    containment: '.rentals-container'
-    appendTo: '.rentals-container'
-    helper: "clone"
-    scroll: false
-
-    start: (e, ui) ->
-      $(ui.helper).addClass "ui-draggable-helper"
-
-  $(".panel.panel-remote").droppable
-    accept: ".bookingsync-rental"
-    activeClass: "dropzone-active"
-    hoverClass: "dropzone-hover"
-    greedy: true
-    tolerance: "pointer"
-    drop: (event, ui) ->
-      remoteRentalDropZone = $(@)
-
-      rentalId = extractIdFromDomId($(ui.draggable).attr("id"))
-      remoteRentalId = extractIdFromDomId(remoteRentalDropZone.attr("id"))
-      remoteAccountId = remoteRentalDropZone.data("remote-account-id")
-      remoteRentalUid = remoteRentalDropZone.data("uid")
-
-      if remoteRentalId
-        postData = { "rental_id": rentalId, "remote_rental_id": remoteRentalId }
-      else
-        postData = { "rental_id": rentalId, "remote_account_id": remoteAccountId }
-        # clone new remote rental drop zone and append to the end
-        remoteRentalDropZone.clone().insertBefore(remoteRentalDropZone).addClass('new_rental_placeholder');
-
-      $(ui.draggable).remove()
-
-      connect_url = $('.remote-rentals-list.rentals-list').data('connect-url')
-
-      $.ajax
-        url: connect_url
-        type: "POST"
-        data: postData
-        dataType: 'script'
-        beforeSend: ->
-          $(@).addClass('loading')
-        success: ->
-          $(@).removeClass('loading')
+  $(".bookingsync-rental").draggableRental()
+  $(".panel.panel-remote").droppableRemoteRental()

data/app/assets/stylesheets/bookingsync_portal/admin/application.css.scss

@@ -189,6 +189,11 @@ body > .footer {
     position: relative;
   }
 
+  h4 small {
+    color: $gray-lighter;
+    display: block;
+  }
+
   .status {
     position: absolute;
     right: 3px;

data/app/controllers/bookingsync_portal/admin/connections_controller.rb

@@ -16,10 +16,13 @@ module BookingsyncPortal
       end
 
       def destroy
-        connection = current_account.connections.find(params[:id]).destroy
+        @connection = current_account.connections.find(params[:id]).destroy
+        @not_connected_rentals = current_account.rentals.visible.ordered.not_connected
+        @visible_rentals = current_account.rentals.visible
 
         respond_to do |wants|
           wants.html { redirect_to admin_rentals_path }
+          wants.js
         end
       end
 

data/app/controllers/bookingsync_portal/admin/rentals_controller.rb

@@ -6,7 +6,7 @@ module BookingsyncPortal
 
       def index
         @not_connected_rentals = current_account.rentals.visible.ordered.not_connected
-        @visible_rentals_count = current_account.rentals.visible.count
+        @visible_rentals = current_account.rentals.visible
         @remote_accounts = current_account.remote_accounts
         @remote_rentals_by_account = current_account.remote_rentals.ordered
           .includes(:remote_account).group_by(&:remote_account)

data/app/views/bookingsync_portal/admin/connections/create.js.coffee

@@ -0,0 +1,6 @@
+<%- if @connection.persisted? %>
+  $("#<%= dom_id @connection.remote_rental %>, .new_rental_placeholder").first().replaceWith(
+    "<%=j render 'bookingsync_portal/admin/rentals/connected_rental', rental: @connection.rental, remote_rental: @connection.remote_rental %>");
+  $(".bookingsync-rental").draggableRental()
+  $(".panel.panel-remote").droppableRemoteRental()
+<%- end %>

data/app/views/bookingsync_portal/admin/connections/destroy.js.coffee

@@ -0,0 +1,7 @@
+$("#<%= dom_id @connection.rental %>").first().replaceWith(
+  "<%=j render 'bookingsync_portal/admin/rentals/remote_rental', remote_rental: @connection.remote_rental %>")
+$(".bookingsync-rentals-list .rentals-list-scroll").first().html(
+  "<%=j render 'bookingsync_portal/admin/rentals/rentals', visible_rentals: @visible_rentals, not_connected_rentals: @not_connected_rentals %>");
+
+$(".bookingsync-rental").draggableRental()
+$(".panel.panel-remote").droppableRemoteRental()

data/app/views/bookingsync_portal/admin/rentals/_connected_rental.html.erb

@@ -9,12 +9,13 @@
     </div>
     <div class="panel-body-grid-text">
       <h4 title="<%= RemoteRental.human_attribute_name(:uid) %>: <%= remote_rental.uid %>">
-          <%= remote_rental.display_name %> / <%= rental.name %>
+          <%= rental.name %><br>
+          <small><%= remote_rental.display_name %></small>
       </h4>
       <div class="status">
         <%= link_to bookingsync_portal.admin_connection_path(rental.connection),
           class: ["btn", "btn-xs", "remove-connection", rental.remote_rental.synchronized? ? "btn-success" : "btn-warning"],
-          data: { disable_with: t('.disconnecting_rental') }, method: :delete do %>
+          data: { disable_with: t('.disconnecting_rental') }, method: :delete, remote: true do %>
           <% unless rental.remote_rental.synchronized? %>
             <span class="hover_hide"><%= icon('spinner') %></span>
           <% else %>

data/app/views/bookingsync_portal/admin/rentals/_rentals.html.erb

@@ -0,0 +1,14 @@
+<%- if visible_rentals.count == 0 -%>
+  <div class="lead text-center well">
+    <p><%= t('.no_published_rentals_html', id: current_account.synced_id) %></p>
+  </div>
+<%- elsif not_connected_rentals.count > 0 -%>
+  <% not_connected_rentals.each do |rental| %>
+    <%= render rental %>
+  <% end %>
+<%- else -%>
+  <div class="lead text-center well">
+    <p class=""><%= icon 'thumbs-up fa-lg' %></p>
+    <p><%=t '.all_synchronized' %></p>
+  </div>
+<%- end -%>

data/app/views/bookingsync_portal/admin/rentals/index.html.erb

@@ -10,20 +10,7 @@
         <legend class="text-center"><%= image_tag('bookingsync_portal/bookingsync.png', alt: 'BookingSync') %></legend>
       </div>
       <div class="rentals-list-scroll">
-        <%- if @visible_rentals_count == 0 -%>
-          <div class="lead text-center well">
-            <p><%= t('.no_published_rentals_html', id: current_account.synced_id) %></p>
-          </div>
-        <%- elsif @not_connected_rentals.count > 0 -%>
-          <% @not_connected_rentals.each do |rental| %>
-            <%= render rental %>
-          <% end %>
-        <%- else -%>
-          <div class="lead text-center well">
-            <p class=""><%= icon 'thumbs-up fa-lg' %></p>
-            <p><%=t '.all_synchronized' %></p>
-          </div>
-        <%- end -%>
+        <%= render "rentals", visible_rentals: @visible_rentals, not_connected_rentals: @not_connected_rentals %>
       </div>
     </div>
   </div>

data/lib/bookingsync_portal/version.rb

@@ -1,3 +1,3 @@
 module BookingsyncPortal
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookingsync_portal
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Marciniak
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -359,7 +359,8 @@ files:
 - app/models/bookingsync_portal/rental.rb
 - app/synchronizers/bookingsync_portal/write/ensure_source_exists.rb
 - app/synchronizers/bookingsync_portal/write/source.rb
-- app/views/bookingsync_portal/admin/connections/create.js.erb
+- app/views/bookingsync_portal/admin/connections/create.js.coffee
+- app/views/bookingsync_portal/admin/connections/destroy.js.coffee
 - app/views/bookingsync_portal/admin/help/_help.html.erb
 - app/views/bookingsync_portal/admin/help/index.html.erb
 - app/views/bookingsync_portal/admin/remote_accounts/_form.html.erb
@@ -370,6 +371,7 @@ files:
 - app/views/bookingsync_portal/admin/rentals/_new_remote_rental.html.erb
 - app/views/bookingsync_portal/admin/rentals/_remote_rental.html.erb
 - app/views/bookingsync_portal/admin/rentals/_rental.html.erb
+- app/views/bookingsync_portal/admin/rentals/_rentals.html.erb
 - app/views/bookingsync_portal/admin/rentals/index.html.erb
 - app/views/bookingsync_portal/admin/rentals/show.js.erb
 - app/views/layouts/bookingsync_portal/_flash.html.erb

data/app/views/bookingsync_portal/admin/connections/create.js.erb

@@ -1,5 +0,0 @@
-<%- if @connection.persisted? %>
-  $("#<%= dom_id @connection.remote_rental %>, .new_rental_placeholder").replaceWith(
-   "<%=j render 'bookingsync_portal/admin/rentals/connected_rental', rental: @connection.rental, remote_rental: @connection.remote_rental,
-      disconnect_url: bookingsync_portal.admin_connection_url(@connection) %>");
-<%- end %>