diff --git a/app/models/sheet.rb b/app/models/sheet.rb index 294e712..68126f6 100644 --- a/app/models/sheet.rb +++ b/app/models/sheet.rb @@ -23,11 +23,26 @@ class Sheet < ActiveRecord::Base SHEET_TYPE = {1 => "adherent",2 => "sympathisant"} + after_create do + self.generate_sheet_number + self.generate_token + self.save + end + + def generate_sheet_number + self.sheet_number = ("%04d" % self.id) + + end + + def generate_token + self.token = (Digest::MD5.hexdigest "#{SecureRandom.hex(20)}-#{DateTime.now.to_s}") + + end before_save do if !self.person and self.people.size > 0 - puts "TEST" + self.person = self.people.first end diff --git a/app/views/layouts/mail.html.haml b/app/views/layouts/mail.html.haml index f87ad76..95f7b59 100755 --- a/app/views/layouts/mail.html.haml +++ b/app/views/layouts/mail.html.haml @@ -63,9 +63,13 @@ %br -if @options[:sheet] and @options[:sheet].corporate? =@options[:sheet].corporate + %br -if @options[:sheet] Dernier renouvellement : =@options[:sheet].last_year + %br + N° d'adhésion : + ="#"+@options[:sheet].sheet_number.to_s %tr{:style => "background:#393939;color:#f6f6f6;text-align:center;"} diff --git a/app/views/sheets/_sheet.html.haml b/app/views/sheets/_sheet.html.haml index 71e08ff..a7de94f 100644 --- a/app/views/sheets/_sheet.html.haml +++ b/app/views/sheets/_sheet.html.haml @@ -1,4 +1,6 @@ %tr#sheet_line{:id => sheet.id} + %td.hidden-phone + =sheet.sheet_number -if sheet.corporate and sheet.corporate != "" %td{:colspan => 2}=sheet.corporate -else diff --git a/app/views/sheets/_sheets.html.haml b/app/views/sheets/_sheets.html.haml index 9f6d50a..38bf55f 100644 --- a/app/views/sheets/_sheets.html.haml +++ b/app/views/sheets/_sheets.html.haml @@ -3,7 +3,7 @@ résultats %table.table.table-striped.table-hover %tr - + %th # %th Nom %th Prénom %th Téléphone diff --git a/db/migrate/20130629170803_add_token_and_sheet_number_to_sheets.rb b/db/migrate/20130629170803_add_token_and_sheet_number_to_sheets.rb new file mode 100644 index 0000000..c973827 --- /dev/null +++ b/db/migrate/20130629170803_add_token_and_sheet_number_to_sheets.rb @@ -0,0 +1,13 @@ +class AddTokenAndSheetNumberToSheets < ActiveRecord::Migration + def change + add_column :sheets, :token, :string + add_column :sheets, :sheet_number, :string + + Sheet.all.each do |sheet| + sheet.generate_sheet_number + sheet.generate_token + sheet.save + end + + end +end diff --git a/db/schema.rb b/db/schema.rb index 56fd762..694f394 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130628154116) do +ActiveRecord::Schema.define(:version => 20130629170803) do create_table "admins", :force => true do |t| t.string "email", :default => "", :null => false @@ -264,6 +264,8 @@ ActiveRecord::Schema.define(:version => 20130628154116) do t.datetime "created_at" t.datetime "updated_at" t.boolean "plume" + t.string "token" + t.string "sheet_number" end create_table "survey_item_answers", :force => true do |t|