|
|
|
|
@ -12,6 +12,7 @@ use Chamilo\CoreBundle\Entity\Message; |
|
|
|
|
use Chamilo\CoreBundle\Entity\Session; |
|
|
|
|
use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser; |
|
|
|
|
use Chamilo\CoreBundle\Entity\SkillRelUser; |
|
|
|
|
use Chamilo\CoreBundle\Entity\SkillRelUserComment; |
|
|
|
|
use Chamilo\CoreBundle\Entity\TrackEAccess; |
|
|
|
|
use Chamilo\CoreBundle\Entity\TrackEAttempt; |
|
|
|
|
use Chamilo\CoreBundle\Entity\TrackECourseAccess; |
|
|
|
|
@ -22,8 +23,10 @@ use Chamilo\CoreBundle\Entity\TrackELastaccess; |
|
|
|
|
use Chamilo\CoreBundle\Entity\TrackELogin; |
|
|
|
|
use Chamilo\CoreBundle\Entity\TrackEOnline; |
|
|
|
|
use Chamilo\CoreBundle\Entity\TrackEUploads; |
|
|
|
|
use Chamilo\CoreBundle\Entity\UserApiKey; |
|
|
|
|
use Chamilo\CoreBundle\Entity\UserCourseCategory; |
|
|
|
|
use Chamilo\CoreBundle\Entity\UsergroupRelUser; |
|
|
|
|
use Chamilo\CoreBundle\Entity\UserRelCourseVote; |
|
|
|
|
use Chamilo\CourseBundle\Entity\CAttendanceResult; |
|
|
|
|
use Chamilo\CourseBundle\Entity\CAttendanceSheet; |
|
|
|
|
use Chamilo\CourseBundle\Entity\CBlogPost; |
|
|
|
|
@ -43,6 +46,7 @@ use Chamilo\TicketBundle\Entity\Ticket; |
|
|
|
|
use Chamilo\UserBundle\Entity\User; |
|
|
|
|
use Doctrine\ORM\EntityRepository; |
|
|
|
|
use Doctrine\ORM\Query\Expr\Join; |
|
|
|
|
use Symfony\Component\Finder\Finder; |
|
|
|
|
use Symfony\Component\Serializer\Encoder\JsonEncoder; |
|
|
|
|
use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer; |
|
|
|
|
use Symfony\Component\Serializer\Serializer; |
|
|
|
|
@ -511,17 +515,31 @@ class UserRepository extends EntityRepository |
|
|
|
|
|
|
|
|
|
$courses = $user->getCourses(); |
|
|
|
|
$list = []; |
|
|
|
|
$chatFiles = []; |
|
|
|
|
/** @var CourseRelUser $course */ |
|
|
|
|
foreach ($courses as $course) { |
|
|
|
|
$list[] = $course->getCourse()->getCode(); |
|
|
|
|
$courseDir = api_get_path(SYS_COURSE_PATH).$course->getCourse()->getDirectory(); |
|
|
|
|
$documentDir = $courseDir.'/document/chat_files/'; |
|
|
|
|
if (is_dir($documentDir)) { |
|
|
|
|
$fs = new Finder(); |
|
|
|
|
$fs->files()->in($documentDir); |
|
|
|
|
foreach ($fs as $file) { |
|
|
|
|
$chatFiles[] = |
|
|
|
|
$course->getCourse()->getDirectory().'/document/chat_files/'.$file->getFilename().' - '. |
|
|
|
|
get_lang('ContentNotAccessibleRequestFromDataPrivacyOfficer'); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$user->setCourses($list); |
|
|
|
|
|
|
|
|
|
$classes = $user->getClasses(); |
|
|
|
|
$list = []; |
|
|
|
|
/** @var UsergroupRelUser $class */ |
|
|
|
|
foreach ($classes as $class) { |
|
|
|
|
$list[] = $class->getUsergroup()->getName(); |
|
|
|
|
$name = $class->getUsergroup()->getName(); |
|
|
|
|
$list[$class->getUsergroup()->getGroupType()][] = $name.' - Status: '.$class->getRelationType(); |
|
|
|
|
} |
|
|
|
|
$user->setClasses($list); |
|
|
|
|
|
|
|
|
|
@ -580,8 +598,8 @@ class UserRepository extends EntityRepository |
|
|
|
|
'IP: '.$item->getUserIp(), |
|
|
|
|
'Start: '.$item->getExeDate()->format($dateFormat), |
|
|
|
|
'Status: '.$item->getStatus(), |
|
|
|
|
'Result: '.$item->getExeResult(), |
|
|
|
|
'Weighting: '.$item->getExeWeighting(), |
|
|
|
|
// 'Result: '.$item->getExeResult(), |
|
|
|
|
// 'Weighting: '.$item->getExeWeighting(), |
|
|
|
|
]; |
|
|
|
|
$trackEExercises[] = implode(', ', $list); |
|
|
|
|
} |
|
|
|
|
@ -597,9 +615,9 @@ class UserRepository extends EntityRepository |
|
|
|
|
$list = [ |
|
|
|
|
'Attempt #'.$item->getExeId(), |
|
|
|
|
'Course # '.$item->getCId(), |
|
|
|
|
'Answer: '.$item->getAnswer(), |
|
|
|
|
//'Answer: '.$item->getAnswer(), |
|
|
|
|
'Session #'.$item->getSessionId(), |
|
|
|
|
'Marks: '.$item->getMarks(), |
|
|
|
|
//'Marks: '.$item->getMarks(), |
|
|
|
|
'Position: '.$item->getPosition(), |
|
|
|
|
'Date: '.$item->getTms()->format($dateFormat), |
|
|
|
|
]; |
|
|
|
|
@ -733,7 +751,7 @@ class UserRepository extends EntityRepository |
|
|
|
|
foreach ($result as $item) { |
|
|
|
|
$list = [ |
|
|
|
|
'Evaluation id# '.$item->getEvaluationId(), |
|
|
|
|
'Score: '.$item->getScore(), |
|
|
|
|
//'Score: '.$item->getScore(), |
|
|
|
|
'Creation date: '.$item->getCreatedAt()->format($dateFormat), |
|
|
|
|
]; |
|
|
|
|
$gradebookResult[] = implode(', ', $list); |
|
|
|
|
@ -797,6 +815,21 @@ class UserRepository extends EntityRepository |
|
|
|
|
$cForumThreadList[] = implode(', ', $list); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// CForumAttachment |
|
|
|
|
/*$criteria = [ |
|
|
|
|
'threadPosterId' => $userId, |
|
|
|
|
]; |
|
|
|
|
$result = $em->getRepository('ChamiloCourseBundle:CForumAttachment')->findBy($criteria); |
|
|
|
|
$cForumThreadList = []; |
|
|
|
|
* @var CForumThread $item |
|
|
|
|
foreach ($result as $item) { |
|
|
|
|
$list = [ |
|
|
|
|
'Title: '.$item->getThreadTitle(), |
|
|
|
|
'Creation date: '.$item->getThreadDate()->format($dateFormat), |
|
|
|
|
]; |
|
|
|
|
$cForumThreadList[] = implode(', ', $list); |
|
|
|
|
}*/ |
|
|
|
|
|
|
|
|
|
// cGroupRelUser |
|
|
|
|
$criteria = [ |
|
|
|
|
'userId' => $userId, |
|
|
|
|
@ -869,7 +902,8 @@ class UserRepository extends EntityRepository |
|
|
|
|
$list = [ |
|
|
|
|
'Title: '.$item->getTitle(), |
|
|
|
|
'Sent date: '.$item->getSendDate()->format($dateFormat), |
|
|
|
|
'To user# '.$item->getUserReceiverId(), |
|
|
|
|
'To user # '.$item->getUserReceiverId(), |
|
|
|
|
'Status'.$item->getMsgStatus(), |
|
|
|
|
]; |
|
|
|
|
$messageList[] = implode(', ', $list); |
|
|
|
|
} |
|
|
|
|
@ -915,6 +949,7 @@ class UserRepository extends EntityRepository |
|
|
|
|
foreach ($result as $item) { |
|
|
|
|
$list = [ |
|
|
|
|
'File #'.$item->getFileId(), |
|
|
|
|
'Course #'.$item->getCId(), |
|
|
|
|
]; |
|
|
|
|
$cDropboxPerson[] = implode(', ', $list); |
|
|
|
|
} |
|
|
|
|
@ -1042,12 +1077,63 @@ class UserRepository extends EntityRepository |
|
|
|
|
$list = [ |
|
|
|
|
'Subject: '.$item->getSubject(), |
|
|
|
|
'IP: '.$item->getIpAddress(), |
|
|
|
|
'Status: '. $item->getStatus(), |
|
|
|
|
'Status: '.$item->getStatus(), |
|
|
|
|
'Creation date: '.$item->getInsertDateTime()->format($dateFormat), |
|
|
|
|
]; |
|
|
|
|
$ticketMessage[] = implode(', ', $list); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// SkillRelUserComment |
|
|
|
|
$criteria = [ |
|
|
|
|
'feedbackGiver' => $userId, |
|
|
|
|
]; |
|
|
|
|
$result = $em->getRepository('ChamiloCoreBundle:SkillRelUserComment')->findBy($criteria); |
|
|
|
|
$skillRelUserComment = []; |
|
|
|
|
/** @var SkillRelUserComment $item */ |
|
|
|
|
foreach ($result as $item) { |
|
|
|
|
$list = [ |
|
|
|
|
'Feedback: '.$item->getFeedbackText(), |
|
|
|
|
'Value: '.$item->getFeedbackValue(), |
|
|
|
|
'Created at: '.$item->getFeedbackDateTime()->format($dateFormat), |
|
|
|
|
]; |
|
|
|
|
$skillRelUserComment[] = implode(', ', $list); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// UserRelCourseVote |
|
|
|
|
$criteria = [ |
|
|
|
|
'userId' => $userId, |
|
|
|
|
]; |
|
|
|
|
$result = $em->getRepository('ChamiloCoreBundle:UserRelCourseVote')->findBy($criteria); |
|
|
|
|
$userRelCourseVote = []; |
|
|
|
|
/** @var UserRelCourseVote $item */ |
|
|
|
|
foreach ($result as $item) { |
|
|
|
|
$list = [ |
|
|
|
|
'Course #'.$item->getCId(), |
|
|
|
|
'Session #'.$item->getSessionId(), |
|
|
|
|
'Vote: '.$item->getVote(), |
|
|
|
|
]; |
|
|
|
|
$userRelCourseVote[] = implode(', ', $list); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// UserApiKey |
|
|
|
|
$criteria = [ |
|
|
|
|
'userId' => $userId, |
|
|
|
|
]; |
|
|
|
|
$result = $em->getRepository('ChamiloCoreBundle:UserApiKey')->findBy($criteria); |
|
|
|
|
$userApiKey = []; |
|
|
|
|
/** @var UserApiKey $item */ |
|
|
|
|
foreach ($result as $item) { |
|
|
|
|
$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), |
|
|
|
|
]; |
|
|
|
|
$userApiKey[] = implode(', ', $list); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$user->setDropBoxSentFiles( |
|
|
|
|
[ |
|
|
|
|
'Friends' => $friendList, |
|
|
|
|
@ -1064,11 +1150,15 @@ class UserRepository extends EntityRepository |
|
|
|
|
'GradebookResult' => $gradebookResult, |
|
|
|
|
'Downloads' => $trackEDownloads, |
|
|
|
|
'UserCourseCategory' => $userCourseCategory, |
|
|
|
|
'SkillRelUserComment' => $skillRelUserComment, |
|
|
|
|
'UserRelCourseVote' => $userRelCourseVote, |
|
|
|
|
'UserApiKey' => $userApiKey, |
|
|
|
|
|
|
|
|
|
// courses |
|
|
|
|
'AttendanceResult' => $cAttendanceResult, |
|
|
|
|
'Blog' => $cBlog, |
|
|
|
|
'DocumentsAdded' => $documents, |
|
|
|
|
'Chat' => $chatFiles, |
|
|
|
|
'ForumPost' => $cForumPostList, |
|
|
|
|
'ForumThread' => $cForumThreadList, |
|
|
|
|
'TrackEExercises' => $trackEExercises, |
|
|
|
|
|
Angel Fernando Quiroz Campos
7 years ago