Merge branch 'fix_edit_project' into mezuro-dev

João da Silva
2 parents ba38a3cf 4251001f
Showing 4 changed files with 17 additions and 5 deletions Show diff stats
plugins/mezuro/lib/kalibro/entities/project.rb
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
plugins/mezuro/views/content_viewer/show_project.rhtml
@@ -9,5 +9,4 @@ class Kalibro::Entities::Project &lt; Kalibro::Entities::Entity
   def error=(value)
     @error = to_entity(value, Kalibro::Entities::Error)
   end
-
-end
 \ No newline at end of file
+end
@@ -18,4 +18,10 @@ class MezuroPlugin::Helpers::ContentViewerHelper
                 :data => values,
                 :axis_with_labels => 'y')
   end
+
+  def self.get_periodicity_option(index)
+   options = [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]]
+   selected_option = options.find { |option| option.last == index.to_i }
+   selected_option.first
+  end
 end
@@ -3,6 +3,7 @@
 <%
   begin
     @project = @article.title.nil? ? nil : Kalibro::Client::ProjectClient.project(@article.title)
+    @kalibro_client = Kalibro::Client::KalibroClient.new
   rescue
     @project = nil
   end
@@ -21,7 +22,7 @@
 <%= f.text_field :description %><br/>
-<% @repository_types = Kalibro::Client::KalibroClient.new.supported_repository_types.sort %>
+<% @repository_types = @kalibro_client.supported_repository_types.sort %>
 <% @selected = (@project.nil? ? @repository_types : @project.repository.type) %>
 <%= required labelled_form_field _('Repository type'),
   f.select(:repository_type, @repository_types, {:selected => @selected}) %><br/>
@@ -31,7 +32,9 @@
 <% @configuration_names = Kalibro::Client::ConfigurationClient.new.configuration_names.sort %>
 <% @selected = (@project.nil? ? @configuration_names[0] : @project.configuration_name) %>
 <%= required labelled_form_field _('Configuration'),
-  f.select(:configuration_name, @configuration_names.sort, {:selected => @selected}) %><br/>
+  f.select(:configuration_name, @configuration_names, {:selected => @selected}) %><br/>
+
+<% selected = (@project.nil? ? 0 : @kalibro_client.process_period(@article.title).to_i) %>
 <%= required labelled_form_field _('Periodic Avaliation'),
-  f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => 0}) %><br/> 
+  f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => selected}) %><br/>
@@ -32,6 +32,10 @@
     <td><%= _('Configuration') %></td>
     <td><%= @project.configuration_name %></td>
   </tr>
+  <tr> 
+    <td><%= _('Periodicity') %></td>
+    <td><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %></td>
+  </tr>
   <tr>
     <td><%= _('Status')%></td>
     <td>
	@@ -18,4 +18,10 @@ class MezuroPlugin::Helpers::ContentViewerHelper		@@ -18,4 +18,10 @@ class MezuroPlugin::Helpers::ContentViewerHelper
18	:data => values,	18	:data => values,
19	:axis_with_labels => 'y')	19	:axis_with_labels => 'y')
20	end	20	end
		21	+
		22	+ def self.get_periodicity_option(index)
		23	+ options = [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]]
		24	+ selected_option = options.find { \|option\| option.last == index.to_i }
		25	+ selected_option.first
		26	+ end
21	end	27	end