From c38a00c8fbc549d1ec45834ee05b19a38d2dd246 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Thu, 24 Apr 2014 18:41:53 -0400 Subject: TOMER WE ADDED YOUR DESIRED 5 TEAM SEED --- app/controllers/matches_controller.rb | 4 +-- db/seeds.rb | 50 +++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 1ad86d0..138cf28 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -23,8 +23,8 @@ class MatchesController < ApplicationController @match.teams.each do |team| team.users.each do |user| - players_id.push(user.remote_usernames[0]["json_value"]["id"]) - players.push(user.remote_usernames[0]["json_value"]["id"]) + players_id.push(user.remote_usernames[0].value["id"]) + players.push(user.remote_usernames[0].value["name"]) end end diff --git a/db/seeds.rb b/db/seeds.rb index 7f066bc..61cf44a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -68,24 +68,25 @@ if Rails.env.development? players_for_league.push(User.create(name: "Kaceytron", password: "password", email: "Kaceytron@gmail.com", user_name: "Kaceytron", password_confirmation: "password")) #semi-real users - User.create(name: "Davis Webb", password: "password", email: "davislwebb@gmail.com", user_name: "TeslasMind", password_confirmation: "password") - User.create(name: "Nathaniel Foy", password: "password", email: "nfoy@notreal.com", user_name: "Nalfeinx", password_confirmation: "password") - User.create(name: "Guntas Grewal", password: "password", email: "guntasgrewal@gmail.com", user_name: "guntasgrewal", password_confirmation: "password") - User.create(name: "Luke Shumaker", password: "password", email: "lukeshu@emacs4lyfe.com", user_name: "lukeshu", password_confirmation: "password") - User.create(name: "Tomer Kimia", password: "password", email: "tomer@2majors4lyfe.com", user_name: "tkimia", password_confirmation: "password") - User.create(name: "Andrew Murrell", password: "password", email: "murrel@murrel.gov", user_name: "ImFromNasa", password_confirmation: "password") - User.create(name: "Joseph Adams", password: "password", email: "alpha142@fluttershyop.com", user_name: "alpha142", password_confirmation: "password") - User.create(name: "Josh Huser", password: "password", email: "jhuser@iownabusiness.net", user_name: "WinterWorks", password_confirmation: "password") - User.create(name: "Professor Dunsmore", password: "password", email: "bxd@purdue.edu", user_name: "Dumbledore", password_confirmation: "password") - User.create(name: "Marco Polo", password: "password", email: "marco@ta4lyfe.com", user_name: "iCoordinate", password_confirmation: "password") - User.create(name: "Geoffrey Webb", password: "password", email: "imnotjoffreybarathian@gameofthrones.com", user_name: "GTBPhoenix", password_confirmation: "password") - User.create(name: "Obama", password: "password", email: "obama@whitehouse.gov", user_name: "Obama", password_confirmation: "password") + davis = User.create(name: "Davis Webb", password: "password", email: "davislwebb@gmail.com", user_name: "TeslasMind", password_confirmation: "password") + foy = User.create(name: "Nathaniel Foy", password: "password", email: "nfoy@notreal.com", user_name: "Nalfeinx", password_confirmation: "password") + guntas = User.create(name: "Guntas Grewal", password: "password", email: "guntasgrewal@gmail.com", user_name: "guntasgrewal", password_confirmation: "password") + luke = User.create(name: "Luke Shumaker", password: "password", email: "lukeshu@emacs4lyfe.com", user_name: "lukeshu", password_confirmation: "password") + tomer = User.create(name: "Tomer Kimia", password: "password", email: "tomer@2majors4lyfe.com", user_name: "tkimia", password_confirmation: "password") + andrew = User.create(name: "Andrew Murrell", password: "password", email: "murrel@murrel.gov", user_name: "ImFromNasa", password_confirmation: "password") + joey = User.create(name: "Joseph Adams", password: "password", email: "alpha142@fluttershyop.com", user_name: "alpha142", password_confirmation: "password") + josh = User.create(name: "Josh Huser", password: "password", email: "jhuser@iownabusiness.net", user_name: "WinterWorks", password_confirmation: "password") + dunsmore = User.create(name: "Professor Dunsmore", password: "password", email: "bxd@purdue.edu", user_name: "Dumbledore", password_confirmation: "password") + marco = User.create(name: "Marco Polo", password: "password", email: "marco@ta4lyfe.com", user_name: "iCoordinate", password_confirmation: "password") + jordan = User.create(name: "Geoffrey Webb", password: "password", email: "imnotjoffreybarathian@gameofthrones.com", user_name: "GTBPhoenix", password_confirmation: "password") + obama = User.create(name: "Obama", password: "password", email: "obama@whitehouse.gov", user_name: "Obama", password_confirmation: "password") #league of legends tournament league_tourn = Tournament.create(game_id: 1, status: 0, name: "League of Legends Seed", min_players_per_team: 5, max_players_per_team: 5, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: 1, randomized_teams: true, sampling_method: nil) + #adds players to the seeded league tournament for i in 0..9 if i == 0 league_tourn.hosts.push(players_for_league[i]) @@ -95,10 +96,31 @@ if Rails.env.development? league_tourn.join(players_for_league[9]) #chess - Tournament.create(game_id: 2, status: 0, name: "Chess Seed", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, + chess_tourn = Tournament.create(game_id: 2, status: 0, name: "Chess Seed", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: 1, randomized_teams: true, sampling_method: nil) + chess_tourn.hosts.push(davis) + chess_tourn.join(davis) + chess_tourn.join(foy) + #Rock Paper Scissors - Tournament.create(game_id: 4, status: 0, name: "Rock, Paper, Scissors Seed", min_players_per_team: 1, max_players_per_team: 3, min_teams_per_match: 2, + rps = Tournament.create(game_id: 4, status: 0, name: "Rock, Paper, Scissors Seed", min_players_per_team: 1, max_players_per_team: 3, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: 1, randomized_teams: true, sampling_method: nil) + + rps.hosts.push(davis) + rps.join(davis) + rps.join(foy) + rps.join(guntas) + + tourn5 = Tournament.create(game_id: 1, status: 0, name: "5 Teams, 2 Teams Per Match", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, + max_teams_per_match: 2, set_rounds: 1, randomized_teams: true, sampling_method: nil) + + for i in 0..9 + if i == 0 + tourn5.hosts.push(players_for_league[i]) + end + tourn5.join(players_for_league[i]) + end + tourn5.join(players_for_league[9]) + end -- cgit v1.1-4-g5e80 From db073045ff7cf5d8a2fb4a3349ed6a9a6ac019d3 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Thu, 24 Apr 2014 18:59:43 -0400 Subject: the db script --- db.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 db.sh diff --git a/db.sh b/db.sh new file mode 100755 index 0000000..9d86834 --- /dev/null +++ b/db.sh @@ -0,0 +1,2 @@ +#!/bin/bash +bundle exec rake db:drop && bundle exec rake db:migrate && bundle exec rake db:seed -- cgit v1.1-4-g5e80 From 9823642115ef52f0a21b9466cef412098a124f3d Mon Sep 17 00:00:00 2001 From: nfoy Date: Thu, 24 Apr 2014 19:03:36 -0400 Subject: Mailboxer progress without generate changes. --- app/controllers/pms_controller.rb | 10 +++- app/views/pms/_form.html.erb | 4 ++ app/views/pms/index.html.erb | 117 ++++++++++++++++++++++---------------- app/views/pms/show.html.erb | 2 +- 4 files changed, 80 insertions(+), 53 deletions(-) diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb index 1d6540d..9dbe760 100644 --- a/app/controllers/pms_controller.rb +++ b/app/controllers/pms_controller.rb @@ -24,11 +24,11 @@ class PmsController < ApplicationController def create @pm = Pm.new(pm_params) @pm.author = current_user - require 'pp' - pp @pm.message + #require 'pp' + #pp @pm.message @pm.recipient = User.find_by_user_name(pm_params['recipient_id']) - @pm.author.send_message(@pm.recipient, @pm.message, 'Default') + @pm.conversation = @pm.author.send_message(@pm.recipient, @pm.message, @pm.subject).conversation respond_to do |format| if @pm.save @@ -41,6 +41,10 @@ class PmsController < ApplicationController end end + #def reply + # current_user.reply_to_conversation(conversation, message) + #end + # PATCH/PUT /pms/1 # PATCH/PUT /pms/1.json def update diff --git a/app/views/pms/_form.html.erb b/app/views/pms/_form.html.erb index e9a7c08..b329e24 100644 --- a/app/views/pms/_form.html.erb +++ b/app/views/pms/_form.html.erb @@ -15,6 +15,10 @@ <%= f.label :recipient_id %>
<%= f.text_field :recipient_id %> +
+ <%= f.label :subject %>
+ <%= f.text_field :subject %> +
<%= f.label :message %>
<%= f.text_area :message %> diff --git a/app/views/pms/index.html.erb b/app/views/pms/index.html.erb index 1175cb2..ee31e08 100644 --- a/app/views/pms/index.html.erb +++ b/app/views/pms/index.html.erb @@ -1,66 +1,85 @@ -

Listing pms

+

Conversations

- - - - - - - - - - - - - + + + <% conversations = current_user.mailbox.inbox %> + <% if !conversations.empty? %> + <%# require 'pp' %> + <%= conversations.class %> + + + + + + <% conversations.each do |conversation| %> + <% receipts = conversation.receipts_for current_user %> + <% receipts.each do |receipt| %> + <% message = receipt.message %> + + + + + + + <% end %> + <% end %> - <% message = @pms.where(recipient: current_user) %> - <% unless message.empty? then message.each do |pm| %> - - - - - - - - + <% else %> + <% end %> - <% else %> - - <% end %> + - - + + - - <% message = @pms.where(author: current_user) %> - <% unless message.empty? then message.each do |pm| %> - - - - - - - - + + <% conversations = current_user.mailbox.sentbox %> + <% if !conversations.empty? %> + + + + + + <% conversations.each do |conversation| %> + <% receipts = conversation.receipts_for current_user %> + <% receipts.each do |receipt| %> + <% message = receipt.message %> + + + + + + + <% end %> + <% end %> + + <% else %> + <% end %> - <% else %> - - <% end %> + - - - + +
AuthorRecipientMessage

Inbox

Inbox
FromSubjectBody
<%= conversation.last_sender.user_name %><%= message.subject %><%= message.body %><%# link_to 'Show', @pms.where(conversation: conversation) %>
<%= pm.author.user_name %><%= pm.recipient.user_name %><%= pm.message %><%= link_to 'Show', pm %><%# link_to 'Edit', edit_pm_path(pm) %><%= link_to 'Delete', pm, method: :delete, data: { confirm: 'Are you sure (also deletes the author\'s copy)?' } %>

No Messages

No New Messages

Outbox

Outbox
<%= pm.author.user_name %><%= pm.recipient.user_name %><%= pm.message %><%= link_to 'Show', pm %><%# link_to 'Edit', edit_pm_path(pm) %><%= link_to 'Delete', pm, method: :delete, data: { confirm: 'Are you sure (also deletes the recipient\'s copy)?'} %>
ToSubjectBody
Doesn't work<%= message.subject %><%= message.body %><%# link_to 'Show', @pms.where(conversation: conversation) %>

No Messages

No New Messages

Conversations

+ +
+ +<%= link_to 'New Pm', new_pm_path %> +

Conversations

+ + + <% conversations = current_user.mailbox.inbox %> - <% if !conversations.nil? %> + <% if !conversations.empty? %> + <%# require 'pp' %> + <%= conversations.class %> @@ -74,7 +93,7 @@ - + <% end %> <% end %> @@ -89,7 +108,7 @@ <% conversations = current_user.mailbox.sentbox %> - <% if !conversations.nil? %> + <% if !conversations.empty? %> diff --git a/app/views/pms/show.html.erb b/app/views/pms/show.html.erb index cfaf00d..aec160f 100644 --- a/app/views/pms/show.html.erb +++ b/app/views/pms/show.html.erb @@ -1,6 +1,6 @@

Author: - <%= @conversation.last_sender.user_name %> + <%# @conversation.last_sender.user_name %>

-- cgit v1.1-4-g5e80

Inbox
From Subject<%= conversation.last_sender.user_name %> <%= message.subject %> <%= message.body %><%# link_to 'Show', pm %><%# link_to 'Show', @pm.where(conversation: conversation) %>
To Subject