From 7303b2b430b3c90f42fe1fff6b298e509ad2691d Mon Sep 17 00:00:00 2001
From: francisco javier casas barrientos <fcasas@alumnos.inf.utfsm.cl>
Date: Mon, 5 Oct 2015 08:52:40 -0300
Subject: [PATCH] Added travels view on the index.
---
app/controllers/welcome_controller.rb | 4 +++-
app/models/travel.rb | 10 ++++++++++
app/views/helpers/_navbar.html.erb | 2 +-
app/views/travels/_travel.html.erb | 17 +++++++++++++++++
app/views/welcome/index.html.erb | 18 +++++++++++++++++-
5 files changed, 48 insertions(+), 3 deletions(-)
create mode 100644 app/views/travels/_travel.html.erb
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index faf887b..b8d2b54 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -1,3 +1,5 @@
class WelcomeController < ApplicationController
-
+ def index
+ @s_travels= Travel.order("updated_at desc").first(8)
+ end
end
diff --git a/app/models/travel.rb b/app/models/travel.rb
index 25054ce..cb46085 100644
--- a/app/models/travel.rb
+++ b/app/models/travel.rb
@@ -15,4 +15,14 @@ class Travel < ActiveRecord::Base
validates :price,
:presence => true
+ validate :start_is_before
+
+ # other model methods
+
+ private
+
+ def start_is_before
+ errors.add(:end_dt, "No puede iniciar antes de terminar.") if start_dt > end_dt
+ end
+
end
\ No newline at end of file
diff --git a/app/views/helpers/_navbar.html.erb b/app/views/helpers/_navbar.html.erb
index 1e131be..ba92c21 100644
--- a/app/views/helpers/_navbar.html.erb
+++ b/app/views/helpers/_navbar.html.erb
@@ -8,7 +8,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="/">Home</a>
+ <a class="navbar-brand" href="/">Tripda<small>bd14</small></a>
</div>
<%- if admin_signed_in? %>
diff --git a/app/views/travels/_travel.html.erb b/app/views/travels/_travel.html.erb
new file mode 100644
index 0000000..1bfcb17
--- /dev/null
+++ b/app/views/travels/_travel.html.erb
@@ -0,0 +1,17 @@
+<div class="row">
+ <div class="col-sm-4">
+ <%= travel.start_place %><br>
+ <%= travel.start_dt %>
+ </div>
+ <div class="col-sm-4">
+ <%= travel.end_place %><br>
+ <%= travel.end_dt %>
+ </div>
+ <div class="col-sm-4">
+ <font color="<%= travel.car.color.code %>">
+ <%= travel.car.name %><br>
+ <a href="#">Ver perfil</a>
+ </font>
+ </div>
+
+</div>
\ No newline at end of file
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 7520eb8..b90bd8b 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1 +1,17 @@
-<h1>Tripda BD 14</h1>
+<div class="panel panel-default">
+
+ <div class="panel-heading">Viajes</div>
+ <div class="panel-body">
+ <h3> Algunos viajes que pueden interesarle: </h3>
+ </div>
+
+ <div class="container">
+ <ul class="list-group">
+ <% @s_travels.each do |trav| %>
+ <li class="list-group-item">
+ <%= render trav %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+</div>
--
GitLab