Build DynamicTable into Library

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>

Build DynamicTable into Library
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Fabio Teixeira · David Silva
1 parent 19330e12
Showing 9 changed files with 114 additions and 123 deletions Show diff stats
lib/database_helper.rb
lib/dynamic_table_helper.rb
lib/library_helper.rb
lib/mpog_software_plugin.rb
lib/software_language_helper.rb
views/mpog_software_plugin_myprofile/_database_fields.html.erb
views/mpog_software_plugin_myprofile/_language_fields.html.erb
views/mpog_software_plugin_myprofile/_library_fields.html.erb
views/profile/_software_tab.html.erb
@@ -43,11 +43,8 @@ class DatabaseHelper &lt; DynamicTableHelper
   end
   def self.database_as_tables(list_databases, disabled=false)
-    model_list = if list_databases.blank?
-      [{:database_description_id => "", :version => ""}]
-    else
-      list_databases
-    end
+    model_list = list_databases
+    model_list ||= [{:database_description_id => "", :version => ""}]
     models_as_tables model_list, "database_html_structure", disabled
   end
@@ -69,12 +66,16 @@ class DatabaseHelper &lt; DynamicTableHelper
       name: {
         value: database_name,
         id: database_id,
+        hidden: true,
+        autocomplete: true
       },
       version: {
-        value: database_data[:version]
+        value: database_data[:version],
+        hidden: true,
+        delete: true
       }
     }
-
+    DATA[:license].delete(:value)
     table_html_structure(data, disabled)
   end
@@ -21,19 +21,16 @@ class DynamicTableHelper
   DATA = {
     name: {
       label: LABEL_TEXT[:name],
-      hidden: true,
-      autocomplete: true,
       name: COLLUMN_NAME[:name],
     },
     version: {
       label: LABEL_TEXT[:version],
       name: COLLUMN_NAME[:version],
-      hidden: true,
-      delete: true,
     } ,
     license: {
       label: LABEL_TEXT[:license],
       name: COLLUMN_NAME[:license],
+      delete: true
     }
   }
   @@disabled = false
@@ -58,7 +55,7 @@ class DynamicTableHelper
       self.table_line(row_data[:version])
     ]
-    if row_data[:license].has_key? :value
+    if row_data[:license].has_key?(:value)
       table_line_data << self.table_line(row_data[:license])
     end
-module LibraryHelper
+class LibraryHelper < DynamicTableHelper
+  MODEL_NAME ="library"
+
   def self.list_libraries new_libraries
     return [] if new_libraries.nil? or new_libraries.length == 0
     list_libraries = []
@@ -26,79 +28,34 @@ module LibraryHelper
     true
   end
-  def self.library_as_tables list_libraries
-    extend(
-      ActionView::Helpers::TagHelper,
-      ActionView::Helpers::FormTagHelper,
-      ActionView::Helpers::UrlHelper,
-      ApplicationHelper
-    )
-
-    return library_html_structure(
-      {
-        :name=>"",
-        :version=>"",
-        :license=>""
-      }
-    ) if list_libraries.nil?
-
-    lambdas_list = []
+  def self.libraries_as_tables list_libraries, disabled=false
+    model_list = list_libraries
+    model_list ||= [{:name=>"", :version=>"", :license=>""}]
-    list_libraries.each do |library|
-      lambdas_list << library_html_structure(library)
-    end
-
-    lambdas_list
+    models_as_tables model_list, "library_html_structure", disabled
   end
-  def self.library_html_structure library_data
-    Proc::new do
-      content_tag(
-        'table',
-        content_tag(
-          'tr',
-          content_tag('td', label_tag(_("Name")))+
-          content_tag(
-            'td',
-            text_field_tag("library[][name]", library_data[:name])
-          )+
-          content_tag('td')
-        )+
-
-        content_tag(
-          'tr',
-          content_tag('td', label_tag(_("Version")))+
-          content_tag(
-            'td',
-            text_field_tag("library[][version]", library_data[:version])
-          )+
-          content_tag('td')
-        )+
-
-        content_tag(
-          'tr',
-          content_tag('td', label_tag(_("License")))+
-          content_tag(
-            'td',
-            text_field_tag("library[][license]", library_data[:license])) +
-          content_tag(
-            'td',
-            button_without_text(
-              :delete,
-              _('Delete'),
-              "#" ,
-              :class=>"delete-dynamic-table"
-            ),
-            :align => 'right'
-          )
-        ),
+  def self.library_html_structure library_data, disabled
+    data = {
+      model_name: MODEL_NAME,
+      name: {
+        value: library_data[:name],
+        hidden: false,
+        autocomplete: false
+      },
+      version: {
+        value: library_data[:version],
+        delete: false
+      },
+      license: {
+        value: library_data[:license]
+      }
+    }
-        :class => 'dynamic-table library-table'
-      )
-    end
+    table_html_structure(data, disabled)
   end
   def self.add_dynamic_table
-    library_as_tables(nil).call
+    libraries_as_tables(nil).first.call
   end
 end
@@ -5,7 +5,6 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   include ActionView::Helpers::JavaScriptHelper
   include ActionView::Helpers::AssetTagHelper
   include FormsHelper
-  include LibraryHelper
   include ActionView::Helpers
   include ActionDispatch::Routing
   include Rails.application.routes.url_helpers
@@ -73,8 +72,11 @@ class MpogSoftwarePlugin &lt; Noosfero::Plugin
   def profile_tabs
     if context.profile.community?
-      profile_tabs_software if context.profile.software?
-      profile_tabs_institution
+      if context.profile.software?
+        profile_tabs_software
+      elsif context.profile.institution?
+        profile_tabs_institution
+      end
     end
   end
@@ -42,11 +42,8 @@ class SoftwareLanguageHelper &lt; DynamicTableHelper
   end
   def self.language_as_tables(list_languages, disabled=false)
-    model_list = if list_languages.blank?
-      [{:programming_language_id => "", :version => ""}]
-    else
-      list_languages
-    end
+    model_list = list_languages
+    model_list ||= [{:programming_language_id => "", :version => ""}]
     models_as_tables model_list, "language_html_structure", disabled
   end
@@ -68,12 +65,16 @@ class SoftwareLanguageHelper &lt; DynamicTableHelper
       name: {
         value: language_name,
         id: language_id,
+        hidden: true,
+        autocomplete: true
       },
       version: {
-        value: language_data[:version]
+        value: language_data[:version],
+        hidden: true,
+        delete: true
       }
     }
-
+    DATA[:license].delete(:value)
     table_html_structure(data, disabled)
   end
 <%= fields_for :database_description, @database_description do |db| %>
 <div id='databases'>
-  <% database = [] if database.nil? %>
+  <% database = [] if database.blank? %>
 	<% DatabaseHelper.database_as_tables(database).each do |tab| %>
 	  <%= tab.call %>
 	<%end%>
 <%= fields_for :software_language, @software_language do |lng| %>
 <div id='languages'>
-  <% languages = [] if languages.nil? %>
+  <% languages = [] if languages.blank? %>
 	<% SoftwareLanguageHelper.language_as_tables(languages).each do |tab| %>
 	  <%= tab.call %>
 	<%end%>
 <%= fields_for :library ,@library do |lib| %>
 <div id='libraries'>
-  <% libraries = [] if libraries.nil? %>
-	<% LibraryHelper.library_as_tables(libraries).each do |tab| %>
+  <% libraries = [] if libraries.blank? %>
+	<% LibraryHelper.libraries_as_tables(libraries).each do |tab| %>
 	  <%= tab.call %>
 	<% end %>
 </div>
@@ -30,13 +30,22 @@
   <tr>
     <td>
-      <table class = "libraries-info dynamic-table">
-        <%= content_tag('tr', content_tag('td', _("Libraries")) + content_tag('td', '')) %>
-        <% profile.software_info.libraries.each do |library| %>
-          <%= display_mpog_field(_('Name:'), library, :name, true) %>
-          <%= display_mpog_field(_('Version:'), library, :version, true) %>
-          <%= display_mpog_field(_('License:'), library, :license, true) %>
-        <% end %>
+      <table class = "libraries-info">
+        <thead>
+          <tr>
+            <th colspan="2"><%= _("Libraries") %></th>
+            <th></th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr> <td>
+            <% libraries = profile.software_info.libraries %>
+            <% LibraryHelper.libraries_as_tables(libraries, true).each do |tab| %>
+              <%= tab.call %>
+            <%end%>
+          </td> </tr>
+        </tbody>
       </table>
     </td>
   </tr>
@@ -49,14 +58,22 @@
   <tr>
     <td>
-      <table class = "database-info dynamic-table">
-        <%= content_tag('tr', content_tag('td', _("Software Databases")) + content_tag('td', '')) %>
-        <tr> <td>
-          <% databases = profile.software_info.software_databases %>
-          <% DatabaseHelper.database_as_tables(databases, true).each do |tab| %>
-            <%= tab.call %>
-          <%end%>
-        </td> </tr>
+      <table class = "database-info">
+        <thead>
+          <tr>
+            <th colspan="2"><%= _("Software Databases") %></th>
+            <th></th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr> <td>
+            <% databases = profile.software_info.software_databases %>
+            <% DatabaseHelper.database_as_tables(databases, true).each do |tab| %>
+              <%= tab.call %>
+            <%end%>
+          </td> </tr>
+        </tbody>
       </table>
     </td>
   </tr>
@@ -69,14 +86,22 @@
   <tr>
     <td>
-      <table class = "language-info dynamic-table">
-       <%= content_tag('tr', content_tag('td', _("Software Languages")) + content_tag('td', '')) %>
-        <tr> <td>
-          <% languages = profile.software_info.software_languages %>
-          <% SoftwareLanguageHelper.language_as_tables(languages, true).each do |tab| %>
-            <%= tab.call %>
-          <%end%>
-        </td> </tr>
+      <table class = "language-info">
+        <thead>
+          <tr>
+            <th colspan="2"><%= _("Software Languages") %></th>
+            <th></th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr> <td>
+            <% languages = profile.software_info.software_languages %>
+            <% SoftwareLanguageHelper.language_as_tables(languages, true).each do |tab| %>
+              <%= tab.call %>
+            <%end%>
+          </td> </tr>
+        </tbody>
      </table>
    </td>
  </tr>
@@ -89,12 +114,20 @@
   <tr>
     <td>
-      <table class = "operating-system-info dynamic-table">
-       <%= content_tag('tr', content_tag('td', _("Operating System")) + content_tag('td', '')) %>
-       <% 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 %>
+      <table class = "operating-system-info">
+        <thead>
+          <tr>
+            <th colspan="2"><%= _("Operating System") %></th>
+            <th></th>
+          </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>
1	-module LibraryHelper	1	+class LibraryHelper < DynamicTableHelper
		2	+ MODEL_NAME ="library"
		3	+
2	def self.list_libraries new_libraries	4	def self.list_libraries new_libraries
3	return [] if new_libraries.nil? or new_libraries.length == 0	5	return [] if new_libraries.nil? or new_libraries.length == 0
4	list_libraries = []	6	list_libraries = []
	@@ -26,79 +28,34 @@ module LibraryHelper		@@ -26,79 +28,34 @@ module LibraryHelper
26	true	28	true
27	end	29	end
28		30
29	- def self.library_as_tables list_libraries
30	- extend(
31	- ActionView::Helpers::TagHelper,
32	- ActionView::Helpers::FormTagHelper,
33	- ActionView::Helpers::UrlHelper,
34	- ApplicationHelper
35	- )
36	-
37	- return library_html_structure(
38	- {
39	- :name=>"",
40	- :version=>"",
41	- :license=>""
42	- }
43	- ) if list_libraries.nil?
44	-
45	- lambdas_list = []	31	+ def self.libraries_as_tables list_libraries, disabled=false
		32	+ model_list = list_libraries
		33	+ model_list \|\|= [{:name=>"", :version=>"", :license=>""}]
46		34
47	- list_libraries.each do \|library\|
48	- lambdas_list << library_html_structure(library)
49	- end
50	-
51	- lambdas_list	35	+ models_as_tables model_list, "library_html_structure", disabled
52	end	36	end
53		37
54	- def self.library_html_structure library_data
55	- Proc::new do
56	- content_tag(
57	- 'table',
58	- content_tag(
59	- 'tr',
60	- content_tag('td', label_tag(_("Name")))+
61	- content_tag(
62	- 'td',
63	- text_field_tag("library[][name]", library_data[:name])
64	- )+
65	- content_tag('td')
66	- )+
67	-
68	- content_tag(
69	- 'tr',
70	- content_tag('td', label_tag(_("Version")))+
71	- content_tag(
72	- 'td',
73	- text_field_tag("library[][version]", library_data[:version])
74	- )+
75	- content_tag('td')
76	- )+
77	-
78	- content_tag(
79	- 'tr',
80	- content_tag('td', label_tag(_("License")))+
81	- content_tag(
82	- 'td',
83	- text_field_tag("library[][license]", library_data[:license])) +
84	- content_tag(
85	- 'td',
86	- button_without_text(
87	- :delete,
88	- _('Delete'),
89	- "#" ,
90	- :class=>"delete-dynamic-table"
91	- ),
92	- :align => 'right'
93	- )
94	- ),	38	+ def self.library_html_structure library_data, disabled
		39	+ data = {
		40	+ model_name: MODEL_NAME,
		41	+ name: {
		42	+ value: library_data[:name],
		43	+ hidden: false,
		44	+ autocomplete: false
		45	+ },
		46	+ version: {
		47	+ value: library_data[:version],
		48	+ delete: false
		49	+ },
		50	+ license: {
		51	+ value: library_data[:license]
		52	+ }
		53	+ }
95		54
96	- :class => 'dynamic-table library-table'
97	- )
98	- end	55	+ table_html_structure(data, disabled)
99	end	56	end
100		57
101	def self.add_dynamic_table	58	def self.add_dynamic_table
102	- library_as_tables(nil).call	59	+ libraries_as_tables(nil).first.call
103	end	60	end
104	end	61	end
1	<%= fields_for :database_description, @database_description do \|db\| %>	1	<%= fields_for :database_description, @database_description do \|db\| %>
2		2
3	<div id='databases'>	3	<div id='databases'>
4	- <% database = [] if database.nil? %>	4	+ <% database = [] if database.blank? %>
5	<% DatabaseHelper.database_as_tables(database).each do \|tab\| %>	5	<% DatabaseHelper.database_as_tables(database).each do \|tab\| %>
6	<%= tab.call %>	6	<%= tab.call %>
7	<%end%>	7	<%end%>
1	<%= fields_for :software_language, @software_language do \|lng\| %>	1	<%= fields_for :software_language, @software_language do \|lng\| %>
2		2
3	<div id='languages'>	3	<div id='languages'>
4	- <% languages = [] if languages.nil? %>	4	+ <% languages = [] if languages.blank? %>
5	<% SoftwareLanguageHelper.language_as_tables(languages).each do \|tab\| %>	5	<% SoftwareLanguageHelper.language_as_tables(languages).each do \|tab\| %>
6	<%= tab.call %>	6	<%= tab.call %>
7	<%end%>	7	<%end%>
	@@ -30,13 +30,22 @@		@@ -30,13 +30,22 @@
30		30
31	<tr>	31	<tr>
32	<td>	32	<td>
33	- <table class = "libraries-info dynamic-table">
34	- <%= content_tag('tr', content_tag('td', _("Libraries")) + content_tag('td', '')) %>
35	- <% profile.software_info.libraries.each do \|library\| %>
36	- <%= display_mpog_field(_('Name:'), library, :name, true) %>
37	- <%= display_mpog_field(_('Version:'), library, :version, true) %>
38	- <%= display_mpog_field(_('License:'), library, :license, true) %>
39	- <% end %>	33	+ <table class = "libraries-info">
		34	+ <thead>
		35	+ <tr>
		36	+ <th colspan="2"><%= _("Libraries") %></th>
		37	+ <th></th>
		38	+ </tr>
		39	+ </thead>
		40	+
		41	+ <tbody>
		42	+ <tr> <td>
		43	+ <% libraries = profile.software_info.libraries %>
		44	+ <% LibraryHelper.libraries_as_tables(libraries, true).each do \|tab\| %>
		45	+ <%= tab.call %>
		46	+ <%end%>
		47	+ </td> </tr>
		48	+ </tbody>
40	</table>	49	</table>
41	</td>	50	</td>
42	</tr>	51	</tr>
	@@ -49,14 +58,22 @@		@@ -49,14 +58,22 @@
49		58
50	<tr>	59	<tr>
51	<td>	60	<td>
52	- <table class = "database-info dynamic-table">
53	- <%= content_tag('tr', content_tag('td', _("Software Databases")) + content_tag('td', '')) %>
54	- <tr> <td>
55	- <% databases = profile.software_info.software_databases %>
56	- <% DatabaseHelper.database_as_tables(databases, true).each do \|tab\| %>
57	- <%= tab.call %>
58	- <%end%>
59	- </td> </tr>	61	+ <table class = "database-info">
		62	+ <thead>
		63	+ <tr>
		64	+ <th colspan="2"><%= _("Software Databases") %></th>
		65	+ <th></th>
		66	+ </tr>
		67	+ </thead>
		68	+
		69	+ <tbody>
		70	+ <tr> <td>
		71	+ <% databases = profile.software_info.software_databases %>
		72	+ <% DatabaseHelper.database_as_tables(databases, true).each do \|tab\| %>
		73	+ <%= tab.call %>
		74	+ <%end%>
		75	+ </td> </tr>
		76	+ </tbody>
60	</table>	77	</table>
61	</td>	78	</td>
62	</tr>	79	</tr>
	@@ -69,14 +86,22 @@		@@ -69,14 +86,22 @@
69		86
70	<tr>	87	<tr>
71	<td>	88	<td>
72	- <table class = "language-info dynamic-table">
73	- <%= content_tag('tr', content_tag('td', _("Software Languages")) + content_tag('td', '')) %>
74	- <tr> <td>
75	- <% languages = profile.software_info.software_languages %>
76	- <% SoftwareLanguageHelper.language_as_tables(languages, true).each do \|tab\| %>
77	- <%= tab.call %>
78	- <%end%>
79	- </td> </tr>	89	+ <table class = "language-info">
		90	+ <thead>
		91	+ <tr>
		92	+ <th colspan="2"><%= _("Software Languages") %></th>
		93	+ <th></th>
		94	+ </tr>
		95	+ </thead>
		96	+
		97	+ <tbody>
		98	+ <tr> <td>
		99	+ <% languages = profile.software_info.software_languages %>
		100	+ <% SoftwareLanguageHelper.language_as_tables(languages, true).each do \|tab\| %>
		101	+ <%= tab.call %>
		102	+ <%end%>
		103	+ </td> </tr>
		104	+ </tbody>
80	</table>	105	</table>
81	</td>	106	</td>
82	</tr>	107	</tr>
	@@ -89,12 +114,20 @@		@@ -89,12 +114,20 @@
89		114
90	<tr>	115	<tr>
91	<td>	116	<td>
92	- <table class = "operating-system-info dynamic-table">
93	- <%= content_tag('tr', content_tag('td', _("Operating System")) + content_tag('td', '')) %>
94	- <% profile.software_info.operating_systems.each do \|operating_system\| %>
95	- <%= display_mpog_field(_('Name:'), operating_system.operating_system_name , :name, true) %>
96	- <%= display_mpog_field(_('Version:'), operating_system, :version, true) %>
97	- <% end %>	117	+ <table class = "operating-system-info">
		118	+ <thead>
		119	+ <tr>
		120	+ <th colspan="2"><%= _("Operating System") %></th>
		121	+ <th></th>
		122	+ </tr>
		123	+ </thead>
		124	+
		125	+ <tbody>
		126	+ <% profile.software_info.operating_systems.each do \|operating_system\| %>
		127	+ <%= display_mpog_field(_('Name:'), operating_system.operating_system_name , :name, true) %>
		128	+ <%= display_mpog_field(_('Version:'), operating_system, :version, true) %>
		129	+ <% end %>
		130	+ </tbody>
98	</table>	131	</table>
99	</td>	132	</td>
100	</tr>	133	</tr>