From 9fa5578a7adc3e59e8e0b497cec225212395e7e0 Mon Sep 17 00:00:00 2001 From: Rob Paskin Date: Wed, 18 Feb 2015 19:58:35 +0000 Subject: [PATCH 1/3] Add code for exercise in "Lists of data" section --- app.rb | 11 ++++++++++- views/rsvps.erb | 18 +++++++++--------- views/schedule.erb | 10 ++++++---- views/todo.erb | 12 ++++++------ 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/app.rb b/app.rb index edf6240..b2f628d 100644 --- a/app.rb +++ b/app.rb @@ -30,7 +30,16 @@ @rejection_count = 0 # TODO categorise rsvps into acceptances/rejections and count them + @rsvps.each do |row| + if row.last == "yes" + @acceptances << row.first + @acceptance_count += 1 + else + @rejections << row.first + @rejection_count += 1 + end + end erb :rsvps -end \ No newline at end of file +end diff --git a/views/rsvps.erb b/views/rsvps.erb index da834f2..b678048 100644 --- a/views/rsvps.erb +++ b/views/rsvps.erb @@ -6,20 +6,20 @@

Invites

-

Attendees (25)

+

Attendees (<%= @acceptance_count %>)

-

Apologies (22)

+

Apologies (<%= @rejection_count %>)

- \ No newline at end of file + diff --git a/views/schedule.erb b/views/schedule.erb index 53a0567..1833d97 100644 --- a/views/schedule.erb +++ b/views/schedule.erb @@ -7,12 +7,14 @@

Event schedule

+ <% @schedule.each do |row| %> - - + <% row.each do |cell| %> + + <% end %> - + <% end %>
8pmDoors open<%= cell %>
- \ No newline at end of file + diff --git a/views/todo.erb b/views/todo.erb index 114ce58..119346a 100644 --- a/views/todo.erb +++ b/views/todo.erb @@ -6,11 +6,11 @@

Todo list

- +
    + <% @todos.each do |todo| %> +
  1. <%= todo %>
    2. + <% end %> +
- \ No newline at end of file + From 80357fa586da2af37deca40a9641628400718f99 Mon Sep 17 00:00:00 2001 From: Rob Paskin Date: Wed, 18 Feb 2015 20:07:01 +0000 Subject: [PATCH 2/3] Add solution to "Sinatra static assets" --- views/schedule.erb | 1 + views/todo.erb | 1 + 2 files changed, 2 insertions(+) diff --git a/views/schedule.erb b/views/schedule.erb index 1833d97..88d2c35 100644 --- a/views/schedule.erb +++ b/views/schedule.erb @@ -2,6 +2,7 @@ Event Manager 2.0 +

Event schedule

diff --git a/views/todo.erb b/views/todo.erb index 119346a..ffe8795 100644 --- a/views/todo.erb +++ b/views/todo.erb @@ -2,6 +2,7 @@ Event Manager 2.0 +

Todo list

From 804bf469c327d9f831bfb947dc19c9b71a9c41c8 Mon Sep 17 00:00:00 2001 From: Rob Paskin Date: Wed, 18 Feb 2015 20:15:43 +0000 Subject: [PATCH 3/3] Add solution to "Layout files" --- views/index.erb | 21 ++++++--------------- views/layout.erb | 12 ++++++++++++ views/rsvps.erb | 40 +++++++++++++++------------------------- views/schedule.erb | 28 +++++++++------------------- views/todo.erb | 22 ++++++---------------- 5 files changed, 48 insertions(+), 75 deletions(-) create mode 100644 views/layout.erb diff --git a/views/index.erb b/views/index.erb index 2aad49b..ad93798 100644 --- a/views/index.erb +++ b/views/index.erb @@ -1,16 +1,7 @@ - - - - Event Manager 2.0 - - -

Picture Unveiling Evening - Event Managment

+

Picture Unveiling Evening - Event Managment

- - - - \ No newline at end of file + diff --git a/views/layout.erb b/views/layout.erb new file mode 100644 index 0000000..583a5de --- /dev/null +++ b/views/layout.erb @@ -0,0 +1,12 @@ + + + + Event Manager 2.0 + + + + + <%= yield %> + + + diff --git a/views/rsvps.erb b/views/rsvps.erb index b678048..93ed48c 100644 --- a/views/rsvps.erb +++ b/views/rsvps.erb @@ -1,25 +1,15 @@ - - - - Event Manager 2.0 - - -

Invites

- -

Attendees (<%= @acceptance_count %>)

-
    - <% @acceptances.each do |person| %> -
  • <%= person %>
    • - <% end %> -
- -

Apologies (<%= @rejection_count %>)

-
    - <% @rejections.each do |person| %> -
  • <%= person %>
    • - <% end %> -
- - - - +

Invites

+ +

Attendees (<%= @acceptance_count %>)

+
    + <% @acceptances.each do |person| %> +
  • <%= person %>
    • + <% end %> +
+ +

Apologies (<%= @rejection_count %>)

+
    + <% @rejections.each do |person| %> +
  • <%= person %>
    • + <% end %> +
diff --git a/views/schedule.erb b/views/schedule.erb index 88d2c35..ec40be8 100644 --- a/views/schedule.erb +++ b/views/schedule.erb @@ -1,21 +1,11 @@ - - - - Event Manager 2.0 - - - -

Event schedule

+

Event schedule

- - <% @schedule.each do |row| %> - - <% row.each do |cell| %> - - <% end %> - +
<%= cell %>
+ <% @schedule.each do |row| %> + + <% row.each do |cell| %> + <% end %> -
<%= cell %>
- - - + + <% end %> + diff --git a/views/todo.erb b/views/todo.erb index ffe8795..284e23b 100644 --- a/views/todo.erb +++ b/views/todo.erb @@ -1,17 +1,7 @@ - - - - Event Manager 2.0 - - - -

Todo list

+

Todo list

-
    - <% @todos.each do |todo| %> -
  1. <%= todo %>
    2. - <% end %> -
- - - +
    + <% @todos.each do |todo| %> +
  1. <%= todo %>
    2. + <% end %> +