effective_memberships 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2fa9825b98ff831e92982093f101688968d4a9de0e1b61bd40d30b4ecdc508a
-  data.tar.gz: 3099497fce47b55f6d47009e5637aac7fdc70990f2bccd4d5d08cd448b7982a3
+  metadata.gz: 23096ca68807bea4bee0124d266ccb80d5e26e2bd2fd9cd9357a527a451212af
+  data.tar.gz: ed6e17ce553edf22b22fabeb6b6a85bf3260b1dc595ef57a1c1dfbfce21e9e4f
 SHA512:
-  metadata.gz: 1ea91efb59aa3d7408a76fbc463febca221f0150f83964361a72aa2c79ae8f14071be1fd91ef6e060dcdd2d08d36edb74c369b6287d2698722000b80ffce02c6
-  data.tar.gz: 826d97b4c4f2fc50cd30dde0b0bbccf2eefdea7c2e1fc73c27e87916ae64a07a00d0d74e2b775cf41b8e2f55268403885a92e3fc932969ed350aa0fde1893737
+  metadata.gz: 498f8de4da09f11cd4933563db907a608d5b261a1e84425f5d7dc07ddefa04bf5feeb58a0b511810a758188fc8c5748e24e67eadb1f1a748e8fc55f8283bf352
+  data.tar.gz: 061176c89de004535b1c619ef7b67f4849a72539689f678724e6217691f75e1653ae895f78a5597b38ac6f63b9122348b3d22785bf467161159fdff8ae2c438b

data/app/controllers/admin/memberships_controller.rb

@@ -0,0 +1,9 @@
+module Admin
+  class MembershipsController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_memberships) }
+
+    include Effective::CrudController
+
+  end
+end

data/app/datatables/admin/effective_memberships_datatable.rb

@@ -0,0 +1,40 @@
+module Admin
+  class EffectiveMembershipsDatatable < Effective::Datatable
+
+    datatable do
+      order :id
+      col :id, visible: false
+
+      col :owner
+      col :categories
+
+      col :number
+      col :number_as_integer, visible: false
+
+      col :joined_on
+      col :registration_on
+
+      col :fees_paid_period, visible: false, label: 'Fees Paid'
+      col :fees_paid_through_period, label: 'Fees Paid Through'
+
+      col :bad_standing
+      col :bad_standing_admin, visible: false
+      col :bad_standing_reason, visible: false
+
+      actions_col
+    end
+
+    collection do
+      memberships = Effective::Membership.deep.all
+
+      raise('expected an owner_id, not user_id') if attributes[:user_id].present?
+
+      if attributes[:owner_id].present?
+        memberships = memberships.where(owner_id: attributes[:owner_id])
+      end
+
+      memberships
+    end
+
+  end
+end

data/app/models/effective/membership.rb

@@ -26,7 +26,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(owner: [:fees, :membership]) }
+    scope :deep, -> { includes(:membership_categories) }
     scope :sorted, -> { order(:id) }
 
     scope :with_paid_fees_through, -> (period = nil) {

data/config/routes.rb

@@ -27,6 +27,7 @@ EffectiveMemberships::Engine.routes.draw do
     resources :applicant_course_names, except: [:show]
 
     resources :fee_payments, only: [:index, :show]
+    resources :memberships, only: [:index]
     resources :registrar_actions, only: [:create]
   end
 

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Code and Effect
@@ -216,6 +216,7 @@ files:
 - app/controllers/admin/categories_controller.rb
 - app/controllers/admin/fee_payments_controller.rb
 - app/controllers/admin/fees_controller.rb
+- app/controllers/admin/memberships_controller.rb
 - app/controllers/admin/registrar_actions_controller.rb
 - app/controllers/effective/applicant_references_controller.rb
 - app/controllers/effective/applicants_controller.rb
@@ -227,6 +228,7 @@ files:
 - app/datatables/admin/effective_fee_payments_datatable.rb
 - app/datatables/admin/effective_fees_datatable.rb
 - app/datatables/admin/effective_membership_histories_datatable.rb
+- app/datatables/admin/effective_memberships_datatable.rb
 - app/datatables/effective_applicant_courses_datatable.rb
 - app/datatables/effective_applicant_educations_datatable.rb
 - app/datatables/effective_applicant_experiences_datatable.rb