AVSDev/sprinkle-organisations
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Update the member count column to exclude admins rather than include

Browse Source
This commit is contained in:
Craig Williams
2022-02-07 15:21:50 +00:00
parent ae0c884e44
commit b6edcf03e8
3 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
locale/en_US/messages.php
View File

@@ -32,7 +32,7 @@ return [
'DELETE_YES' => 'Yes, delete organisation',
'DELETION_SUCCESSFUL' => 'Successfully deleted organisation <strong>{{name}}</strong>',
'TOTAL_MEMBER_COUNT' => '# Members <sub>(inc admins)</sub>',
'MEMBER_COUNT' => '# Members <sub>(excl admins)</sub>',
'ADMIN_COUNT' => '# Admins',
'NAME' => [

37
src/Database/Models/Organisation.php
View File

@@ -61,8 +61,7 @@ class Organisation extends Model
*/
protected $appends = [
'member_count',
'admin_count',
'non_admin_count'
'admin_count'
];
/**
@@ -99,28 +98,23 @@ class Organisation extends Model
/**
* Get a count of members within this organisation (excludes admins).
*/
public function getNonAdminCountAttribute()
public function getTotalMemberCountAttribute()
{
return $this->members(true)->count();
return $this->members()->count() + $this->administrators()->count();
}
/**
* Get a list of members within this organisation.
*/
public function members($exclude_admins = false)
public function members()
{
/** @var \UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */
$classMapper = static::$ci->classMapper;
$qry = $this
return $this
->belongsToMany($classMapper->getClassMapping('user'), 'organisation_members', 'organisation_id', 'user_id')
->where('flag_admin', false)
->withTimestamps();
if ($exclude_admins) {
return $qry->where('flag_admin', false);
} else {
return $qry;
}
}
/**
@@ -132,9 +126,7 @@ class Organisation extends Model
$classMapper = static::$ci->classMapper;
return $this
->belongsToMany(
$classMapper->getClassMapping('user'), 'organisation_members', 'organisation_id', 'user_id'
)
->belongsToMany($classMapper->getClassMapping('user'), 'organisation_members', 'organisation_id', 'user_id')
->where('flag_admin', true)
->withTimestamps();
}
@@ -150,6 +142,7 @@ class Organisation extends Model
{
$memberCountsInner = DB::table('organisation_members')
->selectRaw('organisation_id, COUNT(*) AS member_count')
->where('flag_admin', false)
->groupBy('organisation_id');
$memberCounts = DB::table('organisations')
->leftJoinSub($memberCountsInner, 'member_counts_inner', function ($join) {
@@ -169,26 +162,12 @@ class Organisation extends Model
->select('id AS organisation_id')
->selectRaw('COALESCE(admin_count, 0) AS admin_count');
$nonAdminCountsInner = DB::table('organisation_members')
->selectRaw('organisation_id, COUNT(*) AS non_admin_count')
->where('flag_admin', false)
->groupBy('organisation_id');
$nonAdminCounts = DB::table('organisations')
->leftJoinSub($nonAdminCountsInner, 'non_admin_counts_inner', function ($join) {
$join->on('non_admin_counts_inner.organisation_id', '=', 'organisations.id');
})
->select('id AS organisation_id')
->selectRaw('COALESCE(non_admin_count, 0) AS non_admin_count');
return $query
->leftJoinSub($memberCounts, 'member_counts', function ($join) {
$join->on('member_counts.organisation_id', '=', 'organisations.id');
})
->leftJoinSub($adminCounts, 'admin_counts', function ($join) {
$join->on('admin_counts.organisation_id', '=', 'organisations.id');
})
->leftJoinSub($nonAdminCounts, 'non_admin_counts', function ($join) {
$join->on('non_admin_counts.organisation_id', '=', 'organisations.id');
});
}
}

2
templates/tables/organisations.html.twig
View File

@@ -13,7 +13,7 @@
<tr>
<th class="sorter-metatext" data-column-name="name" data-column-template="#organisation-table-column-info" data-priority="1">{{translate('ORGANISATION')}} <i class="fas fa-sort"></i></th>
<th class="sorter-metatext" data-column-name="description" data-column-template="#organisation-table-column-description" data-priority="2">{{translate("DESCRIPTION")}} <i class="fas fa-sort"></i></th>
<th class="sorter-metanum" data-column-name="member_count" data-column-template="#organisation-table-column-memberCount" data-priority="2">{{translate("ORGANISATION.TOTAL_MEMBER_COUNT")}} <i class="fas fa-sort"></i></th>
<th class="sorter-metanum" data-column-name="member_count" data-column-template="#organisation-table-column-memberCount" data-priority="2">{{translate("ORGANISATION.MEMBER_COUNT")}} <i class="fas fa-sort"></i></th>
<th class="sorter-metanum" data-column-name="admin_count" data-column-template="#organisation-table-column-adminCount" data-priority="2">{{translate("ORGANISATION.ADMIN_COUNT")}} <i class="fas fa-sort"></i></th>
<th data-column-template="#organisation-table-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th>
</tr>