Merge pull request #933 from palomahnhp/tracking_user_verifications_and_others

Tracking user verifications and supports proposals #571
This commit is contained in:
Juanjo Bazán
2016-04-20 12:16:29 +02:00
18 changed files with 210 additions and 1 deletions

View File

@@ -41,6 +41,7 @@
//= require registration_form
//= require suggest
//= require forms
//= require tracks
//= require valuation_spending_proposal_form
//= require embed_video
@@ -59,6 +60,7 @@ var initialize_modules = function() {
App.RegistrationForm.initialize();
App.Suggest.initialize();
App.Forms.initialize();
App.Tracks.initialize();
App.ValuationSpendingProposalForm.initialize();
App.EmbedVideo.initialize();
};

View File

@@ -0,0 +1,28 @@
App.Tracks =
tracking_enabled: ->
_paq?
set_custom_var: (id, name, value, scope) ->
_paq.push(['setCustomVariable', id, name, value, scope])
_paq.push(['trackPageView'])
track_event: ($this) ->
category = $this.data('track-event-category')
action = $this.data('track-event-action')
_paq.push(['trackEvent', category, action])
initialize: ->
if App.Tracks.tracking_enabled()
$('[data-track-usertype]').each ->
$this = $(this)
usertype = $this.data('track-usertype')
App.Tracks.set_custom_var(1, "usertype", usertype, "visit")
$('[data-track-event-category]').each ->
$this = $(this)
App.Tracks.track_event($this)
$('[data-track-click]').on 'click', ->
$this = $(this)
App.Tracks.track_event($this)

View File

@@ -18,6 +18,10 @@ class Admin::StatsController < Admin::BaseController
@verified_users = User.with_hidden.level_two_or_three_verified.count
@unverified_users = User.with_hidden.unverified.count
@users = User.with_hidden.count
@user_ids_who_voted_proposals =
ActsAsVotable::Vote.where(votable_type: 'Proposal').pluck(:voter_id).uniq.count
@user_ids_who_didnt_vote_proposals = @verified_users - @user_ids_who_voted_proposals
@spending_proposals = SpendingProposal.count
end
end

View File

@@ -0,0 +1,12 @@
module TracksHelper
def track_event(data={})
track_data = ""
prefix = " data-track-event-"
data.each do |key, value|
track_data = track_data + prefix + key.to_s + '=' + value + " "
end
content_for :track_event do
track_data
end
end
end

View File

@@ -54,6 +54,17 @@ module Verification
!verification_sms_sent?
end
def user_type
case
when level_three_verified?
:level_3_user
when level_two_verified?
:level_2_user
else
:level_1_user
end
end
def sms_code_not_confirmed?
!sms_verified?
end

View File

@@ -76,6 +76,13 @@
<%= t "admin.stats.show.summary.user_level_three" %><br>
<span class="number"><%= number_with_delimiter(@user_level_three) %></span>
</p>
<p>
<%= t "admin.stats.show.summary.verified_users_who_didnt_vote_proposals" %><br>
<span class="number">
<%=number_with_delimiter(@user_ids_who_didnt_vote_proposals)%>
</span>
</p>
</div>
<div class="small-12 medium-3 column">

View File

@@ -0,0 +1 @@
<meta name="tracking_data" data-track-usertype="<%=current_user ? current_user.user_type : :anonymous%>" <%= yield(:track_event) %>/>

View File

@@ -4,6 +4,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<%=render "layouts/tracking_data"%>
<title><%= content_for?(:title) ? yield(:title) : setting['org_name'] %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>

View File

@@ -1,4 +1,5 @@
<div class="row verify">
<%track_event(category: "verification", action: "edit_letter" )%>
<div class="small-12 medium-9 large-6 small-centered column">
<div class="text-center">
<h1>

View File

@@ -1,4 +1,5 @@
<div class="verification account row">
<%track_event(category: "verification", action: "success_sms" )%>
<div class="small-12 column">
<div class="text-center">

View File

@@ -1,4 +1,5 @@
<div class="row">
<%track_event(category: "verification", action: "start_letter" )%>
<div class="small-12 column">
<%= link_to account_path, class: "back" do %>

View File

@@ -1,4 +1,5 @@
<div class="verification account row">
<%track_event(category: "verification", action: "start_census" )%>
<div class="small-12 column">
<div class="text-center">

View File

@@ -1,4 +1,5 @@
<div class="verification account row">
<%track_event(category: "verification", action: "start_sms" )%>
<div class="small-12 column">
<div class="text-center">

View File

@@ -1,4 +1,5 @@
<div class="verification account row">
<%track_event(category: "verification", action: "success_census" )%>
<div class="small-12 column">
<div class="text-center">

View File

@@ -206,6 +206,7 @@ en:
user_level_two: Level two users
users: Total users
verified_users: Verified users
verified_users_who_didnt_vote_proposals: Verified users who didn't votes proposals
visits: Visits
votes: Total votes
spending_proposals_title: Spending Proposals

View File

@@ -206,6 +206,7 @@ es:
user_level_two: Usuarios de nivel dos
users: Usuarios
verified_users: Usuarios verificados
verified_users_who_didnt_vote_proposals: Usuarios verificados que no han votado propuestas
visits: Visitas
votes: Votos
spending_proposals_title: Propuestas de inversión

View File

@@ -25,7 +25,8 @@ Setting.create(key: 'feature.spending_proposal_features.voting_allowed', value:
Setting.create(key: 'feature.twitter_login', value: "true")
Setting.create(key: 'feature.facebook_login', value: "true")
Setting.create(key: 'feature.google_login', value: "true")
Setting.create(key: 'per_page_code', value: "")
Setting.create(key: 'comments_body_max_length', value: '1000')
puts "Creating Geozones"
('A'..'Z').each{ |i| Geozone.create(name: "District #{i}") }

View File

@@ -0,0 +1,134 @@
require 'rails_helper'
feature 'Tracking' do
context 'Custom variable' do
scenario 'Usertype anonymous' do
visit proposals_path
expect(page.html).to include "anonymous"
end
scenario 'Usertype level_1_user' do
create(:geozone)
user = create(:user)
login_as(user)
visit proposals_path
expect(page.html).to include "level_1_user"
end
scenario 'Usertype level_2_user' do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link 'Verify my account'
verify_residence
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
user = user.reload
fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
click_button 'Send'
expect(page.html).to include "level_2_user"
end
end
context 'Tracking events' do
scenario 'Verification: start census' do
user = create(:user)
login_as(user)
visit account_path
click_link 'Verify my account'
expect(page.html).to include "data-track-event-category=verification"
expect(page.html).to include "data-track-event-action=start_census"
end
scenario 'Verification: success census' do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link 'Verify my account'
verify_residence
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
expect(page.html).to include "data-track-event-category=verification"
expect(page.html).to include "data-track-event-action=start_sms"
end
scenario 'Verification: start sms' do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link 'Verify my account'
verify_residence
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
expect(page.html).to include "data-track-event-category=verification"
expect(page.html).to include "data-track-event-action=start_sms"
end
scenario 'Verification: success sms' do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link 'Verify my account'
verify_residence
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
user = user.reload
fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
click_button 'Send'
expect(page.html).to include "data-track-event-category=verification"
expect(page.html).to include "data-track-event-action=success_sms"
end
scenario 'Verification: letter' do
create(:geozone)
user = create(:user)
login_as(user)
visit account_path
click_link 'Verify my account'
verify_residence
fill_in 'sms_phone', with: "611111111"
click_button 'Send'
user = user.reload
fill_in 'sms_confirmation_code', with: user.sms_confirmation_code
click_button 'Send'
click_link "Send me a letter with the code"
expect(page.html).to include "data-track-event-category=verification"
expect(page.html).to include "data-track-event-action=start_letter"
end
end
end