amélioration admin

app/assets/stylesheets/admin/sheets.css.scss

@@ -83,3 +83,20 @@ padding:10px;
 		vertical-align :top;}
 		
 }
+
+#sheets{
+tr{
+
+&:hover{
+background:#f2f2f2;
+
+}
+
+}
+
+}
+
+.field{
+border:1px solid black;
+
+}

app/controllers/sheets_controller.rb

@@ -186,18 +186,14 @@ require 'iconv'
   def update
     @sheet = Sheet.find(params[:id])
 
-    respond_to do |format|
+
       if @sheet.update_attributes(params[:sheet])
-        flash[:notice] = 'Sheet was successfully updated.'
+        @sheet = Sheet.find(params[:id])
-        format.html { redirect_to(@sheet) }
+
-        format.js { render :action => "show", :layout => false }
-        format.xml  { head :ok }
       else
-        format.html { render :action => "edit" }
+        
-        format.js { render :action => "edit", :layout => false }
-        format.xml  { render :xml => @sheet.errors, :status => :unprocessable_entity }
-      end
       end
+  
   end
 
 

app/models/sheet_year.rb

@@ -4,17 +4,25 @@ class SheetYear < ActiveRecord::Base
   
   validates_presence_of :year
   
-  attr_accessible :year, :join_type, :benefactor, :gift_year, :paid_at, :amount, :payment_type, :bank, :check_number, :sheet_id
+  attr_accessible :year, :join_type, :benefactor, :gift_year, :paid_at, :amount, :payment_type, :bank, :check_number, :sheet_id, :plume
   
   JOIN_TYPE = {1 => "Individuel", 2 => "Familial", 3 =>"Association"}
   PAYMENT_TYPE = {1 => "Chèque", 2 => "Liquide"}
   
   
-	def after_save
+	 after_save do
 		sy = self.sheet.sheet_years.find(:first, :order => "year DESC")
 		if sy
 			self.sheet.last_year = sy.year
 			self.sheet.first_year = self.sheet.sheet_years.find(:first, :order => "year ASC").year
+			
+
+      if sy.plume
+        self.sheet.plume = true
+      else
+        self.sheet.plume = false
+      end
+      
       self.sheet.save
 
       
@@ -26,17 +34,27 @@ class SheetYear < ActiveRecord::Base
 	end
 
 
-	def after_destroy
+	after_destroy do
 		sy = self.sheet.sheet_years.find(:first, :order => "year DESC")
 	    if sy
   			self.sheet.last_year = sy.year
   			self.sheet.first_year = self.sheet.sheet_years.find(:first, :order => "year ASC").year
+  			
+
+        if sy.plume
+          self.sheet.plume = true
+        else
+          self.sheet.plume = false
+        end
+
+        
+        
+      else
+        self.sheet.plume = false
+	    end
+      
       self.sheet.save
 		
-
-
-	    end
-		
 	end
 
 

app/views/sheet_years/_form.html.haml

@@ -1,5 +1,8 @@
 .field
+	= form.label :plume, "Option plume papier : "
+	= form.check_box :plume
 	
+	%br
 	= form.label :year, "Année :"
 	= form.text_field :year
 	
@@ -16,6 +19,7 @@
 	%br
 	
 
+
 	.payment_form{:style => ("display:none;" if form.object.gift_year)}
 		= form.label :paid_at, "Date de paiement : "
 		= form.date_select :paid_at, :include_blank => true

app/views/sheets/_sheet.html.haml

@@ -1,4 +1,4 @@
-%tr
+%tr#sheet_line{:id => sheet.id}
 	-if sheet.corporate and sheet.corporate != ""
 		%td{:colspan => 2}=sheet.corporate
 	-else

app/views/sheets/edit.html.haml

@@ -1,6 +1,7 @@
 #sheet_show
 	.links{:style => "float:right;"}
 		=link_to "Retour", @sheet, :class => "lien", :remote => true, :confirm => "Attention, les changements éventuellements apportés ne seront pas sauvegardés."
+		= link_to 'Fermer', "#", :onclick => "$('#sheet_show').remove();return false;"
 	%h1 Modifier une fiche
 	
 	= semantic_form_for [@sheet], :remote => true do |form| 

app/views/sheets/show.html.haml

@@ -1,7 +1,7 @@
 #sheet_show
 	.links{:style => "float:right;"}
 		= link_to 'Modifier', edit_sheet_path(@sheet), :method => :get, :remote => true
-		= link_to 'Retour', "#", :onclick => "$('#sheet_show').remove();return false;"
+		= link_to 'Fermer', "#", :onclick => "$('#sheet_show').remove();return false;"
 		
 	%h1 
 		Fiche n°
@@ -11,6 +11,11 @@
 	="/"
 	=@sheet.last_year
 	
+	-if @sheet.plume
+		%p{:style => "background:red;"} Souhaite recevoir la plume par courrier.
+
+	
+	
 	%h2 Cette adhésion regroupe :
 	= link_to 'Ajouter', :url => new_person_path(:sheet_id => @sheet), :update => "new_sheet_people", :method => :get, :remote => true #if has_permission?('adherent.edit')
 	#new_sheet_people

app/views/sheets/update.js.erb

@@ -0,0 +1,3 @@
+$('#sheet_show').remove();
+
+$('#sheet_line_<%= @sheet.id %>').replaceWith("<%= escape_javascript(render(@sheet)) %>");

db/migrate/20130318194848_add_plume_to_sheet_years.rb

@@ -0,0 +1,5 @@
+class AddPlumeToSheetYears < ActiveRecord::Migration
+  def change
+    add_column :sheet_years, :plume, :boolean
+  end
+end

db/migrate/20130318194918_add_plume_to_sheets.rb

@@ -0,0 +1,5 @@
+class AddPlumeToSheets < ActiveRecord::Migration
+  def change
+    add_column :sheets, :plume, :boolean
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130115105842) do
+ActiveRecord::Schema.define(:version => 20130318194918) do
 
   create_table "admins", :force => true do |t|
     t.string   "email",                  :default => "", :null => false
@@ -215,6 +215,7 @@ ActiveRecord::Schema.define(:version => 20130115105842) do
     t.integer  "sheet_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "plume"
   end
 
   create_table "sheets", :force => true do |t|
@@ -234,6 +235,7 @@ ActiveRecord::Schema.define(:version => 20130115105842) do
     t.integer  "last_year"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "plume"
   end
 
   create_table "survey_item_answers", :force => true do |t|