has_accounts_engine 2.0.1 → 3.0.0.beta0

data/app/assets/javascripts/has_accounts_engine/cyt.js

@@ -15,9 +15,6 @@ function addAutofocusBehaviour() {
 // Add datepicker
 function addDatePickerBehaviour() {
   $('.date-picker').each(function(){
-    if ($(this).hasClass('date')) {
-      $(this).data('date', new Date().toISOString());
-    }
     $(this).datepicker({ format: 'dd.mm.yyyy' });
   });
 };

data/app/controllers/accounts_controller.rb

@@ -6,7 +6,7 @@ class AccountsController < HasAccountsController
   has_scope :page, :only => :index
 
   def index
-    @accounts = apply_scopes(Account).includes(:account_type).includes(:credit_bookings, :credit_bookings)
+    @accounts = apply_scopes(Account).includes(:account_type).includes(:credit_bookings, :credit_bookings).page(params[:page]).per_page(100)
   end
 
   def show

data/app/inputs/date_field_input.rb

@@ -1,8 +1,19 @@
 class DateFieldInput < SimpleForm::Inputs::StringInput
+  # Normalizes to localized date
+  def date_value
+    value = object.send(attribute_name)
+
+    return nil unless value.present?
+
+    value = Date.parse(value) if value.is_a? String
+
+    I18n.localize(value)
+  end
+
   def input
     input_html_options[:type] = 'text'
     template.content_tag(:div, :class => 'input-append date-picker date') do
-      super +
+      @builder.text_field(attribute_name, input_html_options.merge(:value => date_value)) +
         template.content_tag(:div, :class => 'add-on') do
           template.content_tag(:i, '', :class => 'icon-calendar')
         end

data/app/views/accounts/_list.html.haml

@@ -0,0 +1,11 @@
+%table.table.table-striped.accounts.collection
+  %thead
+    %tr
+      %th= t_attr(:code, Account)
+      %th= t_attr(:title, Account)
+      %th{:style => "text-align: right"}= t_attr(:saldo, Account)
+      %th.action-links
+  %tbody
+    = render @accounts
+
+= render 'bookings/sidebar'

data/app/views/bookings/_booking.html.haml

@@ -2,16 +2,16 @@
 
 %tr[booking]
   %td= booking.value_date
-  %td
-    = link_to booking.title, item_action.call(booking), 'data-href-container' => 'tr'
+  %td.subject
+    = link_to booking.title, item_action.call(booking), 'data-remote' => true, 'data-table-key' => '13'
     - if booking.comments.present?
-      %hr{:style => "height: 1px; margin: 0"}/
-      %i= booking.comments
+      %div
+        %i= booking.comments
   %td= link_to booking.reference.to_s(:reference), booking.reference unless booking.reference.nil?
   %td= link_to booking.debit_account.code, account_path(booking.debit_account), :title => booking.debit_account.title unless booking.debit_account.nil?
   %td= link_to booking.credit_account.code, account_path(booking.credit_account), :title => booking.credit_account.title unless booking.credit_account.nil?
   %td.currency= currency_fmt(booking.amount)
   %td.action-links
-    = list_link_for(:edit, booking)
-    = list_link_for(:delete, booking, :remote => true)
-    = list_link_for(:copy, booking)
+    = list_link_for(:edit, booking, 'data-table-key' => '69')
+    = list_link_for(:delete, booking, :remote => true, 'data-table-key' => '68')
+    = list_link_for(:copy, booking, 'data-table-key' => '67')

data/app/views/bookings/_booking_form.html.haml

@@ -0,0 +1,15 @@
+- booking = resource
+%tr[booking]
+  = simple_fields_for booking, :wrapper => 'table' do |f|
+    %td= f.input :value_date, :as => 'date_field', :label => false
+    %td
+      = f.input :title, :input_html => {'data-autofocus' => true}
+      = f.input :comments, :rows => 2
+    %td= link_to booking.reference.to_s(:reference), booking.reference unless booking.reference.nil?
+    %td= f.association :debit_account, :collection => accounts_as_collection(Account.all), :as => :combobox, :input_html => { :style => 'max-width: 14ex' }
+    %td= f.association :credit_account, :collection => accounts_as_collection(Account.all), :as => :combobox, :input_html => { :style => 'max-width: 14ex' }
+    %td= f.input :amount, :as => :string
+    %td.action-links
+      = list_link_for(:show, booking, :icon => 'remove', :method => :put, :remote => true, 'data-table-key' => '27')
+      = link_to "#", 'data-table-key' => '13' do
+        %i.icon-ok

data/app/views/bookings/_list.html.haml

@@ -1,14 +1,15 @@
-%table.table.table-striped.bookings.collection
-  %thead
-    %tr
-      %th= t_attr :valuta
-      %th= t_attr :title
-      %th= t_attr :reference
-      %th= t_attr :debit_account
-      %th= t_attr :credit_account
-      %th.currency= t_attr 'amount'
-      %th.action-links
-  %tbody
-    = render collection, :item_action => (item_action ||= nil)
+= form_tag '', :id => 'bookings_table_form', 'data-table-select' => true, :method => :put, :remote => true do
+  %table.table.table-striped.bookings.collection
+    %thead
+      %tr
+        %th.valute_date= t_attr :valuta
+        %th.title= t_attr :title
+        %th.reference= t_attr :reference
+        %th.debit_account= t_attr :debit_account
+        %th.credit_account= t_attr :credit_account
+        %th.amount.currency= t_attr 'amount'
+        %th.action-links(style='width: 66px')
+    %tbody
+      = render collection, :item_action => (item_action ||= nil)
 
 = render 'bookings/sidebar'

data/app/views/bookings/new.html.haml

@@ -1,4 +1,4 @@
-= contextual_links
+= contextual_links 'data-remote' => true
 
 = boot_page_title(BookingTemplate)
 = render 'booking_templates/list', :item_action => lambda{|object| new_booking_booking_template_path(object)}

data/app/views/bookings/show.js.erb

@@ -0,0 +1,4 @@
+$('#booking_<%= resource.id %>').replaceWith('<%=j render "booking_form" %>');
+$('#bookings_table_form').attr('action', '<%= booking_path(resource) %>');
+initializeBehaviours();
+window.bookyt_table.enterEdit()

data/app/views/bookings/update.js.erb

@@ -0,0 +1,4 @@
+$('#<%= "#{resource.class.name.underscore}_#{resource.to_param}" %>').replaceWith('<%=escape_javascript render resource %>');
+$('tr#<%= "#{resource.class.name.underscore}_#{resource.to_param}" %>').addClass('selected')
+initializeBehaviours();
+

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "2.0.1"
+  VERSION = "3.0.0.beta0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 3.0.0.beta0
+  prerelease: 6
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -300,18 +300,18 @@ files:
 - app/views/accounts/_edit_booking.html.haml
 - app/views/accounts/_edit_bookings.html.haml
 - app/views/accounts/_form.html.haml
+- app/views/accounts/_list.html.haml
 - app/views/accounts/_list_footer.html.haml
-- app/views/accounts/_list_header.html.haml
 - app/views/accounts/_show.html.haml
 - app/views/accounts/_show_bookings.html.haml
 - app/views/accounts/edit_bookings.html.haml
 - app/views/accounts/edit_bookings.js.erb
-- app/views/accounts/index.html.haml
 - app/views/accounts/show.html.haml
 - app/views/booking_templates/_booking_template.html.haml
 - app/views/booking_templates/_form.html.haml
 - app/views/booking_templates/_list.html.haml
 - app/views/bookings/_booking.html.haml
+- app/views/bookings/_booking_form.html.haml
 - app/views/bookings/_form.html.haml
 - app/views/bookings/_list.html.haml
 - app/views/bookings/_new_form.html.haml
@@ -320,7 +320,9 @@ files:
 - app/views/bookings/new.html.haml
 - app/views/bookings/select.html.haml
 - app/views/bookings/show.html.haml
+- app/views/bookings/show.js.erb
 - app/views/bookings/simple_edit.html.haml
+- app/views/bookings/update.js.erb
 - app/views/has_accounts/_form.html.haml
 - app/views/has_accounts/_list.html.haml
 - app/views/has_accounts/_search_form.html.haml
@@ -364,9 +366,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/app/views/accounts/_list_header.html.haml

@@ -1,5 +0,0 @@
-%tr
-  %th= t_attr(:code, Account)
-  %th= t_attr(:title, Account)
-  %th{:style => "text-align: right"}= t_attr(:saldo, Account)
-  %th.action-links

data/app/views/accounts/index.html.haml

@@ -1,9 +0,0 @@
-= contextual_links
-= boot_page_title
-%table.table.table-striped.accounts.collection
-  %thead
-    = render 'list_header'
-  %tbody
-    = render @accounts
-
-= render 'bookings/sidebar'