Build DynamicTable into Operating Systems

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>

Build DynamicTable into Operating Systems
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Fabio Teixeira · David Silva
1 parent 5e8e5a7e
Showing 6 changed files with 71 additions and 98 deletions Show diff stats
lib/database_helper.rb
lib/dynamic_table_helper.rb
lib/library_helper.rb
lib/operating_system_helper.rb
lib/software_language_helper.rb
views/profile/_software_tab.html.erb
@@ -67,7 +67,8 @@ class DatabaseHelper &lt; DynamicTableHelper
         value: database_name,
         id: database_id,
         hidden: true,
-        autocomplete: true
+        autocomplete: true,
+        select_field: false
       },
       version: {
         value: database_data[:version],
@@ -2,6 +2,7 @@ class DynamicTableHelper
   extend(
     ActionView::Helpers::TagHelper,
     ActionView::Helpers::FormTagHelper,
+    ActionView::Helpers::FormOptionsHelper,
     ActionView::Helpers::UrlHelper,
     ApplicationHelper
   )
@@ -21,11 +22,11 @@ class DynamicTableHelper
   DATA = {
     name: {
       label: LABEL_TEXT[:name],
-      name: COLLUMN_NAME[:name],
+      name: COLLUMN_NAME[:name]
     },
     version: {
       label: LABEL_TEXT[:version],
-      name: COLLUMN_NAME[:version],
+      name: COLLUMN_NAME[:version]
     } ,
     license: {
       label: LABEL_TEXT[:license],
@@ -43,7 +44,7 @@ class DynamicTableHelper
   end
   def self.generate_table_lines data={}
-    @@model = data[:model_name].to_css_class
+    @@model = data[:model_name]
     @@field_name = data[:field_name]
     @@hidden_label = data[:name][:value]
     @@hidden_id = data[:name][:id]
@@ -66,7 +67,13 @@ class DynamicTableHelper
     unless row_data.blank?
       content_tag :tr, [
         self.label_collumn(row_data[:label]),
-        self.value_collumn(row_data[:value], row_data[:name], row_data[:autocomplete]),
+        self.value_collumn(
+          row_data[:value],
+          row_data[:name],
+          row_data[:autocomplete],
+          row_data[:select_field],
+          row_data[:options]
+        ),
         self.hidden_collumn(row_data[:delete], row_data[:hidden])
       ].join()
     end
@@ -76,7 +83,7 @@ class DynamicTableHelper
     content_tag :td, label_tag(label)
   end
-  def self.value_collumn value="", name="", autocomplete=false, disabled=false
+  def self.value_collumn value="", name="", autocomplete=false, select_field=false, options=[]
     html_options =
       if autocomplete
         {
@@ -88,11 +95,16 @@ class DynamicTableHelper
       end
     html_options[:disabled] = @@disabled
-    if autocomplete
-      content_tag :td, text_field_tag("#{@@model}_autocomplete", value, html_options)
+
+    content = if select_field
+      select_tag("#{@@model}[][#{@@field_name}]", options, html_options)
+    elsif autocomplete
+      text_field_tag("#{@@model}_autocomplete", value, html_options)
     else
-      content_tag :td, text_field_tag("#{@@model}[][#{name}]", value, html_options)
+      text_field_tag("#{@@model}[][#{name}]", value, html_options)
     end
+
+    content_tag :td, content
   end
   def self.hidden_collumn delete=false, hidden_data=false
@@ -39,7 +39,8 @@ module LibraryHelper
       name: {
         value: library_data[:name],
         hidden: false,
-        autocomplete: false
+        autocomplete: false,
+        select_field: false
       },
       version: {
         value: library_data[:version],
-module OperatingSystemHelper
+class OperatingSystemHelper < DynamicTableHelper
+  MODEL_NAME = "operating_system"
+  FIELD_NAME = "operating_system_name_id"
+
   def self.list_operating_system new_operating_systems
     return [] if new_operating_systems.nil? or new_operating_systems.length == 0
     list_operating_system = []
@@ -30,88 +33,39 @@ module OperatingSystemHelper
     true
   end
-  def self.operating_system_as_tables(list_operating_system, have_delete_button = true, show_information = false)
-    extend(
-      ActionView::Helpers::TagHelper,
-      ActionView::Helpers::FormTagHelper,
-      ActionView::Helpers::UrlHelper,
-      ActionView::Helpers::FormOptionsHelper,
-      ApplicationHelper
-    )
-
-    lambdas_list = []
-
-    if not show_information
-      return operating_system_html_structure(
-        {:operating_system_name_id => "", :version => ""},
-        have_delete_button
-      ) if list_operating_system.nil?
-
-    list_operating_system.each do |operating_system|
-      lambdas_list << operating_system_html_structure(
-        operating_system,
-        have_delete_button
-      )
-    end
-    else
-    list_operating_system.each do |operating_system|
-      lambdas_list << operating_system_html_structure(operating_system)
-    end
-    end
+  def self.operating_system_as_tables(list_operating_system, disabled=false)
+    model_list = list_operating_system
+    model_list ||= [{:operating_system_name_id => "", :version => ""}]
-    lambdas_list
+    models_as_tables model_list, "operating_system_html_structure", disabled
   end
-  def self.operating_system_html_structure (operating_system_data,have_delete_button = true)
-    Proc::new do
-      content_tag(
-        'table',
-        content_tag(
-          'tr',
-          content_tag('td', label_tag(_("Name")))+
-          content_tag(
-            'td',
-            select_tag(
-              "operating_system[][operating_system_name_id]",
-              SoftwareHelper.select_options(
-                  OperatingSystemName.all,
-                  operating_system_data[:operating_system_name_id]
-                )
-              )
-            )+
-          content_tag('td')
-        )+
+  def self.operating_system_html_structure (operating_system_data, disabled)
+    select_options = options_for_select(
+      OperatingSystemName.all.collect {|osn| [osn.name, osn.id]},
+      operating_system_data[:operating_system_name_id]
+    )
-        content_tag(
-          'tr',
-          content_tag('td', label_tag(_("Version")))+
-          content_tag(
-            'td',
-            text_field_tag(
-              "operating_system[][version]",
-              operating_system_data[:version]
-            )
-          )+
-          if have_delete_button
-            content_tag(
-              'td',
-              button_without_text(
-                :delete,
-                _('Delete'),
-                "#" ,
-                :class=>"delete-dynamic-table"
-              ),
-              :align => 'right'
-            )
-          else
-            content_tag('td', "")
-          end
-        ),:class => 'dynamic-table library-table'
-      )
-    end
+    data = {
+      model_name: MODEL_NAME,
+      field_name: FIELD_NAME,
+      name: {
+        hidden: false,
+        autocomplete: false,
+        select_field: true,
+        options: select_options
+      },
+      version: {
+        value: operating_system_data[:version],
+        hidden: true,
+        delete: true
+      }
+    }
+    DATA[:license].delete(:value)
+    table_html_structure(data, disabled)
   end
   def self.add_dynamic_table
-    operating_system_as_tables(nil).call
+    operating_system_as_tables(nil).first.call
   end
 end
@@ -66,7 +66,8 @@ class SoftwareLanguageHelper &lt; DynamicTableHelper
         value: language_name,
         id: language_id,
         hidden: true,
-        autocomplete: true
+        autocomplete: true,
+        select_field: false
       },
       version: {
         value: language_data[:version],
@@ -112,9 +112,10 @@
     </td>
   </tr>
+
   <tr>
     <td>
-      <table class = "operating-system-info">
+      <table class="operating-system-info">
         <thead>
           <tr>
             <th colspan="2"><%= _("Operating System") %></th>
@@ -122,14 +123,17 @@
           </tr>
         </thead>
-       <tbody>
-         <% profile.software_info.operating_systems.each do |operating_system| %>
-           <%= display_mpog_field(_('Name:'), operating_system.operating_system_name , :name, true) %>
-           <%= display_mpog_field(_('Version:'), operating_system, :version, true) %>
-         <% end %>
-       </tbody>
-     </table>
-   </td>
- </tr>
+        <tbody>
+          <tr> <td>
+            <% operating_systems = profile.software_info.operating_systems %>
+            <% OperatingSystemHelper.operating_system_as_tables(operating_systems, true).each do |tab| %>
+              <%= tab.call %>
+            <%end%>
+          </td> </tr>
+        </tbody>
+      </table>
+    </td>
+  </tr>
+
  </tr>
 </table>
 \ No newline at end of file
1	-module OperatingSystemHelper	1	+class OperatingSystemHelper < DynamicTableHelper
		2	+ MODEL_NAME = "operating_system"
		3	+ FIELD_NAME = "operating_system_name_id"
		4	+
2	def self.list_operating_system new_operating_systems	5	def self.list_operating_system new_operating_systems
3	return [] if new_operating_systems.nil? or new_operating_systems.length == 0	6	return [] if new_operating_systems.nil? or new_operating_systems.length == 0
4	list_operating_system = []	7	list_operating_system = []
	@@ -30,88 +33,39 @@ module OperatingSystemHelper		@@ -30,88 +33,39 @@ module OperatingSystemHelper
30	true	33	true
31	end	34	end
32		35
33	- def self.operating_system_as_tables(list_operating_system, have_delete_button = true, show_information = false)
34	- extend(
35	- ActionView::Helpers::TagHelper,
36	- ActionView::Helpers::FormTagHelper,
37	- ActionView::Helpers::UrlHelper,
38	- ActionView::Helpers::FormOptionsHelper,
39	- ApplicationHelper
40	- )
41	-
42	- lambdas_list = []
43	-
44	- if not show_information
45	- return operating_system_html_structure(
46	- {:operating_system_name_id => "", :version => ""},
47	- have_delete_button
48	- ) if list_operating_system.nil?
49	-
50	- list_operating_system.each do \|operating_system\|
51	- lambdas_list << operating_system_html_structure(
52	- operating_system,
53	- have_delete_button
54	- )
55	- end
56	- else
57	- list_operating_system.each do \|operating_system\|
58	- lambdas_list << operating_system_html_structure(operating_system)
59	- end
60	- end	36	+ def self.operating_system_as_tables(list_operating_system, disabled=false)
		37	+ model_list = list_operating_system
		38	+ model_list \|\|= [{:operating_system_name_id => "", :version => ""}]
61		39
62	- lambdas_list	40	+ models_as_tables model_list, "operating_system_html_structure", disabled
63	end	41	end
64		42
65	- def self.operating_system_html_structure (operating_system_data,have_delete_button = true)
66	- Proc::new do
67	- content_tag(
68	- 'table',
69	- content_tag(
70	- 'tr',
71	- content_tag('td', label_tag(_("Name")))+
72	- content_tag(
73	- 'td',
74	- select_tag(
75	- "operating_system[][operating_system_name_id]",
76	- SoftwareHelper.select_options(
77	- OperatingSystemName.all,
78	- operating_system_data[:operating_system_name_id]
79	- )
80	- )
81	- )+
82	- content_tag('td')
83	- )+	43	+ def self.operating_system_html_structure (operating_system_data, disabled)
		44	+ select_options = options_for_select(
		45	+ OperatingSystemName.all.collect {\|osn\| [osn.name, osn.id]},
		46	+ operating_system_data[:operating_system_name_id]
		47	+ )
84		48
85	- content_tag(
86	- 'tr',
87	- content_tag('td', label_tag(_("Version")))+
88	- content_tag(
89	- 'td',
90	- text_field_tag(
91	- "operating_system[][version]",
92	- operating_system_data[:version]
93	- )
94	- )+
95	- if have_delete_button
96	- content_tag(
97	- 'td',
98	- button_without_text(
99	- :delete,
100	- _('Delete'),
101	- "#" ,
102	- :class=>"delete-dynamic-table"
103	- ),
104	- :align => 'right'
105	- )
106	- else
107	- content_tag('td', "")
108	- end
109	- ),:class => 'dynamic-table library-table'
110	- )
111	- end	49	+ data = {
		50	+ model_name: MODEL_NAME,
		51	+ field_name: FIELD_NAME,
		52	+ name: {
		53	+ hidden: false,
		54	+ autocomplete: false,
		55	+ select_field: true,
		56	+ options: select_options
		57	+ },
		58	+ version: {
		59	+ value: operating_system_data[:version],
		60	+ hidden: true,
		61	+ delete: true
		62	+ }
		63	+ }
		64	+ DATA[:license].delete(:value)
		65	+ table_html_structure(data, disabled)
112	end	66	end
113		67
114	def self.add_dynamic_table	68	def self.add_dynamic_table
115	- operating_system_as_tables(nil).call	69	+ operating_system_as_tables(nil).first.call
116	end	70	end
117	end	71	end