Carlos González Merino y Elena Moreno Alonso

Gemfile.lock

@@ -93,6 +93,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
+    sqlite3 (1.3.4-x86-mingw32)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -107,6 +108,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   coffee-rails (~> 3.1.1)

app/assets/javascripts/trips.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/planet.css

@@ -65,6 +65,48 @@
 }
 
 
+
+#trip_list table {
+        border-collapse: collapse;
+}
+
+#trip_list table tr td {
+        padding: 5px;
+        vertical-align: top;
+}
+
+#trip_list .list_name {
+  width:        40%;
+  margin: 0;
+  color:        #244;
+  font-weight:  bold;
+  font-size:    larger;
+  text-align:   center;
+}
+
+#trip_list .list_order {
+  width:        10%;
+  margin: 0;
+  color:        #244;
+  font-size:    larger;
+  text-align:   center;
+}
+
+#trip_list .list_actions {
+  font-size:    x-small;
+  text-align:   right;
+  padding-left: 1em;
+}
+
+#trip_list .list_line_even {
+  background:   #a8b8f8;
+}
+
+#trip_list .list_line_odd {
+  background:   #88b0f8;
+}
+
+
 /* START:mainlayout */
 /* Styles for main page */
 
@@ -78,6 +120,12 @@
   text-align: center;
 }
 
+#banner a { color: #669999; }
+a:visited { color: #66CCCC; }
+a:hover { color: #0033CC; 
+background-color:#D8D8D8; }
+
+
 #banner img {
   float: left;
   padding-left: 10px;

app/assets/stylesheets/trips.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the Trips controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/planet_controller.rb

@@ -1,12 +1,5 @@
 class PlanetController < ApplicationController
-  def index
-  end
-
-  def contact
-  end
-
-# GET /planet/ejemplo
-  def ejemplo
+  def author
   end
 
 end

app/controllers/sites_controller.rb

@@ -2,16 +2,16 @@ class SitesController < ApplicationController
   # GET /sites
   # GET /sites.json
   def index
-
     if params[:type_id].nil? or params[:type_id].empty?
       @sites = Site.all
     else
       @sites = Type.find(params[:type_id]).sites
     end
+    @trip = Trip.new
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @sites }
+        format.json { render :json=> @sites }
     end
   end
 
@@ -22,7 +22,7 @@ def show
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @site }
+        format.json { render :json=> @site }
     end
   end
 
@@ -33,7 +33,7 @@ def new
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render json: @site }
+        format.json { render :json=> @site }
     end
   end
 
@@ -49,11 +49,11 @@ def create
 
     respond_to do |format|
       if @site.save
-        format.html { redirect_to @site, notice: 'Site was successfully created.' }
-        format.json { render json: @site, status: :created, location: @site }
+          format.html { redirect_to @site, :notice=> 'Site was successfully created.' }
+          format.json { render :json=> @site, :status=> :created, :location=> @site }
       else
-        format.html { render action: "new" }
-        format.json { render json: @site.errors, status: :unprocessable_entity }
+          format.html { render :action=> "new" }
+          format.json { render :json=> @site.errors, :status=> :unprocessable_entity }
       end
     end
   end
@@ -65,11 +65,11 @@ def update
 
     respond_to do |format|
       if @site.update_attributes(params[:site])
-        format.html { redirect_to @site, notice: 'Site was successfully updated.' }
+          format.html { redirect_to @site, :notice=> 'Site was successfully updated.' }
         format.json { head :ok }
       else
-        format.html { render action: "edit" }
-        format.json { render json: @site.errors, status: :unprocessable_entity }
+          format.html { render :action=> "edit" }
+          format.json { render :json=> @site.errors, :status=> :unprocessable_entity }
       end
     end
   end

app/controllers/trips_controller.rb

@@ -0,0 +1,120 @@
+class TripsController < ApplicationController
+  # GET /trips
+  # GET /trips.json
+  def index
+    @trips = Trip.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @trips }
+    end
+  end
+
+  # GET /trips/1
+  # GET /trips/1.json
+  def show
+    @trip = Trip.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @trip }
+    end
+  end
+
+  # GET /trips/new
+  # GET /trips/new.json
+  def new
+    @trip = Trip.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @trip }
+    end
+  end
+
+  # GET /trips/1/edit
+  def edit
+    @trip = Trip.find(params[:id])
+  end
+
+  # POST /trips
+  # POST /trips.json
+  def create
+    @trip = Trip.new(params[:trip]) 
+
+	if !Trip.find(:last, :order => 'trip_id').nil?
+		@trip.trip_id = Trip.find(:last, :order => 'trip_id').trip_id + 1
+	end
+
+    respond_to do |format|
+      if @trip.save
+        format.html { redirect_to @trip, notice: 'Trip was successfully created.' }
+        format.json { render json: @trip, status: :created, location: @trip }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @trip.errors, status: :unprocessable_entity }
+      end
+    end
+
+  end
+
+  # PUT /trips/1
+  # PUT /trips/1.json
+  def update
+    @trip = Trip.find(params[:id])
+    # tid1 identificador de posicion viejo
+    tid1 = @trip.trip_id
+
+    respond_to do |format|
+      if @trip.update_attributes(params[:trip])
+
+	@trips = Trip.find(:all, :order => 'trip_id')
+
+	@trips.each do |trip|
+	  # Si la posicion nueva esta por encima de la vieja, baja los que estuvieran entre ellas
+	  if @trip.trip_id < tid1
+		if (trip.trip_id < tid1) && (trip.trip_id >= @trip.trip_id) && (trip.site_id != @trip.site_id)
+		 	 trip.trip_id = trip.trip_id + 1
+		 	 trip.save
+		 end
+	  end
+	  # Si la posicion nueva esta por debajo de la vieja, sube los que estuvieran entre ellas
+	  if @trip.trip_id > tid1
+		 if (trip.trip_id > tid1) && (trip.trip_id <= @trip.trip_id) && (trip.site_id != @trip.site_id)
+		   trip.trip_id = trip.trip_id - 1
+		   trip.save
+		 end
+	   end
+	end
+
+        format.html { redirect_to @trip, notice: 'Trip was successfully created.' }
+        format.json { head :ok }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @trip.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /trips/1
+  # DELETE /trips/1.json
+  def destroy
+   	@trip = Trip.find(params[:id])
+	# tid es la posicion borrada
+   	tid = @trip.trip_id
+   	@trip.destroy
+   	@trips = Trip.find(:all, :order => 'trip_id')
+
+   	@trips.each do |trip|
+ 		if trip.trip_id > tid
+			trip.trip_id = trip.trip_id - 1
+			trip.save
+		end
+	end
+
+	respond_to do |format|
+		format.html { redirect_to trips_url }
+		format.json { head :ok }
+	end
+  end
+end

app/helpers/trips_helper.rb

@@ -0,0 +1,2 @@
+module TripsHelper
+end

app/models/site.rb

@@ -1,3 +1,5 @@
 class Site < ActiveRecord::Base
     belongs_to :type
+    belongs_to :trip
+    validates_presence_of :name, :message => "must be provided"
 end

app/models/trip.rb

@@ -0,0 +1,3 @@
+class Trip < ActiveRecord::Base
+	has_many :sites
+end

app/views/layouts/application.html.erb

@@ -1,26 +1,46 @@
 <!DOCTYPE html> 
 <html> 
+
 <head> 
   <title>Planet</title>
   <%= stylesheet_link_tag    "application" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
+
 <body id="planet"> 
+
   <div id="banner"> 
     <%= image_tag("logo3.png") %>
-    <%= @page_title || "Planet Travel Site" %>
+    <%= @page_title || "Planet Travel Site" %><br/><!-- <label id="code.depot.e.title"/> -->
+    <%= link_to "Home", planet_index_path %>
+    <%= link_to "Contacto", planet_contact_path %>
+    <%= link_to "Autor", planet_author_path %>
+    <%= link_to "Ejemplo", planet_ejemplo_path %>
   </div> 
+
   <div id="columns"> 
     <div id="side"> 
       <%= link_to "Home", planet_index_path %><br /> 
       <%= link_to "Tipos",  types_path %><br /> 
-      <%= link_to "Sitios", sites_path %><br /> 
-      <%= link_to "Contact", planet_contact_path %>
+      <%= link_to "Sitios", sites_path %><br />
+	<%= link_to "Viajes", trips_path %> <br />
+      <%= link_to "Contacto", planet_contact_path %><br />
+      <%= link_to "Autor", planet_author_path %><br />
+      <%= link_to "Ejemplo", planet_ejemplo_path %>
+
     </div> 
-    <div id="main"> 
-      <%= yield %>
+      <div id="main"> 
+        <%= yield %>
+      </div> 
+    </div>
+
+    <div id="banner"> 
+	<%= link_to "Home", planet_index_path %>
+    	<%= link_to "Contacto", planet_contact_path %>
+   	<%= link_to "Autor", planet_author_path %>
+     	<%= link_to "Ejemplo", planet_ejemplo_path %>
     </div> 
-  </div> 
+
 </body> 
 </html> 

app/views/planet/author.html.erb

@@ -0,0 +1,13 @@
+<h1>Elena Moreno Alonso </h1>
+<%= image_tag('elena.png') %>
+<p>Madrid</p>
+<p>[email protected]</p>
+<p>Estudiante de ingeniería de Telecomunicaciones</p>
+
+
+<h1>Carlos González merino</h1>
+<%= image_tag('Carlos.PNG') %>
+
+<p>Madrid</p>
+<p> [email protected]</p>
+<p>Estudiante de ingeniería de Telecomunicaciones</p>

app/views/sites/index.html.erb

@@ -6,7 +6,9 @@
     <tr class="<%= cycle('list_line_odd', 'list_line_even') %>"> 
 
       <td> 
-        <%= link_to image_tag(site.image_url, :class => 'list_image'), site %>
+	  <% if site.image_url != "" %>
+        	<%= link_to image_tag(site.image_url, :class => 'list_image'), site %>
+	  <% end %>
       </td> 
 
       <td class="list_description"> 
@@ -23,6 +25,11 @@
         <%= link_to 'Destroy', site, 
                     :confirm => 'Are you sure?',
                     :method => :delete %>
+	  <%= form_for(@trip, remote: true) do |f| %>
+	     <% f.number_field :trip_id, :value => 1, :hidden => true %>
+           <% f.number_field :site_id, :value => site.id, :hidden => true %>
+           <%= f.submit "Add site" %>
+        <% end %>
       </td> 
     </tr> 
   <% end %>