From 3c46a3a0dc763e1216bf1e45f8b5cc0153a257dc Mon Sep 17 00:00:00 2001
From: Fellipe Souto Sampaio <fllsouto@gmail.com>
Date: Thu, 13 Feb 2014 12:27:09 -0200
Subject: [PATCH] New view

---
 app/helpers/mezuro_ranges_helper.rb           |  6 ++++++
 app/models/mezuro_range.rb                    |  1 +
 app/views/mezuro_ranges/_form.html.erb        | 12 ++++++++++++
 app/views/mezuro_ranges/_no_readings.html.erb | 27 +++++++++++++++++++++++----
 app/views/mezuro_ranges/_reading.html.erb     |  5 -----
 app/views/mezuro_ranges/new.html.erb          | 20 +-------------------
 6 files changed, 43 insertions(+), 28 deletions(-)
 create mode 100644 app/helpers/mezuro_ranges_helper.rb
 delete mode 100644 app/views/mezuro_ranges/_reading.html.erb

diff --git a/app/helpers/mezuro_ranges_helper.rb b/app/helpers/mezuro_ranges_helper.rb
new file mode 100644
index 0000000..07e96ea
--- /dev/null
+++ b/app/helpers/mezuro_ranges_helper.rb
@@ -0,0 +1,6 @@
+module MezuroRangesHelper
+
+	def readings_options(reading_group)
+		reading_group.readings.map { |reading| [reading.label, reading.id] }
+	end
+end
\ No newline at end of file
diff --git a/app/models/mezuro_range.rb b/app/models/mezuro_range.rb
index 35632b6..8a881f1 100644
--- a/app/models/mezuro_range.rb
+++ b/app/models/mezuro_range.rb
@@ -7,5 +7,6 @@ class MezuroRange < KalibroGem::Entities::Range
 
   validates :beginning, presence: true, beginning_uniqueness: true
   validates :end, presence: true #TODO: Validates numeracy
+  validates :reading_id, presence: true
 
 end
\ No newline at end of file
diff --git a/app/views/mezuro_ranges/_form.html.erb b/app/views/mezuro_ranges/_form.html.erb
index fc7b3f9..5f6dc00 100644
--- a/app/views/mezuro_ranges/_form.html.erb
+++ b/app/views/mezuro_ranges/_form.html.erb
@@ -14,6 +14,18 @@
     <%= f.label :comments, class: 'control-label' %><br>
     <%= f.text_area :comments, class: 'form-control' %>
   </div>
+  
+  <% if @reading_group.readings.size == 0 %>
+    <%= render partial: 'no_readings' %>
+  <% else %>
+    <div class="form-group">
+      <%= f.label :reading_id, 'Reading', class: 'control-label' %>
+      <%= f.select( :reading_id, readings_options(@reading_group), {class: 'form-control'} ) %>
+    </div></br>    
+  <% end %>
+
+
+
 
   <%= f.submit 'Save', class: 'btn btn-primary' %>
 
diff --git a/app/views/mezuro_ranges/_no_readings.html.erb b/app/views/mezuro_ranges/_no_readings.html.erb
index ba3fda6..0e3d203 100644
--- a/app/views/mezuro_ranges/_no_readings.html.erb
+++ b/app/views/mezuro_ranges/_no_readings.html.erb
@@ -1,4 +1,23 @@
-<tr> 
-  <% col_number = reading_groups_owner?(@reading_group.id) ? 5 : 3 %>
-  <td colspan="<%= col_number %>">There are no readings yet!</td>
-</tr>
+<div class="alert alert-error alert-dismissable">
+	<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+	<h4 class="alert-heading">There is not reading yet!</h4>
+	<p>	 
+		You need to create reading in your associeated reading group before create a range
+	</p>
+	<p>
+		<% if reading_groups_owner? @reading_group.id %>
+			
+			<%= link_to 'Create New Reading', new_reading_group_reading_path(@reading_group,), class: 'btn btn-danger' %>
+		
+		<% else %>
+		
+			</p></div>
+			<div class="alert alert-error alert-dismissable">
+				<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+				<p> You are not allowed to do this operation, your reading belongs to another person. </p>
+			</div>
+		
+		<% end %>
+	</p>
+	
+</div>
\ No newline at end of file
diff --git a/app/views/mezuro_ranges/_reading.html.erb b/app/views/mezuro_ranges/_reading.html.erb
deleted file mode 100644
index 9bb9963..0000000
--- a/app/views/mezuro_ranges/_reading.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr>
-  <td><%= reading.label %></td>
-  <td><%= reading.grade %></td>
-  <td style="background-color: #<%= reading.color %>; width: 20%;">&nbsp;</td>
-</tr>
\ No newline at end of file
diff --git a/app/views/mezuro_ranges/new.html.erb b/app/views/mezuro_ranges/new.html.erb
index 4188389..5a8f9b5 100644
--- a/app/views/mezuro_ranges/new.html.erb
+++ b/app/views/mezuro_ranges/new.html.erb
@@ -4,22 +4,4 @@
     @mezuro_range.metric_configuration_id)) do |f|  %>
   <%= render partial: 'form', locals: {f: f} %>
 <% end %>
-
-<table class="table table-hover">
-  <thead>
-    <tr>
-      <th>Label</th>
-      <th>Grade</th>
-      <th>Color</th>
-    </tr>
-  </thead>
-	
-	<tbody>
-		<% if @reading_group.readings.size == 0 %>
-			<%= render partial: 'no_readings' %>
-		<% else %>
-			<%= render partial: 'reading', collection: @reading_group.readings, as: :reading %>      
-		<% end %>
-	</tbody>
-
-</table>
+<%= raise mezuro_range.inspect %>
--
libgit2 0.21.2