diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/App/Controllers/ModuleUsersGroupsController.php b/App/Controllers/ModuleUsersGroupsController.php index f7ea66d..7984250 100644 --- a/App/Controllers/ModuleUsersGroupsController.php +++ b/App/Controllers/ModuleUsersGroupsController.php @@ -638,47 +638,4 @@ public function deleteAction(string $groupId): void $this->deleteEntity($group, 'module-users-groups/module-users-groups/index'); } - /** - * Changes the default user group action. - * - * @return void - */ - public function changeDefaultAction(): void - { - if (!$this->request->isPost()) { - return; - } - - // Get the POST data - $data = $this->request->getPost(); - - // Find all user groups - $groups = UsersGroups::find(); - foreach ($groups as $group) { - // Check if the current group is the selected default group - if ($group->defaultGroup === '1' and $group->id !== $data['defaultGroup']) { - $group->defaultGroup = '0'; - $this->saveEntity($group); - } - if ($group->defaultGroup !== '1' and $group->id === $data['defaultGroup']) { - $group->defaultGroup = '1'; - $this->saveEntity($group); - } - } - - // Get current user group memberships - $currentUsersGroups = GroupMembers::find()->toArray(); - $users = Users::find(); - foreach ($users as $user) { - // Check if the user is not already in a group - $key = array_search($user->id, array_column($currentUsersGroups, 'user_id')); - if (!$key) { - // Create a new group membership record - $record = new GroupMembers(); - $record->group_id = $data['defaultGroup']; - $record->user_id = $user->id; - $this->saveEntity($record); - } - } - } } diff --git a/App/Forms/DefaultGroupForm.php b/App/Forms/DefaultGroupForm.php index 746fbb1..39692a4 100644 --- a/App/Forms/DefaultGroupForm.php +++ b/App/Forms/DefaultGroupForm.php @@ -28,26 +28,34 @@ class DefaultGroupForm extends BaseForm public function initialize($entity = null, $options = null): void { - $variants = []; - $defaultGroupValue = null; $usersGroups = UsersGroups::find(); + $defaultGroupValue = ''; + + // Find default group value foreach ($usersGroups as $usersGroup) { - $variants[$usersGroup->id] = $usersGroup->name; if ($usersGroup->defaultGroup === '1') { - $defaultGroupValue = $usersGroup->id; + $defaultGroupValue = (string)$usersGroup->id; + break; } } + + // Create select with groups as options $defaultGroupSelect = new Select( - 'defaultGroup', $variants, [ + 'defaultGroup', + $usersGroups, + [ 'using' => [ 'id', 'name', ], 'useEmpty' => true, + 'emptyText' => 'Choose...', + 'emptyValue' => '', 'value' => $defaultGroupValue, 'class' => 'ui selection dropdown search select-default-group', ] ); + $this->add($defaultGroupSelect); } } \ No newline at end of file diff --git a/App/Forms/ExtensionEditAdditionalForm.php b/App/Forms/ExtensionEditAdditionalForm.php index db90977..d45b9de 100644 --- a/App/Forms/ExtensionEditAdditionalForm.php +++ b/App/Forms/ExtensionEditAdditionalForm.php @@ -21,63 +21,27 @@ use MikoPBX\AdminCabinet\Forms\BaseForm; use MikoPBX\AdminCabinet\Forms\ExtensionEditForm; -use Modules\ModuleUsersGroups\Models\GroupMembers; use Modules\ModuleUsersGroups\Models\UsersGroups as ModelUsersGroups; -use Phalcon\Forms\Element\Select; +use Phalcon\Forms\Element\Hidden; class ExtensionEditAdditionalForm extends BaseForm { - public static function prepareAdditionalFields(ExtensionEditForm $form, \stdClass $entity, array $options = []){ - - // Prepare groups for select - $parameters = [ - 'columns' => [ - 'id', - 'name' - ] - ]; - $arrGroups = ModelUsersGroups::find($parameters); - $arrGroupsForSelect = []; - foreach ($arrGroups as $group) { - $arrGroupsForSelect[$group->id] = $group->name; - } - - // Find current value - $userGroupId = null; - if (isset($entity->user_id)) { - $parameters = [ - 'conditions' => 'user_id = :user_id:', - 'bind' => ['user_id' => $entity->user_id] - ]; - - $curUserGroup = GroupMembers::findFirst($parameters); - if ($curUserGroup !== null) { - // Get the group ID from the existing group membership - $userGroupId = $curUserGroup->group_id; - } else { - // Get the group ID from the default group - $defaultGroup = ModelUsersGroups::findFirst('defaultGroup=1'); - if ($defaultGroup){ - $userGroupId = $defaultGroup->id; - } - } - } - - $groupForSelect = new Select( - 'mod_usrgr_select_group', $arrGroupsForSelect, [ - 'using' => [ - 'id', - 'name', - ], - 'value' => $userGroupId, - 'useEmpty' => false, - 'class' => 'ui selection dropdown search select-group-field', - ] - ); - - // Add the group select field to the form - $form->add($groupForSelect); - } - + public static function prepareAdditionalFields(ExtensionEditForm $form, \stdClass $entity, array $options = []): void + { + // Add hidden field for the group ID (value will be set by JavaScript) + $form->add(new Hidden('mod_usrgr_select_group', [ + 'value' => '', + 'id' => 'mod_usrgr_select_group' + ])); + + // Get all groups for dropdown (will be used in Volt template) + $groups = ModelUsersGroups::find([ + 'columns' => ['id', 'name'], + 'order' => 'name ASC' + ]); + + // Store groups data in form for access in Volt template + $form->setUserOption('mod_usrgr_groups', $groups); + } } \ No newline at end of file diff --git a/App/Views/Extensions/modify.volt b/App/Views/Extensions/modify.volt index 5698c61..58c9d8e 100644 --- a/App/Views/Extensions/modify.volt +++ b/App/Views/Extensions/modify.volt @@ -1,6 +1,19 @@
- + {{ form.render('mod_usrgr_select_group') }} +
\ No newline at end of file diff --git a/Lib/RestAPI/UsersGroups/CleanupOrphanedMembersAction.php b/Lib/RestAPI/UsersGroups/CleanupOrphanedMembersAction.php new file mode 100644 index 0000000..ad609a9 --- /dev/null +++ b/Lib/RestAPI/UsersGroups/CleanupOrphanedMembersAction.php @@ -0,0 +1,89 @@ +. + */ + +namespace Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups; + +use MikoPBX\PBXCoreREST\Lib\PBXApiResult; +use MikoPBX\Common\Models\Users; +use Modules\ModuleUsersGroups\Models\GroupMembers; + +/** + * Cleanup orphaned group member records + * + * @package Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups + */ +class CleanupOrphanedMembersAction +{ + /** + * Remove group member records for deleted users + * + * @param array $data Request data (empty) + * @return PBXApiResult + */ + public static function main(array $data): PBXApiResult + { + $result = new PBXApiResult(); + $result->processor = __METHOD__; + + try { + // Get valid user IDs using simple find + $validUsers = Users::find(['columns' => 'id']); + + if (count($validUsers) === 0) { + $result->success = true; + $result->data = [ + 'deleted' => 0, + 'message' => 'No users in system' + ]; + $result->httpCode = 200; + return $result; + } + + // Build list of valid user IDs + $validIds = []; + foreach ($validUsers as $user) { + $validIds[] = (int)$user->id; + } + + // Get module database connection through model instance + $groupMember = new GroupMembers(); + $connection = $groupMember->getReadConnection(); + $validIdsList = implode(',', $validIds); + + // Use direct SQL DELETE for performance + $sql = "DELETE FROM m_ModuleUsersGroups_GroupMembers WHERE user_id NOT IN ({$validIdsList})"; + $success = $connection->execute($sql); + $deletedCount = $success ? $connection->affectedRows() : 0; + + $result->success = true; + $result->data = [ + 'deleted' => $deletedCount, + 'valid_users' => count($validIds) + ]; + $result->httpCode = 200; + + } catch (\Throwable $e) { + $result->success = false; + $result->messages[] = 'Failed to cleanup orphaned members: ' . $e->getMessage(); + $result->httpCode = 500; + } + + return $result; + } +} diff --git a/Lib/RestAPI/UsersGroups/DataStructure.php b/Lib/RestAPI/UsersGroups/DataStructure.php new file mode 100644 index 0000000..acf87cc --- /dev/null +++ b/Lib/RestAPI/UsersGroups/DataStructure.php @@ -0,0 +1,92 @@ +. + */ + +namespace Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups; + +/** + * Data structure for Users Groups API + * + * @package Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups + */ +class DataStructure +{ + /** + * Get parameter definitions for Users Groups API + * + * @return array>> + */ + public static function getParameterDefinitions(): array + { + return [ + 'request' => [ + 'user_id' => [ + 'type' => 'integer', + 'description' => 'User ID from Users table', + 'sanitize' => 'int', + 'minimum' => 1, + 'example' => 1 + ], + 'group_id' => [ + 'type' => 'integer', + 'description' => 'Group ID from UsersGroups table', + 'sanitize' => 'int', + 'minimum' => 1, + 'required' => true, + 'example' => 1 + ] + ], + 'response' => [ + 'group_id' => [ + 'type' => 'integer', + 'description' => 'Group ID', + 'example' => 1 + ] + ] + ]; + } + + /** + * Get sanitization rules auto-generated from definitions + * + * @return array + */ + public static function getSanitizationRules(): array + { + $definitions = static::getParameterDefinitions(); + $rules = []; + + foreach ($definitions['request'] as $field => $def) { + $rule = [$def['type'] ?? 'string']; + + if (isset($def['sanitize'])) { + $rule[] = 'sanitize:' . $def['sanitize']; + } + if (isset($def['maxLength'])) { + $rule[] = 'max:' . $def['maxLength']; + } + if (!isset($def['required'])) { + $rule[] = 'empty_to_null'; + } + + $rules[$field] = implode('|', $rule); + } + + return $rules; + } +} diff --git a/Lib/RestAPI/UsersGroups/GetDefaultGroupAction.php b/Lib/RestAPI/UsersGroups/GetDefaultGroupAction.php new file mode 100644 index 0000000..9ace748 --- /dev/null +++ b/Lib/RestAPI/UsersGroups/GetDefaultGroupAction.php @@ -0,0 +1,60 @@ +. + */ + +namespace Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups; + +use MikoPBX\PBXCoreREST\Lib\PBXApiResult; +use Modules\ModuleUsersGroups\Models\UsersGroups as ModelUsersGroups; + +/** + * Get default group + * + * @package Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups + */ +class GetDefaultGroupAction +{ + /** + * Get default group + * + * @param array $data Request data (not used) + * @return PBXApiResult + */ + public static function main(array $data): PBXApiResult + { + $result = new PBXApiResult(); + $result->processor = __METHOD__; + + // Get default group from model + $defaultGroup = ModelUsersGroups::getDefaultGroup(); + + if ($defaultGroup !== null) { + $result->success = true; + $result->data = [ + 'group_id' => (int)$defaultGroup->id + ]; + $result->httpCode = 200; + } else { + $result->success = false; + $result->messages[] = 'No default group configured'; + $result->httpCode = 404; + } + + return $result; + } +} diff --git a/Lib/RestAPI/UsersGroups/GetGroupsStatsAction.php b/Lib/RestAPI/UsersGroups/GetGroupsStatsAction.php new file mode 100644 index 0000000..9ad7c4a --- /dev/null +++ b/Lib/RestAPI/UsersGroups/GetGroupsStatsAction.php @@ -0,0 +1,85 @@ +. + */ + +namespace Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups; + +use MikoPBX\PBXCoreREST\Lib\PBXApiResult; +use Modules\ModuleUsersGroups\Models\GroupMembers; +use Modules\ModuleUsersGroups\Models\UsersGroups; + +/** + * Get statistics for all groups (member counts) + * + * @package Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups + */ +class GetGroupsStatsAction +{ + /** + * Get member counts for all groups + * + * @param array $data Request data (optional group_id for single group) + * @return PBXApiResult + */ + public static function main(array $data): PBXApiResult + { + $result = new PBXApiResult(); + $result->processor = __METHOD__; + + // Optional: filter by specific group_id + $groupId = isset($data['group_id']) ? filter_var($data['group_id'], FILTER_VALIDATE_INT) : null; + + try { + $stats = []; + + if ($groupId !== null && $groupId !== false) { + // Get count for specific group + $count = GroupMembers::count([ + 'conditions' => 'group_id = :groupId:', + 'bind' => ['groupId' => $groupId] + ]); + + $stats[$groupId] = (int)$count; + } else { + // Get counts for all groups + $groups = UsersGroups::find(); + + foreach ($groups as $group) { + $count = GroupMembers::count([ + 'conditions' => 'group_id = :groupId:', + 'bind' => ['groupId' => $group->id] + ]); + + $stats[$group->id] = (int)$count; + } + } + + $result->success = true; + $result->data = [ + 'stats' => $stats + ]; + $result->httpCode = 200; + } catch (\Throwable $e) { + $result->success = false; + $result->messages[] = 'Failed to get group statistics: ' . $e->getMessage(); + $result->httpCode = 500; + } + + return $result; + } +} diff --git a/Lib/RestAPI/UsersGroups/GetUserGroupAction.php b/Lib/RestAPI/UsersGroups/GetUserGroupAction.php new file mode 100644 index 0000000..f7a3bc2 --- /dev/null +++ b/Lib/RestAPI/UsersGroups/GetUserGroupAction.php @@ -0,0 +1,118 @@ +. + */ + +namespace Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups; + +use MikoPBX\PBXCoreREST\Lib\PBXApiResult; +use Modules\ModuleUsersGroups\Models\UsersGroups as ModelUsersGroups; + +/** + * Get user's group by user_id + * + * @package Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups + */ +class GetUserGroupAction +{ + /** + * Get user's group by user_id + * + * @param array $data Request data with user_id or id + * @return PBXApiResult + */ + public static function main(array $data): PBXApiResult + { + $result = new PBXApiResult(); + $result->processor = __METHOD__; + + // ============ PHASE 1: SANITIZATION ============ + // WHY: Security - never trust user input + $sanitizationRules = DataStructure::getSanitizationRules(); + $sanitizedData = self::sanitizeInputData($data, $sanitizationRules); + + // ============ PHASE 2: REQUIRED VALIDATION ============ + // WHY: Fail fast - don't waste resources + // Accept both 'user_id' and 'id' for backwards compatibility + $userId = $sanitizedData['user_id'] ?? null; + + // If user_id not found, try 'id' parameter (fallback for old API calls) + if (empty($userId) && isset($data['id'])) { + $userId = filter_var($data['id'], FILTER_VALIDATE_INT); + if ($userId === false) { + $result->success = false; + $result->messages[] = 'Invalid id format'; + $result->httpCode = 400; + return $result; + } + } + + if (empty($userId)) { + $result->success = false; + $result->messages[] = 'user_id or id parameter is required'; + $result->httpCode = 400; + return $result; + } + + // ============ PHASE 3: GET GROUP ID ============ + // WHY: Get group ID from model (will return default if user has no group) + $groupId = ModelUsersGroups::getUserGroupId($userId); + + if ($groupId !== null) { + $result->success = true; + $result->data = [ + 'group_id' => $groupId + ]; + $result->httpCode = 200; + } else { + $result->success = false; + $result->messages[] = 'No group found for user'; + $result->httpCode = 404; + } + + return $result; + } + + /** + * Sanitize input data + * + * @param array $data Raw input data + * @param array $rules Sanitization rules + * @return array Sanitized data + */ + private static function sanitizeInputData(array $data, array $rules): array + { + $sanitized = []; + + foreach ($rules as $field => $rule) { + if (!isset($data[$field])) { + continue; + } + + $value = $data[$field]; + + // Apply int sanitization + if (strpos($rule, 'sanitize:int') !== false) { + $value = filter_var($value, FILTER_VALIDATE_INT); + } + + $sanitized[$field] = $value; + } + + return $sanitized; + } +} diff --git a/Lib/RestAPI/UsersGroups/SetDefaultGroupAction.php b/Lib/RestAPI/UsersGroups/SetDefaultGroupAction.php new file mode 100644 index 0000000..7422856 --- /dev/null +++ b/Lib/RestAPI/UsersGroups/SetDefaultGroupAction.php @@ -0,0 +1,186 @@ +. + */ + +namespace Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups; + +use MikoPBX\PBXCoreREST\Lib\PBXApiResult; +use MikoPBX\Common\Models\Users; +use Modules\ModuleUsersGroups\Models\UsersGroups as ModelUsersGroups; +use Modules\ModuleUsersGroups\Models\GroupMembers; + +/** + * Set default group + * + * @package Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups + */ +class SetDefaultGroupAction +{ + /** + * Set default group + * + * @param array $data Request data with group_id + * @return PBXApiResult + */ + public static function main(array $data): PBXApiResult + { + $result = new PBXApiResult(); + $result->processor = __METHOD__; + + // ============ PHASE 1: SANITIZATION ============ + // WHY: Security - never trust user input + $sanitizationRules = DataStructure::getSanitizationRules(); + $sanitizedData = self::sanitizeInputData($data, $sanitizationRules); + + // ============ PHASE 2: REQUIRED VALIDATION ============ + // WHY: Fail fast - don't waste resources + $groupId = $sanitizedData['group_id'] ?? null; + + if (empty($groupId)) { + $result->success = false; + $result->messages[] = 'group_id parameter is required'; + $result->httpCode = 400; + return $result; + } + + // ============ PHASE 3: FIND GROUP TO MAKE DEFAULT ============ + // WHY: Verify group exists before attempting to update + $newDefaultGroup = ModelUsersGroups::findFirst((int)$groupId); + if ($newDefaultGroup === null) { + $result->success = false; + $result->messages[] = 'Group not found'; + $result->httpCode = 404; + return $result; + } + + // ============ PHASE 4: CLEAR CURRENT DEFAULT GROUP ============ + // WHY: Only one group can be default at a time + $currentDefaultGroup = ModelUsersGroups::getDefaultGroup(); + if ($currentDefaultGroup !== null && $currentDefaultGroup->id !== $newDefaultGroup->id) { + $currentDefaultGroup->defaultGroup = '0'; + if (!$currentDefaultGroup->save()) { + $result->success = false; + $result->messages[] = 'Failed to clear current default group'; + $result->httpCode = 500; + return $result; + } + } + + // ============ PHASE 5: SET NEW DEFAULT GROUP ============ + // WHY: Mark the new group as default + $newDefaultGroup->defaultGroup = '1'; + if (!$newDefaultGroup->save()) { + $result->success = false; + $result->messages[] = 'Failed to set new default group'; + $result->httpCode = 500; + return $result; + } + + // ============ PHASE 6: AUTO-FILL USERS WITHOUT GROUP ============ + // WHY: When default group is set, automatically assign users without group + $addedCount = self::fillUsersWithoutGroup($newDefaultGroup->id); + + $result->success = true; + $result->data = [ + 'group_id' => (int)$newDefaultGroup->id, + 'users_added' => $addedCount + ]; + $result->httpCode = 200; + + return $result; + } + + /** + * Fill users without group into the default group + * + * @param int $groupId Default group ID + * @return int Number of users added + */ + private static function fillUsersWithoutGroup(int $groupId): int + { + try { + // Get all users + $allUsers = Users::find(['columns' => 'id']); + if (count($allUsers) === 0) { + return 0; + } + + // Build list of all user IDs + $allUserIds = []; + foreach ($allUsers as $user) { + $allUserIds[] = (int)$user->id; + } + + // Get users who already have group membership + $existingMembers = GroupMembers::find(['columns' => 'user_id']); + $existingUserIds = []; + foreach ($existingMembers as $member) { + $existingUserIds[] = (int)$member->user_id; + } + + // Find users without group (difference) + $usersWithoutGroup = array_diff($allUserIds, $existingUserIds); + + // Add each user without group to default group + $addedCount = 0; + foreach ($usersWithoutGroup as $userId) { + $member = new GroupMembers(); + $member->user_id = $userId; + $member->group_id = $groupId; + + if ($member->save()) { + $addedCount++; + } + } + + return $addedCount; + } catch (\Throwable $e) { + // Log error but don't fail the whole operation + return 0; + } + } + + /** + * Sanitize input data + * + * @param array $data Raw input data + * @param array $rules Sanitization rules + * @return array Sanitized data + */ + private static function sanitizeInputData(array $data, array $rules): array + { + $sanitized = []; + + foreach ($rules as $field => $rule) { + if (!isset($data[$field])) { + continue; + } + + $value = $data[$field]; + + // Apply int sanitization + if (strpos($rule, 'sanitize:int') !== false) { + $value = filter_var($value, FILTER_VALIDATE_INT); + } + + $sanitized[$field] = $value; + } + + return $sanitized; + } +} diff --git a/Lib/RestAPI/UsersGroups/UpdateUserGroupAction.php b/Lib/RestAPI/UsersGroups/UpdateUserGroupAction.php new file mode 100644 index 0000000..f4779b7 --- /dev/null +++ b/Lib/RestAPI/UsersGroups/UpdateUserGroupAction.php @@ -0,0 +1,181 @@ +. + */ + +namespace Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups; + +use MikoPBX\Common\Models\Extensions; +use MikoPBX\Common\Models\Users; +use MikoPBX\Common\Providers\MikoPBXVersionProvider as MikoPBXVersion; +use MikoPBX\Core\System\Util; +use MikoPBX\PBXCoreREST\Lib\PBXApiResult; +use Modules\ModuleUsersGroups\Models\GroupMembers; + +/** + * Update user's group membership + * + * @package Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups + */ +class UpdateUserGroupAction +{ + /** + * Update user's group membership + * + * @param array $data Request data with user_id/number and mod_usrgr_select_group + * @return PBXApiResult + */ + public static function main(array $data): PBXApiResult + { + $result = new PBXApiResult(); + $result->processor = __METHOD__; + + // ============ PHASE 1: EXTRACT PARAMETERS ============ + $groupId = $data['mod_usrgr_select_group'] ?? ''; + $userId = $data['user_id'] ?? ''; + $number = $data['number'] ?? ''; + + // ============ PHASE 2: VALIDATE GROUP ID ============ + if (empty($groupId)) { + $result->success = false; + $result->messages[] = 'Group ID is required'; + $result->httpCode = 400; + return $result; + } + + // ============ PHASE 3: GET USER ID ============ + if (empty($userId)) { + $userId = self::getUserIdFromNumber($number); + } + + if (empty($userId)) { + $result->success = false; + $result->messages[] = 'User ID could not be determined'; + $result->httpCode = 400; + return $result; + } + + // ============ PHASE 4: UPDATE GROUP MEMBERSHIP ============ + $updateResult = self::updateOrCreateGroupMembership($userId, $groupId); + + if ($updateResult) { + $result->success = true; + $result->data = [ + 'user_id' => $userId, + 'group_id' => $groupId + ]; + $result->httpCode = 200; + } else { + $result->success = false; + $result->messages[] = 'Failed to update group membership'; + $result->httpCode = 500; + } + + return $result; + } + + /** + * Retrieves a user ID based on a given phone number. + * + * Waits and attempts multiple times to retrieve the user ID for a newly created user + * based on the provided phone number. This method performs a maximum of 10 attempts + * with a 1-second pause between each attempt. It returns the user ID if found, + * otherwise null after exhausting all attempts. + * + * @param string $number The phone number used to lookup the user ID. + * @return string|null The user ID if found, otherwise null. + */ + private static function getUserIdFromNumber(string $number): ?string + { + if (empty($number)) { + return null; + } + + $userId = null; + // New user we have to wait until it will be created + $di = MikoPBXVersion::getDefaultDi(); + $parameters = [ + 'models' => [ + 'Users' => Users::class, + ], + 'conditions' => 'Extensions.number=:number:', + 'bind' => [ + 'number' => $number + ], + 'joins' => [ + 'Extensions' => [ + 0 => Extensions::class, + 1 => 'Extensions.userid = Users.id', + 2 => 'Extensions', + 3 => 'INNER', + ], + ], + 'columns' => [ + 'id' => 'Users.id', + ] + ]; + + // Wait for user to be created (max 10 attempts) + for ($i = 0; $i < 10; $i++) { + $query = $di->get('modelsManager')->createBuilder($parameters)->getQuery(); + $user = $query->getSingleResult(); + if ($user !== null) { + $userId = $user->id; + break; + } + sleep(1); + } + + return $userId; + } + + /** + * Update or create group membership for a user + * + * @param string $userId User ID + * @param string $groupId Group ID + * @return bool True if successful, false otherwise + */ + private static function updateOrCreateGroupMembership(string $userId, string $groupId): bool + { + $parameters = [ + 'conditions' => 'user_id = :user_id:', + 'bind' => [ + 'user_id' => $userId, + ] + ]; + + // Find the existing group membership based on user ID + $curUserGroup = GroupMembers::findFirst($parameters); + + // Update or create the group membership + if ($curUserGroup === null) { + // Create a new group membership + $curUserGroup = new GroupMembers(); + $curUserGroup->user_id = $userId; + } + $curUserGroup->group_id = $groupId; + + // Save the changes to the database + if (!$curUserGroup->save()) { + Util::sysLogMsg(__METHOD__, implode($curUserGroup->getMessages()), LOG_ERR); + return false; + } + + return true; + } +} diff --git a/Lib/RestAPI/UsersGroupsManagementProcessor.php b/Lib/RestAPI/UsersGroupsManagementProcessor.php new file mode 100644 index 0000000..0a21e79 --- /dev/null +++ b/Lib/RestAPI/UsersGroupsManagementProcessor.php @@ -0,0 +1,87 @@ +. + */ + +namespace Modules\ModuleUsersGroups\Lib\RestAPI; + +use Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups\GetUserGroupAction; +use Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups\GetDefaultGroupAction; +use Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups\SetDefaultGroupAction; +use Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups\GetGroupsStatsAction; +use Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups\CleanupOrphanedMembersAction; +use MikoPBX\PBXCoreREST\Lib\PBXApiResult; +use Phalcon\Di\Injectable; + +/** + * Class UsersGroupsManagementProcessor + * + * Processes users groups management requests + * + * API methods: + * - getUserGroup -> Get user's group by user_id + * - getDefaultGroup -> Get default group + * - setDefaultGroup -> Set default group + * - getGroupsStats -> Get member counts for all groups + * - cleanupOrphanedMembers -> Remove group members for deleted users + * + * @package Modules\ModuleUsersGroups\Lib\RestAPI + */ +class UsersGroupsManagementProcessor extends Injectable +{ + // Available actions (PHP 7.4 compatible constants) + public const ACTION_GET_USER_GROUP = 'getUserGroup'; + public const ACTION_GET_DEFAULT_GROUP = 'getDefaultGroup'; + public const ACTION_SET_DEFAULT_GROUP = 'setDefaultGroup'; + public const ACTION_GET_GROUPS_STATS = 'getGroupsStats'; + public const ACTION_CLEANUP_ORPHANED_MEMBERS = 'cleanupOrphanedMembers'; + + /** + * Main entry point for processing actions + * + * @param string $actionName Name of the action to execute + * @param array $parameters Action parameters + * @return PBXApiResult + */ + public function callBack(string $actionName, array $parameters): PBXApiResult + { + // PHP 7.4 compatible switch instead of match + switch ($actionName) { + case self::ACTION_GET_USER_GROUP: + return GetUserGroupAction::main($parameters); + + case self::ACTION_GET_DEFAULT_GROUP: + return GetDefaultGroupAction::main($parameters); + + case self::ACTION_SET_DEFAULT_GROUP: + return SetDefaultGroupAction::main($parameters); + + case self::ACTION_GET_GROUPS_STATS: + return GetGroupsStatsAction::main($parameters); + + case self::ACTION_CLEANUP_ORPHANED_MEMBERS: + return CleanupOrphanedMembersAction::main($parameters); + + default: + $result = new PBXApiResult(); + $result->processor = __METHOD__; + $result->success = false; + $result->messages[] = "Unknown action: {$actionName}"; + return $result; + } + } +} diff --git a/Lib/UsersGroups.php b/Lib/UsersGroups.php index 083222e..7c0d670 100644 --- a/Lib/UsersGroups.php +++ b/Lib/UsersGroups.php @@ -21,10 +21,8 @@ namespace Modules\ModuleUsersGroups\Lib; use MikoPBX\Common\Models\Extensions; -use MikoPBX\Common\Models\Users; use MikoPBX\Core\Asterisk\AstDB; use MikoPBX\Core\System\PBX; -use MikoPBX\Core\System\Util; use MikoPBX\Modules\PbxExtensionBase; use MikoPBX\Modules\PbxExtensionUtils; use Modules\ModuleUsersGroups\Models\AllowedOutboundRules; @@ -184,116 +182,4 @@ private function initChannelVariables($group_id, array $allowedRules): string return "ARRAY({$varNames})={$varValues}"; } - /** - * Updates the user group based on the provided post data. - * - * This method updates the group membership of a user based on the provided post data. - * If the user ID is not provided, it attempts to retrieve it based on a given phone number. - * If the user group is not provided or the user cannot be found, the function exits without making any changes. - * - * @param array $postData The post data containing user and group information. - * Expected keys: - * - 'mod_usrgr_select_group': The new group ID for the user. - * - 'user_id': The ID of the user whose group is being updated. - * - 'number': The phone number of the user, used if the user ID is not provided. - * @return void - */ - public static function updateUserGroup(array $postData): void - { - $userGroup = $postData['mod_usrgr_select_group'] ?? ''; - $userId = $postData['user_id'] ?? ''; - if (empty($userGroup)) { - return; - } - - if (empty($userId)) { - $userId = self::getUserIdFromNumber($postData['number'] ?? ''); - } - - if (empty($userId)) { - return; - } - - self::updateOrCreateGroupMembership($userId, $userGroup); - } - - /** - * Retrieves a user ID based on a given phone number. - * - * Waits and attempts multiple times to retrieve the user ID for a newly created user - * based on the provided phone number. This method performs a maximum of 10 attempts - * with a 1-second pause between each attempt. It returns the user ID if found, - * otherwise null after exhausting all attempts. - * - * @param string $number The phone number used to lookup the user ID. - * @return string|null The user ID if found, otherwise null. - */ - private static function getUserIdFromNumber(string $number): ?string - { - $userId = null; - // New user we have to wait until it will be created - $di = MikoPBXVersion::getDefaultDi(); - $parameters = [ - 'models' => [ - 'Users' => Users::class, - ], - 'conditions' => 'Extensions.number=:number:', - 'bind' => [ - 'number' => $number - ], - 'joins' => [ - 'Extensions' => [ - 0 => Extensions::class, - 1 => 'Extensions.userid = Users.id', - 2 => 'Extensions', - 3 => 'INNER', - ], - ], - ]; - $counter = 0; - while (empty($userId) and $counter < 10) { - $counter++; - sleep(1); - $userData = $di->get('modelsManager')->createBuilder($parameters)->getQuery()->execute()->toArray(); - $userId = $userData[0]['id'] ?? ''; - } - return $userId; - } - - /** - * Updates or creates a group membership for a user. - * - * Checks if a group membership exists for the given user ID. If it exists, the method - * updates the group ID; if not, it creates a new group membership record with the - * provided user ID and group ID. Changes are then saved to the database. Logs an error - * message using Util::sysLogMsg() if saving to the database fails. - * - * @param string $userId The ID of the user whose group membership is being updated or created. - * @param string $userGroup The ID of the group to assign to the user. - * @return void - */ - private static function updateOrCreateGroupMembership(string $userId, string $userGroup): void - { - $parameters = [ - 'conditions' => 'user_id = :user_id:', - 'bind' => [ - 'user_id' => $userId, - ] - ]; - - // Find the existing group membership based on user ID - $curUserGroup = GroupMembers::findFirst($parameters); - - // Update or create the group membership - if ($curUserGroup === null) { - // Create a new group membership - $curUserGroup = new GroupMembers(); - $curUserGroup->user_id = $userId; - } - $curUserGroup->group_id = $userGroup; - // Save the changes to the database - if (!$curUserGroup->save()) { - Util::sysLogMsg(__METHOD__, implode($curUserGroup->getMessages()), LOG_ERR); - } - } } \ No newline at end of file diff --git a/Lib/UsersGroupsConf.php b/Lib/UsersGroupsConf.php index d53c550..12e1046 100644 --- a/Lib/UsersGroupsConf.php +++ b/Lib/UsersGroupsConf.php @@ -20,11 +20,17 @@ namespace Modules\ModuleUsersGroups\Lib; use MikoPBX\AdminCabinet\Forms\ExtensionEditForm; +use MikoPBX\Common\Models\PbxSettings; +use MikoPBX\Common\Models\Users; +use MikoPBX\Core\System\Directories; +use MikoPBX\Core\System\SystemMessages; use MikoPBX\Modules\Config\ConfigClass; +use MikoPBX\PBXCoreREST\Lib\PBXApiResult; +use Modules\ModuleUsersGroups\App\Forms\ExtensionEditAdditionalForm; +use Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroups\UpdateUserGroupAction; use Modules\ModuleUsersGroups\Models\AllowedOutboundRules; use Modules\ModuleUsersGroups\Models\GroupMembers; use Modules\ModuleUsersGroups\Models\UsersGroups as ModelUsersGroups; -use Modules\ModuleUsersGroups\App\Forms\ExtensionEditAdditionalForm; use Phalcon\Forms\Form; use Phalcon\Mvc\Micro; use Phalcon\Mvc\View; @@ -32,6 +38,11 @@ class UsersGroupsConf extends ConfigClass { + // Constants for API endpoints (PHP 7.4 compatible) + private const API_V2_EXTENSIONS_SAVE = '/api/extensions/saveRecord'; + private const API_V3_EMPLOYEES = '/pbxcore/api/v3/employees'; + private const MODULE_PREFIX = 'mod_usrgr_'; + /** * [ * 'extension-1' => 'numberGroup1', @@ -78,8 +89,8 @@ public function extensionGenAllPeersContext(): string // Check and set isolation flags based on conditions. $conf .= 'same => n,ExecIf($[ ${srcIsolate} && ${dstIsolateGroup} != 1 && dstIsolate != 1 && ${DIALPLAN_EXISTS(internal,${EXTEN},1)} != 1 ]?Set(srcIsolate=0))' . PHP_EOL; - $conf .= 'same => n,ExecIf($[ ${srcIsolate} && ${dstIsolateGroup} == 0 ]?Goto(internal-num-undefined,${EXTEN},1))' . PHP_EOL; - $conf .= 'same => n,ExecIf($[ ${srcIsolate} == 0 && ${dstIsolate} ]?Goto(internal-num-undefined,${EXTEN},1))' . PHP_EOL; + $conf .= 'same => n,ExecIf($[ ${srcIsolate} && ${dstIsolateGroup} == 0 ]?Goto(users-group-forbidden,${EXTEN},1))' . PHP_EOL; + $conf .= 'same => n,ExecIf($[ ${srcIsolate} == 0 && ${dstIsolate} ]?Goto(users-group-forbidden,${EXTEN},1))' . PHP_EOL; return $conf; } @@ -146,9 +157,50 @@ public function extensionGenContexts(): string $dialplan .= $isolateDialplan; } + // Add context for forbidden calls with voice notification + $dialplan .= $this->generateForbiddenCallContext(); + return $dialplan; } + /** + * Generate context for handling forbidden calls with voice notification + * + * This context is triggered when a user tries to call a number that is + * forbidden by their group isolation settings. It plays a custom voice + * message in the system language and provides a hook for custom implementations. + * + * Sound file structure: + * ModuleUsersGroups/sounds/{lang}/forbidden.mp3 + * Where {lang} is language code from system settings (ru, en, de, etc.) + * + * @return string The generated context as a string. + */ + private function generateForbiddenCallContext(): string + { + $conf = PHP_EOL . '[users-group-forbidden]' . PHP_EOL; + $conf .= 'exten => _X.,1,NoOp(--- Call to ${EXTEN} forbidden by UsersGroups module ---)' . PHP_EOL; + $conf .= 'same => n,Answer()' . PHP_EOL; + $conf .= 'same => n,Wait(1)' . PHP_EOL; + + // Try to play module custom sound file with automatic language selection + // Asterisk will use CHANNEL(language) to find: ModuleUsersGroups/sounds/{lang}/forbidden + // Supported formats: mp3, wav, gsm (Asterisk auto-selects best available) + $conf .= 'same => n,Playback(moduleusersgroups-forbidden)' . PHP_EOL; + + // Fallback to standard Asterisk sound if custom sound not found + // ss-noservice = "The number you have dialed is not in service" + $conf .= 'same => n,ExecIf($["${PLAYBACKSTATUS}" = "FAILED"]?Playback(ss-noservice))' . PHP_EOL; + + // Allow custom dialplan extension for additional processing + $conf .= 'same => n,GosubIf(${DIALPLAN_EXISTS(users-group-forbidden-custom,${EXTEN},1)}?users-group-forbidden-custom,${EXTEN},1)' . PHP_EOL; + + $conf .= 'same => n,Hangup()' . PHP_EOL; + $conf .= PHP_EOL; + + return $conf; + } + /** * Prepares additional parameters for each outgoing route context * before dial call in the extensions.conf file @@ -161,7 +213,9 @@ public function extensionGenContexts(): string public function generateOutRoutContext(array $rout): string { $conf = "\t" . 'same => n,ExecIf($["x${FROM_PEER}" == "x" && "${CHANNEL(channeltype)}" == "PJSIP" ]?Gosub(set_from_peer,s,1))' . " \n\t"; - $conf .= 'same => n,Set(GR_VARS=${DB(UsersGroups/${FROM_PEER})})' . " \n\t"; + // If call is forwarded, use the forwarding source peer instead of calling peer for CallerID rules + $conf .= 'same => n,Set(EFFECTIVE_FROM_PEER=${IF($["${FW_SOURCE_PEER}x" != "x"]?${FW_SOURCE_PEER}:${FROM_PEER})})' . " \n\t"; + $conf .= 'same => n,Set(GR_VARS=${DB(UsersGroups/${EFFECTIVE_FROM_PEER})})' . " \n\t"; $conf .= 'same => n,ExecIf($["${GR_VARS}x" != "x"]?Exec(Set(${GR_VARS})))' . " \n\t"; $conf .= 'same => n,ExecIf($["${GR_PERM_ENABLE}" == "1" && "${GR_ID_' . $rout['id'] . '}" != "1"]?return)' . " \n\t"; $conf .= 'same => n,ExecIf($["${GR_PERM_ENABLE}" == "1" && "${GR_CID_' . $rout['id'] . '}x" != "x"]?MSet(GR_OLD_CALLERID=${CALLERID(num)},OUTGOING_CID=${GR_CID_' . $rout['id'] . '}))' . "\n\t"; @@ -229,6 +283,9 @@ public function modelsEventChangeData($data): void */ public function onAfterModuleEnable(): void { + // Clean up orphaned group member records + RestAPI\UsersGroups\CleanupOrphanedMembersAction::main([]); + $this->getSettings(); UsersGroups::reloadConfigs(); } @@ -313,6 +370,27 @@ public function onVoltBlockCompile(string $controller, string $blockName, View $ return $result; } + /** + * Modifies the system assets. + * @see https://docs.mikopbx.com/mikopbx-development/module-developement/module-class#onafterassetsprepared + * + * @param \Phalcon\Assets\Manager $assets The assets manager for additional modifications from module. + * @param \Phalcon\Mvc\Dispatcher $dispatcher The dispatcher instance. + * + * @return void + */ + public function onAfterAssetsPrepared($assets, $dispatcher): void + { + $currentController = $dispatcher->getControllerName(); + $currentAction = $dispatcher->getActionName(); + + // Add JS for extension-modify page + if ($currentController === 'Extensions' && $currentAction === 'modify') { + $assets->collection('footerJS') + ->addJs("js/cache/ModuleUsersGroups/module-users-groups-extension-dropdown.js", true); + } + } + /** * Called from BaseForm before the form is initialized. * @see https://docs.mikopbx.com/mikopbx-development/module-developement/module-class#onbeforeforminitialize @@ -330,26 +408,274 @@ public function onBeforeFormInitialize(Form $form, $entity, $options): void } } + /** + * Process REST API requests + * @see https://docs.mikopbx.com/mikopbx-development/module-developement/module-class#modulerestapicallback + * + * @param array $request The request data + * + * @return PBXApiResult The response data + */ + public function moduleRestAPICallback(array $request): PBXApiResult + { + $action = $request['action'] ?? ''; + $data = $request['data'] ?? []; + + // Use the processor to handle the action + $processor = new \Modules\ModuleUsersGroups\Lib\RestAPI\UsersGroupsManagementProcessor(); + return $processor->callBack($action, $data); + } + /** * This method is called from RouterProvider's onAfterExecuteRoute function. * It handles the form submission and updates the user credentials. * + * Supports both: + * - Old API v2: /api/extensions/saveRecord + * - New REST API v3: API_V3_EMPLOYEES + * * @param Micro $app The micro application instance. + * @phpstan-param Micro<\MikoPBX\PBXCoreREST\Http\Request> $app * * @return void */ public function onAfterExecuteRestAPIRoute(Micro $app): void { - // Intercept the form submission of Extensions, only save action $calledUrl = $app->request->get('_url'); - if ($calledUrl!=='/api/extensions/saveRecord') { + + // Handle API v2 + if ($calledUrl === self::API_V2_EXTENSIONS_SAVE) { + $this->handleApiV2Request($app); return; } + + // Handle REST API v3 + $router = $app->getRouter(); + $matchedRoute = $router->getMatchedRoute(); + if ($matchedRoute !== null) { + $this->handleApiV3Request($app, $matchedRoute); + } + } + + /** + * Handle API v2 request: /api/extensions/saveRecord + * + * @param Micro $app The micro application instance. + * @return void + */ + private function handleApiV2Request(Micro $app): void + { $response = json_decode($app->response->getContent()); - if (!empty($response->result) and $response->result===true){ - // Intercept the form submission of Extensions with fields mod_usrgr_select_group and user_id - $postData = $app->request->getPost(); - UsersGroups::updateUserGroup($postData); + + if (!$this->isSuccessfulResponseV2($response)) { + return; + } + + $postData = $app->request->getPost(); + if (!$this->hasModuleData($postData)) { + return; + } + + // Execute update through REST API Action + $result = UpdateUserGroupAction::main($postData); + + // Log the result + if (!$result->success) { + SystemMessages::sysLogMsg( + __METHOD__, + "REST API v2: Failed to update group: " . implode(', ', $result->messages), + LOG_ERR + ); + } + } + + /** + * Handle REST API v3 request: API_V3_EMPLOYEES + * + * @param Micro $app The micro application instance. + * @param mixed $matchedRoute The matched route object. + * @return void + */ + private function handleApiV3Request(Micro $app, $matchedRoute): void + { + $pattern = $matchedRoute->getPattern(); + $httpMethod = $app->request->getMethod(); + + // Check if this is an employee-related request + $isEmployeeRoute = strpos($pattern, self::API_V3_EMPLOYEES) === 0; + if (!$isEmployeeRoute) { + return; + } + + // Handle POST/PUT requests - save group data + if (in_array($httpMethod, ['POST', 'PUT'], true)) { + /** @var \MikoPBX\PBXCoreREST\Http\Request $request */ + $request = $app->request; + $requestData = $request->getData(); + $response = json_decode($app->response->getContent(), false); + + $this->processEmployeeGroupUpdate($requestData, $response); + } + } + + /** + * Check if API v2 response is successful + * + * @param mixed $response The decoded JSON response + * @return bool True if successful + */ + private function isSuccessfulResponseV2($response): bool + { + return !empty($response->result) && $response->result === true; + } + + /** + * Check if POST data contains module-specific fields + * PHP 7.4 compatible - using strpos instead of str_starts_with + * + * @param array $postData The POST data array + * @return bool True if module data exists + */ + private function hasModuleData(array $postData): bool + { + foreach (array_keys($postData) as $key) { + if (strpos($key, self::MODULE_PREFIX) === 0) { + return true; + } + } + return false; + } + + + + /** + * Process employee group update for REST API v3 + * + * @param array $requestData The request data + * @param mixed $response The decoded JSON response + * @return void + */ + private function processEmployeeGroupUpdate(array $requestData, $response): void + { + // Extract IDs from request and response + $employeeId = $response->data->id ?? null; + $groupId = $requestData['mod_usrgr_select_group'] ?? null; + + // Validate employee ID (silent fail) + if (!$this->isValidEmployeeId($employeeId)) { + return; + } + + // Skip if no group data or empty string (silent fail) + if ($groupId === null || $groupId === '') { + return; + } + + // Validate group ID (silent fail) + if (!$this->isValidGroupId($groupId)) { + return; + } + + // Prepare and execute update through REST API Action + $postData = [ + 'mod_usrgr_select_group' => $groupId, + 'user_id' => $employeeId, + 'number' => $requestData['number'] ?? null + ]; + + $result = UpdateUserGroupAction::main($postData); + + // Log the result + if ($result->success) { + SystemMessages::sysLogMsg( + __METHOD__, + "REST API v3: Updated group for employee #{$employeeId} to group #{$groupId}", + LOG_INFO + ); + } else { + SystemMessages::sysLogMsg( + __METHOD__, + "REST API v3: Failed to update group for employee #{$employeeId}: " . implode(', ', $result->messages), + LOG_ERR + ); + } + } + + /** + * Validate employee ID + * PHP 7.4 compatible validation + * + * @param mixed $employeeId The employee ID to validate + * @return bool True if valid + */ + private function isValidEmployeeId($employeeId): bool + { + return $employeeId !== null + && $employeeId !== '' + && is_numeric($employeeId); + } + + /** + * Validate group ID + * PHP 7.4 compatible validation + * + * @param mixed $groupId The group ID to validate + * @return bool True if valid + */ + private function isValidGroupId($groupId): bool + { + return is_numeric($groupId); + } + + /** + * Clean up orphaned group member records + * + * Removes GroupMembers records that reference non-existent users. + * This happens after module reinstallation or restore from backup + * when employee records no longer exist in the main database. + * + * @return void + */ + private function cleanupOrphanedGroupMembers(): void + { + try { + // Get valid user IDs using simple find (works cross-database) + $validUsers = Users::find(['columns' => 'id']); + + if (count($validUsers) === 0) { + SystemMessages::sysLogMsg(__METHOD__, 'No users in system, skipping cleanup', LOG_INFO); + return; + } + + // Build list of valid user IDs + $validIds = []; + foreach ($validUsers as $user) { + $validIds[] = (int)$user->id; + } + + // Get module database connection through model + $connection = GroupMembers::getReadConnection(); + $validIdsList = implode(',', $validIds); + + // Use direct SQL DELETE for performance + $sql = "DELETE FROM m_ModuleUsersGroups_GroupMembers WHERE user_id NOT IN ({$validIdsList})"; + $success = $connection->execute($sql); + $deletedCount = $success ? $connection->affectedRows() : 0; + + // Log cleanup results + if ($deletedCount > 0) { + SystemMessages::sysLogMsg( + __METHOD__, + "Cleaned up {$deletedCount} orphaned group member record(s)", + LOG_INFO + ); + } + } catch (\Throwable $e) { + SystemMessages::sysLogMsg( + __METHOD__, + "Failed to cleanup orphaned members: " . $e->getMessage(), + LOG_ERR + ); } } } \ No newline at end of file diff --git a/Messages/fa.php b/Messages/fa.php new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/Messages/fa.php @@ -0,0 +1 @@ + 'ダイヤル グループ モジュール - %repesent%', + 'repModuleUsersGroups' => 'ダイヤルグループモジュール - %repesent%', 'mo_ModuleModuleUsersGroups' => 'ダイヤルグループ管理', 'BreadcrumbModuleUsersGroups' => 'ダイヤルグループ管理', - 'SubHeaderModuleUsersGroups' => '発信通話の権限の設定、発信 CallerID の管理、コール ピックアップ グループの整理', + 'SubHeaderModuleUsersGroups' => '発信通話の権限の設定、発信者IDの管理、通話ピックアップグループの編成', 'mod_usrgr_Connected' => 'モジュールが接続されています', 'mod_usrgr_Disconnected' => 'モジュールが無効になっています', 'mod_usrgr_Groups' => 'ダイヤルグループリスト', @@ -26,21 +26,21 @@ 'mod_usrgr_RoutingRules' => 'アウトバウンドルーティングルール', 'mod_usrgr_ColumnCallerId' => '発信者ID', 'mod_usrgr_SelectMemberToAddToGroup' => '従業員を選択する', - 'mod_usrgr_PatternsInstructions7' => '7XXXXXXXXXX - 7 で始まる任意の 11 桁の数字', + 'mod_usrgr_PatternsInstructions7' => '7XXXXXXXXXX - 7で始まる11桁の数字', 'mod_usrgr_DefaultGroup' => 'デフォルトグループ', - 'mod_usrgr_patterns' => 'グループに関連する数字のパターン。グループメンバーは通話のみ可能です', + 'mod_usrgr_patterns' => 'グループに関連する番号のパターン。グループメンバーは、その番号にのみ電話をかけることができます', 'mod_usrgr_isolate' => '従業員のグループを隔離する', - 'mod_usrgr_SelectUserGroup' => '従業員のダイヤル プランを選択します', + 'mod_usrgr_SelectUserGroup' => '従業員のダイヤルプランを選択します', 'mod_usrgr_isolatePickUp' => 'ピックアップ機能を分離する', 'mod_usrgr_PatternsInstructions3' => ' ', 'BreadcrumbModuleUsersGroupsModify' => 'ダイヤルプランの設定', 'mod_usrgr_PatternsInstructions4' => 'テンプレートの例:', - 'mod_usrgr_PatternsInstructions1' => 'パターンでは、1 ～ 9 の文字と文字 X (1 ～ 9 の任意の数字) を使用できます。', - 'mod_usrgr_PatternsInstructions5' => '2XX - 200 から 299 までの数字', - 'mod_usrgr_PatternsInstructions6' => '200001 - 明示的に指定された内部番号 (キュー番号など)', - 'mod_usrgr_PatternsInstructions2' => 'グループメンバーは、パターンに一致する番号のみをダイヤルできます。', + 'mod_usrgr_PatternsInstructions1' => 'パターンでは、1 ～ 9 の文字と文字 X (1 ～ 9 の任意の数字) を使用できます', + 'mod_usrgr_PatternsInstructions5' => '2XX - 200から299までの数字', + 'mod_usrgr_PatternsInstructions6' => '200001 - 明示的に指定された内部番号（例：キュー番号）', + 'mod_usrgr_PatternsInstructions2' => 'グループメンバーは、パターンに一致する番号のみをダイヤルできます', 'mod_usrgr_IsolateInstructions1' => 'グループメンバーは、自分のグループの番号にのみ電話をかけることができます。', - 'mod_usrgr_IsolateInstructions2' => '他のグループの従業員は、隔離されたグループに電話をかけることができなくなります。', + 'mod_usrgr_IsolateInstructions2' => '他のグループの従業員は、分離されたグループに電話をかけることができません。', 'mod_usrgr_ColumnDefaultGroup' => 'デフォルトグループ', 'mod_usrgr_ErrorOnDeleteDefaultGroup' => 'デフォルトグループを削除できません', 'mod_usrgr_SelectDefaultGroup' => 'グループを選択してください', diff --git a/Models/UsersGroups.php b/Models/UsersGroups.php index f60fe62..e3df0da 100644 --- a/Models/UsersGroups.php +++ b/Models/UsersGroups.php @@ -107,4 +107,45 @@ public function initialize(): void ); } + /** + * Get user's group by user_id + * + * @param int|string $userId User ID from Users table + * @return int|null Group ID or null if not found + */ + public static function getUserGroupId($userId): ?int + { + if (empty($userId)) { + return null; + } + + // Find user's group membership + $groupMember = GroupMembers::findFirst([ + 'conditions' => 'user_id = :user_id:', + 'bind' => ['user_id' => $userId] + ]); + + if ($groupMember !== null) { + return (int)$groupMember->group_id; + } + + // Return default group if user has no group assigned + $defaultGroup = self::findFirst('defaultGroup=1'); + if ($defaultGroup) { + return (int)$defaultGroup->id; + } + + return null; + } + + /** + * Get default group + * + * @return UsersGroups|null + */ + public static function getDefaultGroup(): ?UsersGroups + { + return self::findFirst('defaultGroup=1'); + } + } \ No newline at end of file diff --git a/README.md b/README.md index f233026..e348d49 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,276 @@ -## Module Users Groups +# Phone Groups Management Module -This module provides functionality for managing user groups and their associated permissions, including: +The Phone Groups Management module for MikoPBX allows you to organize employees into groups with customizable calling permissions and restrictions. This provides flexible access control and helps enforce corporate calling policies. -**Inputs** +## Overview -* **Group Name**: Defines a unique name for the user group. -* **Description**: A brief explanation or details about the purpose of the group. -* **Patterns**: A list of number patterns that group members are allowed to call. This can include specific numbers, ranges, or patterns using wildcards. -* **Isolate**: Enables isolation for the group, restricting members to call only within their group or to numbers matching the defined patterns. -* **Isolate Pickup**: Enables isolation for the call pickup function, allowing only group members to pick up calls from other members within the same group. -* **Default Group**: Sets a specific group as the default group for new users. -* **Users**: Selects individual users to assign to a specific group. -* **Routing Rules**: Defines outbound routing rules and applies them to specific groups, along with custom caller IDs for each rule. +This module enables administrators to: -**Outputs** +- **Organize users into groups** - Create departments, teams, or any logical groupings +- **Control calling permissions** - Restrict who can call whom based on group membership +- **Manage outbound routing** - Control which groups can use specific outbound routes +- **Customize caller IDs** - Set different caller IDs per group for outbound calls +- **Isolate call pickup** - Limit call pickup functionality within groups +- **Voice notifications** - Play customizable messages when calls are restricted -* **User Groups**: Creates and manages user groups with the specified settings. -* **Group Membership**: Assigns individual users to specific groups. -* **Call Restrictions**: Implements call restrictions based on group settings, allowing or denying calls based on isolation and defined patterns. -* **Call Pickup Restrictions**: Implements restrictions on call pickup based on group settings, allowing only members within the same group to pick up calls from each other. -* **Outbound Routing Rules**: Applies outbound routing rules to specific groups and sets custom caller IDs for those rules. +## Key Features -This module enhances call management and security by providing granular control over user permissions and call routing based on group affiliations. It allows administrators to define specific communication policies for different user groups, ensuring efficient and secure call handling within the organization. \ No newline at end of file +### Phone Groups Management + +Create unlimited user groups and assign employees to them. Each group can have: + +- **Unique name and description** for easy identification +- **Custom calling patterns** - Define which numbers the group can call +- **Isolation settings** - Restrict calls within the group or to specific patterns +- **Default group** - Automatically assign new users to a designated group + +### Call Restrictions + +#### Isolation Mode + +When isolation is enabled for a group: +- Members can only call other members within the same group +- Members can call external numbers matching defined patterns +- Members cannot call users in other groups +- Users outside the group can still call isolated members + +**Example patterns:** +``` +_7XXX # 4-digit internal numbers starting with 7 +_8XXXXXXXXXX # 11-digit numbers starting with 8 +*80 # Specific service codes +911 # Emergency numbers +``` + +#### Use Cases + +- **Reception Group** - No restrictions, can call everyone +- **Finance Department** - Isolated to internal finance team + specific external numbers +- **Sales Team** - Can call within team + customer number patterns +- **Management** - No restrictions, full access + +### Outbound Route Control + +Assign specific outbound routes to groups and set custom caller IDs: + +- Control which groups can use expensive international routes +- Display department-specific caller IDs for outbound calls +- Prevent unauthorized use of premium routes +- Automatically restore original caller ID after call completion + +### Call Pickup Restrictions + +When pickup isolation is enabled: +- Users can only pick up calls from their group members +- Prevents accidental or unauthorized call interception +- Maintains privacy within departments + +### Voice Notifications + +When a user attempts a forbidden call: +- System plays a customizable voice message +- Supports 30+ languages with automatic selection +- Falls back to standard system message if custom audio unavailable +- Allows custom call handling hooks for advanced scenarios + +## Installation + +### Requirements + +- MikoPBX version **2023.2.179** or higher +- PHP 7.4 or higher + +### Installation Steps + +1. Open MikoPBX web interface +2. Navigate to **System** → **Extension Modules** +3. Click **Upload Module** and select the module file +4. Click **Enable** to activate the module +5. The module menu will appear in **Routing** → **Phone Groups Management** + +## Configuration + +### Creating Your First Group + +1. Go to **Routing** → **Phone Groups Management** +2. Click **Add Group** button +3. Enter group information: + - **Name** - Unique identifier (e.g., "Sales Department") + - **Description** - Optional detailed description +4. Configure isolation (if needed): + - Enable **Isolation** checkbox to restrict calls + - Add allowed number patterns (one per line) +5. Assign users: + - Switch to **Users** tab + - Drag users from available to selected list +6. Configure outbound routes (optional): + - Switch to **Outbound Rules** tab + - Check allowed routes + - Enter custom caller ID for each route +7. Click **Save** + +### Setting a Default Group + +After creating a group, set it as default and it will be automatically assigned to all employees. + +**Note:** New users will automatically be assigned to the default group. + +### Assigning Users to Groups + +**Method 1: During group creation** +- Use the Users tab to select group members + +**Method 2: From Users tab** +- Go to **Routing** → **Phone Groups Management** → **Users** tab +- Use the dropdown in each user's row to change their group + +**Method 3: When editing employee card** +- Go to **Employees** → **Open employee card** +- Select group and save + +### Configuring Call Restrictions + +To restrict calling for a group: + +1. Edit the group +2. Enable **Isolation** checkbox +3. Add allowed patterns in the text area (one per line) +4. Save changes + +**Pattern Examples:** +- `_7XXX` - Allow 4-digit numbers starting with 7 +- `_8[0-5]XXXXXXX` - Allow 8-digit numbers starting with 8,80,81,82,83,84,85 +- `*80` - Allow specific code +- `911` - Allow emergency number + +**Testing:** +- Call from isolated user to another member in same group → Should work +- Call from isolated user to number matching pattern → Should work +- Call from isolated user to non-matching number → Should be blocked + +### Configuring Outbound Routes + +To control which routes a group can use: + +1. Edit the group +2. Go to **Outbound Rules** tab +3. Check routes this group should access +4. Optionally enter custom caller ID for each route +5. Save changes + +**Example:** +- Sales group: Allow "Local" and "Toll Free" routes with caller ID 555-0100 +- Support group: Allow "Local" only with caller ID 555-0200 +- Management: Allow all routes without custom caller IDs + +## Voice Notifications Setup + +### Basic Setup + +The module automatically plays a message when calls are blocked. By default, it uses the standard Asterisk "number not in service" message. + +## REST API + +The module provides REST API endpoints for integration with external systems. + +**Base URL:** `http://your-pbx.com/pbxcore/api/modules/ModuleUsersGroups/` + +### Available Actions + +- `getUserGroup` - Get user's assigned group +- `updateUserGroup` - Change user's group membership +- `getDefaultGroup` - Get the default group +- `setDefaultGroup` - Set a group as default +- `getGroupsStats` - Get member counts for all groups +- `cleanupOrphanedMembers` - Remove invalid group memberships + +## Troubleshooting + +### Users Not Restricted Despite Isolation + +**Check:** +1. User is actually assigned to the isolated group +2. Called number doesn't match allowed patterns + +### Outbound Routes Not Respecting Permissions + +**Check:** +1. Group has route enabled in Outbound Rules tab +2. Module is enabled and configuration reloaded + +**Solution:** +Disable and re-enable the module to rebuild configuration. + +### Call Pickup Not Isolated + +**Check:** +1. Pickup isolation checkbox is enabled for the group +2. Both users are in the same group + +### Changes Not Taking Effect + +After making any changes: +1. Save the group settings +2. Wait for automatic configuration reload (5-10 seconds) + +## FAQ + +**Q: Can I assign a user to multiple groups?** +A: No, each user can only belong to one group at a time. + +**Q: What happens if I delete a group?** +A: Users from the deleted group will be automatically moved to the default group. + +**Q: Can I delete the default group?** +A: No, you must first set another group as default before deleting it. + +**Q: Do isolated groups block emergency calls?** +A: No, if you include emergency patterns (like 911) in allowed patterns, they will work. + +**Q: Can non-isolated users call isolated users?** +A: Yes, isolation only restricts outgoing calls from isolated group members. + +**Q: How many groups can I create?** +A: Unlimited. The module doesn't impose any limit on the number of groups. + +**Q: Will isolation work for SIP trunks?** +A: Yes, isolation works for all call types - internal, external, and trunk calls. + +**Q: Can I use different voice messages for different groups?** +A: Currently, one message per language is used for all groups. Custom per-group messages require custom dialplan modifications. + +## Support + +### Documentation + +- **English:** [https://docs.mikopbx.com/mikopbx/v/english/modules/miko/module-users-groups](https://docs.mikopbx.com/mikopbx/v/english/modules/miko/module-users-groups) +- **Russian:** [https://docs.mikopbx.com/mikopbx/modules/miko/module-users-groups](https://docs.mikopbx.com/mikopbx/modules/miko/module-users-groups) + +### Contact + +- **Email:** help@miko.ru +- **Developer:** MIKO LLC +- **Website:** [https://www.mikopbx.com](https://www.mikopbx.com) + +### System Requirements + +- **Minimum MikoPBX Version:** 2023.2.179 +- **PHP Version:** 7.4 or higher + +## License + +This module is licensed under the GNU GPL v3.0. See the [LICENSE](LICENSE) file for details. + +--- + +## Recent Updates + +**Version November 2025:** +- Added voice notification system with multi-language support +- Automatic fallback to standard Asterisk sounds +- Fixed auto-population of users when setting default group +- Added cleanup of old group membership records after backup restoration when some employees were deleted +- Improved REST API with dedicated action classes +- Enhanced error handling and logging + +--- \ No newline at end of file diff --git a/README_RU.md b/README_RU.md new file mode 100644 index 0000000..5580a87 --- /dev/null +++ b/README_RU.md @@ -0,0 +1,279 @@ +# Модуль "Управление телефонными группами" + +Модуль "Управление телефонными группами" для MikoPBX позволяет организовывать сотрудников в группы с настраиваемыми правами на звонки и ограничениями. Это обеспечивает гибкий контроль доступа и помогает соблюдать корпоративные политики звонков. + +## Описание + +Модуль позволяет администраторам: + +- **Организовывать пользователей в группы** - создавать отделы, команды или любые логические группировки +- **Контролировать права на звонки** - ограничивать, кто может звонить кому на основе принадлежности к группе +- **Управлять исходящей маршрутизацией** - контролировать, какие группы могут использовать определенные исходящие маршруты +- **Настраивать caller ID** - устанавливать разные номера определителя для исходящих звонков по группам +- **Изолировать перехват вызовов** - ограничивать функцию перехвата вызовов внутри групп +- **Голосовые уведомления** - воспроизводить настраиваемые сообщения при ограничении звонков + +## Основные возможности + +### Управление телефонными группами + +Создавайте неограниченное количество групп пользователей и назначайте в них сотрудников. Каждая группа может иметь: + +- **Уникальное название и описание** для простой идентификации +- **Пользовательские шаблоны звонков** - определение номеров, на которые группа может звонить +- **Настройки изоляции** - ограничение звонков внутри группы или на определенные шаблоны +- **Группа по умолчанию** - автоматическое назначение новых пользователей в выбранную группу + +### Ограничения звонков + +#### Режим изоляции + +Когда для группы включена изоляция: +- Члены группы могут звонить только другим членам той же группы +- Члены группы могут звонить на внешние номера, соответствующие определенным шаблонам +- Члены группы не могут звонить пользователям из других групп +- Пользователи вне группы все еще могут звонить изолированным членам + +**Примеры шаблонов:** +``` +_7XXX # 4-значные внутренние номера, начинающиеся с 7 +_8XXXXXXXXXX # 11-значные номера, начинающиеся с 8 +*80 # Конкретные сервисные коды +112 # Экстренные номера +``` + +#### Примеры использования + +- **Группа ресепшн** - без ограничений, может звонить всем +- **Финансовый отдел** - изолирован на внутренние номера финансов + конкретные внешние номера +- **Отдел продаж** - может звонить внутри команды + шаблоны номеров клиентов +- **Руководство** - без ограничений, полный доступ + +### Контроль исходящих маршрутов + +Назначайте определенные исходящие маршруты группам и устанавливайте пользовательские caller ID: + +- Контролируйте, какие группы могут использовать дорогие международные маршруты +- Отображайте определители номера конкретных отделов для исходящих звонков +- Предотвращайте несанкционированное использование премиум-маршрутов +- Автоматически восстанавливайте исходный caller ID после завершения звонка + +### Ограничения перехвата вызовов + +Когда включена изоляция перехвата: +- Пользователи могут перехватывать только звонки членов своей группы +- Предотвращается случайный или несанкционированный перехват вызовов +- Сохраняется конфиденциальность внутри отделов + +### Голосовые уведомления + +Когда пользователь пытается совершить запрещенный звонок: +- Система воспроизводит настраиваемое голосовое сообщение +- Поддержка 30+ языков с автоматическим выбором +- Резервный вариант со стандартным системным сообщением, если пользовательское аудио недоступно +- Возможность использования пользовательских хуков обработки вызовов для расширенных сценариев + +## Установка + +### Требования + +- MikoPBX версии **2023.2.179** или выше +- PHP 7.4 или выше + +### Шаги установки + +1. Откройте веб-интерфейс MikoPBX +2. Перейдите в **Система** → **Модули расширений** +3. Нажмите **Загрузить модуль** и выберите файл модуля +4. Нажмите **Включить** для активации модуля +5. Меню модуля появится в **Маршрутизация** → **Управление телефонными группами** + +## Настройка + +### Создание первой группы + +1. Перейдите в **Маршрутизация** → **Управление телефонными группами** +2. Нажмите кнопку **Добавить группу** +3. Введите информацию о группе: + - **Название** - уникальный идентификатор (например, "Отдел продаж") + - **Описание** - необязательное подробное описание +4. Настройте изоляцию (при необходимости): + - Включите чекбокс **Изоляция** для ограничения звонков + - Добавьте разрешенные шаблоны номеров (по одному на строку) +5. Назначьте пользователей: + - Переключитесь на вкладку **Пользователи** + - Перетащите пользователей из доступного списка в выбранный +6. Настройте исходящие маршруты (опционально): + - Переключитесь на вкладку **Исходящие правила** + - Отметьте разрешенные маршруты + - Введите пользовательский caller ID для каждого маршрута +7. Нажмите **Сохранить** + +### Установка группы по умолчанию + +После создания группы укажите ее группой по умолчанию и она автоматически прсвоится всем сотрудникам. + +**Примечание:** Новые пользователи будут автоматически назначаться в группу по умолчанию. + +### Назначение пользователей в группы + +**Способ 1: При создании группы** +- Используйте вкладку "Пользователи" для выбора членов группы + +**Способ 2: Из вкладки "Пользователи"** +- Перейдите в **Маршрутизация** → **Управление телефонными группами** → вкладка **Пользователи** +- Используйте выпадающий список в строке каждого пользователя для смены группы + +**Способ 3: При редактировании карточки сотрудника** +- Перейдите в **Сотрудники** → **Откройте карточку** +- Выберите группу и сохраните + +### Настройка ограничений звонков + +Чтобы ограничить звонки для группы: + +1. Отредактируйте группу +2. Включите чекбокс **Изоляция** +3. Добавьте разрешенные шаблоны в текстовое поле (по одному на строку) +4. Сохраните изменения + +**Примеры шаблонов:** +- `_7XXX` - Разрешить 4-значные номера, начинающиеся с 7 +- `_8[0-5]XXXXXXX` - Разрешить 8-значные номера, начинающиеся с 8,80,81,82,83,84,85 +- `*80` - Разрешить конкретный код +- `112` - Разрешить экстренный номер + +**Тестирование:** +- Звонок от изолированного пользователя другому члену той же группы → Должен работать +- Звонок от изолированного пользователя на номер, соответствующий шаблону → Должен работать +- Звонок от изолированного пользователя на несоответствующий номер → Должен быть заблокирован + +### Настройка исходящих маршрутов + +Чтобы контролировать, какие маршруты может использовать группа: + +1. Отредактируйте группу +2. Перейдите на вкладку **Исходящие правила** +3. Отметьте маршруты, к которым должна иметь доступ эта группа +4. Опционально введите пользовательский caller ID для каждого маршрута +5. Сохраните изменения + +**Пример:** +- Группа продаж: Разрешить маршруты "Городские" и "Бесплатные" с caller ID 555-0100 +- Группа поддержки: Разрешить только "Городские" с caller ID 555-0200 +- Руководство: Разрешить все маршруты без пользовательских caller ID + +## Настройка голосовых уведомлений + +### Базовая настройка + +Модуль автоматически воспроизводит сообщение при блокировке звонков. По умолчанию используется стандартное сообщение Asterisk "номер не обслуживается". + + +## REST API + +Модуль предоставляет REST API эндпоинты для интеграции с внешними системами. + +**Базовый URL:** `http://your-pbx.com/pbxcore/api/modules/ModuleUsersGroups/` + +### Доступные действия + +- `getUserGroup` - Получить назначенную группу пользователя +- `updateUserGroup` - Изменить членство пользователя в группе +- `getDefaultGroup` - Получить группу по умолчанию +- `setDefaultGroup` - Установить группу по умолчанию +- `getGroupsStats` - Получить количество членов для всех групп +- `cleanupOrphanedMembers` - Удалить недействительные членства в группах + + +## Устранение неполадок + +### Пользователи не ограничены, несмотря на изоляцию + +**Проверьте:** +1. Пользователь действительно назначен в изолированную группу +2. Набираемый номер не соответствует разрешенным шаблонам + + +### Исходящие маршруты не учитывают права + +**Проверьте:** +1. Для группы включен маршрут на вкладке "Исходящие правила" +2. Модуль включен и конфигурация перезагружена + +**Решение:** +Отключите и снова включите модуль для пересоздания конфигурации. + +### Перехват вызовов не изолирован + +**Проверьте:** +1. Чекбокс изоляции перехвата включен для группы +2. Оба пользователя находятся в одной группе + +### Изменения не вступают в силу + +После внесения любых изменений: +1. Сохраните настройки группы +2. Дождитесь автоматической перезагрузки конфигурации (5-10 секунд) + +## Часто задаваемые вопросы + +**В: Могу ли я назначить пользователя в несколько групп?** +О: Нет, каждый пользователь может принадлежать только к одной группе одновременно. + +**В: Что происходит при удалении группы?** +О: Пользователи из удаленной группы будут автоматически перемещены в группу по умолчанию. + +**В: Могу ли я удалить группу по умолчанию?** +О: Нет, сначала необходимо установить другую группу по умолчанию перед ее удалением. + +**В: Изолированные группы блокируют экстренные вызовы?** +О: Нет, если вы включите экстренные шаблоны (например, 112) в разрешенные шаблоны, они будут работать. + +**В: Могут ли неизолированные пользователи звонить изолированным пользователям?** +О: Да, изоляция ограничивает только исходящие звонки от членов изолированной группы. + +**В: Сколько групп я могу создать?** +О: Неограниченно. Модуль не накладывает никаких ограничений на количество групп. + +**В: Будет ли изоляция работать для SIP транков?** +О: Да, изоляция работает для всех типов звонков - внутренних, внешних и через транки. + +**В: Могу ли я использовать разные голосовые сообщения для разных групп?** +О: В настоящее время используется одно сообщение на язык для всех групп. Пользовательские сообщения для каждой группы требуют модификаций диалплана. + +## Поддержка + +### Документация + +- **Английский:** [https://docs.mikopbx.com/mikopbx/v/english/modules/miko/module-users-groups](https://docs.mikopbx.com/mikopbx/v/english/modules/miko/module-users-groups) +- **Русский:** [https://docs.mikopbx.com/mikopbx/modules/miko/module-users-groups](https://docs.mikopbx.com/mikopbx/modules/miko/module-users-groups) + +### Контакты + +- **Email:** help@miko.ru +- **Разработчик:** MIKO LLC +- **Веб-сайт:** [https://www.mikopbx.com](https://www.mikopbx.com) + +### Системные требования + +- **Минимальная версия MikoPBX:** 2023.2.179 +- **Версия PHP:** 7.4 или выше + +## Лицензия + +Этот модуль лицензирован под GNU GPL v3.0. См. файл [LICENSE](LICENSE) для деталей. + +--- + +## Последние обновления + +**Версия Ноябрь 2025:** +- Добавлена система голосовых уведомлений с поддержкой многоязычности +- Автоматический резервный вариант со стандартными звуками Asterisk +- Исправлено автоматическое заполнение пользователей при установке группы по умолчанию +- Добавлена очистка зтарых записей членства в группе при восстановлении из бекапа, когда часть сотрудников было удалено. +- Улучшен REST API с выделенными классами действий +- Расширена обработка ошибок и логирование + +--- \ No newline at end of file diff --git a/Sounds/ru-ru/forbidden.mp3 b/Sounds/ru-ru/forbidden.mp3 new file mode 100644 index 0000000..1d29cfa Binary files /dev/null and b/Sounds/ru-ru/forbidden.mp3 differ diff --git a/public/assets/js/module-users-groups-extension-dropdown.js b/public/assets/js/module-users-groups-extension-dropdown.js new file mode 100644 index 0000000..c407b0f --- /dev/null +++ b/public/assets/js/module-users-groups-extension-dropdown.js @@ -0,0 +1,155 @@ +"use strict"; + +/* + * MikoPBX - free phone system for small business + * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. + * If not, see . + */ + +/* global globalRootUrl, PbxApi */ + +/** + * ModuleUsersGroupsExtensionDropdown - Initialize user groups dropdown on extension edit page + * Works with both old and new MikoPBX releases via FormPopulated event + */ +var ModuleUsersGroupsExtensionDropdown = { + /** + * jQuery object for the dropdown + */ + $dropdown: $('#mod_usrgr_select_group_dropdown'), + + /** + * Hidden input field for storing selected value + */ + $hiddenInput: $('#mod_usrgr_select_group'), + + /** + * Initialize the dropdown + */ + initialize: function initialize() { + // Check if dropdown element exists + if (ModuleUsersGroupsExtensionDropdown.$dropdown.length === 0) { + return; + } // Initialize Fomantic UI dropdown (items are already in HTML from server) + + + ModuleUsersGroupsExtensionDropdown.$dropdown.dropdown({ + onChange: function onChange(value) { + // Sync value to hidden input + ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(value); // Trigger form change to enable save button + + if (typeof Form !== 'undefined' && typeof Form.dataChanged === 'function') { + Form.dataChanged(); + } + }, + clearable: false, + fullTextSearch: true, + forceSelection: false + }); // Smart initialization - check if user_id or id exists in DOM + // Old release: + // New release: + + var userId = $('#user_id').val() || $('#id').val(); + + if (userId && userId !== '' && userId !== 'new') { + // Existing user - load their group + ModuleUsersGroupsExtensionDropdown.loadUserGroup(userId); + } else { + // New user - load default group + ModuleUsersGroupsExtensionDropdown.loadDefaultGroup(); + } // Listen for form population event (for new release with AJAX forms) + + + $(document).on('FormPopulated', function (event, formData) { + // Get user ID from DOM (new release always uses 'id') + var populatedUserId = $('#id').val(); + + if (populatedUserId && populatedUserId !== '' && populatedUserId !== 'new') { + // Load user's actual group (will override default) + ModuleUsersGroupsExtensionDropdown.loadUserGroup(populatedUserId); + } + }); + }, + + /** + * Update dropdown value from hidden input + */ + updateDropdownValue: function updateDropdownValue() { + var value = ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(); + + if (value && value !== '') { + ModuleUsersGroupsExtensionDropdown.$dropdown.dropdown('set selected', String(value)); + } + }, + + /** + * Load default group from module API + */ + loadDefaultGroup: function loadDefaultGroup() { + $.ajax({ + url: '/pbxcore/api/modules/ModuleUsersGroups/getDefaultGroup', + method: 'POST', + dataType: 'json', + success: function success(response) { + if (response.result === true && response.data && response.data.group_id) { + // Set value to hidden input + ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(response.data.group_id); // Update dropdown + + ModuleUsersGroupsExtensionDropdown.updateDropdownValue(); + } + }, + error: function error(xhr, status, _error) { + console.error('ModuleUsersGroups: Failed to load default group', _error); + } + }); + }, + + /** + * Load user's group from module API + * @param {string|number} userId - User ID + */ + loadUserGroup: function loadUserGroup(userId) { + if (!userId) { + // For new users, load default group + ModuleUsersGroupsExtensionDropdown.loadDefaultGroup(); + return; + } + + $.ajax({ + url: '/pbxcore/api/modules/ModuleUsersGroups/getUserGroup', + method: 'POST', + dataType: 'json', + data: { + user_id: userId + }, + success: function success(response) { + if (response.result === true && response.data && response.data.group_id) { + // Set value to hidden input + ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(response.data.group_id); // Update dropdown + + ModuleUsersGroupsExtensionDropdown.updateDropdownValue(); + } + }, + error: function error(xhr, status, _error2) { + console.error('ModuleUsersGroups: Failed to load user group', _error2); + } + }); + } +}; // Initialize when document is ready + +$(document).ready(function () { + ModuleUsersGroupsExtensionDropdown.initialize(); +}); +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["src/module-users-groups-extension-dropdown.js"],"names":["ModuleUsersGroupsExtensionDropdown","$dropdown","$","$hiddenInput","initialize","length","dropdown","onChange","value","val","Form","dataChanged","clearable","fullTextSearch","forceSelection","userId","loadUserGroup","loadDefaultGroup","document","on","event","formData","populatedUserId","updateDropdownValue","String","ajax","url","method","dataType","success","response","result","data","group_id","error","xhr","status","console","user_id","ready"],"mappings":"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","sourcesContent":["/*\n * MikoPBX - free phone system for small business\n * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation; either version 3 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License along with this program.\n * If not, see <https://www.gnu.org/licenses/>.\n */\n\n/* global globalRootUrl, PbxApi */\n\n/**\n * ModuleUsersGroupsExtensionDropdown - Initialize user groups dropdown on extension edit page\n * Works with both old and new MikoPBX releases via FormPopulated event\n */\nconst ModuleUsersGroupsExtensionDropdown = {\n    /**\n     * jQuery object for the dropdown\n     */\n    $dropdown: $('#mod_usrgr_select_group_dropdown'),\n\n    /**\n     * Hidden input field for storing selected value\n     */\n    $hiddenInput: $('#mod_usrgr_select_group'),\n\n    /**\n     * Initialize the dropdown\n     */\n    initialize() {\n        // Check if dropdown element exists\n        if (ModuleUsersGroupsExtensionDropdown.$dropdown.length === 0) {\n            return;\n        }\n\n        // Initialize Fomantic UI dropdown (items are already in HTML from server)\n        ModuleUsersGroupsExtensionDropdown.$dropdown.dropdown({\n            onChange(value) {\n                // Sync value to hidden input\n                ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(value);\n\n                // Trigger form change to enable save button\n                if (typeof Form !== 'undefined' && typeof Form.dataChanged === 'function') {\n                    Form.dataChanged();\n                }\n            },\n            clearable: false,\n            fullTextSearch: true,\n            forceSelection: false\n        });\n\n        // Smart initialization - check if user_id or id exists in DOM\n        // Old release: <input name=\"user_id\">\n        // New release: <input name=\"id\">\n        const userId = $('#user_id').val() || $('#id').val();\n\n        if (userId && userId !== '' && userId !== 'new') {\n            // Existing user - load their group\n            ModuleUsersGroupsExtensionDropdown.loadUserGroup(userId);\n        } else {\n            // New user - load default group\n            ModuleUsersGroupsExtensionDropdown.loadDefaultGroup();\n        }\n\n        // Listen for form population event (for new release with AJAX forms)\n        $(document).on('FormPopulated', (event, formData) => {\n            // Get user ID from DOM (new release always uses 'id')\n            const populatedUserId = $('#id').val();\n\n            if (populatedUserId && populatedUserId !== '' && populatedUserId !== 'new') {\n                // Load user's actual group (will override default)\n                ModuleUsersGroupsExtensionDropdown.loadUserGroup(populatedUserId);\n            }\n        });\n    },\n\n    /**\n     * Update dropdown value from hidden input\n     */\n    updateDropdownValue() {\n        const value = ModuleUsersGroupsExtensionDropdown.$hiddenInput.val();\n\n        if (value && value !== '') {\n            ModuleUsersGroupsExtensionDropdown.$dropdown.dropdown('set selected', String(value));\n        }\n    },\n\n    /**\n     * Load default group from module API\n     */\n    loadDefaultGroup() {\n        $.ajax({\n            url: '/pbxcore/api/modules/ModuleUsersGroups/getDefaultGroup',\n            method: 'POST',\n            dataType: 'json',\n            success(response) {\n                if (response.result === true && response.data && response.data.group_id) {\n                    // Set value to hidden input\n                    ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(response.data.group_id);\n\n                    // Update dropdown\n                    ModuleUsersGroupsExtensionDropdown.updateDropdownValue();\n                }\n            },\n            error(xhr, status, error) {\n                console.error('ModuleUsersGroups: Failed to load default group', error);\n            }\n        });\n    },\n\n    /**\n     * Load user's group from module API\n     * @param {string|number} userId - User ID\n     */\n    loadUserGroup(userId) {\n        if (!userId) {\n            // For new users, load default group\n            ModuleUsersGroupsExtensionDropdown.loadDefaultGroup();\n            return;\n        }\n\n        $.ajax({\n            url: '/pbxcore/api/modules/ModuleUsersGroups/getUserGroup',\n            method: 'POST',\n            dataType: 'json',\n            data: {user_id: userId},\n            success(response) {\n                if (response.result === true && response.data && response.data.group_id) {\n                    // Set value to hidden input\n                    ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(response.data.group_id);\n\n                    // Update dropdown\n                    ModuleUsersGroupsExtensionDropdown.updateDropdownValue();\n                }\n            },\n            error(xhr, status, error) {\n                console.error('ModuleUsersGroups: Failed to load user group', error);\n            }\n        });\n    }\n};\n\n// Initialize when document is ready\n$(document).ready(() => {\n    ModuleUsersGroupsExtensionDropdown.initialize();\n});\n"]} \ No newline at end of file diff --git a/public/assets/js/module-users-groups-index.js b/public/assets/js/module-users-groups-index.js index 6619530..20531f8 100644 --- a/public/assets/js/module-users-groups-index.js +++ b/public/assets/js/module-users-groups-index.js @@ -49,6 +49,12 @@ var ModuleCGIndex = { */ $selectGroup: $('.select-group'), + /** + * jQuery object for default group dropdown. + * @type {jQuery} + */ + $defaultGroupDropdown: $('.select-default-group'), + /** * jQuery object for current form disability fields * @type {jQuery} @@ -76,6 +82,10 @@ var ModuleCGIndex = { ModuleCGIndex.$selectGroup.dropdown({ onChange: ModuleCGIndex.changeGroupInList + }); // Initialize default group dropdown + + ModuleCGIndex.$defaultGroupDropdown.dropdown({ + onChange: ModuleCGIndex.changeDefaultGroup }); }, @@ -153,8 +163,9 @@ var ModuleCGIndex = { user_id: $($choice).closest('tr').attr('id'), group_id: value }, - onSuccess: function onSuccess() {// ModuleCGIndex.initializeDataTable(); - // console.log('updated'); + onSuccess: function onSuccess() { + // Update group member counters after successful group change + ModuleCGIndex.updateGroupCounters(); }, onError: function onError(response) { console.log(response); @@ -162,6 +173,73 @@ var ModuleCGIndex = { }); }, + /** + * Update group member counters via API + */ + updateGroupCounters: function updateGroupCounters() { + $.ajax({ + url: '/pbxcore/api/modules/ModuleUsersGroups/getGroupsStats', + method: 'GET', + dataType: 'json', + success: function success(response) { + if (response.result === true && response.data && response.data.stats) { + var stats = response.data.stats; // Update each group's member count in the table + + Object.keys(stats).forEach(function (groupId) { + var count = stats[groupId]; + var $row = $("#users-groups-table tr#".concat(groupId)); + + if ($row.length > 0) { + // Find the counter cell (second td with center aligned class) + $row.find('td.center.aligned').first().text(count); + } + }); + } + }, + error: function error(xhr, status, _error) { + console.error('ModuleUsersGroups: Failed to update group counters', _error); + } + }); + }, + + /** + * Handles default group change. + * @param {string} value - The new default group value. + * @param {string} text - The new group text. + * @param {jQuery} $choice - The selected choice. + */ + changeDefaultGroup: function changeDefaultGroup(value, text, $choice) { + if (!value || value === '') { + return; + } // Add loading state to dropdown + + + ModuleCGIndex.$defaultGroupDropdown.addClass('loading'); + $.ajax({ + url: '/pbxcore/api/modules/ModuleUsersGroups/setDefaultGroup', + method: 'POST', + dataType: 'json', + data: { + group_id: value + }, + success: function success(response) { + if (response.result !== true) { + // Show error notification only on failure + var errorMessage = response.messages && response.messages.length > 0 ? response.messages.join(', ') : 'Failed to update default group'; + UserMessage.showError(errorMessage); + } + }, + error: function error(xhr, status, _error2) { + console.error('ModuleUsersGroups: Failed to set default group', _error2); + UserMessage.showError('Failed to update default group'); + }, + complete: function complete() { + // Remove loading state from dropdown + ModuleCGIndex.$defaultGroupDropdown.removeClass('loading'); + } + }); + }, + /** * Calculate data table page length * @@ -185,4 +263,4 @@ var ModuleCGIndex = { $(document).ready(function () { ModuleCGIndex.initialize(); }); -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["src/module-users-groups-index.js"],"names":["ModuleCGIndex","$statusToggle","$","$usersTable","userDataTable","$selectGroup","$disabilityFields","initialize","tab","checkStatusToggle","window","addEventListener","initializeUsersDataTable","each","index","obj","dropdown","values","makeDropdownList","attr","onChange","changeGroupInList","onVisible","data","newPageLength","calculatePageLength","page","len","draw","DataTable","lengthChange","paging","pageLength","scrollCollapse","columns","order","language","SemanticLocalization","dataTableLocalisation","checkbox","removeClass","addClass","selected","value","push","name","text","$choice","api","url","globalRootUrl","on","method","user_id","closest","group_id","onSuccess","onError","response","console","log","rowHeight","find","first","outerHeight","windowHeight","innerHeight","headerFooterHeight","Math","max","floor","document","ready"],"mappings":"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","sourcesContent":["/*\n * MikoPBX - free phone system for small business\n * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation; either version 3 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License along with this program.\n * If not, see <https://www.gnu.org/licenses/>.\n */\n\n/* global SemanticLocalization, globalRootUrl, Datatable */\n\n/**\n * Module for managing call groups and related functionality.\n * @namespace\n */\nconst ModuleCGIndex = {\n\t/**\n\t * jQuery object for the status toggle.\n\t * @type {jQuery}\n\t */\n\t$statusToggle: $('#module-status-toggle'),\n\n\t/**\n\t * jQuery object for the users table.\n\t * @type {jQuery}\n\t */\n\t$usersTable: $('#users-table'),\n\n\t/**\n\t * User data table.\n\t * @type {Datatable}\n\t */\n\tuserDataTable: null,\n\n\t/**\n\t * jQuery object for select group elements.\n\t * @type {jQuery}\n\t */\n\t$selectGroup: $('.select-group'),\n\n\t/**\n\t * jQuery object for current form disability fields\n\t * @type {jQuery}\n\t */\n\t$disabilityFields: $('#module-users-groups'),\n\t/**\n\t * Initializes the module.\n\t */\n\tinitialize() {\n\t\t// Initialize tab menu\n\t\t$('#main-users-groups-tab-menu .item').tab();\n\n\t\t// Check status toggle initially\n\t\tModuleCGIndex.checkStatusToggle();\n\t\t// Add event listener for status changes\n\t\twindow.addEventListener('ModuleStatusChanged', ModuleCGIndex.checkStatusToggle);\n\n\t\t// Initialize users data table\n\t\tModuleCGIndex.initializeUsersDataTable();\n\n\t\t// Initialize dropdowns for select group elements\n\t\tModuleCGIndex.$selectGroup.each((index, obj) => {\n\t\t\t$(obj).dropdown({\n\t\t\t\tvalues: ModuleCGIndex.makeDropdownList($(obj).attr('data-value')),\n\t\t\t});\n\t\t});\n\n\t\t// Initialize dropdown for select group\n\t\tModuleCGIndex.$selectGroup.dropdown({\n\t\t\tonChange: ModuleCGIndex.changeGroupInList,\n\t\t});\n\n\t},\n\n\t/**\n\t * Initializes the DataTable for users table.\n\t */\n\tinitializeUsersDataTable() {\n\n\t\t$('#main-users-groups-tab-menu .item').tab({\n\t\t\tonVisible(){\n\t\t\t\tif ($(this).data('tab')==='users' && ModuleCGIndex.userDataTable!==null){\n\t\t\t\t\tconst newPageLength = ModuleCGIndex.calculatePageLength();\n\t\t\t\t\tModuleCGIndex.userDataTable.page.len(newPageLength).draw(false);\n\t\t\t\t}\n\t\t\t}\n\t\t});\n\n\t\tModuleCGIndex.userDataTable = ModuleCGIndex.$usersTable.DataTable({\n\t\t\t// destroy: true,\n\t\t\tlengthChange: false,\n\t\t\tpaging: true,\n\t\t\tpageLength: ModuleCGIndex.calculatePageLength(),\n\t\t\tscrollCollapse: true,\n\t\t\tcolumns: [\n\t\t\t\tnull,\n\t\t\t\tnull,\n\t\t\t\tnull,\n\t\t\t\tnull,\n\t\t\t],\n\t\t\torder: [1, 'asc'],\n\t\t\tlanguage: SemanticLocalization.dataTableLocalisation,\n\t\t});\n\t},\n\n\t/**\n\t * Checks and updates button status based on module status.\n\t */\n\tcheckStatusToggle() {\n\t\tif (ModuleCGIndex.$statusToggle.checkbox('is checked')) {\n\t\t\tModuleCGIndex.$disabilityFields.removeClass('disabled');\n\t\t} else {\n\t\t\tModuleCGIndex.$disabilityFields.addClass('disabled');\n\t\t}\n\t},\n\n\t/**\n\t * Prepares a dropdown list for user selection.\n\t * @param {string} selected - The selected value.\n\t * @returns {Array} - The prepared dropdown list.\n\t */\n\tmakeDropdownList(selected) {\n\t\tconst values = [];\n\t\t$('#users-groups-list option').each((index, obj) => {\n\t\t\tif (selected === obj.value) {\n\t\t\t\tvalues.push({\n\t\t\t\t\tname: obj.text,\n\t\t\t\t\tvalue: obj.value,\n\t\t\t\t\tselected: true,\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\tvalues.push({\n\t\t\t\t\tname: obj.text,\n\t\t\t\t\tvalue: obj.value,\n\t\t\t\t});\n\t\t\t}\n\t\t});\n\t\treturn values;\n\t},\n\n\t/**\n\t * Handles group change in the list.\n\t * @param {string} value - The new group value.\n\t * @param {string} text - The new group text.\n\t * @param {jQuery} $choice - The selected choice.\n\t */\n\tchangeGroupInList(value, text, $choice) {\n\t\t$.api({\n\t\t\turl: `${globalRootUrl}module-users-groups/module-users-groups/change-user-group/`,\n\t\t\ton: 'now',\n\t\t\tmethod: 'POST',\n\t\t\tdata: {\n\t\t\t\tuser_id: $($choice).closest('tr').attr('id'),\n\t\t\t\tgroup_id: value,\n\t\t\t},\n\t\t\tonSuccess() {\n\t\t\t\t//\tModuleCGIndex.initializeDataTable();\n\t\t\t\t//\tconsole.log('updated');\n\t\t\t},\n\t\t\tonError(response) {\n\t\t\t\tconsole.log(response);\n\t\t\t},\n\t\t});\n\t},\n\n\t/**\n\t * Calculate data table page length\n\t *\n\t * @returns {number}\n\t */\n\tcalculatePageLength() {\n\t\t// Calculate row height\n\t\tlet rowHeight = ModuleCGIndex.$usersTable.find('tr').first().outerHeight();\n\t\t// Calculate window height and available space for table\n\t\tconst windowHeight = window.innerHeight;\n\t\tconst headerFooterHeight = 500; // Estimate height for header, footer, and other elements\n\n\t\t// Calculate new page length\n\t\treturn Math.max(Math.floor((windowHeight - headerFooterHeight) / rowHeight), 10);\n\t},\n};\n\n/**\n * Initialize the module when the document is ready.\n */\n$(document).ready(() => {\n\tModuleCGIndex.initialize();\n});\n\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["src/module-users-groups-index.js"],"names":["ModuleCGIndex","$statusToggle","$","$usersTable","userDataTable","$selectGroup","$defaultGroupDropdown","$disabilityFields","initialize","tab","checkStatusToggle","window","addEventListener","initializeUsersDataTable","each","index","obj","dropdown","values","makeDropdownList","attr","onChange","changeGroupInList","changeDefaultGroup","onVisible","data","newPageLength","calculatePageLength","page","len","draw","DataTable","lengthChange","paging","pageLength","scrollCollapse","columns","order","language","SemanticLocalization","dataTableLocalisation","checkbox","removeClass","addClass","selected","value","push","name","text","$choice","api","url","globalRootUrl","on","method","user_id","closest","group_id","onSuccess","updateGroupCounters","onError","response","console","log","ajax","dataType","success","result","stats","Object","keys","forEach","groupId","count","$row","length","find","first","error","xhr","status","errorMessage","messages","join","UserMessage","showError","complete","rowHeight","outerHeight","windowHeight","innerHeight","headerFooterHeight","Math","max","floor","document","ready"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;AACA;AACA,IAAMA,aAAa,GAAG;AACrB;AACD;AACA;AACA;AACCC,EAAAA,aAAa,EAAEC,CAAC,CAAC,uBAAD,CALK;;AAOrB;AACD;AACA;AACA;AACCC,EAAAA,WAAW,EAAED,CAAC,CAAC,cAAD,CAXO;;AAarB;AACD;AACA;AACA;AACCE,EAAAA,aAAa,EAAE,IAjBM;;AAmBrB;AACD;AACA;AACA;AACCC,EAAAA,YAAY,EAAEH,CAAC,CAAC,eAAD,CAvBM;;AAyBrB;AACD;AACA;AACA;AACCI,EAAAA,qBAAqB,EAAEJ,CAAC,CAAC,uBAAD,CA7BH;;AA+BrB;AACD;AACA;AACA;AACCK,EAAAA,iBAAiB,EAAEL,CAAC,CAAC,sBAAD,CAnCC;;AAoCrB;AACD;AACA;AACCM,EAAAA,UAvCqB,wBAuCR;AACZ;AACAN,IAAAA,CAAC,CAAC,mCAAD,CAAD,CAAuCO,GAAvC,GAFY,CAIZ;;AACAT,IAAAA,aAAa,CAACU,iBAAd,GALY,CAMZ;;AACAC,IAAAA,MAAM,CAACC,gBAAP,CAAwB,qBAAxB,EAA+CZ,aAAa,CAACU,iBAA7D,EAPY,CASZ;;AACAV,IAAAA,aAAa,CAACa,wBAAd,GAVY,CAYZ;;AACAb,IAAAA,aAAa,CAACK,YAAd,CAA2BS,IAA3B,CAAgC,UAACC,KAAD,EAAQC,GAAR,EAAgB;AAC/Cd,MAAAA,CAAC,CAACc,GAAD,CAAD,CAAOC,QAAP,CAAgB;AACfC,QAAAA,MAAM,EAAElB,aAAa,CAACmB,gBAAd,CAA+BjB,CAAC,CAACc,GAAD,CAAD,CAAOI,IAAP,CAAY,YAAZ,CAA/B;AADO,OAAhB;AAGA,KAJD,EAbY,CAmBZ;;AACApB,IAAAA,aAAa,CAACK,YAAd,CAA2BY,QAA3B,CAAoC;AACnCI,MAAAA,QAAQ,EAAErB,aAAa,CAACsB;AADW,KAApC,EApBY,CAwBZ;;AACAtB,IAAAA,aAAa,CAACM,qBAAd,CAAoCW,QAApC,CAA6C;AAC5CI,MAAAA,QAAQ,EAAErB,aAAa,CAACuB;AADoB,KAA7C;AAIA,GApEoB;;AAsErB;AACD;AACA;AACCV,EAAAA,wBAzEqB,sCAyEM;AAE1BX,IAAAA,CAAC,CAAC,mCAAD,CAAD,CAAuCO,GAAvC,CAA2C;AAC1Ce,MAAAA,SAD0C,uBAC/B;AACV,YAAItB,CAAC,CAAC,IAAD,CAAD,CAAQuB,IAAR,CAAa,KAAb,MAAsB,OAAtB,IAAiCzB,aAAa,CAACI,aAAd,KAA8B,IAAnE,EAAwE;AACvE,cAAMsB,aAAa,GAAG1B,aAAa,CAAC2B,mBAAd,EAAtB;AACA3B,UAAAA,aAAa,CAACI,aAAd,CAA4BwB,IAA5B,CAAiCC,GAAjC,CAAqCH,aAArC,EAAoDI,IAApD,CAAyD,KAAzD;AACA;AACD;AANyC,KAA3C;AASA9B,IAAAA,aAAa,CAACI,aAAd,GAA8BJ,aAAa,CAACG,WAAd,CAA0B4B,SAA1B,CAAoC;AACjE;AACAC,MAAAA,YAAY,EAAE,KAFmD;AAGjEC,MAAAA,MAAM,EAAE,IAHyD;AAIjEC,MAAAA,UAAU,EAAElC,aAAa,CAAC2B,mBAAd,EAJqD;AAKjEQ,MAAAA,cAAc,EAAE,IALiD;AAMjEC,MAAAA,OAAO,EAAE,CACR,IADQ,EAER,IAFQ,EAGR,IAHQ,EAIR,IAJQ,CANwD;AAYjEC,MAAAA,KAAK,EAAE,CAAC,CAAD,EAAI,KAAJ,CAZ0D;AAajEC,MAAAA,QAAQ,EAAEC,oBAAoB,CAACC;AAbkC,KAApC,CAA9B;AAeA,GAnGoB;;AAqGrB;AACD;AACA;AACC9B,EAAAA,iBAxGqB,+BAwGD;AACnB,QAAIV,aAAa,CAACC,aAAd,CAA4BwC,QAA5B,CAAqC,YAArC,CAAJ,EAAwD;AACvDzC,MAAAA,aAAa,CAACO,iBAAd,CAAgCmC,WAAhC,CAA4C,UAA5C;AACA,KAFD,MAEO;AACN1C,MAAAA,aAAa,CAACO,iBAAd,CAAgCoC,QAAhC,CAAyC,UAAzC;AACA;AACD,GA9GoB;;AAgHrB;AACD;AACA;AACA;AACA;AACCxB,EAAAA,gBArHqB,4BAqHJyB,QArHI,EAqHM;AAC1B,QAAM1B,MAAM,GAAG,EAAf;AACAhB,IAAAA,CAAC,CAAC,2BAAD,CAAD,CAA+BY,IAA/B,CAAoC,UAACC,KAAD,EAAQC,GAAR,EAAgB;AACnD,UAAI4B,QAAQ,KAAK5B,GAAG,CAAC6B,KAArB,EAA4B;AAC3B3B,QAAAA,MAAM,CAAC4B,IAAP,CAAY;AACXC,UAAAA,IAAI,EAAE/B,GAAG,CAACgC,IADC;AAEXH,UAAAA,KAAK,EAAE7B,GAAG,CAAC6B,KAFA;AAGXD,UAAAA,QAAQ,EAAE;AAHC,SAAZ;AAKA,OAND,MAMO;AACN1B,QAAAA,MAAM,CAAC4B,IAAP,CAAY;AACXC,UAAAA,IAAI,EAAE/B,GAAG,CAACgC,IADC;AAEXH,UAAAA,KAAK,EAAE7B,GAAG,CAAC6B;AAFA,SAAZ;AAIA;AACD,KAbD;AAcA,WAAO3B,MAAP;AACA,GAtIoB;;AAwIrB;AACD;AACA;AACA;AACA;AACA;AACCI,EAAAA,iBA9IqB,6BA8IHuB,KA9IG,EA8IIG,IA9IJ,EA8IUC,OA9IV,EA8ImB;AACvC/C,IAAAA,CAAC,CAACgD,GAAF,CAAM;AACLC,MAAAA,GAAG,YAAKC,aAAL,+DADE;AAELC,MAAAA,EAAE,EAAE,KAFC;AAGLC,MAAAA,MAAM,EAAE,MAHH;AAIL7B,MAAAA,IAAI,EAAE;AACL8B,QAAAA,OAAO,EAAErD,CAAC,CAAC+C,OAAD,CAAD,CAAWO,OAAX,CAAmB,IAAnB,EAAyBpC,IAAzB,CAA8B,IAA9B,CADJ;AAELqC,QAAAA,QAAQ,EAAEZ;AAFL,OAJD;AAQLa,MAAAA,SARK,uBAQO;AACX;AACA1D,QAAAA,aAAa,CAAC2D,mBAAd;AACA,OAXI;AAYLC,MAAAA,OAZK,mBAYGC,QAZH,EAYa;AACjBC,QAAAA,OAAO,CAACC,GAAR,CAAYF,QAAZ;AACA;AAdI,KAAN;AAgBA,GA/JoB;;AAiKrB;AACD;AACA;AACCF,EAAAA,mBApKqB,iCAoKC;AACrBzD,IAAAA,CAAC,CAAC8D,IAAF,CAAO;AACNb,MAAAA,GAAG,EAAE,uDADC;AAENG,MAAAA,MAAM,EAAE,KAFF;AAGNW,MAAAA,QAAQ,EAAE,MAHJ;AAINC,MAAAA,OAJM,mBAIEL,QAJF,EAIY;AACjB,YAAIA,QAAQ,CAACM,MAAT,KAAoB,IAApB,IAA4BN,QAAQ,CAACpC,IAArC,IAA6CoC,QAAQ,CAACpC,IAAT,CAAc2C,KAA/D,EAAsE;AACrE,cAAMA,KAAK,GAAGP,QAAQ,CAACpC,IAAT,CAAc2C,KAA5B,CADqE,CAGrE;;AACAC,UAAAA,MAAM,CAACC,IAAP,CAAYF,KAAZ,EAAmBG,OAAnB,CAA2B,UAACC,OAAD,EAAa;AACvC,gBAAMC,KAAK,GAAGL,KAAK,CAACI,OAAD,CAAnB;AACA,gBAAME,IAAI,GAAGxE,CAAC,kCAA2BsE,OAA3B,EAAd;;AACA,gBAAIE,IAAI,CAACC,MAAL,GAAc,CAAlB,EAAqB;AACpB;AACAD,cAAAA,IAAI,CAACE,IAAL,CAAU,mBAAV,EAA+BC,KAA/B,GAAuC7B,IAAvC,CAA4CyB,KAA5C;AACA;AACD,WAPD;AAQA;AACD,OAlBK;AAmBNK,MAAAA,KAnBM,iBAmBAC,GAnBA,EAmBKC,MAnBL,EAmBaF,MAnBb,EAmBoB;AACzBhB,QAAAA,OAAO,CAACgB,KAAR,CAAc,oDAAd,EAAoEA,MAApE;AACA;AArBK,KAAP;AAuBA,GA5LoB;;AA8LrB;AACD;AACA;AACA;AACA;AACA;AACCvD,EAAAA,kBApMqB,8BAoMFsB,KApME,EAoMKG,IApML,EAoMWC,OApMX,EAoMoB;AACxC,QAAI,CAACJ,KAAD,IAAUA,KAAK,KAAK,EAAxB,EAA4B;AAC3B;AACA,KAHuC,CAKxC;;;AACA7C,IAAAA,aAAa,CAACM,qBAAd,CAAoCqC,QAApC,CAA6C,SAA7C;AAEAzC,IAAAA,CAAC,CAAC8D,IAAF,CAAO;AACNb,MAAAA,GAAG,EAAE,wDADC;AAENG,MAAAA,MAAM,EAAE,MAFF;AAGNW,MAAAA,QAAQ,EAAE,MAHJ;AAINxC,MAAAA,IAAI,EAAE;AACLgC,QAAAA,QAAQ,EAAEZ;AADL,OAJA;AAONqB,MAAAA,OAPM,mBAOEL,QAPF,EAOY;AACjB,YAAIA,QAAQ,CAACM,MAAT,KAAoB,IAAxB,EAA8B;AAC7B;AACA,cAAMc,YAAY,GAAGpB,QAAQ,CAACqB,QAAT,IAAqBrB,QAAQ,CAACqB,QAAT,CAAkBP,MAAlB,GAA2B,CAAhD,GAClBd,QAAQ,CAACqB,QAAT,CAAkBC,IAAlB,CAAuB,IAAvB,CADkB,GAElB,gCAFH;AAGAC,UAAAA,WAAW,CAACC,SAAZ,CAAsBJ,YAAtB;AACA;AACD,OAfK;AAgBNH,MAAAA,KAhBM,iBAgBAC,GAhBA,EAgBKC,MAhBL,EAgBaF,OAhBb,EAgBoB;AACzBhB,QAAAA,OAAO,CAACgB,KAAR,CAAc,gDAAd,EAAgEA,OAAhE;AACAM,QAAAA,WAAW,CAACC,SAAZ,CAAsB,gCAAtB;AACA,OAnBK;AAoBNC,MAAAA,QApBM,sBAoBK;AACV;AACAtF,QAAAA,aAAa,CAACM,qBAAd,CAAoCoC,WAApC,CAAgD,SAAhD;AACA;AAvBK,KAAP;AAyBA,GArOoB;;AAuOrB;AACD;AACA;AACA;AACA;AACCf,EAAAA,mBA5OqB,iCA4OC;AACrB;AACA,QAAI4D,SAAS,GAAGvF,aAAa,CAACG,WAAd,CAA0ByE,IAA1B,CAA+B,IAA/B,EAAqCC,KAArC,GAA6CW,WAA7C,EAAhB,CAFqB,CAGrB;;AACA,QAAMC,YAAY,GAAG9E,MAAM,CAAC+E,WAA5B;AACA,QAAMC,kBAAkB,GAAG,GAA3B,CALqB,CAKW;AAEhC;;AACA,WAAOC,IAAI,CAACC,GAAL,CAASD,IAAI,CAACE,KAAL,CAAW,CAACL,YAAY,GAAGE,kBAAhB,IAAsCJ,SAAjD,CAAT,EAAsE,EAAtE,CAAP;AACA;AArPoB,CAAtB;AAwPA;AACA;AACA;;AACArF,CAAC,CAAC6F,QAAD,CAAD,CAAYC,KAAZ,CAAkB,YAAM;AACvBhG,EAAAA,aAAa,CAACQ,UAAd;AACA,CAFD","sourcesContent":["/*\n * MikoPBX - free phone system for small business\n * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov\n *\n * This program is free software: you can redistribute it and/or modify\n * it under the terms of the GNU General Public License as published by\n * the Free Software Foundation; either version 3 of the License, or\n * (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License along with this program.\n * If not, see <https://www.gnu.org/licenses/>.\n */\n\n/* global SemanticLocalization, globalRootUrl, Datatable */\n\n/**\n * Module for managing call groups and related functionality.\n * @namespace\n */\nconst ModuleCGIndex = {\n\t/**\n\t * jQuery object for the status toggle.\n\t * @type {jQuery}\n\t */\n\t$statusToggle: $('#module-status-toggle'),\n\n\t/**\n\t * jQuery object for the users table.\n\t * @type {jQuery}\n\t */\n\t$usersTable: $('#users-table'),\n\n\t/**\n\t * User data table.\n\t * @type {Datatable}\n\t */\n\tuserDataTable: null,\n\n\t/**\n\t * jQuery object for select group elements.\n\t * @type {jQuery}\n\t */\n\t$selectGroup: $('.select-group'),\n\n\t/**\n\t * jQuery object for default group dropdown.\n\t * @type {jQuery}\n\t */\n\t$defaultGroupDropdown: $('.select-default-group'),\n\n\t/**\n\t * jQuery object for current form disability fields\n\t * @type {jQuery}\n\t */\n\t$disabilityFields: $('#module-users-groups'),\n\t/**\n\t * Initializes the module.\n\t */\n\tinitialize() {\n\t\t// Initialize tab menu\n\t\t$('#main-users-groups-tab-menu .item').tab();\n\n\t\t// Check status toggle initially\n\t\tModuleCGIndex.checkStatusToggle();\n\t\t// Add event listener for status changes\n\t\twindow.addEventListener('ModuleStatusChanged', ModuleCGIndex.checkStatusToggle);\n\n\t\t// Initialize users data table\n\t\tModuleCGIndex.initializeUsersDataTable();\n\n\t\t// Initialize dropdowns for select group elements\n\t\tModuleCGIndex.$selectGroup.each((index, obj) => {\n\t\t\t$(obj).dropdown({\n\t\t\t\tvalues: ModuleCGIndex.makeDropdownList($(obj).attr('data-value')),\n\t\t\t});\n\t\t});\n\n\t\t// Initialize dropdown for select group\n\t\tModuleCGIndex.$selectGroup.dropdown({\n\t\t\tonChange: ModuleCGIndex.changeGroupInList,\n\t\t});\n\n\t\t// Initialize default group dropdown\n\t\tModuleCGIndex.$defaultGroupDropdown.dropdown({\n\t\t\tonChange: ModuleCGIndex.changeDefaultGroup,\n\t\t});\n\n\t},\n\n\t/**\n\t * Initializes the DataTable for users table.\n\t */\n\tinitializeUsersDataTable() {\n\n\t\t$('#main-users-groups-tab-menu .item').tab({\n\t\t\tonVisible(){\n\t\t\t\tif ($(this).data('tab')==='users' && ModuleCGIndex.userDataTable!==null){\n\t\t\t\t\tconst newPageLength = ModuleCGIndex.calculatePageLength();\n\t\t\t\t\tModuleCGIndex.userDataTable.page.len(newPageLength).draw(false);\n\t\t\t\t}\n\t\t\t}\n\t\t});\n\n\t\tModuleCGIndex.userDataTable = ModuleCGIndex.$usersTable.DataTable({\n\t\t\t// destroy: true,\n\t\t\tlengthChange: false,\n\t\t\tpaging: true,\n\t\t\tpageLength: ModuleCGIndex.calculatePageLength(),\n\t\t\tscrollCollapse: true,\n\t\t\tcolumns: [\n\t\t\t\tnull,\n\t\t\t\tnull,\n\t\t\t\tnull,\n\t\t\t\tnull,\n\t\t\t],\n\t\t\torder: [1, 'asc'],\n\t\t\tlanguage: SemanticLocalization.dataTableLocalisation,\n\t\t});\n\t},\n\n\t/**\n\t * Checks and updates button status based on module status.\n\t */\n\tcheckStatusToggle() {\n\t\tif (ModuleCGIndex.$statusToggle.checkbox('is checked')) {\n\t\t\tModuleCGIndex.$disabilityFields.removeClass('disabled');\n\t\t} else {\n\t\t\tModuleCGIndex.$disabilityFields.addClass('disabled');\n\t\t}\n\t},\n\n\t/**\n\t * Prepares a dropdown list for user selection.\n\t * @param {string} selected - The selected value.\n\t * @returns {Array} - The prepared dropdown list.\n\t */\n\tmakeDropdownList(selected) {\n\t\tconst values = [];\n\t\t$('#users-groups-list option').each((index, obj) => {\n\t\t\tif (selected === obj.value) {\n\t\t\t\tvalues.push({\n\t\t\t\t\tname: obj.text,\n\t\t\t\t\tvalue: obj.value,\n\t\t\t\t\tselected: true,\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\tvalues.push({\n\t\t\t\t\tname: obj.text,\n\t\t\t\t\tvalue: obj.value,\n\t\t\t\t});\n\t\t\t}\n\t\t});\n\t\treturn values;\n\t},\n\n\t/**\n\t * Handles group change in the list.\n\t * @param {string} value - The new group value.\n\t * @param {string} text - The new group text.\n\t * @param {jQuery} $choice - The selected choice.\n\t */\n\tchangeGroupInList(value, text, $choice) {\n\t\t$.api({\n\t\t\turl: `${globalRootUrl}module-users-groups/module-users-groups/change-user-group/`,\n\t\t\ton: 'now',\n\t\t\tmethod: 'POST',\n\t\t\tdata: {\n\t\t\t\tuser_id: $($choice).closest('tr').attr('id'),\n\t\t\t\tgroup_id: value,\n\t\t\t},\n\t\t\tonSuccess() {\n\t\t\t\t// Update group member counters after successful group change\n\t\t\t\tModuleCGIndex.updateGroupCounters();\n\t\t\t},\n\t\t\tonError(response) {\n\t\t\t\tconsole.log(response);\n\t\t\t},\n\t\t});\n\t},\n\n\t/**\n\t * Update group member counters via API\n\t */\n\tupdateGroupCounters() {\n\t\t$.ajax({\n\t\t\turl: '/pbxcore/api/modules/ModuleUsersGroups/getGroupsStats',\n\t\t\tmethod: 'GET',\n\t\t\tdataType: 'json',\n\t\t\tsuccess(response) {\n\t\t\t\tif (response.result === true && response.data && response.data.stats) {\n\t\t\t\t\tconst stats = response.data.stats;\n\n\t\t\t\t\t// Update each group's member count in the table\n\t\t\t\t\tObject.keys(stats).forEach((groupId) => {\n\t\t\t\t\t\tconst count = stats[groupId];\n\t\t\t\t\t\tconst $row = $(`#users-groups-table tr#${groupId}`);\n\t\t\t\t\t\tif ($row.length > 0) {\n\t\t\t\t\t\t\t// Find the counter cell (second td with center aligned class)\n\t\t\t\t\t\t\t$row.find('td.center.aligned').first().text(count);\n\t\t\t\t\t\t}\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t},\n\t\t\terror(xhr, status, error) {\n\t\t\t\tconsole.error('ModuleUsersGroups: Failed to update group counters', error);\n\t\t\t},\n\t\t});\n\t},\n\n\t/**\n\t * Handles default group change.\n\t * @param {string} value - The new default group value.\n\t * @param {string} text - The new group text.\n\t * @param {jQuery} $choice - The selected choice.\n\t */\n\tchangeDefaultGroup(value, text, $choice) {\n\t\tif (!value || value === '') {\n\t\t\treturn;\n\t\t}\n\n\t\t// Add loading state to dropdown\n\t\tModuleCGIndex.$defaultGroupDropdown.addClass('loading');\n\n\t\t$.ajax({\n\t\t\turl: '/pbxcore/api/modules/ModuleUsersGroups/setDefaultGroup',\n\t\t\tmethod: 'POST',\n\t\t\tdataType: 'json',\n\t\t\tdata: {\n\t\t\t\tgroup_id: value,\n\t\t\t},\n\t\t\tsuccess(response) {\n\t\t\t\tif (response.result !== true) {\n\t\t\t\t\t// Show error notification only on failure\n\t\t\t\t\tconst errorMessage = response.messages && response.messages.length > 0\n\t\t\t\t\t\t? response.messages.join(', ')\n\t\t\t\t\t\t: 'Failed to update default group';\n\t\t\t\t\tUserMessage.showError(errorMessage);\n\t\t\t\t}\n\t\t\t},\n\t\t\terror(xhr, status, error) {\n\t\t\t\tconsole.error('ModuleUsersGroups: Failed to set default group', error);\n\t\t\t\tUserMessage.showError('Failed to update default group');\n\t\t\t},\n\t\t\tcomplete() {\n\t\t\t\t// Remove loading state from dropdown\n\t\t\t\tModuleCGIndex.$defaultGroupDropdown.removeClass('loading');\n\t\t\t},\n\t\t});\n\t},\n\n\t/**\n\t * Calculate data table page length\n\t *\n\t * @returns {number}\n\t */\n\tcalculatePageLength() {\n\t\t// Calculate row height\n\t\tlet rowHeight = ModuleCGIndex.$usersTable.find('tr').first().outerHeight();\n\t\t// Calculate window height and available space for table\n\t\tconst windowHeight = window.innerHeight;\n\t\tconst headerFooterHeight = 500; // Estimate height for header, footer, and other elements\n\n\t\t// Calculate new page length\n\t\treturn Math.max(Math.floor((windowHeight - headerFooterHeight) / rowHeight), 10);\n\t},\n};\n\n/**\n * Initialize the module when the document is ready.\n */\n$(document).ready(() => {\n\tModuleCGIndex.initialize();\n});\n\n"]} \ No newline at end of file diff --git a/public/assets/js/src/module-users-groups-extension-dropdown.js b/public/assets/js/src/module-users-groups-extension-dropdown.js new file mode 100644 index 0000000..0cc733e --- /dev/null +++ b/public/assets/js/src/module-users-groups-extension-dropdown.js @@ -0,0 +1,155 @@ +/* + * MikoPBX - free phone system for small business + * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. + * If not, see . + */ + +/* global globalRootUrl, PbxApi */ + +/** + * ModuleUsersGroupsExtensionDropdown - Initialize user groups dropdown on extension edit page + * Works with both old and new MikoPBX releases via FormPopulated event + */ +const ModuleUsersGroupsExtensionDropdown = { + /** + * jQuery object for the dropdown + */ + $dropdown: $('#mod_usrgr_select_group_dropdown'), + + /** + * Hidden input field for storing selected value + */ + $hiddenInput: $('#mod_usrgr_select_group'), + + /** + * Initialize the dropdown + */ + initialize() { + // Check if dropdown element exists + if (ModuleUsersGroupsExtensionDropdown.$dropdown.length === 0) { + return; + } + + // Initialize Fomantic UI dropdown (items are already in HTML from server) + ModuleUsersGroupsExtensionDropdown.$dropdown.dropdown({ + onChange(value) { + // Sync value to hidden input + ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(value); + + // Trigger form change to enable save button + if (typeof Form !== 'undefined' && typeof Form.dataChanged === 'function') { + Form.dataChanged(); + } + }, + clearable: false, + fullTextSearch: true, + forceSelection: false + }); + + // Smart initialization - check if user_id or id exists in DOM + // Old release: + // New release: + const userId = $('#user_id').val() || $('#id').val(); + + if (userId && userId !== '' && userId !== 'new') { + // Existing user - load their group + ModuleUsersGroupsExtensionDropdown.loadUserGroup(userId); + } else { + // New user - load default group + ModuleUsersGroupsExtensionDropdown.loadDefaultGroup(); + } + + // Listen for form population event (for new release with AJAX forms) + $(document).on('FormPopulated', (event, formData) => { + // Get user ID from DOM (new release always uses 'id') + const populatedUserId = $('#id').val(); + + if (populatedUserId && populatedUserId !== '' && populatedUserId !== 'new') { + // Load user's actual group (will override default) + ModuleUsersGroupsExtensionDropdown.loadUserGroup(populatedUserId); + } + }); + }, + + /** + * Update dropdown value from hidden input + */ + updateDropdownValue() { + const value = ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(); + + if (value && value !== '') { + ModuleUsersGroupsExtensionDropdown.$dropdown.dropdown('set selected', String(value)); + } + }, + + /** + * Load default group from module API + */ + loadDefaultGroup() { + $.ajax({ + url: '/pbxcore/api/modules/ModuleUsersGroups/getDefaultGroup', + method: 'POST', + dataType: 'json', + success(response) { + if (response.result === true && response.data && response.data.group_id) { + // Set value to hidden input + ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(response.data.group_id); + + // Update dropdown + ModuleUsersGroupsExtensionDropdown.updateDropdownValue(); + } + }, + error(xhr, status, error) { + console.error('ModuleUsersGroups: Failed to load default group', error); + } + }); + }, + + /** + * Load user's group from module API + * @param {string|number} userId - User ID + */ + loadUserGroup(userId) { + if (!userId) { + // For new users, load default group + ModuleUsersGroupsExtensionDropdown.loadDefaultGroup(); + return; + } + + $.ajax({ + url: '/pbxcore/api/modules/ModuleUsersGroups/getUserGroup', + method: 'POST', + dataType: 'json', + data: {user_id: userId}, + success(response) { + if (response.result === true && response.data && response.data.group_id) { + // Set value to hidden input + ModuleUsersGroupsExtensionDropdown.$hiddenInput.val(response.data.group_id); + + // Update dropdown + ModuleUsersGroupsExtensionDropdown.updateDropdownValue(); + } + }, + error(xhr, status, error) { + console.error('ModuleUsersGroups: Failed to load user group', error); + } + }); + } +}; + +// Initialize when document is ready +$(document).ready(() => { + ModuleUsersGroupsExtensionDropdown.initialize(); +}); diff --git a/public/assets/js/src/module-users-groups-index.js b/public/assets/js/src/module-users-groups-index.js index 61347be..e38f495 100644 --- a/public/assets/js/src/module-users-groups-index.js +++ b/public/assets/js/src/module-users-groups-index.js @@ -47,6 +47,12 @@ const ModuleCGIndex = { */ $selectGroup: $('.select-group'), + /** + * jQuery object for default group dropdown. + * @type {jQuery} + */ + $defaultGroupDropdown: $('.select-default-group'), + /** * jQuery object for current form disability fields * @type {jQuery} @@ -79,6 +85,11 @@ const ModuleCGIndex = { onChange: ModuleCGIndex.changeGroupInList, }); + // Initialize default group dropdown + ModuleCGIndex.$defaultGroupDropdown.dropdown({ + onChange: ModuleCGIndex.changeDefaultGroup, + }); + }, /** @@ -163,8 +174,8 @@ const ModuleCGIndex = { group_id: value, }, onSuccess() { - // ModuleCGIndex.initializeDataTable(); - // console.log('updated'); + // Update group member counters after successful group change + ModuleCGIndex.updateGroupCounters(); }, onError(response) { console.log(response); @@ -172,6 +183,76 @@ const ModuleCGIndex = { }); }, + /** + * Update group member counters via API + */ + updateGroupCounters() { + $.ajax({ + url: '/pbxcore/api/modules/ModuleUsersGroups/getGroupsStats', + method: 'GET', + dataType: 'json', + success(response) { + if (response.result === true && response.data && response.data.stats) { + const stats = response.data.stats; + + // Update each group's member count in the table + Object.keys(stats).forEach((groupId) => { + const count = stats[groupId]; + const $row = $(`#users-groups-table tr#${groupId}`); + if ($row.length > 0) { + // Find the counter cell (second td with center aligned class) + $row.find('td.center.aligned').first().text(count); + } + }); + } + }, + error(xhr, status, error) { + console.error('ModuleUsersGroups: Failed to update group counters', error); + }, + }); + }, + + /** + * Handles default group change. + * @param {string} value - The new default group value. + * @param {string} text - The new group text. + * @param {jQuery} $choice - The selected choice. + */ + changeDefaultGroup(value, text, $choice) { + if (!value || value === '') { + return; + } + + // Add loading state to dropdown + ModuleCGIndex.$defaultGroupDropdown.addClass('loading'); + + $.ajax({ + url: '/pbxcore/api/modules/ModuleUsersGroups/setDefaultGroup', + method: 'POST', + dataType: 'json', + data: { + group_id: value, + }, + success(response) { + if (response.result !== true) { + // Show error notification only on failure + const errorMessage = response.messages && response.messages.length > 0 + ? response.messages.join(', ') + : 'Failed to update default group'; + UserMessage.showError(errorMessage); + } + }, + error(xhr, status, error) { + console.error('ModuleUsersGroups: Failed to set default group', error); + UserMessage.showError('Failed to update default group'); + }, + complete() { + // Remove loading state from dropdown + ModuleCGIndex.$defaultGroupDropdown.removeClass('loading'); + }, + }); + }, + /** * Calculate data table page length *