adherent 0.1.10 → 0.2.0

data/app/assets/stylesheets/bootstrap/mixins/_panels.scss

@@ -0,0 +1,24 @@
+// Panels
+
+@mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
+  border-color: $border;
+
+  & > .panel-heading {
+    color: $heading-text-color;
+    background-color: $heading-bg-color;
+    border-color: $heading-border;
+
+    + .panel-collapse > .panel-body {
+      border-top-color: $border;
+    }
+    .badge {
+      color: $heading-bg-color;
+      background-color: $heading-text-color;
+    }
+  }
+  & > .panel-footer {
+    + .panel-collapse > .panel-body {
+      border-bottom-color: $border;
+    }
+  }
+}

data/app/assets/stylesheets/bootstrap/mixins/_progress-bar.scss

@@ -0,0 +1,10 @@
+// Progress bars
+
+@mixin progress-bar-variant($color) {
+  background-color: $color;
+
+  // Deprecated parent class requirement as of v3.2.0
+  .progress-striped & {
+    @include gradient-striped;
+  }
+}

data/app/assets/stylesheets/bootstrap/mixins/_reset-filter.scss

@@ -0,0 +1,8 @@
+// Reset filters for IE
+//
+// When you need to remove a gradient background, do not forget to use this to reset
+// the IE filter for IE9 and below.
+
+@mixin reset-filter() {
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}

data/app/assets/stylesheets/bootstrap/mixins/_resize.scss

@@ -0,0 +1,6 @@
+// Resize anything
+
+@mixin resizable($direction) {
+  resize: $direction; // Options: horizontal, vertical, both
+  overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible`
+}

data/app/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss

@@ -0,0 +1,21 @@
+// Responsive utilities
+
+//
+// More easily include all the states for responsive-utilities.less.
+// [converter] $parent hack
+@mixin responsive-visibility($parent) {
+  #{$parent} {
+    display: block !important;
+  }
+  table#{$parent}  { display: table; }
+  tr#{$parent}     { display: table-row !important; }
+  th#{$parent},
+  td#{$parent}     { display: table-cell !important; }
+}
+
+// [converter] $parent hack
+@mixin responsive-invisibility($parent) {
+  #{$parent} {
+    display: none !important;
+  }
+}

data/app/assets/stylesheets/bootstrap/mixins/_size.scss

@@ -0,0 +1,10 @@
+// Sizing shortcuts
+
+@mixin size($width, $height) {
+  width: $width;
+  height: $height;
+}
+
+@mixin square($size) {
+  @include size($size, $size);
+}

data/app/assets/stylesheets/bootstrap/mixins/_tab-focus.scss

@@ -0,0 +1,9 @@
+// WebKit-style focus
+
+@mixin tab-focus() {
+  // Default
+  outline: thin dotted;
+  // WebKit
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}

data/app/assets/stylesheets/bootstrap/mixins/_table-row.scss

@@ -0,0 +1,28 @@
+// Tables
+
+@mixin table-row-variant($state, $background) {
+  // Exact selectors below required to override `.table-striped` and prevent
+  // inheritance to nested tables.
+  .table > thead > tr,
+  .table > tbody > tr,
+  .table > tfoot > tr {
+    > td.#{$state},
+    > th.#{$state},
+    &.#{$state} > td,
+    &.#{$state} > th {
+      background-color: $background;
+    }
+  }
+
+  // Hover states for `.table-hover`
+  // Note: this is not available for cells or rows within `thead` or `tfoot`.
+  .table-hover > tbody > tr {
+    > td.#{$state}:hover,
+    > th.#{$state}:hover,
+    &.#{$state}:hover > td,
+    &:hover > .#{$state},
+    &.#{$state}:hover > th {
+      background-color: darken($background, 5%);
+    }
+  }
+}

data/app/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss

@@ -0,0 +1,11 @@
+// Typography
+
+// [converter] $parent hack
+@mixin text-emphasis-variant($parent, $color) {
+  #{$parent} {
+    color: $color;
+  }
+  a#{$parent}:hover {
+    color: darken($color, 10%);
+  }
+}

data/app/assets/stylesheets/bootstrap/mixins/_text-overflow.scss

@@ -0,0 +1,8 @@
+// Text overflow
+// Requires inline-block or block for proper styling
+
+@mixin text-overflow() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

data/app/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss

@@ -0,0 +1,222 @@
+// Vendor Prefixes
+//
+// All vendor mixins are deprecated as of v3.2.0 due to the introduction of
+// Autoprefixer in our Gruntfile. They will be removed in v4.
+
+// - Animations
+// - Backface visibility
+// - Box shadow
+// - Box sizing
+// - Content columns
+// - Hyphens
+// - Placeholder text
+// - Transformations
+// - Transitions
+// - User Select
+
+
+// Animations
+@mixin animation($animation) {
+  -webkit-animation: $animation;
+       -o-animation: $animation;
+          animation: $animation;
+}
+@mixin animation-name($name) {
+  -webkit-animation-name: $name;
+          animation-name: $name;
+}
+@mixin animation-duration($duration) {
+  -webkit-animation-duration: $duration;
+          animation-duration: $duration;
+}
+@mixin animation-timing-function($timing-function) {
+  -webkit-animation-timing-function: $timing-function;
+          animation-timing-function: $timing-function;
+}
+@mixin animation-delay($delay) {
+  -webkit-animation-delay: $delay;
+          animation-delay: $delay;
+}
+@mixin animation-iteration-count($iteration-count) {
+  -webkit-animation-iteration-count: $iteration-count;
+          animation-iteration-count: $iteration-count;
+}
+@mixin animation-direction($direction) {
+  -webkit-animation-direction: $direction;
+          animation-direction: $direction;
+}
+@mixin animation-fill-mode($fill-mode) {
+  -webkit-animation-fill-mode: $fill-mode;
+          animation-fill-mode: $fill-mode;
+}
+
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms.
+// Default value is `visible`, but can be changed to `hidden`
+
+@mixin backface-visibility($visibility){
+  -webkit-backface-visibility: $visibility;
+     -moz-backface-visibility: $visibility;
+          backface-visibility: $visibility;
+}
+
+// Drop shadows
+//
+// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
+// supported browsers that have box shadow capabilities now support it.
+
+@mixin box-shadow($shadow...) {
+  -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1
+          box-shadow: $shadow;
+}
+
+// Box sizing
+@mixin box-sizing($boxmodel) {
+  -webkit-box-sizing: $boxmodel;
+     -moz-box-sizing: $boxmodel;
+          box-sizing: $boxmodel;
+}
+
+// CSS3 Content Columns
+@mixin content-columns($column-count, $column-gap: $grid-gutter-width) {
+  -webkit-column-count: $column-count;
+     -moz-column-count: $column-count;
+          column-count: $column-count;
+  -webkit-column-gap: $column-gap;
+     -moz-column-gap: $column-gap;
+          column-gap: $column-gap;
+}
+
+// Optional hyphenation
+@mixin hyphens($mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: $mode;
+     -moz-hyphens: $mode;
+      -ms-hyphens: $mode; // IE10+
+       -o-hyphens: $mode;
+          hyphens: $mode;
+}
+
+// Placeholder text
+@mixin placeholder($color: $input-color-placeholder) {
+  // Firefox
+  &::-moz-placeholder {
+    color: $color;
+    opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526
+  }
+  &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
+  &::-webkit-input-placeholder  { color: $color; } // Safari and Chrome
+}
+
+// Transformations
+@mixin scale($ratio...) {
+  -webkit-transform: scale($ratio);
+      -ms-transform: scale($ratio); // IE9 only
+       -o-transform: scale($ratio);
+          transform: scale($ratio);
+}
+
+@mixin scaleX($ratio) {
+  -webkit-transform: scaleX($ratio);
+      -ms-transform: scaleX($ratio); // IE9 only
+       -o-transform: scaleX($ratio);
+          transform: scaleX($ratio);
+}
+@mixin scaleY($ratio) {
+  -webkit-transform: scaleY($ratio);
+      -ms-transform: scaleY($ratio); // IE9 only
+       -o-transform: scaleY($ratio);
+          transform: scaleY($ratio);
+}
+@mixin skew($x, $y) {
+  -webkit-transform: skewX($x) skewY($y);
+      -ms-transform: skewX($x) skewY($y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
+       -o-transform: skewX($x) skewY($y);
+          transform: skewX($x) skewY($y);
+}
+@mixin translate($x, $y) {
+  -webkit-transform: translate($x, $y);
+      -ms-transform: translate($x, $y); // IE9 only
+       -o-transform: translate($x, $y);
+          transform: translate($x, $y);
+}
+@mixin translate3d($x, $y, $z) {
+  -webkit-transform: translate3d($x, $y, $z);
+          transform: translate3d($x, $y, $z);
+}
+@mixin rotate($degrees) {
+  -webkit-transform: rotate($degrees);
+      -ms-transform: rotate($degrees); // IE9 only
+       -o-transform: rotate($degrees);
+          transform: rotate($degrees);
+}
+@mixin rotateX($degrees) {
+  -webkit-transform: rotateX($degrees);
+      -ms-transform: rotateX($degrees); // IE9 only
+       -o-transform: rotateX($degrees);
+          transform: rotateX($degrees);
+}
+@mixin rotateY($degrees) {
+  -webkit-transform: rotateY($degrees);
+      -ms-transform: rotateY($degrees); // IE9 only
+       -o-transform: rotateY($degrees);
+          transform: rotateY($degrees);
+}
+@mixin perspective($perspective) {
+  -webkit-perspective: $perspective;
+     -moz-perspective: $perspective;
+          perspective: $perspective;
+}
+@mixin perspective-origin($perspective) {
+  -webkit-perspective-origin: $perspective;
+     -moz-perspective-origin: $perspective;
+          perspective-origin: $perspective;
+}
+@mixin transform-origin($origin) {
+  -webkit-transform-origin: $origin;
+     -moz-transform-origin: $origin;
+      -ms-transform-origin: $origin; // IE9 only
+          transform-origin: $origin;
+}
+
+
+// Transitions
+
+@mixin transition($transition...) {
+  -webkit-transition: $transition;
+       -o-transition: $transition;
+          transition: $transition;
+}
+@mixin transition-property($transition-property...) {
+  -webkit-transition-property: $transition-property;
+          transition-property: $transition-property;
+}
+@mixin transition-delay($transition-delay) {
+  -webkit-transition-delay: $transition-delay;
+          transition-delay: $transition-delay;
+}
+@mixin transition-duration($transition-duration...) {
+  -webkit-transition-duration: $transition-duration;
+          transition-duration: $transition-duration;
+}
+@mixin transition-timing-function($timing-function) {
+  -webkit-transition-timing-function: $timing-function;
+          transition-timing-function: $timing-function;
+}
+@mixin transition-transform($transition...) {
+  -webkit-transition: -webkit-transform $transition;
+     -moz-transition: -moz-transform $transition;
+       -o-transition: -o-transform $transition;
+          transition: transform $transition;
+}
+
+
+// User select
+// For selecting text on the page
+
+@mixin user-select($select) {
+  -webkit-user-select: $select;
+     -moz-user-select: $select;
+      -ms-user-select: $select; // IE10+
+          user-select: $select;
+}

data/app/controllers/adherent/adhesions_controller.rb

@@ -24,7 +24,7 @@ module Adherent
       @adhesion = @member.adhesions.find(params[:id])
   
       respond_to do |format|
-        if @adhesion.update_attributes(params[:adhesion])
+        if @adhesion.update_attributes(adhesion_params)
           format.html { redirect_to member_adhesions_path(@member), notice: 'Adhésion mise à jour.' }
           format.json { head :no_content }
         else
@@ -41,7 +41,7 @@ module Adherent
     # POST /adhesions
     # POST /adhesions.json
     def create
-      @adhesion = @member.adhesions.new(params[:adhesion])
+      @adhesion = @member.adhesions.new(adhesion_params)
       unless @adhesion.valid?
         
         flash[:notice] = @adhesion.errors.messages
@@ -76,5 +76,12 @@ module Adherent
     def find_member
       @member = Member.find(params[:member_id])
     end
+    
+    private 
+    
+     # Never trust parameters from the scary internet, only allow the white list through.
+    def adhesion_params
+      params.require(:adhesion).permit(:from_date, :to_date, :amount)
+    end
   end
 end

data/app/controllers/adherent/allpayments_controller.rb

@@ -3,7 +3,7 @@ require_dependency "adherent/application_controller"
 module Adherent
   class AllpaymentsController < ApplicationController
     def index
-      @payments = @organism.payments.all
+      @payments = @organism.payments
     end
   end
 end

data/app/controllers/adherent/coords_controller.rb

@@ -40,7 +40,7 @@ module Adherent
     # POST /coords
     # POST /coords.json
     def create
-      @coord = @member.build_coord(params[:coord])
+      @coord = @member.build_coord(coord_params)
   
       respond_to do |format|
         if @coord.save
@@ -59,7 +59,7 @@ module Adherent
       @coord = @member.coord
   
       respond_to do |format|
-        if @coord.update_attributes(params[:coord])
+        if @coord.update_attributes(coord_params)
           format.html { redirect_to member_coord_path(@member), notice: 'Coordonnées mises à jour' }
           format.json { head :no_content }
         else
@@ -76,5 +76,9 @@ module Adherent
     def find_member
       @member = Member.find(params[:member_id])
     end
+    
+    def coord_params
+      params.require(:coord).permit(:address, :city, :gsm, :mail, :office, :references, :tel, :zip)
+    end
   end
 end

data/app/controllers/adherent/members_controller.rb

@@ -7,7 +7,7 @@ module Adherent
     # GET /members
     # GET /members.json
     def index
-      @members = @organism.members.all
+      @members = @organism.members
   
       respond_to do |format|
         format.html # index.html.erb
@@ -45,7 +45,7 @@ module Adherent
     # POST /members
     # POST /members.json
     def create
-      @member = @organism.members.new(params[:member])
+      @member = @organism.members.new(member_params)
   
       respond_to do |format|
         if @member.save
@@ -64,7 +64,7 @@ module Adherent
       @member = Member.find(params[:id])
   
       respond_to do |format|
-        if @member.update_attributes(params[:member])
+        if @member.update_attributes(member_params)
           format.html { redirect_to @member, notice: 'Les données ont été mises à jour' }
           format.json { head :no_content }
         else
@@ -85,5 +85,12 @@ module Adherent
         format.json { head :no_content }
       end
     end
+    
+    private 
+    
+     # Never trust parameters from the scary internet, only allow the white list through.
+    def member_params
+      params.require(:member).permit(:birthdate, :forname, :name, :number)
+    end
   end
 end

data/app/controllers/adherent/payments_controller.rb

@@ -18,7 +18,7 @@ module Adherent
     end
     
     def create
-      @payment=@member.payments.new(params[:payment])
+      @payment=@member.payments.new(payment_params)
       if @payment.save
         
         flash[:notice] = 'Le paiement a été enregistré' 
@@ -33,8 +33,8 @@ module Adherent
     end
     
     def update
-      @payment = @member.payments.find_by_id(params[:id])
-      if @payment.update_attributes(params[:payment])
+      @payment = @member.payments.find_by_id(payment_params[:id])
+      if @payment.update_attributes(payment_params)
         
         flash[:notice] = 'Le paiement a été modifié' 
         redirect_to member_payments_path(@member)
@@ -94,5 +94,11 @@ module Adherent
       date = rd.first if date < rd.first
       date
     end
+    
+    private
+    
+    def payment_params
+      params.require(:payment).permit(:amount, :date, :mode)
+    end
   end
 end

data/app/controllers/adherent/reglements_controller.rb

@@ -45,6 +45,12 @@ module Adherent
       end
     end
     
+    private
+    
+    def reglement_params
+      params.require(:reglement).permit(:amount, :payment_id)
+    end
+    
   
     
   end

data/app/helpers/adherent/adhesion_helper.rb

@@ -1,4 +1,8 @@
 module Adherent
   module AdhesionHelper
+    
+    def amount_due(adhesion)
+      adhesion.due
+    end
   end
 end

data/app/models/adherent/adhesion.rb

@@ -3,7 +3,7 @@
 module Adherent
   class Adhesion < ActiveRecord::Base
     
-    attr_accessible :from_date, :to_date, :amount
+   # attr_accessible :from_date, :to_date, :amount
     
     belongs_to :member
     has_many :reglements
@@ -36,10 +36,10 @@ module Adherent
     # 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').
+    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').
         group('adherent_adhesions.id').
-        having('adherent_adhesions.amount > 0 AND (adherent_adhesions.amount > sum(adherent_reglements.amount) OR sum(adherent_reglements.amount) IS NULL)')
+        having('adherent_adhesions.amount > 0 AND (adherent_adhesions.amount > sum(adherent_reglements.amount) OR sum(adherent_reglements.amount) IS NULL)')}
  
     
     # méthode mise en place pour assurer une mise en forme lisible

data/app/models/adherent/coord.rb

@@ -2,7 +2,7 @@ module Adherent
   class Coord < ActiveRecord::Base
     belongs_to :member
     
-    attr_accessible :address, :city, :gsm, :mail, :office, :references, :tel, :zip
+    
     
     validates :member_id, :presence=>true
     

data/app/models/adherent/member.rb

@@ -1,6 +1,6 @@
 module Adherent
   class Member < ActiveRecord::Base
-    attr_accessible :birthdate, :forname, :name, :number
+    
     
     pick_date_for :birthdate
     
@@ -24,7 +24,7 @@ module Adherent
     
     # donne le montant total des adhésions impayées
     def unpaid_amount
-      unpaid_adhesions.sum(&:due)
+      unpaid_adhesions.to_a.sum(&:due)
     end
     
     # renvoie le prenom NOM

data/app/models/adherent/payment.rb

@@ -21,7 +21,7 @@ module Adherent
     belongs_to :member
     
     
-    attr_accessible :amount, :date, :mode
+    # attr_accessible :amount, :date, :mode
     
     validates :amount, :date, :mode, :member_id, presence:true
     validates :amount, :over_imputations=>true

data/app/models/adherent/reglement.rb

@@ -2,7 +2,7 @@ module Adherent
   class Reglement < ActiveRecord::Base
     belongs_to :adhesion
     belongs_to :payment
-    attr_accessible :amount
+    # attr_accessible :amount
     
     validates :adhesion_id, :payment_id, :amount, presence:true
     validates_numericality_of :amount, greater_than:0.0

data/app/models/organism.rb

@@ -1,5 +1,5 @@
 class Organism < ActiveRecord::Base
-  attr_accessible :title
+  
   
   has_many :members, class_name:'Adherent::Member'
   has_many :payments, through: :members, class_name:'Adherent::Payment'

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

@@ -1,13 +1,21 @@
-.inputs.row-fluid#transfer
-  = simple_form_for([@member, @adhesion], :html=>{class:'form-inline'})  do |f|
+.panel-body#transfer
+  = simple_form_for([@member, @adhesion], :html=>{class:'form-horizontal'},
+    wrapper: :horizontal_form)  do |f|
     =f.error_notification
-    .row-fluid
-      .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: 'span5'}, input_html:{class:'span7', value:two_decimals(@adhesion.amount)}, :as=>:french_decimal
-    
-    .row-fluid
-      .span12
-        .form-actions
-          = f.button :submit, id: 'new_adhesion', class: "btn-primary span2"
+    .form-inputs
+      = f.input :from_date, 
+        wrapper_html:{class:'col-lg-4'},
+        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'}, 
+        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'},
+        wrapper_html:{class:'col-lg-4'},
+        label_html:{class:'col-lg-4'},
+        my_wrapper_html:{class:'col-lg-8'},
+        input_html:{value:two_decimals(@adhesion.amount)}, :as=>:french_decimal
+    .form-actions
+      = f.button :submit, id: 'new_adhesion', class: "btn-primary col-md-2 col-md-offset-2"

data/app/views/adherent/adhesions/edit.html.erb

@@ -3,10 +3,11 @@
 <%= icon_to 'bandaid.png', member_adhesions_path(@member) %>
 <% end -%>
 
-<div class="champ">
+<div class="champ col-lg-12">
   <h3>Modification adhésion pour <%=  @member.to_s %></h3>
-</div>
-<div class="row-fluid inner-champ">
+
+<div class="inner-champ">
 
 <%= render 'form' %>
-</div>
+</div>
+  </div>