Merge branch 'master' of beta.softwarepublico.gov.br:softwarepublico/softwarepublico

Athos
2 parents ee63d261 d2f639c4
Showing 7 changed files with 29 additions and 3 deletions Show diff stats
src/colab-spb-theme-plugin/Makefile
src/colab-spb-theme-plugin/colab_spb_theme/templates/header_sisp.html
src/colab-spb-theme-plugin/colab_spb_theme/templates/header_spb.html
src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
src/noosfero-spb/software_communities/db/migrate/20160104170028_changing_software_statistics_from_block_to_software_info.rb
src/noosfero-spb/software_communities/views/profile/_profile_members_list.html.erb
src/pkg-rpm/colab-spb-theme/colab-spb-theme.spec
 PACKAGE = colab-spb-theme
-VERSION = 0.3.6
+VERSION = 0.3.8
 DISTDIR = dist
 PACKAGE_NAME = $(PACKAGE)-$(VERSION)
 TARBALL = $(PACKAGE_NAME).tar.gz
@@ -113,6 +113,7 @@
     </div>
   </div>
 </div>
+</header>
  
 {% block main_content %}
   <a name="acontent" id="acontent"></a>
@@ -161,6 +161,7 @@
     </div>
   </div>
 </div>
+</header>
  
 {% block main_content %}
   <a name="acontent" id="acontent"></a>
@@ -1052,7 +1052,7 @@ float: left;
   padding-bottom: 30px;
 }
  
-.action-profile-members .box-1 .common-profile-list-block span{
+.action-profile-members .box-1 .common-profile-list-block .profile-list-members span{
   margin-right: 0px;
   width: 90px;
   height: 86px;
@@ -0,0 +1,22 @@
+class ChangingSoftwareStatisticsFromBlockToSoftwareInfo < ActiveRecord::Migration
+  def up
+    select_all("SELECT * FROM software_infos").each do |software|
+      benefited_people = 0
+      saved_resources = 0
+
+      select_all("SELECT * FROM tasks WHERE status=3 AND type='CreateOrganizationRatingComment' AND target_id=#{software['community_id']}").each do |task|
+        settings = YAML.load(task['data'])
+        organization_rating = select_one("SELECT * FROM organization_ratings WHERE id=#{settings[:organization_rating_id]}")
+
+        benefited_people += organization_rating["people_benefited"].to_i
+        saved_resources += organization_rating["saved_value"].to_f
+      end
+      execute("UPDATE software_infos SET benefited_people=#{benefited_people}, saved_resources=#{saved_resources} WHERE id=#{software['id']}")
+    end
+
+  end
+
+  def down
+    execute("UPDATE software_infos SET benefited_people=0,saved_resources=0")
+  end
+end
@@ -12,3 +12,5 @@
       <%= profile_image_link(u) %>
     <% end %>
 </ul>
+
+<%= pagination_links users, :param_name => "npage" %>
  
 Name:           colab-spb-theme
-Version:        0.3.6
+Version:        0.3.7
 Release:        1
 Summary:        SPB-specific Colab theme
 License:        GPL-3.0
1	1	PACKAGE = colab-spb-theme
2		-VERSION = 0.3.6
	2	+VERSION = 0.3.8
3	3	DISTDIR = dist
4	4	PACKAGE_NAME = $(PACKAGE)-$(VERSION)
5	5	TARBALL = $(PACKAGE_NAME).tar.gz
...	...
...	...	@@ -113,6 +113,7 @@
113	113	</div>
114	114	</div>
115	115	</div>
	116	+</header>
116	117
117	118	{% block main_content %}
118	119	<a name="acontent" id="acontent"></a>
...	...
...	...	@@ -161,6 +161,7 @@
161	161	</div>
162	162	</div>
163	163	</div>
	164	+</header>
164	165
165	166	{% block main_content %}
166	167	<a name="acontent" id="acontent"></a>
...	...
...	...	@@ -1052,7 +1052,7 @@ float: left;
1052	1052	padding-bottom: 30px;
1053	1053	}
1054	1054
1055		-.action-profile-members .box-1 .common-profile-list-block span{
	1055	+.action-profile-members .box-1 .common-profile-list-block .profile-list-members span{
1056	1056	margin-right: 0px;
1057	1057	width: 90px;
1058	1058	height: 86px;
...	...
...	...	@@ -0,0 +1,22 @@
	1	+class ChangingSoftwareStatisticsFromBlockToSoftwareInfo < ActiveRecord::Migration
	2	+ def up
	3	+ select_all("SELECT * FROM software_infos").each do \|software\|
	4	+ benefited_people = 0
	5	+ saved_resources = 0
	6	+
	7	+ select_all("SELECT * FROM tasks WHERE status=3 AND type='CreateOrganizationRatingComment' AND target_id=#{software['community_id']}").each do \|task\|
	8	+ settings = YAML.load(task['data'])
	9	+ organization_rating = select_one("SELECT * FROM organization_ratings WHERE id=#{settings[:organization_rating_id]}")
	10	+
	11	+ benefited_people += organization_rating["people_benefited"].to_i
	12	+ saved_resources += organization_rating["saved_value"].to_f
	13	+ end
	14	+ execute("UPDATE software_infos SET benefited_people=#{benefited_people}, saved_resources=#{saved_resources} WHERE id=#{software['id']}")
	15	+ end
	16	+
	17	+ end
	18	+
	19	+ def down
	20	+ execute("UPDATE software_infos SET benefited_people=0,saved_resources=0")
	21	+ end
	22	+end
...	...
...	...	@@ -12,3 +12,5 @@
12	12	<%= profile_image_link(u) %>
13	13	<% end %>
14	14	</ul>
	15	+
	16	+<%= pagination_links users, :param_name => "npage" %>
...	...
1	1
2	2	Name: colab-spb-theme
3		-Version: 0.3.6
	3	+Version: 0.3.7
4	4	Release: 1
5	5	Summary: SPB-specific Colab theme
6	6	License: GPL-3.0
...	...