adherent 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9453a892990d0b8f648539d14f09ba379a24067
-  data.tar.gz: 3fb67efc34fd4e646e8243fa3b7d5ef33934673d
+  metadata.gz: bcb31a14740d77a176e63a7f0d07182c1084cf77
+  data.tar.gz: 9554bf9e5da5cf3dff4a991fb18065f663dd7e2c
 SHA512:
-  metadata.gz: d7a94e6b21b12fbe84b25352282c773a0aa7866b86c1479505a30bc51ac3bbd724f4f52d2a92fbd22a3ae11deb824bb5bb4d22f9425acd807d9438ca00eb088a
-  data.tar.gz: 6ac210132b30cc57195784567bfc49f6a193f0f08f5b65b02c5e5715b06503507476c92e2c72211b4aa93ab9ff3f32dc9a0a0a600a5e481c04108ae0ec4c45a5
+  metadata.gz: 46a4a5da98bac79da37c61fac452c73c15e7b98a9903cd776fe6112fd0ee33fd88bfc570a63924ca31dfc05e33f4041f9045f7a1710e8e4b61aae9c26a8c4766
+  data.tar.gz: 0ff293aa381e091f8e7f59660c7d397ba6e4dd2f08d06c7a44c9de6044a1a3b7aa4ee7e4e4bbb12dbe6aed39bb6b163d78cd690f1db2c524baf1eefcc1baaca1

data/app/helpers/adherent/application_helper.rb

@@ -38,8 +38,11 @@ module Adherent
     end
     
     def imputation_with_actions(pay, r)
+      # on gère le cas où l'adhésion a disparu (car le membre a disparu)
+      a = r.adhesion
+      mem = a ? a.member : 'supprimée'
       html = ''
-      html << "Adhésion #{r.adhesion.member} pour #{number_to_currency(r.adhesion.amount, locale: :fr)}"
+      html << "Adhésion #{mem} pour #{number_to_currency(r.amount, locale: :fr)}"
       html << "&nbsp;&nbsp;"
       html << "#{icon_to 'detail.png', payment_reglement_path(pay.id, r.id)}"
       html.html_safe

data/app/helpers/adherent/payments_helper.rb

@@ -14,23 +14,22 @@ module Adherent
     # TODO A voir, il peut y avoir des paiements partiels ou total
     def recu_cotisation(payment, member)
       rs = payment.reglements
-      if rs.count == 1 && rs.first.adhesion.member == member
+      if rs.count == 1 && rs.first.try(:adhesion).try(:member) == member
         adh = rs.first.adhesion
-        "votre adhésion pour la période #{du_au(adh.from_date, adh.to_date)}"
+        "Adhésion pour la période #{du_au(adh.from_date, adh.to_date)}"
         
       elsif rs.size == 1
         # une seule adhésion mais pas pour lui
         adh = rs.first.adhesion
-        m = adh.member
-        "l'adhésion de #{m.forname} #{m.name} pour la période #{du_au(adh.from_date, adh.to_date)}"    
+        "l'adhésion de #{coords(adh)} pour la période #{pour(adh)}"    
       else  
         # plusieurs adhésions
         str  = "les adhésions de <ul>"
         rs.each do |r| 
           str+='<li>'
           adh = r.adhesion
-          m = adh.member
-          str += "#{m.forname} #{m.name} pour la période #{du_au(adh.from_date, adh.to_date)}"
+          
+          str += "#{coords(adh)} pour la période #{pour(adh)}"
           str += '</li>'
         end
         str += '</ul>'
@@ -44,5 +43,21 @@ module Adherent
     def du_au(from_date, to_date)
       "du #{from_date} au #{to_date}"
     end
+    
+    def coords(adh)
+      if adh && m = adh.member
+        "#{m.name} #{m.forname}"
+      else
+        'Effacé'
+      end
+    end
+    
+    def pour(adh)
+      if adh
+      "#{du_au(adh.from_date, adh.to_date)}"
+      else
+       'du ??? au ???' 
+      end
+    end
   end
 end

data/app/models/adherent/payment.rb

@@ -19,12 +19,10 @@ module Adherent
     
     has_many :reglements, :dependent=>:destroy
     belongs_to :member
-    
-    
-    # attr_accessible :amount, :date, :mode
-    
+        
     validates :amount, :date, :mode, :member_id, presence:true
-    validates :amount, :over_imputations=>true
+    # le validator over_imputations est défini dans config/initializers/validators.rb
+    validates :amount, :over_imputations=>true, :if=>'amount' 
     validates :comment, :format=>{with:NAME_REGEX},
       :length=>{:maximum=>LONG_NAME_LENGTH_MAX}, allow_blank: true
     

data/lib/adherent/version.rb

@@ -21,5 +21,6 @@ module Adherent
   # VERSION = '0.3.2' # find_member est maintenant défini dans ApplicationController
   # VERSION = '0.3.3' # retour en arrière car find_member(id) et find_member(member_id)
   # VERSION = '0.3.4' # les règlements sans adhésion s'affichent
-  VERSION = '0.3.5' # Affichage plus rapide des paiements
+  # VERSION = '0.3.5' # Affichage plus rapide des paiements
+  VERSION = '0.3.6' # Affichage plus rapide des paiements
   end

data/spec/dummy/log/development.log

@@ -118252,3 +118252,23 @@ Started GET "/assets/adherent/reglements.js?body=1" for 127.0.0.1 at 2015-10-12
 
 
 Started GET "/assets/adherent/icones/supprimer.png" for 127.0.0.1 at 2015-10-12 19:37:10 +0200
+  Adherent::Reglement Load (163.4ms)  SELECT "adherent_reglements".* FROM "adherent_reglements"  WHERE (amount = 10)
+  Adherent::Reglement Load (2.4ms)  SELECT "adherent_reglements".* FROM "adherent_reglements"  WHERE (amount = 26.66)
+  Adherent::Reglement Load (2.1ms)  SELECT "adherent_reglements".* FROM "adherent_reglements"  WHERE (amount = 10.0)
+   (432.0ms)  DROP DATABASE IF EXISTS "adh_test"
+   (5625.3ms)  CREATE DATABASE "adh_test" ENCODING = 'unicode'
+  SQL (4.0ms)  CREATE EXTENSION IF NOT EXISTS "plpgsql"
+   (130.3ms)  CREATE TABLE "adherent_adhesions" ("id" serial primary key, "from_date" date, "to_date" date, "amount" decimal(10,2), "member_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (38.9ms)  CREATE  INDEX  "index_adherent_adhesions_on_member_id" ON "adherent_adhesions" USING btree ("member_id")
+   (55.9ms)  CREATE TABLE "adherent_coords" ("id" serial primary key, "mail" character varying(255), "tel" character varying(255), "gsm" character varying(255), "office" character varying(255), "address" text, "zip" character varying(255), "city" character varying(255), "member_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (49.4ms)  CREATE TABLE "adherent_members" ("id" serial primary key, "number" character varying(255), "name" character varying(255), "forname" character varying(255), "birthdate" date, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "organism_id" integer) 
+   (175.8ms)  CREATE TABLE "adherent_payments" ("id" serial primary key, "date" date, "amount" decimal(10,2), "mode" character varying(255), "member_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "comment" character varying(255)) 
+   (9.2ms)  CREATE  INDEX  "index_adherent_payments_on_member_id" ON "adherent_payments" USING btree ("member_id")
+   (32.3ms)  CREATE TABLE "adherent_reglements" ("id" serial primary key, "amount" decimal(10,2), "adhesion_id" integer, "payment_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (22.0ms)  CREATE  INDEX  "index_adherent_reglements_on_adhesion_id" ON "adherent_reglements" USING btree ("adhesion_id")
+   (4.9ms)  CREATE  INDEX  "index_adherent_reglements_on_payment_id" ON "adherent_reglements" USING btree ("payment_id")
+   (13.6ms)  CREATE TABLE "organisms" ("id" serial primary key, "title" character varying(255), "status" character varying(255), "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (2.6ms)  CREATE TABLE "schema_migrations" ("version" character varying(255) NOT NULL) 
+   (5.6ms)  CREATE UNIQUE INDEX  "unique_schema_migrations" ON "schema_migrations"  ("version")
+   (0.6ms)  SELECT version FROM "schema_migrations"
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130810074112')