gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Another round of splash design

Browse source 
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
This commit is contained in:
Henne Vogelsang 2014-11-20 14:57:03 +01:00
parent 30e8ab856c
commit cb227a0afc
55 changed files with 717 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

2
db/migrate/20141117214230_move_banner_description_to_conference.rb
View file

@ -20,6 +20,6 @@ class MoveBannerDescriptionToConference < ActiveRecord::Migration
end
end
remove_column :splashpages, :banner_description, :text
remove_column :splashpages, :banner_description, :text
end
end

12
db/migrate/20141118143700_add_address_fields_to_venue.rb Normal file
View file

@ -0,0 +1,12 @@
class AddAddressFieldsToVenue < ActiveRecord::Migration
def change
add_column :venues, :street, :string
add_column :venues, :postalcode, :integer
add_column :venues, :city, :string
add_column :venues, :country, :string
add_column :venues, :latitude, :string
add_column :venues, :longitude, :string
remove_column :venues, :address, :text
end
end

7
db/migrate/20141118150427_cleanup_venue.rb Normal file
View file

@ -0,0 +1,7 @@
class CleanupVenue < ActiveRecord::Migration
def change
change_column :venues, :name, :string
remove_column :venues, :offline_map_url, :string
remove_column :venues, :offline_map_bounds, :string
end
end

25
db/migrate/20141118153918_change_venue_conference_association.rb Normal file
View file

@ -0,0 +1,25 @@
class ChangeVenueConferenceAssociation < ActiveRecord::Migration
class TempConference < ActiveRecord::Base
self.table_name = 'conferences'
end
class TempVenue < ActiveRecord::Base
self.table_name = 'venues'
attr_accessible :conference_id
end
def change
add_column :venues, :conference_id, :integer
TempVenue.reset_column_information
# Change association from venue and conference
TempConference.all.each do |conference|
if TempVenue.exists?(id: conference.venue_id)
venue = TempVenue.find_by(id: conference.venue_id)
venue.update_attributes(conference_id: conference.id)
end
end
remove_column :conferences, :venue_id, :integer
end
end

32
db/migrate/20141118162030_change_lodging_association_to_conference.rb Normal file
View file

@ -0,0 +1,32 @@
class ChangeLodgingAssociationToConference < ActiveRecord::Migration
class TempConference < ActiveRecord::Base
self.table_name = 'conferences'
end
class TempVenue < ActiveRecord::Base
self.table_name = 'venues'
end
class TempLodging < ActiveRecord::Base
self.table_name = 'lodgings'
attr_accessible :conference_id
end
def change
add_column :lodgings, :conference_id, :integer
TempLodging.reset_column_information
# Change association from venue and conference
TempConference.all.each do |conference|
if TempVenue.exists?(conference_id: conference.id)
venue = TempVenue.find_by(conference_id: conference.id)
lodgings = TempLodging.where(venue_id: venue.id)
lodgings.each do |lodging|
lodging.update_attributes(conference_id: conference.id)
end
end
end
remove_column :lodgings, :venue_id, :integer
end
end

200
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20141117222919) do
ActiveRecord::Schema.define(version: 20141118162030) do
create_table "ahoy_events", force: true do |t|
t.uuid "visit_id"
@ -27,21 +27,21 @@ ActiveRecord::Schema.define(version: 20141117222919) do
create_table "answers", force: true do |t|
t.string "title"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "call_for_papers", force: true do |t|
t.date "start_date", null: false
t.date "end_date", null: false
t.text "description", null: false
t.date "start_date", null: false
t.date "end_date", null: false
t.text "description", limit: 16777215, null: false
t.integer "conference_id"
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "schedule_changes", default: false
t.integer "rating", default: 3
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.boolean "schedule_changes", default: false
t.integer "rating", default: 3
t.boolean "schedule_public"
t.boolean "include_cfp_in_splash", default: false
t.boolean "include_cfp_in_splash", default: false
end
create_table "campaigns", force: true do |t|
@ -57,13 +57,13 @@ ActiveRecord::Schema.define(version: 20141117222919) do
end
create_table "comments", force: true do |t|
t.string "title", limit: 50, default: ""
t.text "body"
t.string "title", limit: 50, default: ""
t.text "body", limit: 16777215
t.integer "commentable_id"
t.string "commentable_type"
t.integer "user_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "subject"
t.integer "parent_id"
t.integer "lft"
@ -91,9 +91,8 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.string "html_export_path"
t.date "start_date", null: false
t.date "end_date", null: false
t.integer "venue_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "logo_file_name"
t.string "logo_content_type"
t.integer "logo_file_size"
@ -146,8 +145,8 @@ ActiveRecord::Schema.define(version: 20141117222919) do
create_table "dietary_choices", force: true do |t|
t.integer "conference_id"
t.string "title", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "difficulty_levels", force: true do |t|
@ -155,37 +154,37 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.string "title"
t.text "description"
t.string "color"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "email_settings", force: true do |t|
t.integer "conference_id"
t.boolean "send_on_registration", default: false
t.boolean "send_on_accepted", default: false
t.boolean "send_on_rejected", default: false
t.boolean "send_on_confirmed_without_registration", default: false
t.text "registration_email_template"
t.text "accepted_email_template"
t.text "rejected_email_template"
t.text "confirmed_email_template"
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "send_on_registration", default: false
t.boolean "send_on_accepted", default: false
t.boolean "send_on_rejected", default: false
t.boolean "send_on_confirmed_without_registration", default: false
t.text "registration_email_template", limit: 16777215
t.text "accepted_email_template", limit: 16777215
t.text "rejected_email_template", limit: 16777215
t.text "confirmed_email_template", limit: 16777215
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "registration_subject"
t.string "accepted_subject"
t.string "rejected_subject"
t.string "confirmed_without_registration_subject"
t.boolean "send_on_updated_conference_dates", default: false
t.boolean "send_on_updated_conference_dates", default: false
t.string "updated_conference_dates_subject"
t.text "updated_conference_dates_template"
t.boolean "send_on_updated_conference_registration_dates", default: false
t.boolean "send_on_updated_conference_registration_dates", default: false
t.string "updated_conference_registration_dates_subject"
t.text "updated_conference_registration_dates_template"
t.boolean "send_on_venue_update", default: false
t.boolean "send_on_venue_update", default: false
t.string "venue_update_subject"
t.text "venue_update_template"
t.boolean "send_on_call_for_papers_dates_updates", default: false
t.boolean "send_on_call_for_papers_schedule_public", default: false
t.boolean "send_on_call_for_papers_dates_updates", default: false
t.boolean "send_on_call_for_papers_schedule_public", default: false
t.string "call_for_papers_schedule_public_subject"
t.string "call_for_papers_dates_updates_subject"
t.text "call_for_papers_schedule_public_template"
@ -194,14 +193,14 @@ ActiveRecord::Schema.define(version: 20141117222919) do
create_table "event_attachments", force: true do |t|
t.integer "event_id"
t.string "title", null: false
t.string "title", null: false
t.string "attachment_file_name"
t.string "attachment_content_type"
t.integer "attachment_file_size"
t.datetime "attachment_updated_at"
t.boolean "public", default: false
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "public", default: true
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "event_types", force: true do |t|
@ -223,28 +222,28 @@ ActiveRecord::Schema.define(version: 20141117222919) do
end
create_table "events", force: true do |t|
t.string "guid", null: false
t.string "guid", null: false
t.integer "conference_id"
t.integer "event_type_id"
t.string "title", null: false
t.string "title", null: false
t.string "subtitle"
t.integer "time_slots"
t.string "state", default: "new", null: false
t.string "progress", default: "new", null: false
t.string "state", default: "new", null: false
t.string "progress", default: "new", null: false
t.string "language"
t.datetime "start_time"
t.text "abstract"
t.text "description"
t.boolean "public", default: true
t.text "abstract", limit: 16777215
t.text "description", limit: 16777215
t.boolean "public", default: true
t.string "logo_file_name"
t.string "logo_content_type"
t.integer "logo_file_size"
t.datetime "logo_updated_at"
t.text "proposal_additional_speakers"
t.text "proposal_additional_speakers", limit: 16777215
t.integer "track_id"
t.integer "room_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.boolean "require_registration"
t.integer "difficulty_level_id"
t.integer "week"
@ -262,10 +261,10 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.string "photo_content_type"
t.integer "photo_file_size"
t.datetime "photo_updated_at"
t.integer "venue_id"
t.datetime "created_at"
t.datetime "updated_at"
t.string "website_link"
t.integer "conference_id"
end
create_table "openids", force: true do |t|
@ -277,6 +276,29 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.datetime "updated_at"
end
create_table "people", force: true do |t|
t.string "guid", null: false
t.text "first_name"
t.text "last_name"
t.text "public_name"
t.text "company"
t.string "email", null: false
t.boolean "email_public"
t.string "avatar_file_name"
t.string "avatar_content_type"
t.integer "avatar_file_size"
t.datetime "avatar_updated_at"
t.text "biography"
t.integer "user_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "irc_nickname"
t.text "volunteer_experience"
t.string "tshirt"
t.string "mobile"
t.string "languages"
end
create_table "photos", force: true do |t|
t.text "description"
t.string "picture_file_name"
@ -300,8 +322,8 @@ ActiveRecord::Schema.define(version: 20141117222919) do
create_table "question_types", force: true do |t|
t.string "title"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "questions", force: true do |t|
@ -309,8 +331,8 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.integer "question_type_id"
t.integer "conference_id"
t.boolean "global"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "registration_periods", force: true do |t|
@ -325,12 +347,12 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.integer "conference_id"
t.datetime "arrival"
t.datetime "departure"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "dietary_choice_id"
t.text "other_dietary_choice"
t.text "other_special_needs"
t.boolean "attended", default: false
t.text "other_dietary_choice", limit: 16777215
t.text "other_special_needs", limit: 16777215
t.boolean "attended", default: false
t.boolean "volunteer"
t.integer "user_id"
t.integer "week"
@ -348,8 +370,8 @@ ActiveRecord::Schema.define(version: 20141117222919) do
create_table "roles", force: true do |t|
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "description"
t.integer "resource_id"
t.string "resource_type"
@ -452,13 +474,13 @@ ActiveRecord::Schema.define(version: 20141117222919) do
end
create_table "tracks", force: true do |t|
t.string "guid", null: false
t.string "guid", null: false
t.integer "conference_id"
t.string "name", null: false
t.text "description"
t.string "name", null: false
t.text "description", limit: 16777215
t.string "color"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "users", force: true do |t|
@ -476,8 +498,8 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.datetime "confirmed_at"
t.datetime "confirmation_sent_at"
t.string "unconfirmed_email"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "name"
t.boolean "email_public"
t.text "biography"
@ -510,33 +532,37 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.integer "conference_id"
t.date "day"
t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "venues", force: true do |t|
t.string "guid"
t.text "name", limit: 255
t.text "address", limit: 255
t.string "name"
t.string "website"
t.text "description"
t.string "offline_map_url"
t.string "offline_map_bounds"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "photo_file_name"
t.string "photo_content_type"
t.integer "photo_file_size"
t.datetime "photo_updated_at"
t.string "street"
t.integer "postalcode"
t.string "city"
t.string "country"
t.string "latitude"
t.string "longitude"
t.integer "conference_id"
end
create_table "versions", force: true do |t|
t.string "item_type", null: false
t.integer "item_id", null: false
t.string "event", null: false
t.string "item_type", null: false
t.integer "item_id", null: false
t.string "event", null: false
t.string "whodunnit"
t.text "object"
t.text "object_changes"
t.text "object", limit: 16777215
t.text "object_changes", limit: 16777215
t.datetime "created_at"
end
@ -570,8 +596,8 @@ ActiveRecord::Schema.define(version: 20141117222919) do
create_table "votes", force: true do |t|
t.integer "event_id"
t.integer "rating"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "user_id"
end
@ -579,8 +605,8 @@ ActiveRecord::Schema.define(version: 20141117222919) do
t.integer "conference_id"
t.string "title", null: false
t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
end