ish_manager 0.1.8.489 → 0.1.8.490

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeabedb9e57e736ebd35e8e73ac4387f3cb77aafda58658dcb913fff72e6ab1d
-  data.tar.gz: 5ed6cb10a9536857cc6e2c6f33dcd0a6f9bba66c4cbea4d939f43e44ee1f26cd
+  metadata.gz: f3eeaba4f2df8f0813b9c4c52aa4bfa7526d4dbeccd199b2fae4f5c510dde395
+  data.tar.gz: 4a07d354553477353bce3225c42ddd36cd394226b9401a37200544ab08012f4b
 SHA512:
-  metadata.gz: e25f395330b7566a261f7dd9e0e0742bb0cf481ad6b1481c71004320d2acdc65cd9f2eb93dca4c231a7f7b2217dd74ef42b13a63c05d76e4f4ddffb795c108c2
-  data.tar.gz: e94184249552ace988a61121a50e4730600b279b519972c3cc91e3c884be5082e5c4fb011e519d6ca9db7042589c51612f145eca55343083d5be37a0c5e83324
+  metadata.gz: 124c737e4fce7120d0d30f7ff0a7945cda87f89f1188611ee1f6006daabb8569c78cdba1184b2d34b2fc42c794fa58df3c8e10a1d12dd55fb542819f81693572
+  data.tar.gz: cc2440a9421a471f20b6cc8d9ab8edded0949d0d7e94c2fe6de47b1bb5637a04a985746c14de1ce49569f4f309a5f09a1cac11886daf2de648b0a241014bfff9

data/app/controllers/ish_manager/analytics_controller.rb

@@ -10,18 +10,24 @@ class IshManager::AnalyticsController < IshManager::ApplicationController
   def test
     authorize! :analytics, IshManager::Ability
 
-    if !@prev_intervals.include?( params[:prev_interval] )
-      flash_error "prev_interval not allowed"
-      redirect_to action: :index
-      return
+    if params[:prev_interval].present?
+      if !@prev_intervals.include?( params[:prev_interval] )
+        flash_alert "prev_interval not allowed"
+        redirect_to action: :index
+        return
+      end
+      prev_interval = eval( params[:prev_interval] )
+      selected_date = "#{(Time.now - prev_interval ).to_date.to_s},#{Time.now.to_date.to_s}"
+    else
+      selected_date = "#{params[:date_from]},#{params[:date_to]}"
     end
-    prev_interval = eval( params[:prev_interval] )
-    puts! prev_interval, 'prev_interval'
 
     base_url = "https://analytics.wasya.co/index.php?force_api_session=1&module=API&format=JSON&"
-    api_url_trash = "&idDimension=1&idSite=2&period=day&date=2023-07-01,2023-09-01"
+    # api_url_trash = "&idDimension=1&idSite=2&period=day&date=2023-07-01,2023-09-01"
     opts = {
       "token_auth" => ANALYTICS_TOKEN,
+      "filter_limit" => "-1",
+      "expanded" => 1,
 
       # "method" => "Actions.getPageUrls",
       method: params[:method],
@@ -31,33 +37,55 @@ class IshManager::AnalyticsController < IshManager::ApplicationController
       # "idSite" => 2,
       idSite: params[:idSite],
 
-      "period" => "day",
+      # "period" => "day",
+      "period" => "range",
       # period: params[:period],
 
-      "date" => "#{(Time.now - prev_interval ).to_date.to_s},#{Time.now.to_date.to_s}",
+      "date" => selected_date,
     }
 
     cids    = []
     reports = {}
+    reports[9999] = []
 
     puts! "#{base_url}#{opts.to_query}", 'ze query'
 
     inns = HTTParty.get( "#{base_url}#{opts.to_query}" )
     inns = JSON.parse( inns.body )
 
-    inns.each do |date, items|
-      items.each do |item|
-
-        path = item['label']
-        if path[0] != '/'
-          path = "/#{path}"
+    if "Actions.getPageUrls" == params[:method]
+      inns.each do |date, items|
+        items.each do |item|
+
+          path = item['label']
+          if path[0] != '/'
+            path = "/#{path}"
+          end
+
+          cid = path[/.*cid=([\d]*)/,1]&.to_i
+          if cid
+            cids.push cid
+            reports[cid] ||= []
+            reports[cid].push "#{date} :: #{path}"
+          end
         end
+      end
+    end
 
-        cid = path[/.*cid=([\d]*)/,1]&.to_i
-        if cid
-          cids.push cid
-          reports[cid] ||= []
-          reports[cid].push "#{date} :: #{path}"
+    if "Live.getLastVisitsDetails" == params[:method]
+      inns.each do |items|
+        date = items['serverDate']
+        items['actionDetails'].each do |item|
+          path = item['url']
+
+          cid = path[/.*cid=([\d]*)/,1]&.to_i
+          if cid
+            cids.push cid
+            reports[cid] ||= []
+            reports[cid].push "#{date} :: #{path}"
+          else
+            reports[9999].push "#{date} :: #{path}"
+          end
         end
       end
     end
@@ -67,10 +95,12 @@ class IshManager::AnalyticsController < IshManager::ApplicationController
     @reports = {}
 
     reports.each do |k, v|
-      lead_label = "[#{k}] <#{leads_h[k].name} #{leads_h[k].email}>"
+      lead_label = "[#{k}] <#{leads_h[k]&.name} #{leads_h[k]&.email}>"
       @reports[lead_label] = v
     end
 
+    @reports = @reports.sort
+
   end
 
   ##
@@ -81,10 +111,12 @@ class IshManager::AnalyticsController < IshManager::ApplicationController
   def set_vars
     @methods_list = [
       "Actions.getPageUrls",
+      "Live.getLastVisitsDetails",
     ]
 
 
     @prev_intervals = [
+      nil,
       "1.month",
       "2.months",
       "3.months",

data/app/views/ish_manager/analytics/_menu.haml

@@ -5,14 +5,22 @@
     %li= link_to 'Test', analytics_test_path
 
   = form_tag( analytics_test_path, method: :get ) do
+
     .field
       %label Domain
       = select_tag :idSite, options_for_select(@sites_list, selected: params[:idSite]), class: :select2
+
     .field
       %label prev_interval
       = select_tag :prev_interval, options_for_select( @prev_intervals, selected: params[:prev_interval] )
+      %label date_from
+      = text_field_tag :date_from, params[:date_from]
+      %label date_to
+      = text_field_tag :date_to, params[:date_to]
+
     .field
       %label method
       = select_tag :method, options_for_select( @methods_list, selected: params[:method] )
+
     .actions
       = submit_tag 'Submit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.489
+  version: 0.1.8.490
 platform: ruby
 authors:
 - piousbox