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

Write Preview
Loading…
Cancel
Save