Merge pull request #594 from coopdevs/improve_reports

Reports: more internal refactor and include new attributes

Author: sseerrggii

Gemfile.lock

@@ -133,7 +133,7 @@ GEM
     fabrication (2.21.1)
     faker (2.16.0)
       i18n (>= 1.6, < 2)
-    ffi (1.14.2)
+    ffi (1.15.0)
     formtastic (4.0.0)
       actionpack (>= 5.2.0)
     formtastic_i18n (0.6.0)
@@ -199,16 +199,16 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0212)
+    mime-types-data (3.2021.0225)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     netrc (0.11.0)
-    nio4r (2.5.5)
+    nio4r (2.5.7)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
@@ -279,7 +279,7 @@ GEM
       ffi (~> 1.0)
     rdiscount (2.2.0.2)
     redis (4.2.5)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -307,7 +307,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    rubocop (1.10.0)
+    rubocop (1.11.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -390,7 +390,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (4.5.0)
+    webdrivers (4.6.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)

app/assets/javascripts/application.js

@@ -3,7 +3,7 @@
 $(document).on('click', 'a[data-popup]', function(event) {
   event.preventDefault();
 
-  window.open($(this).attr('href'), 'popup', 'width=600,height=600');
+  window.open($(this).attr('href'), 'popup', 'width=800,height=600');
 });
 
 $(document).on('click', 'span.show-password', function(event) {

app/decorators/member_report_decorator.rb

@@ -17,7 +17,11 @@ def headers
       User.human_attribute_name(:username),
       User.human_attribute_name(:email),
       User.human_attribute_name(:phone),
-      User.human_attribute_name(:alt_phone)
+      User.human_attribute_name(:alt_phone),
+      User.human_attribute_name(:created_at),
+      User.human_attribute_name(:last_sign_in_at),
+      User.human_attribute_name(:locale),
+      Account.human_attribute_name(:balance)
     ]
   end
 
@@ -28,7 +32,11 @@ def rows
         member.user.username,
         member.user.email_if_real,
         member.user.phone,
-        member.user.alt_phone
+        member.user.alt_phone,
+        member.user.created_at.to_s,
+        member.user.last_sign_in_at.to_s,
+        member.user.locale,
+        member.account_balance.to_s
       ]
     end
   end

app/decorators/post_report_decorator.rb

@@ -16,21 +16,25 @@ def headers
     [
       "",
       @type.model_name.human,
-      User.model_name.human
+      Post.human_attribute_name(:tag_list),
+      User.model_name.human,
+      Post.human_attribute_name(:created_at)
     ]
   end
 
   def rows
     grouped_rows = []
 
     @collection.each do |category, posts|
-      grouped_rows << ["", category.try(:name) || "-", ""]
+      grouped_rows << ["", category.try(:name) || "-", "", "", ""]
 
       posts.each do |post|
         grouped_rows << [
           post.id,
           post.title,
-          "#{post.user} (#{post.member_uid})"
+          post.tag_list.to_s,
+          "#{post.user} (#{post.member_uid})",
+          post.created_at.to_s
         ]
       end
     end

app/services/report/csv.rb

@@ -1,16 +1,26 @@
+require "csv"
+
 module Report
   module Csv
     class Base
+      attr_accessor :decorator
+
       def name
-        @decorator.name(:csv)
+        decorator.name(:csv)
       end
 
       def mime_type
         Mime[:csv]
       end
 
       def run
-        Report::Csv.run(@decorator.headers, @decorator.rows)
+        ::CSV.generate do |csv|
+          csv << decorator.headers
+
+          decorator.rows.each do |row|
+            csv << row
+          end
+        end
       end
     end
   end

app/services/report/csv/base.rb

@@ -2,7 +2,7 @@ module Report
   module Csv
     class Member < Base
       def initialize(org, collection)
-        @decorator = MemberReportDecorator.new(org, collection)
+        self.decorator = MemberReportDecorator.new(org, collection)
       end
     end
   end

app/services/report/csv/member.rb

@@ -2,7 +2,7 @@ module Report
   module Csv
     class Post < Base
       def initialize(org, collection, type)
-        @decorator = PostReportDecorator.new(org, collection, type)
+        self.decorator = PostReportDecorator.new(org, collection, type)
       end
     end
   end

app/services/report/csv/post.rb

@@ -1,16 +1,21 @@
 module Report
   module Pdf
     class Base
+      attr_accessor :decorator
+
       def name
-        @decorator.name(:pdf)
+        decorator.name(:pdf)
       end
 
       def mime_type
         Mime[:pdf]
       end
 
       def run
-        Report::Pdf.run(@decorator.headers, @decorator.rows)
+        pdf = Prawn::Document.new({ page_size: "A4", margin: 30 })
+        pdf.table [decorator.headers] + decorator.rows
+
+        pdf.render
       end
     end
   end