adherent 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc38f0e8374b387fb78018d2256a35d72eaa42a0
-  data.tar.gz: 6da830b9cba2dfb5172b2187667515a232e913c4
+  metadata.gz: d6c55e7186ffae84d7243d16220587bd3d74ec7d
+  data.tar.gz: 8714056c137db25698e8149e1148a7f86b6f098d
 SHA512:
-  metadata.gz: 8929f5da67a218679c1cb133780e9c64e1643c2eb638f9d4d19e5aefcdfc7f3d972fe1809fa7b8a6350eb98480dc05e92dc98ec916ef2e8ecaff7967e4b8c787
-  data.tar.gz: 050ca3b73234556f4b891a1e9827f68478ce33386d2622970e479bfdd59e281f3fb285200ea4bc8e47da2e8d6c1a1570bd6f7e4776495572704c9711935696af
+  metadata.gz: f7be31ba50aa0bb3b7d125ed40362e4aa7d0969cbc628a5fd0a852e46a7ce9dd35fb62f77947f628fcac584972fb7332325f52533bb24b09d3b2fc1d65c3da06
+  data.tar.gz: 329917e1686688b1271101849f5dedfead85a7928f6fec244a69ef656e62d283e155abcfc934193a5436fcf898b6c8f16510b6eafcd9e8fd8d8ddd63cfa77c2f

data/app/assets/stylesheets/adherent/jc_application.css.scss

@@ -25,6 +25,10 @@ Purpose of the stylesheet follows.
     /*    font-family: sans-serif;*/
 }
 
+.french_decimal {
+  text-align: right;
+}
+
 
 /* stylesheets/application.css */
 /*.simple_form label {

data/app/controllers/adherent/application_controller.rb

@@ -1,6 +1,6 @@
 
 # pour avoir les méthodes d'authenfication proposées par l'ApplicationController
 # ainsi que la gestion des sessions et notamment la méthode find_organism
-  class Adherent::ApplicationController < ApplicationController
-  end
+class Adherent::ApplicationController < ApplicationController
+end
 

data/app/controllers/adherent/payments_controller.rb

@@ -18,7 +18,7 @@ module Adherent
       if @payment.save
         
         flash[:notice] = 'Le paiement a été enregistré' 
-        redirect_to member_adhesions_path(@member)
+        redirect_to member_payments_path(@member)
       else
         flash[:alert] = 'Impossible d\'enregistrer ce paiement'
         render 'new'

data/app/helpers/adherent/application_helper.rb

@@ -18,6 +18,14 @@ module Adherent
       ActionController::Base.helpers.number_with_precision(montant, precision:2) rescue '0,00'
     end
     
+    # affiche un nombre avec deux décimales
+    # utilisé dans les vues qui demandent un montant
+    def two_decimals(montant)
+      sprintf('%0.02f',montant)
+    rescue
+      '0.00'
+    end 
+    
     def icon_to_users
       icon_to 'users.png', members_path, title:'Liste des membres' 
     end

data/app/views/adherent/adhesions/_form.html.haml

@@ -5,7 +5,7 @@
       .span12
         = f.input :from_date, wrapper_html:{class:'span2'}, label_html:{class: 'span4'}, input_html:{class:'span8', value:@adhesion.from_date}, :as=>:date_picker
         = f.input :to_date, wrapper_html:{class:'span2'}, label_html:{class: 'span4'}, input_html:{class:'span8', value:@adhesion.to_date}, :as=>:date_picker
-        = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span4'}, input_html:{class:'span8'}
+        = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span5'}, input_html:{class:'span7', value:two_decimals(@adhesion.amount)}, :as=>:french_decimal
     
     .row-fluid
       .span12

data/app/views/adherent/payments/_form.html.haml

@@ -4,8 +4,8 @@
     .row-fluid
       .span12
         = f.input :date, wrapper_html:{class:'span2'}, label_html:{class: 'span4'}, input_html:{class:'span8', value:@payment.date}, :as=>:date_picker
-        = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span4'}, input_html:{class:'span8'}
-        = f.input :mode, wrapper_html:{class:'span3'}, :collection=>Adherent::MODES, prompt:'Choissisez', label_html:{class: 'span6'}, input_html:{class:'span6'}
+        = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span6'}, input_html:{class:'span6', value:two_decimals(@payment.amount)}, :as=>:french_decimal
+        = f.input :mode, wrapper_html:{class:'span3'}, :collection=>Adherent::MODES, prompt:'Choisissez', label_html:{class: 'span6'}, input_html:{class:'span6'}
     .row-fluid
       .span12
         .form-actions

data/app/views/adherent/payments/index.html.haml

@@ -26,5 +26,5 @@
 
           %td
             - if (payment.non_impute != 0.0)
-              = link_to 'imputation', new_payment_reglement_path(payment), title: 'Imputer le solde sur une autre adhésion'
+              = icon_to 'imputation.png', new_payment_reglement_path(payment), title: 'Imputer le solde sur une autre adhésion'
             = icon_to 'supprimer.png', [@member,payment], method: :delete, confirm: 'Etes vous sûr ?'

data/app/views/adherent/reglements/_form.html.haml

@@ -3,8 +3,8 @@
     =f.error_notification
     .row-fluid
       .span12
-        = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span4'}, input_html:{class:'span8', value:number_to_currency(@reglement.amount)}, :disabled=>true
-        = f.association :adhesion, :collection=>@unpaid_adhesions, :label_method=>:to_s_for_select, :prompt=>'Choisissez une adhésion', wrapper_html:{class:'span4'}, label_html:{class: 'span2'}, input_html:{class:'span10'} 
+        = f.input :amount, wrapper_html:{class:'span2'}, label_html:{class: 'span6'}, input_html:{class:'span6', value:number_to_currency(@reglement.amount)}, :as=>:french_decimal, :disabled=>true
+        = f.association :adhesion, :collection=>@unpaid_adhesions, :label_method=>:to_s_for_select, :prompt=>'Choisissez une adhésion', wrapper_html:{class:'span4'}, label_html:{class: 'span3'}, input_html:{class:'span9'} 
            
     .row-fluid
       .span12

data/config/initializers/french_decimal_input.rb

@@ -0,0 +1,16 @@
+# la classe FenchDecimalInput permet d'utiliser les
+# possibilités de html 5 (text pattern) mais pas numeric car Chrome
+# rentre les points décimaux d'un clavier comme des points
+# ce qui n'est pas accepté et tronque les décimales.
+#
+class FrenchDecimalInput < SimpleForm::Inputs::Base
+
+ def input
+   input_html_options['type'] = 'text' # probablement inutile
+   input_html_options['pattern'] = '\-?\d+(\.\d{0,2})?'
+   
+
+   @builder.text_field(attribute_name, input_html_options)
+  end
+end
+

data/lib/adherent/version.rb

@@ -1,3 +1,3 @@
 module Adherent
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end