adherent 0.2.2.4 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa8b1a42314d24578b2a8eeeb6d0453dafd925ea
-  data.tar.gz: cfeb4077bffb54e0a890874393a330afbbab5aeb
+  metadata.gz: 5db061d98a083cc706a9bfc3f7415993278e7dc1
+  data.tar.gz: 923387c4520c2d794bf386f4880f58343cbeb53f
 SHA512:
-  metadata.gz: 1949c0043e52955c08733f6cc83dd68fd2c9589b8e10d8ea905259b6a7e223eb17a12b28bdbb07a9dfd370de9b3c5f52185ecf3934b3770aa37b09c7766d7805
-  data.tar.gz: fea45e6f1883c9ea7583f5f7483f462ee3f675cf97523da47c707cdf22e5e7f4454de5323502cb195a5324705c02715a3f4e301ce89e6f6cad6674124ab4a9b2
+  metadata.gz: 2dacb0e0576b36cbc31ffa8446944be1571ef93b634d2ab87c62601e533b867b7550bdb1f69843a175d78943b0cc76672d7c3df223c408971ce873c2b8095611
+  data.tar.gz: 1871ea355722ed68e3d33a58a89f716e1c5d6062e44774b4be25e0ffe4c1d991368d353f8062357f1a4185f575487a508e82615b94703bd101693f4074e472bd

data/app/assets/javascripts/adherent/payments.js.coffee

@@ -0,0 +1,5 @@
+# Lance l'impression de la page avec l'icône de classe icon_print
+$ ->
+  $('img.icon_print').click (e) ->
+    e.preventDefault()
+    javascript:print()

data/app/assets/stylesheets/adherent/jcmenu.css

@@ -23,6 +23,13 @@
     float: left;
 }
 
+#main_nav {
+  background-color: #fff;
+  width: 100%;
+  height: 40px;
+  border-bottom: 1px solid #ddd;
+}
+
 /* Utile pour que les nav-header tels que le numéro de compte ne soient pas cliquable*/
 .dropdown-menu li.no-link > a:hover  {
     background-color: #FFF;

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

@@ -6,7 +6,7 @@ adaptée.
 
 @media print {
   
-  .container-fluid, #adherent_footer {
+  .container-fluid, #adherent_footer, #adherent_header {
     display: none;
   }
   
@@ -54,7 +54,9 @@ adaptée.
   }
   
  // partie rajoutée pour la mise en page spécifique du reçu
-  
+ #adherent_header {
+    display: none;
+  }
   
  h1#print_title, h4 {
     padding-top: 1em;

data/app/assets/stylesheets/bootstrap/_forms.scss

@@ -387,6 +387,7 @@ input[type="checkbox"] {
   margin-top: 5px;
   margin-bottom: 10px;
   color: lighten($text-color, 25%); // lighten the text some for contrast
+  font-style: italic;
 }
 
 

data/app/controllers/adherent/payments_controller.rb

@@ -100,7 +100,7 @@ module Adherent
     private
     
     def payment_params
-      params.require(:payment).permit(:amount, :date, :mode)
+      params.require(:payment).permit(:amount, :date, :mode, :comment)
     end
   end
 end

data/app/models/adherent/payment.rb

@@ -25,6 +25,10 @@ module Adherent
     
     validates :amount, :date, :mode, :member_id, presence:true
     validates :amount, :over_imputations=>true
+    validates :comment, :format=>{with:NAME_REGEX},
+      :length=>{:maximum=>LONG_NAME_LENGTH_MAX}, allow_blank: true
+    
+    
     before_save :correct_range_date
     
     pick_date_for :date 

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

@@ -6,11 +6,13 @@
         input_html:{value:@payment.date, 
           date_min:min_date,
           date_max:max_date},
-        :as=>:date_picker
+        :as=>:date_picker 
+      = f.input :comment, wrapper_html:{class:'col-lg-5'}, 
+        hint:'Factultatif. Si rempli, sera utilisé pour le libéllé de l\'écriture en compta'
       = f.input :amount, wrapper_html:{class:'col-lg-2'},
         input_html:{value:two_decimals(@payment.amount)}, :as=>:french_decimal
       = f.input :mode, wrapper_html:{class:'col-lg-3'},
         :collection=>Adherent::MODES, prompt:'Choisissez'
         
     .form-actions
-      = f.button :submit, id: 'new_payement', class: "btn-primary col-lg-offset-6"
+      = f.button :submit, id: 'new_payement', class: "btn-primary col-lg-offset-9"

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

@@ -1,6 +1,7 @@
 %tr
   %td= payment.date
   %td.numeric= number_to_currency(payment.amount, locale: :fr)
+  %td= payment.comment
   %td= payment.mode
   %td= list_imputations(payment)
   %td.numeric= number_to_currency payment.non_impute, locale: :fr

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

@@ -11,6 +11,7 @@
       %tr
         %th Le
         %th Montant
+        %th Commentaire
         %th Par
         %th Imputé sur 
         %th Reste à imputer

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

@@ -3,9 +3,10 @@
   = icon_to 'money-plus.png', new_member_payment_path(@member), title:'Nouveau paiement'
   - if (@payment.non_impute != 0.0)
     = icon_to 'imputation.png', new_payment_reglement_path(@payment), title: 'Imputer le solde sur une autre adhésion'
-  = link_to_function(image_tag("adherent/icones/printer.png"),
-      "javascript:print()",
-       class:'icon_menu', title:'Imprimer un reçu')  
+  %a.icon_menu{href:'#'}
+    = image_tag("adherent/icones/printer.png", title:'Imprimer un reçu', 
+      class:'icon_print')
+  
   = icon_to 'modifier.png', edit_member_payment_path(@payment.member, @payment)
   = icon_to 'supprimer.png', [@member,@payment], method: :delete, data: {confirm: 'Etes vous sûr ?'}
   
@@ -23,6 +24,9 @@
     %p
       %b Montant :
       = number_to_currency(@payment.amount, locale: :fr)
+    %p
+      %b Commentaire :
+      = @payment.comment
     %p
       %b Par :
       = @payment.mode

data/app/views/layouts/adherent/_header.html.haml

@@ -2,7 +2,7 @@
   -#Place pour le Header : surcharger  le partial _header dans votre application principale pour y adapter votre Header
   -#ou masquer ce div par un style display: hidden; si vous ne voulez pas personnaliser ce header.
   -#L'id de ce header est #adherent_header
-  %ul.nav.nav-tabs#menu_general
+  %ul.nav.nav-tabs#main_nav
     -# pas très bien nommé, la suite affiche les icones
     %li.horizontal_icons
       = yield :menu

data/config/initializers/constants.rb

@@ -1,6 +1,44 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
+# Définition de diverses constantes pour les validations des modèles
+# Sont directement copiées des fichiers all_constants et regex de l'appli
+# FaitesLesComptes. 
+# 
 
 module Adherent
   MODES = %w(CB Chèque Virement Espèces)
+  
+  # limites de validation
+  NAME_LENGTH_MIN = 3
+  NAME_LENGTH_MAX = 30
+  NAME_LENGTH_LIMITS = NAME_LENGTH_MIN..NAME_LENGTH_MAX
+
+  MEDIUM_NAME_LENGTH_MAX = 60
+
+  LONG_NAME_LENGTH_MAX = 90
+  LONG_NAME_LENGTH_LIMITS = NAME_LENGTH_MIN..LONG_NAME_LENGTH_MAX
+
+  MAX_COMMENT_LENGTH = 300
+
+  
+  # Définition des constantes pour les REGEX
+  #
+  # NAME_REGEX doit commercer par un chiffre, une lettre minuscule ou majuscule ou encore
+  # minuscule accentuée.
+  #
+  # Ce premier caractère est suivi par autant de caractères du même type mais ce peut être
+  # aussi le signe @ ou & ou un point ou une virgule ou une apostrophe
+  #
+  # Le dernier caractère de la chaîne ne peut être qu'un ALNUM ou un point pour marquer la fin
+  # de la phrase. Par exemple pour un commentaire.
+  #
+
+  # chiffre, lettre et caractères accentués
+  ALNUM = '[a-zA-Z0-9]|[\u00e0-\u00ff]|[€]'
+  # les mêmes plus le point final, point d'interrogation et parenthèse fermante
+  ALNUMEND = '[a-zA-Z0-9]|[\u00e0-\u00ff]|[\?)€\.%]' 
+  # les mêmes plus les espaces ainsi que () ° @ & / - +' , et .
+  WORDCHARS =  '[a-zA-Z0-9]|[\u00e0-\u00ff]|\s|[\u0153€@()=%&_\*\:°\-\+\'\.\/,]' 
+  # on regroupe le tout
+  WORD = "((#{ALNUM})((#{WORDCHARS})*(#{ALNUMEND}))?)" 
+  NAME_REGEX = /\A#{WORD}\Z/ # pour obtenir le name_regex
+
 end

data/config/locales/simple_form.fr.yml

@@ -35,6 +35,7 @@ fr:
       payment: 
         amount: Montant
         mode: Mode de paiement
+        comment: Commentaire
       reglement:
         amount: Montant
         adhesion: Adhésion

data/db/migrate/20150321054651_add_comment_to_payment.rb

@@ -0,0 +1,5 @@
+class AddCommentToPayment < ActiveRecord::Migration
+  def change
+    add_column :adherent_payments, :comment, :string
+  end
+end

data/lib/adherent/version.rb

@@ -12,6 +12,6 @@ module Adherent
   # VERSION = "0.2.2.1" # ajustements suite premiers essais staging 
   # VERSION = "0.2.2.2" # correction french_decimal_input 
   # VERSION = "0.2.2.3" # adaptation à la précompilation des assets 
-  VERSION = "0.2.2.4" # correction des références des assets data_tables 
-  
+  # VERSION = "0.2.2.4" # correction des références des assets data_tables 
+  VERSION = '0.2.3' # Ajout d'un champ comment pour les paiements
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,25 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '891fd10ca76294dc2eba56dad2e80aa8a28a49634b6b7fe4e3d470cb26affc02346bcae23f9cf667df45360f98de9b7e134208a485fb7f3592ac44cdd0d45d36'
+# Dummy::Application.config.secret_token = '891fd10ca76294dc2eba56dad2e80aa8a28a49634b6b7fe4e3d470cb26affc02346bcae23f9cf667df45360f98de9b7e134208a485fb7f3592ac44cdd0d45d36'
+require 'securerandom'
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+
+def find_secure_token
+  token_file = Rails.root.join('.secret')
+  if File.exist? token_file
+    # Use the existing token.
+    File.read(token_file).chomp
+  else
+    # Generate a new token of 64 random hexadecimal characters and store it in token_file.
+    token = SecureRandom.hex(64)
+    File.write(token_file, token)
+    token
+  end
+end
+
+Dummy::Application.config.secret_key_base = find_secure_token

data/spec/dummy/db/schema.rb

@@ -9,22 +9,25 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130810074112) do
+ActiveRecord::Schema.define(version: 20150321054651) do
 
-  create_table "adherent_adhesions", :force => true do |t|
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "adherent_adhesions", force: true do |t|
     t.date     "from_date"
     t.date     "to_date"
-    t.decimal  "amount",     :precision => 10, :scale => 2
+    t.decimal  "amount",     precision: 10, scale: 2
     t.integer  "member_id"
-    t.datetime "created_at",                                :null => false
-    t.datetime "updated_at",                                :null => false
+    t.datetime "created_at",                          null: false
+    t.datetime "updated_at",                          null: false
   end
 
-  add_index "adherent_adhesions", ["member_id"], :name => "index_adherent_adhesions_on_member_id"
+  add_index "adherent_adhesions", ["member_id"], name: "index_adherent_adhesions_on_member_id", using: :btree
 
-  create_table "adherent_coords", :force => true do |t|
+  create_table "adherent_coords", force: true do |t|
     t.string   "mail"
     t.string   "tel"
     t.string   "gsm"
@@ -33,47 +36,48 @@ ActiveRecord::Schema.define(:version => 20130810074112) do
     t.string   "zip"
     t.string   "city"
     t.integer  "member_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
-  create_table "adherent_members", :force => true do |t|
+  create_table "adherent_members", force: true do |t|
     t.string   "number"
     t.string   "name"
     t.string   "forname"
     t.date     "birthdate"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
     t.integer  "organism_id"
   end
 
-  create_table "adherent_payments", :force => true do |t|
+  create_table "adherent_payments", force: true do |t|
     t.date     "date"
-    t.decimal  "amount",     :precision => 10, :scale => 2
+    t.decimal  "amount",     precision: 10, scale: 2
     t.string   "mode"
     t.integer  "member_id"
-    t.datetime "created_at",                                :null => false
-    t.datetime "updated_at",                                :null => false
+    t.datetime "created_at",                          null: false
+    t.datetime "updated_at",                          null: false
+    t.string   "comment"
   end
 
-  add_index "adherent_payments", ["member_id"], :name => "index_adherent_payments_on_member_id"
+  add_index "adherent_payments", ["member_id"], name: "index_adherent_payments_on_member_id", using: :btree
 
-  create_table "adherent_reglements", :force => true do |t|
-    t.decimal  "amount",      :precision => 10, :scale => 2
+  create_table "adherent_reglements", force: true do |t|
+    t.decimal  "amount",      precision: 10, scale: 2
     t.integer  "adhesion_id"
     t.integer  "payment_id"
-    t.datetime "created_at",                                 :null => false
-    t.datetime "updated_at",                                 :null => false
+    t.datetime "created_at",                           null: false
+    t.datetime "updated_at",                           null: false
   end
 
-  add_index "adherent_reglements", ["adhesion_id"], :name => "index_adherent_reglements_on_adhesion_id"
-  add_index "adherent_reglements", ["payment_id"], :name => "index_adherent_reglements_on_payment_id"
+  add_index "adherent_reglements", ["adhesion_id"], name: "index_adherent_reglements_on_adhesion_id", using: :btree
+  add_index "adherent_reglements", ["payment_id"], name: "index_adherent_reglements_on_payment_id", using: :btree
 
-  create_table "organisms", :force => true do |t|
+  create_table "organisms", force: true do |t|
     t.string   "title"
     t.string   "status"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end