diff --git a/assets/css/scss/_social.scss b/assets/css/scss/_social.scss index a5cd517db1..b4fb657082 100644 --- a/assets/css/scss/_social.scss +++ b/assets/css/scss/_social.scss @@ -626,3 +626,122 @@ border-top: none; } } + +.invite-friends { + .invite-friends-container { + max-width: 600px; + margin: auto; + } + + .invite-friends-header { + text-align: center; + margin-bottom: 20px; + } + + .invite-friends-body { + display: flex; + justify-content: space-between; + margin-bottom: 20px; + } + + .friends-list, .selected-friends-list { + width: 48%; + } + + .list-header { + background-color: #f5f5f5; + padding: 10px; + border-radius: 5px; + } + + .list-content { + border: 1px solid #ddd; + border-radius: 5px; + padding: 10px; + height: 300px; + overflow-y: auto; + } + + .friend-entry { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + } + + .friend-avatar { + border-radius: 50%; + width: 30px; + height: 30px; + margin-right: 10px; + } + + .friend-info { + display: flex; + align-items: center; + } + + .invite-btn, .remove-btn { + border: none; + background-color: #5cb85c; + color: white; + padding: 5px 10px; + border-radius: 5px; + cursor: pointer; + } + + .remove-btn { + background-color: #d9534f; + } + + .send-invites-btn { + width: 100%; + padding: 10px 20px; + background-color: #0275d8; + color: white; + border: none; + border-radius: 5px; + cursor: pointer; + } + + .send-invites-btn:hover { + background-color: #025aa5; + } + + .invited-users-container { + margin-top: 20px; + } + + .invited-users-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); + gap: 10px; + } + + .user-card { + display: flex; + flex-direction: column; + align-items: center; + padding: 10px; + border: 1px solid #ddd; + border-radius: 5px; + background-color: #f9f9f9; + } + + .user-avatar { + border-radius: 50%; + width: 50px; + height: 50px; + margin-bottom: 10px; + } + + .user-name { + text-align: center; + } +} + +.admin-icon { + color: gold; + margin-left: 5px; + vertical-align: middle; +} diff --git a/assets/vue/components/social/SocialGroupMenu.vue b/assets/vue/components/social/SocialGroupMenu.vue index d98120379b..d098ba2141 100644 --- a/assets/vue/components/social/SocialGroupMenu.vue +++ b/assets/vue/components/social/SocialGroupMenu.vue @@ -13,12 +13,6 @@ {{ t("Home") }} -
  • - - - {{ t("Edit this group") }} - -
  • @@ -26,7 +20,7 @@
  • - + {{ t("Invite friends") }} diff --git a/assets/vue/components/usergroup/GroupDiscussions.vue b/assets/vue/components/usergroup/GroupDiscussions.vue index ac358022a9..53030ee0a0 100644 --- a/assets/vue/components/usergroup/GroupDiscussions.vue +++ b/assets/vue/components/usergroup/GroupDiscussions.vue @@ -3,7 +3,7 @@

    Discussions

    - Create thread + {{ t("Create thread") }}
    @@ -11,7 +11,7 @@
    - {{ discussion.repliesCount }} Replies + {{ discussion.repliesCount }} {{ t("Replies") }} Created {{ new Date(discussion.sendDate).toLocaleDateString() }}
    diff --git a/assets/vue/components/usergroup/GroupMembers.vue b/assets/vue/components/usergroup/GroupMembers.vue index e7c80745e1..f241009366 100644 --- a/assets/vue/components/usergroup/GroupMembers.vue +++ b/assets/vue/components/usergroup/GroupMembers.vue @@ -12,10 +12,13 @@
    - Member avatar + Member avatar
    -
    {{ member.name }}
    +
    + {{ member.name }} + +
    {{ member.role }}
    @@ -23,24 +26,38 @@ diff --git a/assets/vue/composables/useSocialInfo.js b/assets/vue/composables/useSocialInfo.js index fa4dac6a2f..6403505603 100644 --- a/assets/vue/composables/useSocialInfo.js +++ b/assets/vue/composables/useSocialInfo.js @@ -19,7 +19,14 @@ export function useSocialInfo() { if (groupId) { try { const response = await axios.get(`/api/usergroup/${groupId}`); - groupInfo.value = response.data; + const groupData = response.data; + const extractedId = groupData['@id'].split('/').pop(); + + groupInfo.value = { + ...groupData, + id: extractedId + }; + isGroup.value = true; } catch (error) { console.error("Error loading group:", error); @@ -50,9 +57,9 @@ export function useSocialInfo() { onMounted(async () => { try { - if (!route.params.group_id) { + //if (!route.params.group_id) { await loadUser(); - } + //} if (route.params.group_id) { await loadGroup(route.params.group_id); } diff --git a/assets/vue/router/usergroup.js b/assets/vue/router/usergroup.js index 92765851a8..e8f4a7b486 100644 --- a/assets/vue/router/usergroup.js +++ b/assets/vue/router/usergroup.js @@ -21,6 +21,12 @@ export default { path: 'search', component: () => import('../views/usergroup/Search.vue'), props: (route) => ({ q: route.query.q }) + }, + { + name: 'UserGroupInvite', + path: 'invite/:group_id?', + component: () => import('../views/usergroup/Invite.vue'), + props: true } ] }; diff --git a/assets/vue/views/usergroup/Invite.vue b/assets/vue/views/usergroup/Invite.vue new file mode 100644 index 0000000000..fa96370296 --- /dev/null +++ b/assets/vue/views/usergroup/Invite.vue @@ -0,0 +1,112 @@ + + + diff --git a/src/CoreBundle/Controller/SocialController.php b/src/CoreBundle/Controller/SocialController.php index af0f251d36..ccbd1418f2 100644 --- a/src/CoreBundle/Controller/SocialController.php +++ b/src/CoreBundle/Controller/SocialController.php @@ -11,6 +11,7 @@ use Chamilo\CoreBundle\Entity\Usergroup; use Chamilo\CoreBundle\Repository\LanguageRepository; use Chamilo\CoreBundle\Repository\LegalRepository; use Chamilo\CoreBundle\Repository\Node\CourseRepository; +use Chamilo\CoreBundle\Repository\Node\IllustrationRepository; use Chamilo\CoreBundle\Repository\Node\UsergroupRepository; use Chamilo\CoreBundle\Repository\Node\UserRepository; use Chamilo\CoreBundle\Serializer\UserToJsonNormalizer; @@ -22,6 +23,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mime\Email; use Symfony\Component\Routing\Annotation\Route; @@ -272,21 +274,59 @@ class SocialController extends AbstractController return $this->json(['go_to' => $goToLink]); } - /** - * @Route("/upload-group-picture/{id}", name="chamilo_core_social_upload_group_picture", methods={"POST"}) - */ - #[Route('/upload-group-picture/{id}', name: 'chamilo_core_social_upload_group_picture')] - public function uploadGroupPicture(Request $request, Usergroup $usergroup) + #[Route('/invite-friends/{userId}/{groupId}', name: 'chamilo_core_social_invite_friends')] + public function inviteFriends(int $userId, int $groupId, UserRepository $userRepository, UsergroupRepository $usergroupRepository, IllustrationRepository $illustrationRepository): JsonResponse { - $file = $request->files->get('picture'); - if ($file) { + $user = $userRepository->find($userId); + if (!$user) { + return $this->json(['error' => 'User not found'], Response::HTTP_NOT_FOUND); + } + $group = $usergroupRepository->find($groupId); + if (!$group) { + return $this->json(['error' => 'Group not found'], Response::HTTP_NOT_FOUND); } - return $this->json([ - 'success' => true, - 'message' => 'Imagen del grupo actualizada correctamente.', - ]); + $friends = $userRepository->getFriendsNotInGroup($userId, $groupId); + + $friendsList = array_map(function ($friend) use ($illustrationRepository) { + return [ + 'id' => $friend->getId(), + 'name' => $friend->getFirstName() . ' ' . $friend->getLastName(), + 'avatar' => $illustrationRepository->getIllustrationUrl($friend), + ]; + }, $friends); + + return $this->json(['friends' => $friendsList]); } + #[Route('/add-users-to-group/{groupId}', name: 'chamilo_core_social_add_users_to_group')] + public function addUsersToGroup(Request $request, int $groupId, UsergroupRepository $usergroupRepository): JsonResponse + { + $data = json_decode($request->getContent(), true); + $userIds = $data['userIds'] ?? []; + + try { + $usergroupRepository->addUserToGroup($userIds, $groupId); + return $this->json(['success' => true, 'message' => 'Users added to group successfully.']); + } catch (\Exception $e) { + return $this->json(['success' => false, 'message' => 'An error occurred: ' . $e->getMessage()], Response::HTTP_BAD_REQUEST); + } + } + + #[Route('/group/{groupId}/invited-users', name: 'chamilo_core_social_group_invited_users')] + public function groupInvitedUsers(int $groupId, UsergroupRepository $usergroupRepository, IllustrationRepository $illustrationRepository): JsonResponse + { + $invitedUsers = $usergroupRepository->getInvitedUsersByGroup($groupId); + + $invitedUsersList = array_map(function ($user) use ($illustrationRepository) { + return [ + 'id' => $user['id'], + 'name' => $user['username'], + // 'avatar' => $illustrationRepository->getIllustrationUrl($user), + ]; + }, $invitedUsers); + + return $this->json(['invitedUsers' => $invitedUsersList]); + } } diff --git a/src/CoreBundle/DataProvider/GroupMembersDataProvider.php b/src/CoreBundle/DataProvider/GroupMembersDataProvider.php new file mode 100644 index 0000000000..6a9243899d --- /dev/null +++ b/src/CoreBundle/DataProvider/GroupMembersDataProvider.php @@ -0,0 +1,39 @@ +entityManager = $entityManager; + } + + public function supports(Operation $operation, array $uriVariables = [], array $context = []): bool + { + return Usergroup::class === $operation->getClass() && 'get_group_members' === $operation->getName(); + } + + public function provide(Operation $operation, array $uriVariables = [], array $context = []): iterable + { + $groupId = $uriVariables['id'] ?? null; + + if (null === $groupId) { + return []; + } + + $usergroupRepository = $this->entityManager->getRepository(Usergroup::class); + $users = $usergroupRepository->getUsersByGroup((int)$groupId); + + return $users; + } +} diff --git a/src/CoreBundle/Entity/Usergroup.php b/src/CoreBundle/Entity/Usergroup.php index e9cdf126fc..dd0bfd53c5 100644 --- a/src/CoreBundle/Entity/Usergroup.php +++ b/src/CoreBundle/Entity/Usergroup.php @@ -12,6 +12,7 @@ use ApiPlatform\Metadata\Get; use ApiPlatform\Metadata\GetCollection; use ApiPlatform\Metadata\Post; use ApiPlatform\Metadata\Put; +use Chamilo\CoreBundle\DataProvider\GroupMembersDataProvider; use Chamilo\CoreBundle\DataProvider\UsergroupDataProvider; use Chamilo\CoreBundle\Repository\Node\UsergroupRepository; use Chamilo\CoreBundle\State\UsergroupPostProcessor; @@ -61,6 +62,13 @@ use Symfony\Component\Validator\Constraints as Assert; security: "is_granted('ROLE_USER')", name: 'search_usergroups' ), + new GetCollection( + uriTemplate: '/usergroups/{id}/members', + normalizationContext: ['groups' => ['usergroup:read']], + security: "is_granted('ROLE_USER')", + name: 'get_group_members', + provider: GroupMembersDataProvider::class + ), new Post( securityPostDenormalize: "is_granted('CREATE', object)", processor: UsergroupPostProcessor::class diff --git a/src/CoreBundle/Repository/Node/UserRepository.php b/src/CoreBundle/Repository/Node/UserRepository.php index e33c5b8974..8e6450b089 100644 --- a/src/CoreBundle/Repository/Node/UserRepository.php +++ b/src/CoreBundle/Repository/Node/UserRepository.php @@ -14,6 +14,8 @@ use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\TrackELogin; use Chamilo\CoreBundle\Entity\TrackEOnline; use Chamilo\CoreBundle\Entity\User; +use Chamilo\CoreBundle\Entity\Usergroup; +use Chamilo\CoreBundle\Entity\UsergroupRelUser; use Chamilo\CoreBundle\Entity\UserRelUser; use Chamilo\CoreBundle\Repository\ResourceRepository; use Datetime; @@ -694,4 +696,33 @@ class UserRepository extends ResourceRepository implements PasswordUpgraderInter return $qb; } + + public function getFriendsNotInGroup(int $userId, int $groupId) + { + $entityManager = $this->getEntityManager(); + + $subQueryBuilder = $entityManager->createQueryBuilder(); + $subQuery = $subQueryBuilder + ->select('IDENTITY(ugr.user)') + ->from(UsergroupRelUser::class, 'ugr') + ->where('ugr.usergroup = :subGroupId') + ->andWhere('ugr.relationType IN (:subRelationTypes)') + ->getDQL(); + + $queryBuilder = $entityManager->createQueryBuilder(); + $query = $queryBuilder + ->select('u') + ->from(User::class, 'u') + ->leftJoin('u.friendsWithMe', 'uruf') + ->leftJoin('u.friends', 'urut') + ->where('uruf.friend = :userId OR urut.user = :userId') + ->andWhere($queryBuilder->expr()->notIn('u.id', $subQuery)) + ->setParameter('userId', $userId) + ->setParameter('subGroupId', $groupId) + ->setParameter('subRelationTypes', [Usergroup::GROUP_USER_PERMISSION_PENDING_INVITATION]) + ->getQuery(); + + return $query->getResult(); + } + } diff --git a/src/CoreBundle/Repository/Node/UsergroupRepository.php b/src/CoreBundle/Repository/Node/UsergroupRepository.php index 5d502c15f3..39cb045f71 100644 --- a/src/CoreBundle/Repository/Node/UsergroupRepository.php +++ b/src/CoreBundle/Repository/Node/UsergroupRepository.php @@ -6,7 +6,9 @@ declare(strict_types=1); namespace Chamilo\CoreBundle\Repository\Node; +use Chamilo\CoreBundle\Entity\User; use Chamilo\CoreBundle\Entity\Usergroup; +use Chamilo\CoreBundle\Entity\UsergroupRelUser; use Chamilo\CoreBundle\Repository\ResourceRepository; use Doctrine\Persistence\ManagerRegistry; @@ -134,6 +136,74 @@ class UsergroupRepository extends ResourceRepository return $queryBuilder->getQuery()->getResult(); } + public function getUsersByGroup(int $groupID) + { + $qb = $this->createQueryBuilder('g') + ->innerJoin('g.users', 'gu') + ->innerJoin('gu.user', 'u') + ->where('g.id = :groupID') + ->setParameter('groupID', $groupID) + ->andWhere('gu.relationType IN (:relationTypes)') + ->setParameter('relationTypes', [ + Usergroup::GROUP_USER_PERMISSION_ADMIN, + Usergroup::GROUP_USER_PERMISSION_READER, + Usergroup::GROUP_USER_PERMISSION_PENDING_INVITATION + ]) + ->select('u.id, u.username, u.email, gu.relationType'); + + return $qb->getQuery()->getResult(); + } + + public function addUserToGroup(array $userIds, int $groupId): void + { + $group = $this->find($groupId); + if (!$group) { + throw new \Exception("Group not found"); + } + + foreach ($userIds as $userId) { + $user = $this->_em->getRepository(User::class)->find($userId); + if ($user) { + $groupRelUser = new UsergroupRelUser(); + $groupRelUser->setUsergroup($group); + $groupRelUser->setUser($user); + $groupRelUser->setRelationType(Usergroup::GROUP_USER_PERMISSION_PENDING_INVITATION); + $this->_em->persist($groupRelUser); + } + } + + $this->_em->flush(); + } + + public function getInvitedUsersByGroup(int $groupID) + { + $qb = $this->createQueryBuilder('g') + ->innerJoin('g.users', 'gu') + ->innerJoin('gu.user', 'u') + ->where('g.id = :groupID') + ->setParameter('groupID', $groupID) + ->andWhere('gu.relationType = :relationType') + ->setParameter('relationType', Usergroup::GROUP_USER_PERMISSION_PENDING_INVITATION) + ->select('u.id, u.username, u.email, gu.relationType'); + + return $qb->getQuery()->getResult(); + } + + + public function getInvitedUsers(int $groupId): array + { + $qb = $this->createQueryBuilder('g') + ->innerJoin('g.users', 'rel') + ->innerJoin('rel.user', 'u') + ->where('g.id = :groupId') + ->andWhere('rel.relationType = :relationType') + ->setParameter('groupId', $groupId) + ->setParameter('relationType', Usergroup::GROUP_USER_PERMISSION_PENDING_INVITATION) + ->select('u'); + + return $qb->getQuery()->getResult(); + } + /** * Determines whether to use the multi-URL feature. *