Merge branch 'members-filters' into dev

app/assets/javascripts/controllers/admin/members.js.erb

@@ -146,7 +146,15 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
       // currently displayed page of members
       page: 1,
       // true when all members where loaded
-      noMore: false
+      noMore: false,
+      // default filter for members
+      memberFilter: 'all',
+      // options for members filtering
+      memberFilters: [
+        'all',
+        'not_confirmed',
+        'inactive_for_3_years'
+      ]
     };
 
     // admins list
@@ -261,6 +269,14 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
       }, 300);
     };
 
+    /**
+     * Callback when the member filter changes: reload the search results
+     */
+    $scope.updateMemberFilter = function () {
+      resetSearchMember();
+      memberSearch();
+    };
+
     /**
      * Callback to alert the admin that the export request was acknowledged and is
      * processing right now.
@@ -317,6 +333,7 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce',
         query: {
           search: $scope.member.searchText,
           order_by: $scope.member.order,
+          filter: $scope.member.memberFilter,
           page: $scope.member.page,
           size: USERS_PER_PAGE
         }

app/assets/templates/admin/members/members.html.erb

@@ -1,4 +1,6 @@
 <div class="col-md-5 m-t-lg">
+  <div class="row">
+    <div class="col-lg-7">
       <div class="form-group">
         <div class="input-group">
           <span class="input-group-addon"><i class="fa fa-filter"></i></span>
@@ -6,6 +8,15 @@
         </div>
       </div>
     </div>
+    <div class="col-lg-5">
+      <div class="form-group">
+        <select ng-model="member.memberFilter" ng-change="updateMemberFilter()" class="form-control">
+          <option ng-repeat="filter in member.memberFilters" value="{{filter}}" translate>{{ 'app.admin.members.group_form.member_filter_'+filter }}</option>
+        </select>
+      </div>
+    </div>
+  </div>
+</div>
 <div class="col-md-12">
   <button type="button" class="btn btn-warning m-t m-b" ui-sref="app.admin.members_new" translate>{{ 'app.admin.members.add_a_new_member' }}</button>
   <div class="pull-right">
@@ -21,7 +32,6 @@
     <iframe name="export-frame" height="0" width="0" class="none"></iframe>
   </div>
 
-
   <table class="table">
     <thead>
     <tr>

app/controllers/api/members_controller.rb

@@ -231,6 +231,6 @@ class API::MembersController < API::ApiController
   end
 
   def query_params
-    params.require(:query).permit(:search, :order_by, :page, :size)
+    params.require(:query).permit(:search, :filter, :order_by, :page, :size)
   end
 end

app/models/user.rb

@@ -77,6 +77,8 @@ class User < ActiveRecord::Base
   scope :active, -> { where(is_active: true) }
   scope :without_subscription, -> { includes(statistic_profile: [:subscriptions]).where(subscriptions: { statistic_profile_id: nil }) }
   scope :with_subscription, -> { joins(statistic_profile: [:subscriptions]) }
+  scope :not_confirmed, -> { where(confirmed_at: nil) }
+  scope :inactive_for_3_years, -> { where('users.last_sign_in_at < ?', 3.years.ago) }
 
   def to_json(*)
     ApplicationController.new.view_context.render(

app/services/members/list_service.rb

@@ -34,6 +34,9 @@ class Members::ListService
                               'plans.base_name ILIKE :search', search: "%#{params[:search]}%")
       end
 
+      filter = params[:filter].presence_in(%w[inactive_for_3_years not_confirmed]) || nil
+      @query = @query.send(filter) if filter
+
       @query
     end
 

config/locales/app.admin.en.yml

@@ -646,6 +646,9 @@ en:
           status_enabled: "Enabled"
           status_disabled: "Disabled"
           status_all: "All"
+          member_filter_all: "All"
+          member_filter_not_confirmed: "Unconfirmed"
+          member_filter_inactive_for_3_years: "Inactive for 3 years"
 
       members_new:
         # add a member

config/locales/app.admin.es.yml

@@ -591,6 +591,7 @@ es:
         groups: "Grupos"
         tags: "Tags"
         authentication: "Autenticación"
+        confirmation_required: "Confirmation required"
         confirm_delete_member: "¿Desea realmente eliminar este usario? Esto no se puede deshacer."
         member_successfully_deleted: "Usario eliminado correctamente."
         unable_to_delete_the_member: "No se puede eliminar el usario."
@@ -645,6 +646,9 @@ es:
           status_enabled: "Enabled"
           status_disabled: "Disabled"
           status_all: "All"
+          member_filter_all: "All"
+          member_filter_not_confirmed: "Unconfirmed"
+          member_filter_inactive_for_3_years: "Inactive for 3 years"
 
       members_new:
         # add a member

config/locales/app.admin.fr.yml

@@ -646,6 +646,9 @@ fr:
           status_enabled: "Activés"
           status_disabled: "Désactivés"
           status_all: "Tous"
+          member_filter_all: "Tous"
+          member_filter_not_confirmed: "Non confirmés"
+          member_filter_inactive_for_3_years: "Inactifs depuis 3 ans"
 
       members_new:
         # ajouter un membre

config/locales/app.admin.pt.yml

@@ -646,6 +646,9 @@ pt:
           status_enabled: "Ativos"
           status_disabled: "Desabilitados"
           status_all: "Todos"
+          member_filter_all: "All"
+          member_filter_not_confirmed: "Unconfirmed"
+          member_filter_inactive_for_3_years: "Inactive for 3 years"
 
       members_new:
         # add a member