primera version de produccion

Author: jalagrange

app/models/job.rb

@@ -110,7 +110,7 @@ def js_line_chart(attr)
 
   def self.build_from_xml
 
-    @file_name = ((Time.now)-(3.day)).strftime("%Y%m%d") + ".xml"
+    @file_name = ((Time.now)-(1.day)).strftime("%Y%m%d") + ".xml"
     @host = 'account'
     @user = 'account'
     @pass = '2hot2work'
@@ -151,16 +151,8 @@ def self.build_from_xml
         )
       end
     end
-     for job in @jobs do
-       @split = job.jobname.split('_')
-        job.project = Project.find_by_name(@split[0])
-        job.proceso = Proceso.find_by_name(@split[1])
-        job.walltime = total_seconds(job.walltime)
-        job.cput = total_seconds(job.cput)
-        job.time_in_queue = (job.start.to_i) - (job.ctime.to_i)
-        job.time_in_execution = (job.end.to_i) - (job.start.to_i)
-        job.save
-      end
+    remove_xml = `rm data/xml/#{@file_name}`
+    jobs
   end
 
   def self.save_xml
@@ -183,18 +175,9 @@ def self.disk_free()
   end
 
   def self.ssh_test
+    @file_name = ((Time.now)-(1.day)).strftime("%Y%m%d") + ".xml"
     puts "test"
-    @file_to_download = ((Time.now)-(1.day)).strftime("%Y%m%d") + ".xml"
-    @host = 'account'
-    @user = 'account'
-    @pass = '2hot2work'
-
-      Net::SCP.start( @host, @user, :password => @pass ) do |scp| 
-        puts "entro en el l"  
-        scp.download!( "/usr/local/accounting/xml/#{@file_to_download}", 'data/xml', options ={ :verbose => "1"}) do |ch, name, sent, total|
-          puts "#{name}: #{sent}/#{total}"
-            end 
-      end 
+    remove_xml = `rm data/xml/#{@file_name}`
 
   end
 

app/views/charts/bar_chart.html.erb

@@ -16,9 +16,8 @@ $(document).ready(function() {
 </script>
  <% end %>
 
-<h3>Desde: <%= @from %> Hasta: <%= @to %></h3>
-
-
+<h4>From: <%= @from.readable_inspect %></h4> 
+<h4>To: <%= @to.readable_inspect %></h4>
 
 <%= render :partial => "shared/bar", :locals => { :insert_div => "chart"} %>
 

app/views/charts/disk_space.html.erb

@@ -22,9 +22,9 @@
 	});
 	</script>
 	<% end %>
-	<p>
-		<b>Charts:</b>
-	</p>
+	<h2>
+		<b>Disk Usage Chart:</b>
+	</h2>
 	<% form_for :chart, @chart, :url => { :action => "show_disk_space" }, :html=>{:class=>"form"}  do |f| %>
 	<%= error_messages_for :chart, 
 							:header_message => "Please Try Again!", 
@@ -42,6 +42,7 @@
 		<%= f.text_field :to %>
 	</p>
 	<p>
+		<label for="type">Type</label>
 		<select id="type" name="type">
 			<option value= "line">LINE</option>
 			<option value= "bar">BAR</option>

app/views/charts/index.html.erb

@@ -22,9 +22,9 @@
 	});
 	</script>
 	<% end %>
-	<p>
-		<b>Charts:</b>
-	</p>
+	<h2>
+		<b>Resource Chart:</b>
+	</h2>
 	<% form_for :chart, @chart, :url => { :action => "show" }, :html=>{:class=>"form"}  do |f| %>
 	<%= error_messages_for :chart, 
 							:header_message => "Please Try Again!", 

app/views/charts/line_chart.html.erb

@@ -16,19 +16,10 @@ $(document).ready(function() {
 </script>
  <% end %>
 
+<h4>From: <%= @from.readable_inspect %></h4> 
+<h4>To: <%= @to.readable_inspect %></h4>
 
-<h2><%= @chart.title %></h2>
-<h2><%= @from %></h2>
-<h2><%= @to %></h2>
-<h2><%= @type %></h2>
+<%= render :partial => "shared/line", :locals => { :insert_div => "chart"} %>
 
 
-<h3>Selected Projects</h3>
-
-
-
-
-<%= render :partial => "shared/line", :locals => { :insert_div => "memory_line_chart", :title => "Memory Vs Virtual Memory"} %>
-
-
-<div id="memory_line_chart" style="width:800px; height:450px"></div>
+<div id="chart" style="width:800px; height:450px"></div>

app/views/charts/pie_chart.html.erb

@@ -16,17 +16,8 @@ $(document).ready(function() {
 </script>
  <% end %>
 
-
-<h2><%= @chart.title %></h2>
-<h2><%= @from %></h2>
-<h2><%= @to %></h2>
-<h2><%= @type %></h2>
-
-
-<h3>Selected Projects</h3>
-
-
-
+<h4>From: <%= @from.readable_inspect %></h4> 
+<h4>To: <%= @to.readable_inspect %></h4>
 
 <%= render :partial => "shared/pie", :locals => { :insert_div => "chart"} %>
 

app/views/charts/show_disk_space.html.erb

@@ -15,16 +15,11 @@ $(document).ready(function() {
 });
 </script>
  <% end %>
+<h4>From: <%= @from.readable_inspect %></h4> 
+<h4>To: <%= @to.readable_inspect %></h4>
 
 
-<h2><%= @chart.title %></h2>
-<h2><%= @from %></h2>
-<h2><%= @to %></h2>
+<%= render :partial => "shared/disk_line", :locals => { :insert_div => "chart"}%>
 
 
-
-
-<%= render :partial => "shared/disk_line", :locals => { :insert_div => "memory_line_chart"}%>
-
-
-<div id="memory_line_chart" style="width:800px; height:450px"></div>
+<div id="chart" style="width:800px; height:450px"></div>

app/views/shared/_disk_line.html.erb

@@ -41,6 +41,9 @@ $(document).ready(function() {
 			y: 100,
 			borderWidth: 0
 		},
+		credits: {
+			enabled: false
+		},
 		series: [
 
 		<% for series in @data %>