jzimmek-reportme 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/reportme/report_factory.rb

@@ -29,12 +29,14 @@ module Reportme
           when :day
             [today - 1.day, today - 1.day]
           when :week
-            [today - 1.day - 1.week, today - 1.day]
+            # [today - 1.day - 1.week, today - 1.day]
+            [today - 1.week, today - 1.day]
           when :calendar_week
             n = today - 1.day
             [n - n.cwday + 1, n - n.cwday + 7]
           when :month
-            [today - 1.day - 1.month, today - 1.day]
+            # [today - 1.day - 1.month, today - 1.day]
+            [today - 1.month, today - 1.day]
           when :calendar_month
             n = today - 1.month
             [n.beginning_of_month, n.end_of_month]
@@ -68,11 +70,21 @@ module Reportme
         end
       end
     end
-  
-    def run
-    
-      debug = false
+
+    def week_data_present?(report, von, bis)
+      puts "von: #{von} ... bis: #{bis}"
+    end
+
+    def ensure_report_table_exist(report, period)
+      unless report.table_exist?(period)
+        table_name  = report.table_name(period)
+        sql         = report.sql('0000-00-00 00:00:00', '0000-00-00 00:00:00', period)
+
+        exec("create table #{table_name} ENGINE=InnoDB default CHARSET=utf8 as #{sql} limit 0;")
+      end
+    end
     
+    def ensure_report_informations_table_exist
       unless report_information_table_name_exist?
         ddl = <<-SQL
           create
@@ -88,12 +100,40 @@ module Reportme
         SQL
         exec(ddl)
       end
+    end
     
-      if debug
-        # just for testing
-        exec("truncate #{report_information_table_name};")
+    def try_weekly_report_by_daily_reports(report, _von, _bis)
+
+      table_name = report.table_name(:week)
+
+      von = _von.strftime("%Y-%m-%d 00:00:00")
+      bis = _bis.strftime("%Y-%m-%d 23:59:59")
+      
+      existing_daily_reports = select_value(<<-SQL
+        select
+          count(1) cnt
+        from
+          #{report_information_table_name}
+        where
+          report = '#{report.table_name(:day)}'
+          and von between '#{von}' and '#{(_von + 6.days).strftime("%Y-%m-%d 23:59:59")}'
+      SQL
+      ).to_i
+      
+      puts "weekly report depends on 7 daily reports ... #{existing_daily_reports} daily found"
+      
+      if existing_daily_reports == 7
+        ActiveRecord::Base.transaction do
+          exec("insert into #{report_information_table_name} values ('#{table_name}', '#{von}', '#{bis}', now());")
+          exec("insert into #{table_name} select * from #{report.table_name(:day)} where von between '#{von}' and '#{(_von + 6.days).strftime("%Y-%m-%d 00:00:00")}';")
+        end
       end
+    end
 
+    def run
+    
+      ensure_report_informations_table_exist
+    
       while !@since.future?
         
         periods(@since).each do |period|
@@ -103,31 +143,31 @@ module Reportme
             period_name = period[:name]
           
             next unless r.wants_period?(period_name)
-          
-            von = period[:von].strftime("%Y-%m-%d 00:00:00")
-            bis = period[:bis].strftime("%Y-%m-%d 23:59:59")
 
-            table_name = r.table_name(period_name)
+            _von = period[:von]
+            _bis = period[:bis]
 
-            # if debug
-            #   # drop and create table while in testing mode
-            #   exec("drop table if exists #{table_name};")
-            # end
+            von = _von.strftime("%Y-%m-%d 00:00:00")
+            bis = _bis.strftime("%Y-%m-%d 23:59:59")
+
+            table_name = r.table_name(period_name)
 
             table_exist   = r.table_exist?(period_name)
             sql           = r.sql(von, bis, period_name)
-            report_exist  = report_exists?(table_name, von, bis)
         
             puts "report: #{r.table_name(period_name)} exist: #{table_exist}"
-        
-        
-            unless table_exist
-              exec("create table #{table_name} ENGINE=InnoDB default CHARSET=utf8 as #{sql} limit 0;")
-            end
-                    
-            if !report_exist || period_name == :today
+
+            ensure_report_table_exist(r, period_name)
+            
+            report_exists = report_exists?(table_name, von, bis)
+            
+            try_weekly_report_by_daily_reports(r, _von, _bis) if period_name == :week && !report_exists
+
+            report_exists = report_exists?(table_name, von, bis)
+            
+            if !report_exists || period_name == :today
               ActiveRecord::Base.transaction do
-                exec("insert into #{report_information_table_name} values ('#{table_name}', '#{von}', '#{bis}', now());") unless report_exist
+                exec("insert into #{report_information_table_name} values ('#{table_name}', '#{von}', '#{bis}', now());") unless report_exists
             
                 if period_name == :today
                   exec("truncate #{table_name};")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jzimmek-reportme
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jan Zimmek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -07:00
+date: 2009-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: []