Skip to content

Commit

Permalink
Added QEC field to institution
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidMikeSimon committed Apr 15, 2011
1 parent 2fad29e commit 2d4e531
Show file tree
Hide file tree
Showing 8 changed files with 110 additions and 96 deletions.
3 changes: 2 additions & 1 deletion app/controllers/people_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ def index
["Institution", lambda { |p| p.institution.try.name.to_s }],
["Region", lambda { |p| p.institution.try.region.to_s }],
["BEP", lambda { |p| p.institution.try.bep || "false" }],
["School Code", lambda { |p| p.institution.try.school_code }],
["School Code", lambda { |p| p.institution.try.school_code.to_s }],
["QEC", lambda { |p| p.institution.try.qec.to_s }],
["Last Name", lambda { |p| p.last_name }],
["First Name", lambda { |p| p.first_name }],
["Cell", lambda { |p| p.cell_number }],
Expand Down
1 change: 1 addition & 0 deletions app/controllers/workshops_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def create
["Institution", lambda {|a| a.person.institution.try.name.to_s }],
["BEP School", lambda {|a| a.person.institution.try.bep ? "true" : "false"}],
["School Code", lambda {|a| a.person.institution.try.school_code.to_s }],
["QEC", lambda {|a| a.person.institution.try.qec.to_s }],
["Role", lambda {|a| a.role }],
["Last Name", lambda {|a| a.person.last_name }],
["First Name", lambda {|a| a.person.first_name }],
Expand Down
1 change: 1 addition & 0 deletions app/models/institution.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class Institution < ActiveRecord::Base
fields do
name :string, :required
school_code :string
qec :string
region :integer
address :text
parish Institution::Parish
Expand Down
3 changes: 2 additions & 1 deletion app/viewhints/institution_hints.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ class InstitutionHints < Hobo::ViewHints
:male_teachers_total => "Male Teachers (All Grades)",
:female_teachers_early_grade_total => "Female Teachers (Grades 1-3)",
:male_teachers_early_grade_total => "Male Teachers (Grades 1-3)",
:bep => "BEP School"
:bep => "BEP School",
:qec => "QEC"
# model_name "My Model"
# field_names :field1 => "First Field", :field2 => "Second Field"
# field_help :field1 => "Enter what you want in this field"
Expand Down
2 changes: 1 addition & 1 deletion app/views/taglibs/auto/rapid/forms.dryml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<def tag="form" for="Institution">
<form merge param="default">
<error-messages param/>
<field-list fields="name, school_code, region, address, parish, telephone_numbers, fax_number, email_address, organization_type, principal, education_officer, bep, female_students_total, male_students_total, female_students_early_grade_total, male_students_early_grade_total, female_teachers_total, male_teachers_total, female_teachers_early_grade_total, male_teachers_early_grade_total" param/>
<field-list fields="name, school_code, qec, region, address, parish, telephone_numbers, fax_number, email_address, organization_type, principal, education_officer, bep, female_students_total, male_students_total, female_students_early_grade_total, male_students_early_grade_total, female_teachers_total, male_teachers_total, female_teachers_early_grade_total, male_teachers_early_grade_total" param/>
<div param="actions">
<submit label="#{ht 'institutions.actions.save', :default=>['Save']}" param/><or-cancel param="cancel"/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/taglibs/auto/rapid/pages.dryml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
</header>

<section param="content-body">
<field-list fields="school_code, region, address, parish, telephone_numbers, fax_number, email_address, organization_type, principal, education_officer, female_students_total, male_students_total, female_students_early_grade_total, male_students_early_grade_total, female_teachers_total, male_teachers_total, female_teachers_early_grade_total, male_teachers_early_grade_total" param/>
<field-list fields="school_code, qec, region, address, parish, telephone_numbers, fax_number, email_address, organization_type, principal, education_officer, female_students_total, male_students_total, female_students_early_grade_total, male_students_early_grade_total, female_teachers_total, male_teachers_total, female_teachers_early_grade_total, male_teachers_early_grade_total" param/>
</section>
</content:>

Expand Down
9 changes: 9 additions & 0 deletions db/migrate/20110415185127_hobo_migration_56.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class HoboMigration56 < ActiveRecord::Migration
def self.up
add_column :institutions, :qec, :string
end

def self.down
remove_column :institutions, :qec
end
end
185 changes: 93 additions & 92 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
#
# It's strongly recommended to check this file into your version control system.

ActiveRecord::Schema.define(:version => 20110316022002) do
ActiveRecord::Schema.define(:version => 20110415185127) do

create_table "appointments", :force => true do |t|
t.datetime "created_at"
t.datetime "updated_at"
t.integer "workshop_id"
t.integer "person_id"
t.string "role"
t.integer "random_identifier_id"
t.boolean "print_needed", :default => true
t.boolean "registered", :default => false
t.timestamp "created_at"
t.timestamp "updated_at"
t.integer "workshop_id"
t.integer "person_id"
t.string "role"
t.integer "random_identifier_id"
t.boolean "print_needed", :default => true
t.boolean "registered", :default => false
end

add_index "appointments", ["person_id"], :name => "index_appointments_on_person_id"
add_index "appointments", ["random_identifier_id"], :name => "index_appointments_on_random_identifier_id"

create_table "attendances", :force => true do |t|
t.datetime "created_at"
t.datetime "updated_at"
t.integer "appointment_id"
t.integer "workshop_session_id"
t.timestamp "created_at"
t.timestamp "updated_at"
t.integer "appointment_id"
t.integer "workshop_session_id"
end

add_index "attendances", ["appointment_id"], :name => "index_attendances_on_appointment_id"
Expand All @@ -44,37 +44,38 @@
add_index "institution_trigrams", ["token"], :name => "index_institution_trigrams_on_token"

create_table "institutions", :force => true do |t|
t.string "name"
t.string "school_code"
t.integer "region"
t.text "address"
t.string "telephone_numbers"
t.string "fax_number"
t.string "email_address"
t.datetime "created_at"
t.datetime "updated_at"
t.string "parish"
t.string "organization_type", :default => "school"
t.string "principal"
t.string "education_officer"
t.integer "female_students_total", :default => 0
t.integer "male_students_total", :default => 0
t.integer "female_students_early_grade_total", :default => 0
t.integer "male_students_early_grade_total", :default => 0
t.integer "female_teachers_total", :default => 0
t.integer "male_teachers_total", :default => 0
t.integer "female_teachers_early_grade_total", :default => 0
t.integer "male_teachers_early_grade_total", :default => 0
t.boolean "bep", :default => false
t.string "name"
t.string "school_code"
t.integer "region"
t.text "address"
t.string "telephone_numbers"
t.string "fax_number"
t.string "email_address"
t.timestamp "created_at"
t.timestamp "updated_at"
t.string "parish"
t.string "organization_type", :default => "school"
t.string "principal"
t.string "education_officer"
t.integer "female_students_total", :default => 0
t.integer "male_students_total", :default => 0
t.integer "female_students_early_grade_total", :default => 0
t.integer "male_students_early_grade_total", :default => 0
t.integer "female_teachers_total", :default => 0
t.integer "male_teachers_total", :default => 0
t.integer "female_teachers_early_grade_total", :default => 0
t.integer "male_teachers_early_grade_total", :default => 0
t.boolean "bep", :default => false
t.string "qec"
end

add_index "institutions", ["name", "region"], :name => "index_institutions_on_name_and_region", :unique => true

create_table "jobs", :force => true do |t|
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "admin", :default => false
t.string "name"
t.timestamp "created_at"
t.timestamp "updated_at"
t.boolean "admin", :default => false
end

create_table "offroad_group_states", :force => true do |t|
Expand Down Expand Up @@ -122,20 +123,20 @@
end

create_table "people", :force => true do |t|
t.string "first_name"
t.string "last_name"
t.string "title"
t.string "gender"
t.string "cell_number"
t.string "landline_number"
t.string "fax_number"
t.string "email_address"
t.datetime "created_at"
t.datetime "updated_at"
t.string "job_details"
t.string "grade_taught"
t.integer "job_id"
t.integer "institution_id"
t.string "first_name"
t.string "last_name"
t.string "title"
t.string "gender"
t.string "cell_number"
t.string "landline_number"
t.string "fax_number"
t.string "email_address"
t.timestamp "created_at"
t.timestamp "updated_at"
t.string "job_details"
t.string "grade_taught"
t.integer "job_id"
t.integer "institution_id"
end

add_index "people", ["institution_id"], :name => "index_people_on_institution_id"
Expand All @@ -150,11 +151,11 @@
add_index "person_trigrams", ["token"], :name => "index_person_trigrams_on_token"

create_table "processed_xml_files", :force => true do |t|
t.string "filename"
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "accepted"
t.boolean "duplicate_entry"
t.string "filename"
t.timestamp "created_at"
t.timestamp "updated_at"
t.boolean "accepted"
t.boolean "duplicate_entry"
end

create_table "random_identifier_groups", :force => true do |t|
Expand All @@ -172,54 +173,54 @@
add_index "random_identifiers", ["random_identifier_group_id"], :name => "index_random_identifiers_on_random_identifier_group_id"

create_table "training_subjects", :force => true do |t|
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.string "name"
t.timestamp "created_at"
t.timestamp "updated_at"
end

create_table "users", :force => true do |t|
t.string "crypted_password", :limit => 40
t.string "salt", :limit => 40
t.string "remember_token"
t.datetime "remember_token_expires_at"
t.string "name"
t.string "email_address"
t.boolean "administrator", :default => false
t.datetime "created_at"
t.datetime "updated_at"
t.string "state", :default => "active"
t.datetime "key_timestamp"
t.string "crypted_password", :limit => 40
t.string "salt", :limit => 40
t.string "remember_token"
t.timestamp "remember_token_expires_at"
t.string "name"
t.string "email_address"
t.boolean "administrator", :default => false
t.timestamp "created_at"
t.timestamp "updated_at"
t.string "state", :default => "active"
t.timestamp "key_timestamp"
end

add_index "users", ["state"], :name => "index_users_on_state"

create_table "workshop_sessions", :force => true do |t|
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.integer "workshop_id"
t.integer "random_identifier_id"
t.datetime "starts_at"
t.integer "minutes", :default => 0
t.integer "training_subject_id"
t.string "name"
t.timestamp "created_at"
t.timestamp "updated_at"
t.integer "workshop_id"
t.integer "random_identifier_id"
t.timestamp "starts_at"
t.integer "minutes", :default => 0
t.integer "training_subject_id"
end

add_index "workshop_sessions", ["random_identifier_id"], :name => "index_workshop_sessions_on_random_identifier_id"
add_index "workshop_sessions", ["workshop_id", "name"], :name => "index_workshop_sessions_on_workshop_id_and_name", :unique => true

create_table "workshops", :force => true do |t|
t.string "title"
t.date "first_day"
t.string "venue"
t.integer "region"
t.string "purpose"
t.datetime "created_at"
t.datetime "updated_at"
t.date "last_day"
t.integer "random_identifier_id"
t.integer "appointment_identifier_group_id"
t.integer "workshop_session_identifier_group_id"
t.integer "default_training_subject_id"
t.string "title"
t.date "first_day"
t.string "venue"
t.integer "region"
t.string "purpose"
t.timestamp "created_at"
t.timestamp "updated_at"
t.date "last_day"
t.integer "random_identifier_id"
t.integer "appointment_identifier_group_id"
t.integer "workshop_session_identifier_group_id"
t.integer "default_training_subject_id"
end

add_index "workshops", ["appointment_identifier_group_id"], :name => "index_workshops_on_appointment_identifier_group_id"
Expand Down

0 comments on commit 2d4e531

Please sign in to comment.