adherent 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db061d98a083cc706a9bfc3f7415993278e7dc1
-  data.tar.gz: 923387c4520c2d794bf386f4880f58343cbeb53f
+  metadata.gz: 127fbdd71b1bdaa6d9072a7033fe51b12509da0c
+  data.tar.gz: df8d29fd57d16ef6bd3a00e117d8d46f94df0052
 SHA512:
-  metadata.gz: 2dacb0e0576b36cbc31ffa8446944be1571ef93b634d2ab87c62601e533b867b7550bdb1f69843a175d78943b0cc76672d7c3df223c408971ce873c2b8095611
-  data.tar.gz: 1871ea355722ed68e3d33a58a89f716e1c5d6062e44774b4be25e0ffe4c1d991368d353f8062357f1a4185f575487a508e82615b94703bd101693f4074e472bd
+  metadata.gz: 190a65eb5593687177f11dd585704c2aa82df315664e5fa86416b60092a4ef42b0a892706cc2d97cc1c5a0818756151844f2c52b6c642342c01a0a9c3d38a967
+  data.tar.gz: bc51fcbe4e1deb9250cd972ae5acd3b1030cdda952b6e4c590b5bd89eda46b67669cbb6e059387d83f7765a8a3028facb55304fa8ae882d9f6f85efb18219b4d

data/app/controllers/adherent/application_controller.rb

@@ -2,5 +2,13 @@
 # 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
+  
+  # met en forme une date au format dd-mmm-yyyy en retirant le point 
+  # par exemple 13-nov-2013 (et non 13-nov.-2016), ceci pour pouvoir 
+  # facilement inclure la date dans le nom d'un fichier
+  def dashed_date(date)
+    I18n.l(date, format:'%d-%b-%Y').gsub('.', '')
+  end
+
 end
 

data/app/controllers/adherent/members_controller.rb

@@ -6,12 +6,18 @@ module Adherent
   class MembersController < ApplicationController
     # GET /members
     # GET /members.json
-    def index
-      @members = @organism.members
+    def index 
+      
+      @members = Adherent::QueryMember.query_members(@organism)
   
       respond_to do |format|
         format.html # index.html.erb
-        format.json { render json: @members }
+        format.csv { send_data Adherent::QueryMember.to_csv(@organism),
+          :filename=>"#{@organism.title}-#{dashed_date(Date.today)}-Membres.csv"  } 
+        
+        format.xls { send_data Adherent::QueryMember.to_csv(@organism),
+          :filename=>"#{@organism.title}-#{dashed_date(Date.today)}-Membres.xls"  }
+        format.json { render json:@members }
       end
     end
   
@@ -22,7 +28,7 @@ module Adherent
   
       respond_to do |format|
         format.html # show.html.erb
-        format.json { render json: @member }
+        format.json { render json:@member }
       end
     end
   
@@ -33,7 +39,7 @@ module Adherent
   
       respond_to do |format|
         format.html # new.html.erb
-        format.json { render json: @member }
+        format.json { render json:@member }
       end
     end
   
@@ -53,7 +59,7 @@ module Adherent
           format.json { render json: @member, status: :created, location: @member }
         else
           format.html { render action: "new" }
-          format.json { render json: @member.errors, status: :unprocessable_entity }
+          format.json { render json:@member.errors, status: :unprocessable_entity }
         end
       end
     end

data/app/models/adherent/adhesion.rb

@@ -8,10 +8,15 @@ module Adherent
     belongs_to :member
     has_many :reglements
     
+    # TODO changer le champ to_date en un champ until_date car crée de la 
+    # confusion avec les méthodes to_date de Ruby
+    
     validates :from_date, :to_date, :member_id, :amount, presence:true
     validates_numericality_of :amount, greater_than_or_equal_to: 0
     validate :chrono_order
     
+    # défini dans le module pick_date_extension. 
+    # Voir les conseils et instructions de ce module
     pick_date_for :from_date, :to_date
     
     # partant d'une adhésion, retourne un hash avec les attributs correspondants à  
@@ -28,16 +33,15 @@ module Adherent
          montant = amount if montant == 0
         {:from_date =>I18n.l(read_attribute(:to_date)+1),
            :to_date=>I18n.l(read_attribute(:to_date).years_since(1)),
-           amount: montant
+           amount: montant 
            } 
     end
     
     # liste toutes les adhésions qui ne sont pas payées.
     # pour rappel un where ne fonctionne pas avec un aggrégat obligeant à utiliser la clause having
-    # reglements_amount.to_i donne le montant des règlements enregistrés
-    # to_i est nécessaire car le retour fait par Rails est un string
+    #
     scope :unpaid, -> {select('adherent_adhesions.*, sum(adherent_reglements.amount) as reglements_amount').
-        joins('left join adherent_reglements on adherent_reglements.adhesion_id = adherent_adhesions.id').
+        joins('left join adherent_reglements on adherent_adhesions.id = adherent_reglements.adhesion_id').
         group('adherent_adhesions.id').
         having('adherent_adhesions.amount > 0 AND (adherent_adhesions.amount > sum(adherent_reglements.amount) OR sum(adherent_reglements.amount) IS NULL)')}
  
@@ -48,6 +52,8 @@ module Adherent
       "#{member.to_s} - #{Adherent::ApplicationController.helpers.number_to_currency(due, locale: :fr)}"
     end
     
+  
+    
     
     
     # indique si une adhésion a été réglée

data/app/models/adherent/member.rb

@@ -1,10 +1,12 @@
+# coding: utf-8
+
 module Adherent
   class Member < ActiveRecord::Base
     
-    
+
     pick_date_for :birthdate
     
-    belongs_to :organism, class_name: '::Organism'
+    belongs_to :organism, class_name:'::Organism'
     has_one :coord, dependent: :destroy
     has_many :adhesions, dependent: :destroy
     has_many :payments
@@ -34,6 +36,17 @@ module Adherent
       [forname, name.upcase].join(' ')
     end
     
+    # indique la date de fin de son adhésion actuelle.
+    # S'il n'y a pas d'adhésion, on prend la date de création du membre
+    # 
+    # On n'a qu'un I18n::l car le to_date de last_adhesion est déja mis
+    # au format par le module pick_date_extension
+    #
+    def jusquau
+      la = last_adhesion
+      la ? la.to_date : I18n::l(created_at.to_date)
+    end
+    
     # renvoie une nouvelle adhésion préremplie avec les éléments issus de la
     # dernière adhésion.
     # il est possible d'imposer le montant si nécessaire
@@ -48,5 +61,32 @@ module Adherent
       adhesions.new(vals)
     end
     
+    
+    # Permet en une seule requête de récupérer les données de la vue index 
+    # avec l'id, le number, name, forname, mail, tel, l'échande de l'adhésion
+    # (champ to_date), le montant des reglements reçus pour les adhésions de 
+    # ce membre (champ t_reglements), le montant des adhésions de ce membre
+    # champ (t_adhesions)
+    def self.index_members
+      sql= <<EOF
+      SELECT adherent_members.id, number, name, forname, birthdate, adherent_coords.mail AS mail, adherent_coords.tel AS tel,
+      (SELECT to_date FROM adherent_adhesions WHERE adherent_adhesions.member_id = adherent_members.id ORDER BY to_date DESC LIMIT 1 ) AS m_to_date,
+      (SELECT SUM(adherent_reglements.amount) FROM adherent_reglements, adherent_adhesions WHERE adherent_reglements.adhesion_id = adherent_adhesions.id AND adherent_adhesions.member_id = adherent_members.id) AS t_reglements,
+      (SELECT SUM(amount) FROM adherent_adhesions WHERE adherent_adhesions.member_id = adherent_members.id) AS t_adhesions
+      FROM adherent_members LEFT JOIN adherent_coords ON adherent_members.id = adherent_coords.member_id;
+EOF
+      Adherent::Member.connection.execute( sql.gsub("\n", ''))
+    end
+    
+    
+    
+    
+    protected
+    
+    def last_adhesion
+      adhesions.order('to_date').last
+    end
+    
+    
   end
 end

data/app/models/adherent/query_member.rb

@@ -0,0 +1,113 @@
+require 'csv'
+
+module Adherent
+  # La classe QueryMember s'appuie sur une view de SQL appelée 
+  # adherent_query_members. 
+  # 
+  # Elle reprend les principaux éléments de Member (organism_id, id, name,
+  # forname, birthdate, et rajoute la date de la dernière adhésion (champ 
+  # m_to_date), le montant total des adhésions dues (t_adhesions) et le montant
+  # total des règlements (t_reglements).
+  # 
+  #  Ces deux derniers champs sont utilisés pour savoir si le membre est à 
+  #  jour de ses paiements (méthode #a_jour?) 
+  #
+  class QueryMember < ActiveRecord::Base
+    
+    
+    
+    def self.columns() @columns ||= []; end
+
+    def self.column(name, sql_type = nil, default = nil, null = true)
+      columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+    end
+
+    column :id, :integer
+    column :organism_id, :integer
+    column :number, :string
+    column :name, :string
+    column :forname, :string
+    column :birthdate, :date
+    column :m_to_date, :date
+    column :t_adhesions, :decimal
+    column :t_reglements, :decimal
+    
+    
+    # juste pour avoir la remise en forme du champ birthdate
+    # pour l'affichage
+    pick_date_for :birthdate
+    
+    # booléen indiquant si l'adhérent est à jour de ces cotisations
+    def a_jour?
+      montant_du <= 0.001
+    end
+    
+    def self.query_sql(organism)
+      %Q(SELECT adherent_members.id, organism_id, number, name, forname, birthdate,
+       adherent_coords.mail AS mail, adherent_coords.tel AS tel,
+      (SELECT to_date FROM adherent_adhesions
+         WHERE adherent_adhesions.member_id = adherent_members.id
+         ORDER BY to_date DESC LIMIT 1 ) AS m_to_date,
+      (SELECT SUM(adherent_reglements.amount) FROM adherent_reglements,
+         adherent_adhesions
+       WHERE adherent_reglements.adhesion_id = adherent_adhesions.id AND
+         adherent_adhesions.member_id = adherent_members.id) AS t_reglements,
+      (SELECT SUM(amount) FROM adherent_adhesions
+         WHERE adherent_adhesions.member_id = adherent_members.id) AS t_adhesions
+      FROM adherent_members 
+      
+      LEFT JOIN adherent_coords ON adherent_members.id = adherent_coords.member_id
+      WHERE organism_id = #{organism.id}; 
+    )
+    end
+    
+    def self.query_members(organism)
+      find_by_sql(query_sql(organism))
+    end
+    
+    # ici on aurait pu utiliser pick_date_for mais cela pose le problème 
+    # des dates non remplies. Ce qui a son tour est gênant pour le tri dans 
+    # les tables.
+    def m_to_date
+      td = read_attribute(:m_to_date)
+      td.is_a?(Date) ? (I18n::l td) : '31/12/2099' 
+    end
+    
+    # montant dû par l'adhérent pour ses adhésions
+    def montant_du
+      tadh = t_adhesions ? BigDecimal.new(t_adhesions, 2) : BigDecimal.new(0.0, 2)
+      treg = t_reglements ? BigDecimal.new(t_reglements, 2) : BigDecimal.new(0.0, 2)
+      tadh - treg
+    end
+    
+    # edition en csv des membres d'un organisme dont l'id est 
+    # transmis en argument
+    def self.to_csv(organism, options = {col_sep:"\t"})
+      ms = query_members(organism)
+      CSV.generate(options) do |csv|
+        csv << ['Numero', 'Nom', 'Prénom', 'Date de naissance',
+          'Mail', 'Tél', 'Doit', 'Fin Adh.']
+        ms.each do |m|
+          csv << [m.number, m.name, m.forname, m.birthdate, m.mail, m.tel,
+            ActiveSupport::NumberHelper.number_to_rounded(m.montant_du, precision:2),
+            m.m_to_date]
+        end
+      end
+    end
+    
+    # Pour avoir l'encodage Windows, voir à mettre dans un module si 
+    # répété avec d'autres modèles
+    def self.to_xls(organism, options = {col_sep:"\t"})
+      to_csv(organism, options).encode("windows-1252")
+    end
+    
+    
+    
+    protected 
+    
+    # forcément car basé sur une view sql
+    def readonly?
+      true
+    end
+  end
+end

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

@@ -8,11 +8,11 @@
         my_wrapper_html:{class:'col-lg-9'},
         input_html:{value:@adhesion.from_date},
         :as=>:date_picker
-      = f.input :to_date, wrapper_html:{class:'col-lg-3'}, 
+      = f.input :to_date, 
         wrapper_html:{class:'col-lg-4'},
         my_wrapper_html:{class:'col-lg-9'},
         input_html:{value:@adhesion.to_date}, :as=>:date_picker
-      = f.input :amount, wrapper_html:{class:'col-lg-3'},
+      = f.input :amount, 
         wrapper_html:{class:'col-lg-4'},
         label_html:{class:'col-lg-4'},
         my_wrapper_html:{class:'col-lg-8'},

data/app/views/adherent/members/index.html.erb

@@ -2,6 +2,8 @@
 
 <%= icon_to 'nouveau.png', new_member_path, title:'Ajouter un membre' %>
 <%= icon_to 'payment.png', payments_path, title:'Table des paiements' %>
+<%= icon_to('csv.png', members_path(@organism,:format=>:csv)) %>
+<%= icon_to('xls.png', members_path(@organism, :format=>:csv)) %>
 <% end -%>
 
 
@@ -13,37 +15,36 @@
        id='members' cellpadding="0" cellspacing="0" border="0">
 <thead>
   <tr>
-  
     <th>Numero </th>
-  
     <th><%= I18n::t('name') %></th>
-  
     <th><%= I18n::t('forname') %></th>
-  
     <th class='date-euro'><%= I18n::t('birthdate') %></th>
-    
     <th><%= I18n::t('mail') %></th>
     <th><%= I18n::t('tel') %></th>
-  
+    <th>Doit</th>
+    <th class='date-euro'>Fin Adh.</th>
     <th class='actions'>Actions</th>
     
   </tr>
 </thead>
 <tbody> 
 <% @members.each do |member| %>
-  <tr class="<%=  member.unpaid_adhesions? ? 'impaye' : 'ok' %>" id="<%="member_#{member.id}"%>">
+  <tr id="<%="member_#{member.id}"%>">
     <td><%= member.number %></td>
     <td><%= member.name %></td>
     <td><%= member.forname %></td>
     <td><%= member.birthdate %></td>
-    <td><%= member.coord ? member.coord.mail : '' %>
-    <td><%= member.coord ? member.coord.tel : '' %>
-    <td><%= icon_to 'card-address.png', member_coord_path(member), title:'Coordonnées', id:"coord_member_#{member.id}" %>
+    <td><%= member.mail %></td>
+    <td><%= member.tel %></td>
+    <td class="numeric"><%= number_to_currency member.montant_du %></td>
+    <td><%= member.m_to_date %></td>
+    <td>
+      <%= icon_to 'card-address.png', member_coord_path(member), title:'Coordonnées', id:"coord_member_#{member.id}" %>
       <%= icon_to 'bandaid.png', member_adhesions_path(member), title:'Liste des adhésions', id:"adhesion_member_#{member.id}"%>
-    
-    <%= icon_to 'payment.png', member_payments_path(member), title: 'Liste des paiements' , id:"payment_member_#{member.id}"%>
+      <%= icon_to 'payment.png', member_payments_path(member), title: 'Liste des paiements' , id:"payment_member_#{member.id}"%>
       <%= icon_to 'modifier.png', edit_member_path(member) , id:"edit_member_#{member.id}" %>
-    <%= icon_to 'supprimer.png', member, id:"delete_member_#{member.id}", data:{:confirm => 'Etes vous sûr ?'}, :method => :delete %></td>
+      <%= icon_to 'supprimer.png', member_path(id:member.id), :method => :delete, data:{:confirm => 'Etes vous sûr ?'}  %>
+    </td>
   </tr>
 <% end %>
 </tbody>

data/config/initializers/mime_types.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone
+
+# Mime::Type.register "application/pdf", :pdf
+Mime::Type.register_alias "application/xls", :xls

data/db/migrate/20150412145132_create_query_member.rb

@@ -0,0 +1,23 @@
+class CreateQueryMember < ActiveRecord::Migration
+  def up 
+    self.connection.execute %Q(CREATE OR REPLACE VIEW adherent_query_members AS
+      SELECT adherent_members.id, organism_id, number, name, forname, birthdate,
+       adherent_coords.mail AS mail, adherent_coords.tel AS tel,
+      (SELECT to_date FROM adherent_adhesions
+         WHERE adherent_adhesions.member_id = adherent_members.id
+         ORDER BY to_date DESC LIMIT 1 ) AS m_to_date,
+      (SELECT SUM(adherent_reglements.amount) FROM adherent_reglements,
+         adherent_adhesions
+       WHERE adherent_reglements.adhesion_id = adherent_adhesions.id AND
+         adherent_adhesions.member_id = adherent_members.id) AS t_reglements,
+      (SELECT SUM(amount) FROM adherent_adhesions
+         WHERE adherent_adhesions.member_id = adherent_members.id) AS t_adhesions
+      FROM adherent_members
+      LEFT JOIN adherent_coords ON adherent_members.id = adherent_coords.member_id; 
+    )
+  end
+  
+  def down 
+    self.connection.execute "DROP VIEW IF EXISTS adherent_query_members"
+  end
+end

data/lib/adherent/version.rb

@@ -13,5 +13,6 @@ module Adherent
   # 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.3' # Ajout d'un champ comment pour les paiements
+  # VERSION = '0.2.3' # Ajout d'un champ comment pour les paiements
+  VERSION = '0.2.4' # Vue index avec fin adh et montant du plus export
 end

data/spec/controllers/adherent/members_controller_spec.rb

@@ -10,9 +10,7 @@ describe Adherent::MembersController, :type => :controller do
     
   
   describe "GET index" do
-     
-    
-    
+        
     it 'rend la vue index' do
       get :index
       expect(response).to render_template("index")
@@ -20,11 +18,17 @@ describe Adherent::MembersController, :type => :controller do
     
 
     it "assigns all members as @members" do
-      expect_any_instance_of(Organism).to receive(:members).and_return([1,2])
-      
+      expect(Adherent::QueryMember).to receive(:query_members).and_return([1,2])
       get :index
       expect(assigns(:members)).to eq([1,2])
-  
+    end
+    
+    it 'peut rendre un csv' do
+      expect {get :index, format:'csv'}.not_to raise_error
+    end
+    
+    it 'ou un xls' do
+      expect {get :index, format:'xls'}.not_to raise_error
     end
   end
   

data/spec/dummy/db/migrate/20150412145762_create_query_member.adherent.rb

@@ -0,0 +1,24 @@
+# This migration comes from adherent (originally 20150412145132)
+class CreateQueryMember < ActiveRecord::Migration
+  def up 
+    self.connection.execute %Q(CREATE OR REPLACE VIEW adherent_query_members AS
+      SELECT adherent_members.id, organism_id, number, name, forname, birthdate,
+       adherent_coords.mail AS mail, adherent_coords.tel AS tel,
+      (SELECT to_date FROM adherent_adhesions
+         WHERE adherent_adhesions.member_id = adherent_members.id
+         ORDER BY to_date DESC LIMIT 1 ) AS m_to_date,
+      (SELECT SUM(adherent_reglements.amount) FROM adherent_reglements,
+         adherent_adhesions
+       WHERE adherent_reglements.adhesion_id = adherent_adhesions.id AND
+         adherent_adhesions.member_id = adherent_members.id) AS t_reglements,
+      (SELECT SUM(amount) FROM adherent_adhesions
+         WHERE adherent_adhesions.member_id = adherent_members.id) AS t_adhesions
+      FROM adherent_members
+      LEFT JOIN adherent_coords ON adherent_members.id = adherent_coords.member_id; 
+    )
+  end
+  
+  def down 
+    self.connection.execute "DROP VIEW IF EXISTS adherent_query_members"
+  end
+end