has_accounts_engine 3.0.0.beta5 → 3.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb734abe68a549c974145506703f6cee9b700124
-  data.tar.gz: 205fffc13de768c22c9b33f9d07b2a54ba163bc7
+  metadata.gz: 55dd3abef7759acba2842d6e3ea4f84d9a75626e
+  data.tar.gz: 93781ee13a4dbd617660129e1c6f9abc10a96008
 SHA512:
-  metadata.gz: 4467b3ea1b2a9ba4bf27e733fe9dc7409fe7b51781cfd857ad5e2f3afd937bc435e83040f593a5f7f4d1968c2508cf4cfc512801e46f77b4b0793ff0e97a1cab
-  data.tar.gz: 657493303886374ae00572325190fac170b687ffc3c210996418c118eaef13a21b2fc4f513f6fd0818e23f8955ae33fb0b2ac979e3398148b4ffda5d09ac9c53
+  metadata.gz: 8d49141e17eadd475cffbc7a6fa720ac4360f15e33ecc704911b63bf7a57913209ecf6ea385f9cf86c19e71d674cd3d4cb059d19d3156d936524db2a1245dbbd
+  data.tar.gz: 1d4fea76a1ffbb6594306fb8dc2d711aeb845907ec2b51244dffa6ba70ac5788fb161d098be784ad218f4f01fa96b712303712c8f8fa7f5efae7f47f99230c25

data/app/assets/stylesheets/has_accounts_engine/partials/content/_overview.sass

@@ -32,7 +32,8 @@ ul.overview-list.level-1
     padding-top: 0.8em
     padding-bottom: 0.8em
     width: 20%
-  ul // Level > 1
+  ul
+    // Level > 1
     margin-top: 5px
     li
       display: block

data/app/controllers/bookings_controller.rb

@@ -2,6 +2,8 @@ class BookingsController < HasAccountsController
   # Scopes
   has_scope :by_value_period, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
   has_scope :by_text
+  has_scope :by_amount, :using => [:from, :to]
+  has_scope :by_date, :using => [:from, :to]
 
   # Actions
   def index

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

@@ -0,0 +1,18 @@
+= contextual_links
+
+= boot_page_title
+
+= simple_form_for '', :method => :get, remote: true do |f|
+  .row-fluid
+    .span6= f.input :by_text, label: t(:by_text, scope: 'bookings.search'), required: false
+  .row-fluid
+    .span3= f.input 'by_amount[from]', label: t(:by_amount_from, scope: 'bookings.search'), required: false
+    .span3= f.input 'by_amount[to]', label: t(:by_amount_to, scope: 'bookings.search'), required: false
+    .span3= f.input 'by_date[from]', label: t(:by_date_from, scope: 'bookings.search'), required: false
+    .span3= f.input 'by_date[to]', label: t(:by_date_to, scope: 'bookings.search'), required: false
+
+  .form-actions
+    = f.button :submit, t_action(:search)
+
+= paginate collection if defined?(paginate)
+= render 'list'

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

@@ -0,0 +1,2 @@
+$('.collection').html('<%=escape_javascript render collection %>');
+initializeBehaviours();

data/config/locales/de.yml

@@ -61,6 +61,12 @@ de:
       title:            Buchungsjournal
     copy:
       title:            Buchung kopieren
+    search:
+      by_text:          Inhalt
+      by_amount_from:   Betrag von
+      by_amount_to:     Betrag bis
+      by_date_from:     Datum von
+      by_date_to:       Datum bis
 
   crud:
     action:

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "3.0.0.beta5"
+  VERSION = "3.0.0.beta6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta5
+  version: 3.0.0.beta6
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 3.0.0.beta0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 3.0.0.beta0
 - !ruby/object:Gem::Dependency
   name: has_vcards
   requirement: !ruby/object:Gem::Requirement
@@ -298,6 +298,8 @@ files:
 - app/views/bookings/_new_form.html.haml
 - app/views/bookings/_sidebar.html.haml
 - app/views/bookings/_simple_form.html.haml
+- app/views/bookings/index.html.haml
+- app/views/bookings/index.js.erb
 - app/views/bookings/new.html.haml
 - app/views/bookings/select.html.haml
 - app/views/bookings/show.html.haml
@@ -354,3 +356,4 @@ signing_key:
 specification_version: 4
 summary: HasAccountsEngine provides controllers, views for has_accounts.
 test_files: []
+has_rdoc: