adherent 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb31a14740d77a176e63a7f0d07182c1084cf77
-  data.tar.gz: 9554bf9e5da5cf3dff4a991fb18065f663dd7e2c
+  metadata.gz: c260a0e3744343904e807eb757955a572c98de90
+  data.tar.gz: bb21b657a9a852a40f0531ffc8639b38137f7400
 SHA512:
-  metadata.gz: 46a4a5da98bac79da37c61fac452c73c15e7b98a9903cd776fe6112fd0ee33fd88bfc570a63924ca31dfc05e33f4041f9045f7a1710e8e4b61aae9c26a8c4766
-  data.tar.gz: 0ff293aa381e091f8e7f59660c7d397ba6e4dd2f08d06c7a44c9de6044a1a3b7aa4ee7e4e4bbb12dbe6aed39bb6b163d78cd690f1db2c524baf1eefcc1baaca1
+  metadata.gz: 67d94d773bb54cc7584c1c2936aad47d02f5d7a2a820d14d12d2fc9726c04b9d0c0acf04282e3857eff3d2d5684d0c767ce933bcb09cf1f914c6835159e3438c
+  data.tar.gz: 5247da4d2db38f8010c182db7a273be948799f55de71dd82fb5131aa43b2f819d9634a5f7d3a0954ad17c3add449386bec22ba53a41400a540cd6a0a8e6e9f6e

data/app/helpers/adherent/application_helper.rb

@@ -13,6 +13,17 @@ module Adherent
       link_to image_tag(img_path, :alt=> alt), options, html_options
     end
     
+    def icon_to_if(condition, icon_file, options={}, html_options={})
+      raise ArgumentError unless icon_file
+      title = alt = icon_file.split('.')[0].capitalize
+
+      html_options[:title] ||=title
+      html_options[:class] ||= 'icon_menu'
+      # html_options[:tabindex]= "-1"
+      img_path="adherent/icones/#{icon_file}"
+      link_to_if condition, image_tag(img_path, :alt=> alt), options, html_options
+    end
+    
     # Pour transformer un montant selon le format numérique français avec deux décimales
     def virgule(montant)
       ActionController::Base.helpers.number_with_precision(montant, precision:2) rescue '0,00'

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

@@ -46,9 +46,9 @@
       <% if member.nb_payments == 0 %>
         <%= icon_to 'supprimer.png', member_path(id:member.id), :method => :delete, data:{:confirm => 'Etes vous sûr ?'}  %>
       <% else %>
-        <%= image_tag 'adherent/icones/nb_supprimer.png', 
-          title:'Suppression impossible car présence de paiements', 
-          class:'inactive_icon_menu' %>
+        <%= icon_to_if false, 'nb_supprimer.png', member_path(id:member.id),
+          {title:'Suppression impossible car présence de paiements', 
+          class:'inactive_icon_menu'} %>
       <% end %>
     </td>
   </tr>

data/lib/adherent/version.rb

@@ -22,5 +22,6 @@ module Adherent
   # 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.6' # Affichage plus rapide des paiements
+  # VERSION = '0.3.6' # Affichage plus rapide des paiements
+  VERSION = '0.3.7' # icone nb_supprimer pour les adhérents avec paiements
   end

data/spec/dummy/log/development.log

@@ -118272,3 +118272,298 @@ Started GET "/assets/adherent/icones/supprimer.png" for 127.0.0.1 at 2015-10-12
    (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')
+
+
+Started GET "/" for 127.0.0.1 at 2015-10-14 17:28:52 +0200
+Processing by OrganismsController#index as HTML
+  Organism Load (40.4ms)  SELECT "organisms".* FROM "organisms"
+  Rendered organisms/index.html.haml within layouts/application (256.2ms)
+Completed 200 OK in 905ms (Views: 606.8ms | ActiveRecord: 210.6ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/jquery-ui/theme.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/jquery-ui/datepicker.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/jquery-ui/core.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/organisms.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/scaffold.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/jquery-ui/datepicker.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/organisms.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:54 +0200
+
+
+Started GET "/organisms/2" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+Processing by OrganismsController#show as HTML
+  Parameters: {"id"=>"2"}
+  Organism Load (30.2ms)  SELECT  "organisms".* FROM "organisms"  WHERE "organisms"."id" = $1 LIMIT 1  [["id", 2]]
+  Rendered organisms/show.html.haml within layouts/application (27.6ms)
+Completed 200 OK in 69ms (Views: 34.9ms | ActiveRecord: 30.4ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/jquery-ui/theme.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/jquery-ui/datepicker.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/jquery-ui/core.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/scaffold.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/organisms.css?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/jquery-ui/datepicker.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/organisms.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2015-10-14 17:28:56 +0200
+
+
+Started GET "/adherent/members" for 127.0.0.1 at 2015-10-14 17:28:58 +0200
+Processing by Adherent::MembersController#index as HTML
+  Organism Load (0.5ms)  SELECT  "organisms".* FROM "organisms"  WHERE "organisms"."id" = 2 LIMIT 1
+  Adherent::Member Load (127.0ms)  SELECT adherent_members.id, organism_id, number, name, forname, birthdate,
+       adherent_coords.mail AS mail,
+       adherent_coords.tel AS tel,
+       adherent_coords.gsm AS gsm,
+       adherent_coords.office AS office,
+       adherent_coords.address AS address,
+       adherent_coords.zip AS zip,
+       adherent_coords.city AS city,
+      (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, 
+      (SELECT COUNT(*) FROM adherent_payments
+         WHERE adherent_payments.member_id = adherent_members.id) AS nb_payments
+         
+      FROM adherent_members 
+      LEFT JOIN adherent_coords ON adherent_members.id = adherent_coords.member_id
+      WHERE organism_id = 2 
+
+  Rendered /home/jcl/rails_project/Adherent/app/views/adherent/members/index.html.erb within layouts/adherent/application (636.3ms)
+  Rendered /home/jcl/rails_project/Adherent/app/views/layouts/adherent/_header.html.haml (1.5ms)
+  Rendered /home/jcl/rails_project/Adherent/app/views/layouts/adherent/_flash_partial.html.haml (3.9ms)
+  Rendered /home/jcl/rails_project/Adherent/app/views/layouts/adherent/_footer.html.haml (1.2ms)
+Completed 200 OK in 1717ms (Views: 1388.4ms | ActiveRecord: 130.5ms)
+
+
+Started GET "/assets/jquery-ui/core.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/jquery-ui/theme.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/jquery-ui/datepicker.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/jquery-ui/core.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/jquery-ui/datepicker.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/application.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/allpayments.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/adhesion.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/date_picker.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/coords.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/jc_application.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/demo_table.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/jcmenu.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/layouts.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/old_bootstrap.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/payments.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/print.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/affix.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/reglements.css?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/alert.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/button.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/transition.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/collapse.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/tab.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/carousel.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/dropdown.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/scrollspy.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/modal.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/tooltip.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap/popover.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/bootstrap-sprockets.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/jquery.dataTables.min.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/adhesion.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/allpayments.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/common.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/coords.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/datatableinit.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/members.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/reglements.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/payments.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/date_picker.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/application.js?body=1" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/icones/payment.png" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/icones/csv.png" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/icones/nouveau.png" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/icones/card-address.png" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/icones/xls.png" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/icones/bandaid.png" for 127.0.0.1 at 2015-10-14 17:29:00 +0200
+
+
+Started GET "/assets/adherent/icones/modifier.png" for 127.0.0.1 at 2015-10-14 17:29:01 +0200
+
+
+Started GET "/assets/adherent/icones/nb_supprimer.png" for 127.0.0.1 at 2015-10-14 17:29:01 +0200
+
+
+Started GET "/assets/adherent/icones/supprimer.png" for 127.0.0.1 at 2015-10-14 17:29:01 +0200
+
+
+Started GET "/assets/sort_asc.png" for 127.0.0.1 at 2015-10-14 17:29:01 +0200
+
+
+Started GET "/assets/sort_both.png" for 127.0.0.1 at 2015-10-14 17:29:02 +0200
+
+
+Started GET "/assets/back_disabled.png" for 127.0.0.1 at 2015-10-14 17:29:02 +0200
+
+
+Started GET "/assets/forward_disabled.png" for 127.0.0.1 at 2015-10-14 17:29:02 +0200
+
+
+Started GET "/assets/forward_enabled.png" for 127.0.0.1 at 2015-10-14 17:29:02 +0200

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adherent
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Jean-Claude Lepage