chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - update from 1.11.x

Browse Source
pull/2650/head
Julio Montoya 7 years ago
parent b52d0ac192
commit 819fa762f3
1 changed files with 58 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 90
      src/UserBundle/Repository/UserRepository.php

90
src/UserBundle/Repository/UserRepository.php
Unescape View File

@ -183,8 +183,7 @@ class UserRepository extends EntityRepository
*/ */
public function searchUsersByStatus($query, $status, $accessUrlId = null) public function searchUsersByStatus($query, $status, $accessUrlId = null)
{ {
$accessUrlId = intval($accessUrlId); $accessUrlId = (int) $accessUrlId;
$queryBuilder = $this->createQueryBuilder('u'); $queryBuilder = $this->createQueryBuilder('u');
if ($accessUrlId > 0) { if ($accessUrlId > 0) {
@ -588,10 +587,11 @@ class UserRepository extends EntityRepository
$gradebookCertificate = []; $gradebookCertificate = [];
/** @var GradebookCertificate $item */ /** @var GradebookCertificate $item */
foreach ($result as $item) { foreach ($result as $item) {
$createdAt = $item->getCreatedAt() ? $item->getCreatedAt()->format($dateFormat) : '';
$list = [ $list = [
'Score: '.$item->getScoreCertificate(), 'Score: '.$item->getScoreCertificate(),
'Path: '.$item->getPathCertificate(), 'Path: '.$item->getPathCertificate(),
'Created at: '.$item->getCreatedAt()->format($dateFormat), 'Created at: '.$createdAt,
]; ];
$gradebookCertificate[] = implode(', ', $list); $gradebookCertificate[] = implode(', ', $list);
} }
@ -604,12 +604,13 @@ class UserRepository extends EntityRepository
$trackEExercises = []; $trackEExercises = [];
/** @var TrackEExercises $item */ /** @var TrackEExercises $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getExeDate() ? $item->getExeDate()->format($dateFormat) : '';
$list = [ $list = [
'IP: '.$item->getUserIp(), 'IP: '.$item->getUserIp(),
'Start: '.$item->getExeDate()->format($dateFormat), 'Start: '.$date,
'Status: '.$item->getStatus(), 'Status: '.$item->getStatus(),
// 'Result: '.$item->getExeResult(), // 'Result: '.$item->getExeResult(),
// 'Weighting: '.$item->getExeWeighting(), // 'Weighting: '.$item->getExeWeighting(),
]; ];
$trackEExercises[] = implode(', ', $list); $trackEExercises[] = implode(', ', $list);
} }
@ -629,7 +630,7 @@ class UserRepository extends EntityRepository
'Session #'.$item->getSessionId(), 'Session #'.$item->getSessionId(),
//'Marks: '.$item->getMarks(), //'Marks: '.$item->getMarks(),
'Position: '.$item->getPosition(), 'Position: '.$item->getPosition(),
'Date: '.$item->getTms()->format($dateFormat), 'Date: '.$date,
]; ];
$trackEAttempt[] = implode(', ', $list); $trackEAttempt[] = implode(', ', $list);
} }
@ -642,10 +643,12 @@ class UserRepository extends EntityRepository
$trackECourseAccessList = []; $trackECourseAccessList = [];
/** @var TrackECourseAccess $item */ /** @var TrackECourseAccess $item */
foreach ($result as $item) { foreach ($result as $item) {
$startDate = $item->getLoginCourseDate() ? $item->getLoginCourseDate()->format($dateFormat) : '';
$endDate = $item->getLogoutCourseDate() ? $item->getLogoutCourseDate()->format($dateFormat) : '';
$list = [ $list = [
'IP: '.$item->getUserIp(), 'IP: '.$item->getUserIp(),
'Start: '.$item->getLoginCourseDate()->format($dateFormat), 'Start: '.$startDate,
'End: '.$item->getLogoutCourseDate()->format($dateFormat), 'End: '.$endDate,
]; ];
$trackECourseAccessList[] = implode(', ', $list); $trackECourseAccessList[] = implode(', ', $list);
} }
@ -658,10 +661,12 @@ class UserRepository extends EntityRepository
$trackELoginList = []; $trackELoginList = [];
/** @var TrackELogin $item */ /** @var TrackELogin $item */
foreach ($result as $item) { foreach ($result as $item) {
$startDate = $item->getLoginDate() ? $item->getLoginDate()->format($dateFormat) : '';
$endDate = $item->getLogoutDate() ? $item->getLogoutDate()->format($dateFormat) : '';
$list = [ $list = [
'IP: '.$item->getUserIp(), 'IP: '.$item->getUserIp(),
'Start: '.$item->getLoginDate()->format($dateFormat), 'Start: '.$startDate,
'End: '.$item->getLogoutDate()->format($dateFormat), 'End: '.$endDate,
]; ];
$trackELoginList[] = implode(', ', $list); $trackELoginList[] = implode(', ', $list);
} }
@ -674,10 +679,11 @@ class UserRepository extends EntityRepository
$trackEAccessList = []; $trackEAccessList = [];
/** @var TrackEAccess $item */ /** @var TrackEAccess $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getAccessDate() ? $item->getAccessDate()->format($dateFormat) : '';
$list = [ $list = [
'IP: '.$item->getUserIp(), 'IP: '.$item->getUserIp(),
'Tool: '.$item->getAccessTool(), 'Tool: '.$item->getAccessTool(),
'End: '.$item->getAccessDate()->format($dateFormat), 'End: '.$date,
]; ];
$trackEAccessList[] = implode(', ', $list); $trackEAccessList[] = implode(', ', $list);
} }
@ -690,9 +696,10 @@ class UserRepository extends EntityRepository
$trackEOnlineList = []; $trackEOnlineList = [];
/** @var TrackEOnline $item */ /** @var TrackEOnline $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getLoginDate() ? $item->getLoginDate()->format($dateFormat) : '';
$list = [ $list = [
'IP: '.$item->getUserIp(), 'IP: '.$item->getUserIp(),
'Login date: '.$item->getLoginDate()->format($dateFormat), 'Login date: '.$date,
'Course # '.$item->getCId(), 'Course # '.$item->getCId(),
'Session # '.$item->getSessionId(), 'Session # '.$item->getSessionId(),
]; ];
@ -707,11 +714,12 @@ class UserRepository extends EntityRepository
$trackEDefault = []; $trackEDefault = [];
/** @var TrackEDefault $item */ /** @var TrackEDefault $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getDefaultDate() ? $item->getDefaultDate()->format($dateFormat) : '';
$list = [ $list = [
'Type: '.$item->getDefaultEventType(), 'Type: '.$item->getDefaultEventType(),
'Value: '.$item->getDefaultValue(), 'Value: '.$item->getDefaultValue(),
'Value type: '.$item->getDefaultValueType(), 'Value type: '.$item->getDefaultValueType(),
'Date: '.$item->getDefaultDate()->format($dateFormat), 'Date: '.$date,
'Course #'.$item->getCId(), 'Course #'.$item->getCId(),
'Session # '.$item->getSessionId(), 'Session # '.$item->getSessionId(),
]; ];
@ -726,11 +734,12 @@ class UserRepository extends EntityRepository
$trackELastaccess = []; $trackELastaccess = [];
/** @var TrackELastaccess $item */ /** @var TrackELastaccess $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getAccessDate() ? $item->getAccessDate()->format($dateFormat) : '';
$list = [ $list = [
'Course #'.$item->getCId(), 'Course #'.$item->getCId(),
'Session # '.$item->getAccessSessionId(), 'Session # '.$item->getAccessSessionId(),
'Tool: '.$item->getAccessTool(), 'Tool: '.$item->getAccessTool(),
'Access date: '.$item->getAccessDate()->format($dateFormat), 'Access date: '.$date,
]; ];
$trackELastaccess[] = implode(', ', $list); $trackELastaccess[] = implode(', ', $list);
} }
@ -743,9 +752,10 @@ class UserRepository extends EntityRepository
$trackEUploads = []; $trackEUploads = [];
/** @var TrackEUploads $item */ /** @var TrackEUploads $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getUploadDate() ? $item->getUploadDate()->format($dateFormat) : '';
$list = [ $list = [
'Course #'.$item->getCId(), 'Course #'.$item->getCId(),
'Uploaded at: '.$item->getUploadDate()->format($dateFormat), 'Uploaded at: '.$date,
'Upload id # '.$item->getUploadId(), 'Upload id # '.$item->getUploadId(),
]; ];
$trackEUploads[] = implode(', ', $list); $trackEUploads[] = implode(', ', $list);
@ -758,10 +768,11 @@ class UserRepository extends EntityRepository
$gradebookResult = []; $gradebookResult = [];
/** @var GradebookResult $item */ /** @var GradebookResult $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getCreatedAt() ? $item->getCreatedAt()->format($dateFormat) : '';
$list = [ $list = [
'Evaluation id# '.$item->getEvaluationId(), 'Evaluation id# '.$item->getEvaluationId(),
//'Score: '.$item->getScore(), //'Score: '.$item->getScore(),
'Creation date: '.$item->getCreatedAt()->format($dateFormat), 'Creation date: '.$date,
]; ];
$gradebookResult[] = implode(', ', $list); $gradebookResult[] = implode(', ', $list);
} }
@ -773,9 +784,10 @@ class UserRepository extends EntityRepository
$trackEDownloads = []; $trackEDownloads = [];
/** @var TrackEDownloads $item */ /** @var TrackEDownloads $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getDownDate() ? $item->getDownDate()->format($dateFormat) : '';
$list = [ $list = [
'File: '.$item->getDownDocPath(), 'File: '.$item->getDownDocPath(),
'Download at: '.$item->getDownDate()->format($dateFormat), 'Download at: '.$date,
]; ];
$trackEDownloads[] = implode(', ', $list); $trackEDownloads[] = implode(', ', $list);
} }
@ -802,9 +814,10 @@ class UserRepository extends EntityRepository
$cForumPostList = []; $cForumPostList = [];
/** @var CForumPost $item */ /** @var CForumPost $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getPostDate() ? $item->getPostDate()->format($dateFormat) : '';
$list = [ $list = [
'Title: '.$item->getPostTitle(), 'Title: '.$item->getPostTitle(),
'Creation date: '.$item->getPostDate()->format($dateFormat), 'Creation date: '.$date,
]; ];
$cForumPostList[] = implode(', ', $list); $cForumPostList[] = implode(', ', $list);
} }
@ -817,9 +830,10 @@ class UserRepository extends EntityRepository
$cForumThreadList = []; $cForumThreadList = [];
/** @var CForumThread $item */ /** @var CForumThread $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getThreadDate() ? $item->getThreadDate()->format($dateFormat) : '';
$list = [ $list = [
'Title: '.$item->getThreadTitle(), 'Title: '.$item->getThreadTitle(),
'Creation date: '.$item->getThreadDate()->format($dateFormat), 'Creation date: '.$date,
]; ];
$cForumThreadList[] = implode(', ', $list); $cForumThreadList[] = implode(', ', $list);
} }
@ -878,9 +892,10 @@ class UserRepository extends EntityRepository
$cBlog = []; $cBlog = [];
/** @var CBlogPost $item */ /** @var CBlogPost $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getDateCreation() ? $item->getDateCreation()->format($dateFormat) : '';
$list = [ $list = [
'Title: '.$item->getTitle(), 'Title: '.$item->getTitle(),
'Date: '.$item->getDateCreation()->format($dateFormat), 'Date: '.$date,
]; ];
$cBlog[] = implode(', ', $list); $cBlog[] = implode(', ', $list);
} }
@ -908,9 +923,10 @@ class UserRepository extends EntityRepository
$messageList = []; $messageList = [];
/** @var Message $item */ /** @var Message $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getSendDate() ? $item->getSendDate()->format($dateFormat) : '';
$list = [ $list = [
'Title: '.$item->getTitle(), 'Title: '.$item->getTitle(),
'Sent date: '.$item->getSendDate()->format($dateFormat), 'Sent date: '.$date,
'To user # '.$item->getUserReceiverId(), 'To user # '.$item->getUserReceiverId(),
'Status'.$item->getMsgStatus(), 'Status'.$item->getMsgStatus(),
]; ];
@ -940,9 +956,10 @@ class UserRepository extends EntityRepository
$cDropboxFile = []; $cDropboxFile = [];
/** @var CDropboxFile $item */ /** @var CDropboxFile $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getUploadDate() ? $item->getUploadDate()->format($dateFormat) : '';
$list = [ $list = [
'Title: '.$item->getTitle(), 'Title: '.$item->getTitle(),
'Uploaded date: '.$item->getUploadDate()->format($dateFormat), 'Uploaded date: '.$date,
'File: '.$item->getFilename(), 'File: '.$item->getFilename(),
]; ];
$cDropboxFile[] = implode(', ', $list); $cDropboxFile[] = implode(', ', $list);
@ -971,10 +988,11 @@ class UserRepository extends EntityRepository
$cDropboxFeedback = []; $cDropboxFeedback = [];
/** @var CDropboxFeedback $item */ /** @var CDropboxFeedback $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getFeedbackDate() ? $item->getFeedbackDate()->format($dateFormat) : '';
$list = [ $list = [
'File #'.$item->getFileId(), 'File #'.$item->getFileId(),
'Feedback: '.$item->getFeedback(), 'Feedback: '.$item->getFeedback(),
'Date: '.$item->getFeedbackDate()->format($dateFormat), 'Date: '.$date,
]; ];
$cDropboxFeedback[] = implode(', ', $list); $cDropboxFeedback[] = implode(', ', $list);
} }
@ -987,9 +1005,10 @@ class UserRepository extends EntityRepository
$cNotebook = []; $cNotebook = [];
/** @var CNotebook $item */ /** @var CNotebook $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getUpdateDate() ? $item->getUpdateDate()->format($dateFormat) : '';
$list = [ $list = [
'Title: '.$item->getTitle(), 'Title: '.$item->getTitle(),
'Date: '.$item->getUpdateDate()->format($dateFormat), 'Date: '.$date,
]; ];
$cNotebook[] = implode(', ', $list); $cNotebook[] = implode(', ', $list);
} }
@ -1035,11 +1054,12 @@ class UserRepository extends EntityRepository
$cStudentPublicationComment = []; $cStudentPublicationComment = [];
/** @var CStudentPublicationComment $item */ /** @var CStudentPublicationComment $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getSentAt() ? $item->getSentAt()->format($dateFormat) : '';
$list = [ $list = [
'Commment: '.$item->getComment(), 'Commment: '.$item->getComment(),
'File '.$item->getFile(), 'File '.$item->getFile(),
'Course # '.$item->getCId(), 'Course # '.$item->getCId(),
'Date: '.$item->getSentAt()->format($dateFormat), 'Date: '.$date,
]; ];
$cStudentPublicationComment[] = implode(', ', $list); $cStudentPublicationComment[] = implode(', ', $list);
} }
@ -1083,11 +1103,12 @@ class UserRepository extends EntityRepository
$ticketMessage = []; $ticketMessage = [];
/** @var \Chamilo\TicketBundle\Entity\Message $item */ /** @var \Chamilo\TicketBundle\Entity\Message $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getInsertDateTime() ? $item->getInsertDateTime()->format($dateFormat) : '';
$list = [ $list = [
'Subject: '.$item->getSubject(), 'Subject: '.$item->getSubject(),
'IP: '.$item->getIpAddress(), 'IP: '.$item->getIpAddress(),
'Status: '.$item->getStatus(), 'Status: '.$item->getStatus(),
'Creation date: '.$item->getInsertDateTime()->format($dateFormat), 'Creation date: '.$date,
]; ];
$ticketMessage[] = implode(', ', $list); $ticketMessage[] = implode(', ', $list);
} }
@ -1100,10 +1121,11 @@ class UserRepository extends EntityRepository
$skillRelUserComment = []; $skillRelUserComment = [];
/** @var SkillRelUserComment $item */ /** @var SkillRelUserComment $item */
foreach ($result as $item) { foreach ($result as $item) {
$date = $item->getFeedbackDateTime() ? $item->getFeedbackDateTime()->format($dateFormat) : '';
$list = [ $list = [
'Feedback: '.$item->getFeedbackText(), 'Feedback: '.$item->getFeedbackText(),
'Value: '.$item->getFeedbackValue(), 'Value: '.$item->getFeedbackValue(),
'Created at: '.$item->getFeedbackDateTime()->format($dateFormat), 'Created at: '.$date,
]; ];
$skillRelUserComment[] = implode(', ', $list); $skillRelUserComment[] = implode(', ', $list);
} }
@ -1132,13 +1154,17 @@ class UserRepository extends EntityRepository
$userApiKey = []; $userApiKey = [];
/** @var UserApiKey $item */ /** @var UserApiKey $item */
foreach ($result as $item) { foreach ($result as $item) {
$validityStart = $item->getValidityStartDate() ? $item->getValidityStartDate()->format($dateFormat) : '';
$validityEnd = $item->getValidityEndDate() ? $item->getValidityEndDate()->format($dateFormat) : '';
$created = $item->getCreatedDate() ? $item->getCreatedDate()->format($dateFormat) : '';
$list = [ $list = [
'ApiKey #'.$item->getApiKey(), 'ApiKey #'.$item->getApiKey(),
'Service: '.$item->getApiService(), 'Service: '.$item->getApiService(),
'EndPoint: '.$item->getApiEndPoint(), 'EndPoint: '.$item->getApiEndPoint(),
'Validity start date: '.$item->getValidityEndDate()->format($dateFormat), 'Validity start date: '.$validityStart,
'Validity enddate: '.$item->getValidityStartDate()->format($dateFormat), 'Validity enddate: '.$validityEnd,
'Created at: '.$item->getCreatedDate()->format($dateFormat), 'Created at: '.$created,
]; ];
$userApiKey[] = implode(', ', $list); $userApiKey[] = implode(', ', $list);
} }
@ -1205,8 +1231,8 @@ class UserRepository extends EntityRepository
$portalInfo = \UrlManager::get_url_data_from_id($portal->getAccessUrlId()); $portalInfo = \UrlManager::get_url_data_from_id($portal->getAccessUrlId());
$list[] = $portalInfo['url']; $list[] = $portalInfo['url'];
} }
$user->setPortals($list);
} }
$user->setPortals($list);
$coachList = $user->getSessionAsGeneralCoach(); $coachList = $user->getSessionAsGeneralCoach();
$list = []; $list = [];

Write Preview
Loading…
Cancel
Save