+ */
+ protected function generateAttachments(array $portfolioAttachments, User $user): array
+ {
+ if (empty($portfolioAttachments)) {
+ return [];
+ }
+
+ $attachments = [];
+
+ $userDirectory = UserManager::getUserPathById($user->getId(), 'system');
+ $attachmentsDirectory = $userDirectory.'portfolio_attachments/';
+
+ $langIso = api_get_language_isocode();
+
+ $cidreq = api_get_cidreq();
+ $baseUrl = api_get_path(WEB_CODE_PATH).'portfolio/index.php?'.($cidreq ? $cidreq.'&' : '');
+
+ foreach ($portfolioAttachments as $portfolioAttachment) {
+ $attachmentFilename = $attachmentsDirectory.$portfolioAttachment->getPath();
+
+ $display = LanguageMap::create(
+ ['und' => $portfolioAttachment->getFilename()]
+ );
+ $description = null;
+
+ if ($portfolioAttachment->getComment()) {
+ $description = LanguageMap::create(
+ [$langIso => $portfolioAttachment->getComment()]
+ );
+ }
+
+ $attachments[] = new Attachment(
+ IRI::fromString('http://id.tincanapi.com/attachment/supporting_media'),
+ mime_content_type($attachmentFilename),
+ $portfolioAttachment->getSize(),
+ hash_file('sha256', $attachmentFilename),
+ $display,
+ $description,
+ IRL::fromString(
+ $baseUrl.http_build_query(['action' => 'download', 'file' => $portfolioAttachment->getPath()])
+ )
+ );
+ }
+
+ return $attachments;
+ }
+
+ protected function generateAttachmentsForItem(Portfolio $item): array
+ {
+ $itemAttachments = \Database::getManager()
+ ->getRepository(PortfolioAttachment::class)
+ ->findFromItem($item)
+ ;
+
+ return $this->generateAttachments($itemAttachments, $item->getUser());
+ }
+
+ protected function generateAttachmentsForComment(PortfolioCommentEntity $comment): array
+ {
+ $commentAttachments = \Database::getManager()
+ ->getRepository(PortfolioAttachment::class)
+ ->findFromComment($this->comment)
+ ;
+
+ return $this->generateAttachments($commentAttachments, $comment->getAuthor());
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioComment.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioComment.php
new file mode 100644
index 00000000000..f967d6a1c10
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioComment.php
@@ -0,0 +1,25 @@
+comment = $comment;
+ $this->item = $this->comment->getItem();
+ $this->parentComment = $this->comment->getParent();
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioCommentEdited.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioCommentEdited.php
new file mode 100644
index 00000000000..5c2e2076e44
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioCommentEdited.php
@@ -0,0 +1,39 @@
+comment);
+ $context = $this->generateContext();
+ $attachements = $this->generateAttachmentsForComment($this->comment);
+
+ return new Statement(
+ $this->generateStatementId('portfolio-comment'),
+ $actor->generate(),
+ $verb->generate(),
+ $object->generate(),
+ null,
+ null,
+ api_get_utc_datetime(null, false, true),
+ null,
+ $context,
+ $attachements
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioCommentScored.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioCommentScored.php
new file mode 100644
index 00000000000..2892173e4a9
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioCommentScored.php
@@ -0,0 +1,47 @@
+comment->getScore();
+ $scaled = $maxScore ? ($rawScore / $maxScore) : 0;
+
+ $actor = new User($user);
+ $verb = new Scored();
+ $object = new PortfolioCommentActivity($this->comment);
+ $context = $this->generateContext();
+ $attachments = $this->generateAttachmentsForComment($this->comment);
+ $score = new Score($scaled, $rawScore, 0, $maxScore);
+ $result = new Result($score);
+
+ return new Statement(
+ $this->generateStatementId('portfolio-comment'),
+ $actor->generate(),
+ $verb->generate(),
+ $object->generate(),
+ $result,
+ null,
+ api_get_utc_datetime(null, false, true),
+ null,
+ $context,
+ $attachments
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioDownloaded.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioDownloaded.php
new file mode 100644
index 00000000000..419f051ff32
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioDownloaded.php
@@ -0,0 +1,42 @@
+owner = $owner;
+ }
+
+ public function generate(): Statement
+ {
+ $user = api_get_user_entity(api_get_user_id());
+
+ $actor = new UserActor($user);
+ $verb = new Downloaded();
+ $object = new PortfolioActivity($this->owner);
+ $context = $this->generateContext();
+
+ return new Statement(
+ $this->generateStatementId('portfolio-item'),
+ $actor->generate(),
+ $verb->generate(),
+ $object->generate(),
+ null,
+ null,
+ api_get_utc_datetime(null, false, true),
+ null,
+ $context
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItem.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItem.php
new file mode 100644
index 00000000000..bc8940eb926
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItem.php
@@ -0,0 +1,41 @@
+item = $item;
+ }
+
+ protected function generateContext(): Context
+ {
+ $context = parent::generateContext();
+
+ $category = $this->item->getCategory();
+
+ if ($category) {
+ $categoryActivity = new PortfolioCategory($category);
+
+ $contextActivities = $context
+ ->getContextActivities()
+ ->withAddedCategoryActivity(
+ $categoryActivity->generate()
+ )
+ ;
+
+ $context = $context->withContextActivities($contextActivities);
+ }
+
+ return $context;
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemCommented.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemCommented.php
new file mode 100644
index 00000000000..4f4e37cacbd
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemCommented.php
@@ -0,0 +1,74 @@
+generateStatementId('portfolio-comment');
+
+ $userActor = new UserActor($this->comment->getAuthor());
+ $statementResult = new Result(null, null, null, $this->comment->getContent());
+
+ $context = $this->generateContext();
+
+ $em = \Database::getManager();
+ $commentAttachments = $em->getRepository(PortfolioAttachment::class)->findFromComment($this->comment);
+
+ $attachments = $this->generateAttachments(
+ $commentAttachments,
+ $this->comment->getAuthor()
+ );
+
+ if ($this->parentComment) {
+ $repliedVerb = new RepliedVerb();
+
+ $itemActivity = new PortfolioItemActivity($this->item);
+ $parentCommentActivity = new PortfolioCommentActivity($this->parentComment);
+
+ $contextActivities = $context
+ ->getContextActivities()
+ ->withAddedGroupingActivity($itemActivity->generate());
+
+ return new Statement(
+ $statementId,
+ $userActor->generate(),
+ $repliedVerb->generate(),
+ $parentCommentActivity->generate(),
+ $statementResult,
+ null,
+ $this->comment->getDate(),
+ null,
+ $context->withContextActivities($contextActivities),
+ $attachments
+ );
+ } else {
+ $itemShared = new PortfolioItemShared($this->item);
+
+ $commentedVerb = new CommentedVerb();
+
+ return $itemShared->generate()
+ ->withId($statementId)
+ ->withActor($userActor->generate())
+ ->withVerb($commentedVerb->generate())
+ ->withStored($this->comment->getDate())
+ ->withResult($statementResult)
+ ->withContext($context)
+ ->withAttachments($attachments);
+ }
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemEdited.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemEdited.php
new file mode 100644
index 00000000000..f8ed7ae2e0c
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemEdited.php
@@ -0,0 +1,39 @@
+item);
+ $context = $this->generateContext();
+ $attachements = $this->generateAttachmentsForItem($this->item);
+
+ return new Statement(
+ $this->generateStatementId('portfolio-item'),
+ $actor->generate(),
+ $verb->generate(),
+ $object->generate(),
+ null,
+ null,
+ api_get_utc_datetime(null, false, true),
+ null,
+ $context,
+ $attachements
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemHighlighted.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemHighlighted.php
new file mode 100644
index 00000000000..b0d6a33bfee
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemHighlighted.php
@@ -0,0 +1,39 @@
+item);
+ $context = $this->generateContext();
+ $attachments = $this->generateAttachmentsForItem($this->item);
+
+ return new Statement(
+ $this->generateStatementId('portfolio-item'),
+ $actor->generate(),
+ $verb->generate(),
+ $object->generate(),
+ null,
+ null,
+ api_get_utc_datetime(null, false, true),
+ null,
+ $context,
+ $attachments
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemScored.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemScored.php
new file mode 100644
index 00000000000..73977a0d73a
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemScored.php
@@ -0,0 +1,47 @@
+item->getScore();
+ $scaled = $maxScore ? ($rawScore / $maxScore) : 0;
+
+ $actor = new User($user);
+ $verb = new Scored();
+ $object = new PortfolioItemActivity($this->item);
+ $context = $this->generateContext();
+ $attachments = $this->generateAttachmentsForItem($this->item);
+ $score = new Score($scaled, $rawScore, 0, $maxScore);
+ $result = new Result($score);
+
+ return new Statement(
+ $this->generateStatementId('portfolio-item'),
+ $actor->generate(),
+ $verb->generate(),
+ $object->generate(),
+ $result,
+ null,
+ api_get_utc_datetime(null, false, true),
+ null,
+ $context,
+ $attachments
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemShared.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemShared.php
new file mode 100644
index 00000000000..ee44f0473c9
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemShared.php
@@ -0,0 +1,47 @@
+item->getUser();
+
+ $userActor = new User($itemAuthor);
+ $sharedVerb = new Shared();
+ $itemActivity = new PortfolioItem($this->item);
+
+ $context = $this->generateContext();
+
+ $attachments = $this->generateAttachmentsForItem($this->item);
+
+ return new Statement(
+ $this->generateStatementId('portfolio-item'),
+ $userActor->generate(),
+ $sharedVerb->generate(),
+ $itemActivity->generate(),
+ null,
+ null,
+ $this->item->getCreationDate(),
+ null,
+ $context,
+ $attachments
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemViewed.php b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemViewed.php
new file mode 100644
index 00000000000..3612ab08893
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/PortfolioItemViewed.php
@@ -0,0 +1,40 @@
+item);
+ $context = $this->generateContext();
+ $attachments = $this->generateAttachmentsForItem($this->item);
+
+ return new Statement(
+ $this->generateStatementId('portfolio-item'),
+ $actor->generate(),
+ $verb->generate(),
+ $object->generate(),
+ null,
+ null,
+ $this->item->getCreationDate(),
+ null,
+ $context,
+ $attachments
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/QuizCompleted.php b/public/plugin/xapi/src/ToolExperience/Statement/QuizCompleted.php
new file mode 100644
index 00000000000..2a4e9ba517e
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/QuizCompleted.php
@@ -0,0 +1,70 @@
+exe = $exe;
+ $this->quiz = $quiz;
+ }
+
+ public function generate(): Statement
+ {
+ $user = api_get_user_entity($this->exe->getExeUserId());
+
+ $userActor = new UserActor($user);
+ $completedVerb = new CompletedVerb();
+ $quizActivity = new QuizActivity($this->quiz);
+
+ $rawResult = $this->exe->getExeResult();
+ $maxResult = $this->exe->getExeWeighting();
+ $scaledResult = $rawResult / $maxResult;
+
+ $duration = $this->exe->getExeDuration();
+
+ return new Statement(
+ $this->generateStatementId('exercise'),
+ $userActor->generate(),
+ $completedVerb->generate(),
+ $quizActivity->generate(),
+ new Result(
+ new Score($scaledResult, $rawResult, 0, $maxResult),
+ null,
+ true,
+ null,
+ $duration ? "PT{$duration}S" : null
+ ),
+ null,
+ $this->exe->getExeDate(),
+ null,
+ $this->generateContext()
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Statement/QuizQuestionAnswered.php b/public/plugin/xapi/src/ToolExperience/Statement/QuizQuestionAnswered.php
new file mode 100644
index 00000000000..f891e4ce440
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Statement/QuizQuestionAnswered.php
@@ -0,0 +1,79 @@
+attempt = $attempt;
+ $this->question = $question;
+ $this->quiz = $quiz;
+ }
+
+ public function generate(): Statement
+ {
+ $user = api_get_user_entity($this->attempt->getUserId());
+
+ $userActor = new UserActor($user);
+ $answeredVerb = new AnsweredVerb();
+ $questionActivity = new QuizQuestionActivity($this->question);
+ $quizActivity = new QuizActivity($this->quiz);
+
+ $rawResult = $this->attempt->getMarks();
+ $maxResult = $this->question->getPonderation();
+ $scaledResult = $maxResult ? ($rawResult / $maxResult) : 0;
+
+ $context = $this->generateContext();
+ $contextActivities = $context
+ ->getContextActivities()
+ ->withAddedGroupingActivity($quizActivity->generate());
+
+ return new Statement(
+ $this->generateStatementId('exercise-question'),
+ $userActor->generate(),
+ $answeredVerb->generate(),
+ $questionActivity->generate(),
+ new Result(
+ new Score($scaledResult, $rawResult, null, $maxResult),
+ $rawResult > 0,
+ true
+ ),
+ null,
+ $this->attempt->getTms(),
+ null,
+ $context->withContextActivities($contextActivities)
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Verb/Answered.php b/public/plugin/xapi/src/ToolExperience/Verb/Answered.php
new file mode 100644
index 00000000000..4007892f389
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Verb/Answered.php
@@ -0,0 +1,21 @@
+iri = $iri;
+ $this->display = $display;
+ }
+
+ public function generate(): Verb
+ {
+ $langIso = api_get_language_isocode();
+
+ return new Verb(
+ IRI::fromString($this->iri),
+ LanguageMap::create(
+ [
+ $langIso => get_lang($this->display),
+ ]
+ )
+ );
+ }
+}
diff --git a/public/plugin/xapi/src/ToolExperience/Verb/Commented.php b/public/plugin/xapi/src/ToolExperience/Verb/Commented.php
new file mode 100644
index 00000000000..34865a6b384
--- /dev/null
+++ b/public/plugin/xapi/src/ToolExperience/Verb/Commented.php
@@ -0,0 +1,21 @@
+',
+ ];
+ $settings = [
+ self::SETTING_UUID_NAMESPACE => 'text',
+
+ self::SETTING_LRS_URL => 'text',
+ self::SETTING_LRS_AUTH_USERNAME => 'text',
+ self::SETTING_LRS_AUTH_PASSWORD => 'text',
+
+ self::SETTING_CRON_LRS_URL => 'text',
+ self::SETTING_CRON_LRS_AUTH_USERNAME => 'text',
+ self::SETTING_CRON_LRS_AUTH_PASSWORD => 'text',
+
+ self::SETTING_LRS_LP_ITEM_ACTIVE => 'boolean',
+ self::SETTING_LRS_LP_ACTIVE => 'boolean',
+ self::SETTING_LRS_QUIZ_ACTIVE => 'boolean',
+ self::SETTING_LRS_QUIZ_QUESTION_ACTIVE => 'boolean',
+ self::SETTING_LRS_PORTFOLIO_ACTIVE => 'boolean',
+ ];
+
+ parent::__construct(
+ $version,
+ implode(', ', $author),
+ $settings
+ );
+ }
+
+ /**
+ * @return \XApiPlugin
+ */
+ public static function create()
+ {
+ static $result = null;
+
+ return $result ? $result : $result = new self();
+ }
+
+ /**
+ * Process to install plugin.
+ */
+ public function install()
+ {
+ $em = Database::getManager();
+
+ $tablesExists = $em->getConnection()->getSchemaManager()->tablesExist(
+ [
+ 'xapi_shared_statement',
+ 'xapi_tool_launch',
+ 'xapi_lrs_auth',
+ 'xapi_cmi5_item',
+ 'xapi_activity_state',
+ 'xapi_activity_profile',
+ 'xapi_internal_log',
+
+ 'xapi_attachment',
+ 'xapi_object',
+ 'xapi_result',
+ 'xapi_verb',
+ 'xapi_extensions',
+ 'xapi_context',
+ 'xapi_actor',
+ 'xapi_statement',
+ ]
+ );
+
+ if ($tablesExists) {
+ return;
+ }
+
+ $this->installPluginDbTables();
+ $this->installInitialConfig();
+ $this->addCourseTools();
+ $this->installHook();
+ }
+
+ /**
+ * Process to uninstall plugin.
+ */
+ public function uninstall()
+ {
+ $this->uninstallHook();
+ $this->uninstallPluginDbTables();
+ $this->deleteCourseTools();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function uninstallHook()
+ {
+ $learningPathItemViewedHook = XApiLearningPathItemViewedHookObserver::create();
+ $learningPathEndHook = XApiLearningPathEndHookObserver::create();
+ $quizQuestionAnsweredHook = XApiQuizQuestionAnsweredHookObserver::create();
+ $quizEndHook = XApiQuizEndHookObserver::create();
+ $createCourseHook = XApiCreateCourseHookObserver::create();
+ $portfolioItemAddedHook = XApiPortfolioItemAddedHookObserver::create();
+ $portfolioItemCommentedHook = XApiPortfolioItemCommentedHookObserver::create();
+ $portfolioItemHighlightedHook = XApiPortfolioItemHighlightedHookObserver::create();
+ $portfolioDownloaded = XApiPortfolioDownloadedHookObserver::create();
+ $portfolioItemScoredHook = XApiPortfolioItemScoredHookObserver::create();
+ $portfolioCommentedScoredHook = XApiPortfolioCommentScoredHookObserver::create();
+ $portfolioItemEditedHook = XApiPortfolioItemEditedHookObserver::create();
+ $portfolioCommentEditedHook = XApiPortfolioCommentEditedHookObserver::create();
+
+ HookLearningPathItemViewed::create()->detach($learningPathItemViewedHook);
+ HookLearningPathEnd::create()->detach($learningPathEndHook);
+ HookQuizQuestionAnswered::create()->detach($quizQuestionAnsweredHook);
+ HookQuizEnd::create()->detach($quizEndHook);
+ HookCreateCourse::create()->detach($createCourseHook);
+ HookPortfolioItemAdded::create()->detach($portfolioItemAddedHook);
+ HookPortfolioItemCommented::create()->detach($portfolioItemCommentedHook);
+ HookPortfolioItemHighlighted::create()->detach($portfolioItemHighlightedHook);
+ HookPortfolioDownloaded::create()->detach($portfolioDownloaded);
+ HookPortfolioItemScored::create()->detach($portfolioItemScoredHook);
+ HookPortfolioCommentScored::create()->detach($portfolioCommentedScoredHook);
+ HookPortfolioItemEdited::create()->detach($portfolioItemEditedHook);
+ HookPortfolioCommentEdited::create()->detach($portfolioCommentEditedHook);
+
+ return 1;
+ }
+
+ public function uninstallPluginDbTables()
+ {
+ $em = Database::getManager();
+ $pluginEm = self::getEntityManager();
+
+ $schemaTool = new SchemaTool($em);
+ $schemaTool->dropSchema(
+ [
+ $em->getClassMetadata(ActivityProfile::class),
+ $em->getClassMetadata(ActivityState::class),
+ $em->getClassMetadata(SharedStatement::class),
+ $em->getClassMetadata(ToolLaunch::class),
+ $em->getClassMetadata(LrsAuth::class),
+ $em->getClassMetadata(Cmi5Item::class),
+ $em->getClassMetadata(InternalLog::class),
+ ]
+ );
+
+ $pluginSchemaTool = new SchemaTool($pluginEm);
+ $pluginSchemaTool->dropSchema(
+ [
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Attachment::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\StatementObject::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Result::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Verb::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Extensions::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Context::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Actor::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Statement::class),
+ ]
+ );
+ }
+
+ /**
+ * @param string|null $lrsUrl
+ * @param string|null $lrsAuthUsername
+ * @param string|null $lrsAuthPassword
+ *
+ * @return \Xabbuh\XApi\Client\Api\StateApiClientInterface
+ */
+ public function getXApiStateClient($lrsUrl = null, $lrsAuthUsername = null, $lrsAuthPassword = null)
+ {
+ return $this
+ ->createXApiClient($lrsUrl, $lrsAuthUsername, $lrsAuthPassword)
+ ->getStateApiClient();
+ }
+
+ public function getXApiStatementClient(): StatementsApiClientInterface
+ {
+ return $this->createXApiClient()->getStatementsApiClient();
+ }
+
+ public function getXapiStatementCronClient(): StatementsApiClientInterface
+ {
+ $lrsUrl = $this->get(self::SETTING_CRON_LRS_URL);
+ $lrsUsername = $this->get(self::SETTING_CRON_LRS_AUTH_USERNAME);
+ $lrsPassword = $this->get(self::SETTING_CRON_LRS_AUTH_PASSWORD);
+
+ return $this
+ ->createXApiClient(
+ empty($lrsUrl) ? null : $lrsUrl,
+ empty($lrsUsername) ? null : $lrsUsername,
+ empty($lrsPassword) ? null : $lrsPassword
+ )
+ ->getStatementsApiClient();
+ }
+
+ /**
+ * Perform actions after save the plugin configuration.
+ *
+ * @return \XApiPlugin
+ */
+ public function performActionsAfterConfigure()
+ {
+ $learningPathItemViewedHook = XApiLearningPathItemViewedHookObserver::create();
+ $learningPathEndHook = XApiLearningPathEndHookObserver::create();
+ $quizQuestionAnsweredHook = XApiQuizQuestionAnsweredHookObserver::create();
+ $quizEndHook = XApiQuizEndHookObserver::create();
+ $portfolioItemAddedHook = XApiPortfolioItemAddedHookObserver::create();
+ $portfolioItemCommentedHook = XApiPortfolioItemCommentedHookObserver::create();
+ $portfolioItemViewedHook = XApiPortfolioItemViewedHookObserver::create();
+ $portfolioItemHighlightedHook = XApiPortfolioItemHighlightedHookObserver::create();
+ $portfolioDownloadedHook = XApiPortfolioDownloadedHookObserver::create();
+ $portfolioItemScoredHook = XApiPortfolioItemScoredHookObserver::create();
+ $portfolioCommentScoredHook = XApiPortfolioCommentScoredHookObserver::create();
+ $portfolioItemEditedHook = XApiPortfolioItemEditedHookObserver::create();
+ $portfolioCommentEditedHook = XApiPortfolioCommentEditedHookObserver::create();
+
+ $learningPathItemViewedEvent = HookLearningPathItemViewed::create();
+ $learningPathEndEvent = HookLearningPathEnd::create();
+ $quizQuestionAnsweredEvent = HookQuizQuestionAnswered::create();
+ $quizEndEvent = HookQuizEnd::create();
+ $portfolioItemAddedEvent = HookPortfolioItemAdded::create();
+ $portfolioItemCommentedEvent = HookPortfolioItemCommented::create();
+ $portfolioItemViewedEvent = HookPortfolioItemViewed::create();
+ $portfolioItemHighlightedEvent = HookPortfolioItemHighlighted::create();
+ $portfolioDownloadedEvent = HookPortfolioDownloaded::create();
+ $portfolioItemScoredEvent = HookPortfolioItemScored::create();
+ $portfolioCommentScoredEvent = HookPortfolioCommentScored::create();
+ $portfolioItemEditedEvent = HookPortfolioItemEdited::create();
+ $portfolioCommentEditedEvent = HookPortfolioCommentEdited::create();
+
+ if ('true' === $this->get(self::SETTING_LRS_LP_ITEM_ACTIVE)) {
+ $learningPathItemViewedEvent->attach($learningPathItemViewedHook);
+ } else {
+ $learningPathItemViewedEvent->detach($learningPathItemViewedHook);
+ }
+
+ if ('true' === $this->get(self::SETTING_LRS_LP_ACTIVE)) {
+ $learningPathEndEvent->attach($learningPathEndHook);
+ } else {
+ $learningPathEndEvent->detach($learningPathEndHook);
+ }
+
+ if ('true' === $this->get(self::SETTING_LRS_QUIZ_ACTIVE)) {
+ $quizQuestionAnsweredEvent->attach($quizQuestionAnsweredHook);
+ } else {
+ $quizQuestionAnsweredEvent->detach($quizQuestionAnsweredHook);
+ }
+
+ if ('true' === $this->get(self::SETTING_LRS_QUIZ_QUESTION_ACTIVE)) {
+ $quizEndEvent->attach($quizEndHook);
+ } else {
+ $quizEndEvent->detach($quizEndHook);
+ }
+
+ if ('true' === $this->get(self::SETTING_LRS_PORTFOLIO_ACTIVE)) {
+ $portfolioItemAddedEvent->attach($portfolioItemAddedHook);
+ $portfolioItemCommentedEvent->attach($portfolioItemCommentedHook);
+ $portfolioItemViewedEvent->attach($portfolioItemViewedHook);
+ $portfolioItemHighlightedEvent->attach($portfolioItemHighlightedHook);
+ $portfolioDownloadedEvent->attach($portfolioDownloadedHook);
+ $portfolioItemScoredEvent->attach($portfolioItemScoredHook);
+ $portfolioCommentScoredEvent->attach($portfolioCommentScoredHook);
+ $portfolioItemEditedEvent->attach($portfolioItemEditedHook);
+ $portfolioCommentEditedEvent->attach($portfolioCommentEditedHook);
+ } else {
+ $portfolioItemAddedEvent->detach($portfolioItemAddedHook);
+ $portfolioItemCommentedEvent->detach($portfolioItemCommentedHook);
+ $portfolioItemViewedEvent->detach($portfolioItemViewedHook);
+ $portfolioItemHighlightedEvent->detach($portfolioItemHighlightedHook);
+ $portfolioDownloadedEvent->detach($portfolioDownloadedHook);
+ $portfolioItemScoredEvent->detach($portfolioItemScoredHook);
+ $portfolioCommentScoredEvent->detach($portfolioCommentScoredHook);
+ $portfolioItemEditedEvent->detach($portfolioItemEditedHook);
+ $portfolioCommentEditedEvent->detach($portfolioCommentEditedHook);
+ }
+
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function installHook()
+ {
+ $createCourseHook = XApiCreateCourseHookObserver::create();
+
+ HookCreateCourse::create()->attach($createCourseHook);
+ }
+
+ /**
+ * @param string $variable
+ *
+ * @return array
+ */
+ public function getLangMap($variable)
+ {
+ $platformLanguage = api_get_setting('platformLanguage');
+ $platformLanguageIso = api_get_language_isocode($platformLanguage);
+
+ $map = [];
+ $map[$platformLanguageIso] = $this->getLangFromFile($variable, $platformLanguage);
+
+ try {
+ $interfaceLanguage = api_get_interface_language();
+ } catch (Exception $e) {
+ return $map;
+ }
+
+ if (!empty($interfaceLanguage) && $platformLanguage !== $interfaceLanguage) {
+ $interfaceLanguageIso = api_get_language_isocode($interfaceLanguage);
+
+ $map[$interfaceLanguageIso] = $this->getLangFromFile($variable, $interfaceLanguage);
+ }
+
+ return $map;
+ }
+
+ /**
+ * @param string $value
+ * @param string $type
+ *
+ * @return \Xabbuh\XApi\Model\IRI
+ */
+ public function generateIri($value, $type)
+ {
+ return IRI::fromString(
+ api_get_path(WEB_PATH)."xapi/$type/$value"
+ );
+ }
+
+ /**
+ * @param int $courseId
+ */
+ public function addCourseToolForTinCan($courseId)
+ {
+ // The $link param is set to "../plugin" as a hack to link correctly to the plugin URL in course tool.
+ // Otherwise, the link en the course tool will link to "/main/" URL.
+ $this->createLinkToCourseTool(
+ $this->get_lang('ToolTinCan'),
+ $courseId,
+ 'sessions_category.png',
+ '../plugin/xapi/start.php',
+ 0,
+ 'authoring'
+ );
+ }
+
+ /**
+ * @param string $language
+ *
+ * @return mixed|string
+ */
+ public static function extractVerbInLanguage(Xabbuh\XApi\Model\LanguageMap $languageMap, $language)
+ {
+ $iso = self::findLanguageIso($languageMap->languageTags(), $language);
+
+ $text = current($languageMap);
+
+ if (isset($languageMap[$iso])) {
+ $text = trim($languageMap[$iso]);
+ } elseif (isset($languageMap['und'])) {
+ $text = $languageMap['und'];
+ }
+
+ return $text;
+ }
+
+ /**
+ * @param string $needle
+ *
+ * @return string
+ */
+ public static function findLanguageIso(array $haystack, $needle)
+ {
+ if (in_array($needle, $haystack)) {
+ return $needle;
+ }
+
+ foreach ($haystack as $language) {
+ if (strpos($language, $needle) === 0) {
+ return $language;
+ }
+ }
+
+ return $haystack[0];
+ }
+
+ public function generateLaunchUrl(
+ $type,
+ $launchUrl,
+ $activityId,
+ Agent $actor,
+ $attemptId,
+ $customLrsUrl = null,
+ $customLrsUsername = null,
+ $customLrsPassword = null,
+ $viewSessionId = null
+ ) {
+ $lrsUrl = $customLrsUrl ?: $this->get(self::SETTING_LRS_URL);
+ $lrsAuthUsername = $customLrsUsername ?: $this->get(self::SETTING_LRS_AUTH_USERNAME);
+ $lrsAuthPassword = $customLrsPassword ?: $this->get(self::SETTING_LRS_AUTH_PASSWORD);
+
+ $queryData = [
+ 'endpoint' => trim($lrsUrl, "/ \t\n\r\0\x0B"),
+ 'actor' => Serializer::createSerializer()->serialize($actor, 'json'),
+ 'registration' => $attemptId,
+ ];
+
+ if ('tincan' === $type) {
+ $queryData['auth'] = 'Basic '.base64_encode(trim($lrsAuthUsername).':'.trim($lrsAuthPassword));
+ $queryData['activity_id'] = $activityId;
+ } elseif ('cmi5' === $type) {
+ $queryData['fetch'] = api_get_path(WEB_PLUGIN_PATH).'xapi/cmi5/token.php?session='.$viewSessionId;
+ $queryData['activityId'] = $activityId;
+ }
+
+ return $launchUrl.'?'.http_build_query($queryData, null, '&', PHP_QUERY_RFC3986);
+ }
+
+ /**
+ * @return \Doctrine\ORM\EntityManager|null
+ */
+ public static function getEntityManager()
+ {
+ $em = Database::getManager();
+
+ $prefixes = [
+ __DIR__.'/../php-xapi/repository-doctrine-orm/metadata' => 'XApi\Repository\Doctrine\Mapping',
+ ];
+
+ $driver = new SimplifiedXmlDriver($prefixes);
+ $driver->setGlobalBasename('global');
+
+ $config = Database::getDoctrineConfig(api_get_configuration_value('root_sys'));
+ $config->setMetadataDriverImpl($driver);
+
+ try {
+ return EntityManager::create($em->getConnection()->getParams(), $config);
+ } catch (ORMException $e) {
+ api_not_allowed(true, $e->getMessage());
+ }
+
+ return null;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getAdminUrl()
+ {
+ $webPath = api_get_path(WEB_PLUGIN_PATH).$this->get_name();
+
+ return "$webPath/admin.php";
+ }
+
+ public function getLpResourceBlock(int $lpId)
+ {
+ $cidReq = api_get_cidreq(true, true, 'lp');
+ $webPath = api_get_path(WEB_PLUGIN_PATH).'xapi/';
+ $course = api_get_course_entity();
+ $session = api_get_session_entity();
+
+ $tools = Database::getManager()
+ ->getRepository(ToolLaunch::class)
+ ->findByCourseAndSession($course, $session);
+
+ $importIcon = Display::return_icon('import_scorm.png');
+ $moveIcon = Display::url(
+ Display::return_icon('move_everywhere.png', get_lang('Move'), [], ICON_SIZE_TINY),
+ '#',
+ ['class' => 'moved']
+ );
+
+ $return = '- '
+ .$importIcon
+ .Display::url(
+ get_lang('Import'),
+ $webPath."tool_import.php?$cidReq&".http_build_query(['lp_id' => $lpId])
+ )
+ .'
';
+
+ /** @var ToolLaunch $tool */
+ foreach ($tools as $tool) {
+ $toolAnchor = Display::url(
+ Security::remove_XSS($tool->getTitle()),
+ api_get_self()."?$cidReq&"
+ .http_build_query(
+ ['action' => 'add_item', 'type' => TOOL_XAPI, 'file' => $tool->getId(), 'lp_id' => $lpId]
+ ),
+ ['class' => 'moved']
+ );
+
+ $return .= Display::tag(
+ 'li',
+ $moveIcon.$importIcon.$toolAnchor,
+ [
+ 'class' => 'lp_resource_element',
+ 'data_id' => $tool->getId(),
+ 'data_type' => TOOL_XAPI,
+ 'title' => $tool->getTitle(),
+ ]
+ );
+ }
+
+ $return .= '
';
+
+ return $return;
+ }
+
+ /**
+ * @throws \Doctrine\ORM\Tools\ToolsException
+ */
+ private function installPluginDbTables()
+ {
+ $em = Database::getManager();
+ $pluginEm = self::getEntityManager();
+
+ $schemaTool = new SchemaTool($em);
+ $schemaTool->createSchema(
+ [
+ $em->getClassMetadata(SharedStatement::class),
+ $em->getClassMetadata(ToolLaunch::class),
+ $em->getClassMetadata(LrsAuth::class),
+ $em->getClassMetadata(Cmi5Item::class),
+ $em->getClassMetadata(ActivityState::class),
+ $em->getClassMetadata(ActivityProfile::class),
+ $em->getClassMetadata(InternalLog::class),
+ ]
+ );
+
+ $pluginSchemaTool = new SchemaTool($pluginEm);
+ $pluginSchemaTool->createSchema(
+ [
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Attachment::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\StatementObject::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Result::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Verb::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Extensions::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Context::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Actor::class),
+ $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Statement::class),
+ ]
+ );
+ }
+
+ /**
+ * @throws \Exception
+ */
+ private function installInitialConfig()
+ {
+ $uuidNamespace = Uuid::uuid1();
+
+ $pluginName = $this->get_name();
+ $urlId = api_get_current_access_url_id();
+
+ api_add_setting(
+ $uuidNamespace,
+ $pluginName.'_'.self::SETTING_UUID_NAMESPACE,
+ $pluginName,
+ 'setting',
+ 'Plugins',
+ $pluginName,
+ '',
+ '',
+ '',
+ $urlId,
+ 1
+ );
+
+ api_add_setting(
+ api_get_path(WEB_PATH).'plugin/xapi/lrs.php',
+ $pluginName.'_'.self::SETTING_LRS_URL,
+ $pluginName,
+ 'setting',
+ 'Plugins',
+ $pluginName,
+ '',
+ '',
+ '',
+ $urlId,
+ 1
+ );
+ }
+
+ /**
+ * @param string|null $lrsUrl
+ * @param string|null $lrsAuthUsername
+ * @param string|null $lrsAuthPassword
+ *
+ * @return \Xabbuh\XApi\Client\XApiClientInterface
+ */
+ private function createXApiClient($lrsUrl = null, $lrsAuthUsername = null, $lrsAuthPassword = null)
+ {
+ $baseUrl = $lrsUrl ?: $this->get(self::SETTING_LRS_URL);
+ $lrsAuthUsername = $lrsAuthUsername ?: $this->get(self::SETTING_LRS_AUTH_USERNAME);
+ $lrsAuthPassword = $lrsAuthPassword ?: $this->get(self::SETTING_LRS_AUTH_PASSWORD);
+
+ $clientBuilder = new XApiClientBuilder();
+ $clientBuilder
+ ->setHttpClient(Client::createWithConfig([RequestOptions::VERIFY => false]))
+ ->setRequestFactory(new GuzzleMessageFactory())
+ ->setBaseUrl(trim($baseUrl, "/ \t\n\r\0\x0B"))
+ ->setAuth(trim($lrsAuthUsername), trim($lrsAuthPassword));
+
+ return $clientBuilder->build();
+ }
+
+ private function addCourseTools()
+ {
+ $courses = Database::getManager()
+ ->createQuery('SELECT c.id FROM ChamiloCoreBundle:Course c')
+ ->getResult();
+
+ foreach ($courses as $course) {
+ $this->addCourseToolForTinCan($course['id']);
+ }
+ }
+
+ private function deleteCourseTools()
+ {
+ Database::getManager()
+ ->createQuery('DELETE FROM ChamiloCourseBundle:CTool t WHERE t.category = :category AND t.link LIKE :link')
+ ->execute(['category' => 'authoring', 'link' => '../plugin/xapi/start.php%']);
+ }
+}
diff --git a/public/plugin/xapi/start.php b/public/plugin/xapi/start.php
new file mode 100644
index 00000000000..f3d305a4bad
--- /dev/null
+++ b/public/plugin/xapi/start.php
@@ -0,0 +1,151 @@
+getRepository(ToolLaunch::class);
+
+$course = api_get_course_entity();
+$session = api_get_session_entity();
+$userInfo = api_get_user_info();
+
+$cidReq = api_get_cidreq();
+
+$table = new SortableTable(
+ 'tbl_xapi',
+ function () use ($em, $course, $session, $isAllowedToEdit) {
+ return $em->getRepository(ToolLaunch::class)
+ ->countByCourseAndSession($course, $session, !$isAllowedToEdit);
+ },
+ function ($start, $limit, $orderBy, $orderDir) use ($toolLaunchRepo, $course, $session, $isAllowedToEdit) {
+ $tools = $toolLaunchRepo->findByCourseAndSession($course, $session, ['title' => $orderDir], $limit, $start);
+
+ $data = [];
+
+ /** @var ToolLaunch $toolLaunch */
+ foreach ($tools as $toolLaunch) {
+ $wasAddedInLp = $toolLaunchRepo->wasAddedInLp($toolLaunch);
+
+ if ($wasAddedInLp && !$isAllowedToEdit) {
+ continue;
+ }
+
+ $datum = [];
+ $datum[] = [
+ $toolLaunch->getId(),
+ $toolLaunch->getTitle(),
+ $toolLaunch->getDescription(),
+ $toolLaunch->getActivityType(),
+ $wasAddedInLp,
+ ];
+
+ if ($isAllowedToEdit) {
+ $datum[] = $toolLaunch->getId();
+ }
+
+ $data[] = $datum;
+ }
+
+ return $data;
+ },
+ 0
+);
+$table->set_header(0, $plugin->get_lang('ActivityTitle'), true);
+$table->set_column_filter(
+ 0,
+ function (array $toolInfo) use ($cidReq, $session, $userInfo, $plugin) {
+ list($id, $title, $description, $activityType, $wasAddedInLp) = $toolInfo;
+
+ $sessionStar = api_get_session_image(
+ $session ? $session->getId() : 0,
+ $userInfo['status']
+ );
+
+ $data = Display::url(
+ $title.$sessionStar,
+ ('cmi5' === $activityType ? 'cmi5/view.php' : 'tincan/view.php')."?id=$id&$cidReq",
+ ['class' => 'show']
+ );
+
+ if ($description) {
+ $data .= PHP_EOL.Display::tag('small', $description, ['class' => 'text-muted']);
+ }
+
+ if ($wasAddedInLp) {
+ $data .= Display::div(
+ $plugin->get_lang('ActivityAddedToLPCannotBeAccessed'),
+ ['class' => 'lp_content_type_label']
+ );
+ }
+
+ return $data;
+ }
+);
+
+if ($isAllowedToEdit) {
+ $thAttributes = ['class' => 'text-right', 'style' => 'width: 100px;'];
+
+ $table->set_header(1, get_lang('Actions'), false, $thAttributes, $thAttributes);
+ $table->set_column_filter(
+ 1,
+ function ($id) use ($cidReq, $isAllowedToEdit) {
+ $actions = [];
+
+ if ($isAllowedToEdit) {
+ $actions[] = Display::url(
+ Display::return_icon('statistics.png', get_lang('Reporting')),
+ "tincan/stats.php?$cidReq&id=$id"
+ );
+ $actions[] = Display::url(
+ Display::return_icon('edit.png', get_lang('Edit')),
+ "tool_edit.php?$cidReq&edit=$id"
+ );
+ $actions[] = Display::url(
+ Display::return_icon('delete.png', get_lang('Delete')),
+ "tool_delete.php?$cidReq&delete=$id"
+ );
+ }
+
+ return implode(PHP_EOL, $actions);
+ }
+ );
+}
+
+$pageTitle = $plugin->get_lang('ToolTinCan');
+$pageContent = Display::return_message($plugin->get_lang('NoActivities'), 'info');
+
+if ($table->get_total_number_of_items() > 0) {
+ $pageContent = $table->return_table();
+}
+
+$view = new Template($pageTitle);
+$view->assign('header', $pageTitle);
+
+if ($isAllowedToEdit) {
+ $actions = Display::url(
+ Display::return_icon('import_scorm.png', get_lang('Import'), [], ICON_SIZE_MEDIUM),
+ "tool_import.php?$cidReq"
+ );
+
+ $view->assign(
+ 'actions',
+ Display::toolbarAction(
+ 'xapi_actions',
+ [$actions]
+ )
+ );
+}
+
+$view->assign('content', $pageContent);
+$view->display_one_col_template();
diff --git a/public/plugin/xapi/tincan/launch.php b/public/plugin/xapi/tincan/launch.php
new file mode 100644
index 00000000000..b61eee3bdeb
--- /dev/null
+++ b/public/plugin/xapi/tincan/launch.php
@@ -0,0 +1,142 @@
+request->get('attempt_id');
+$toolLaunch = $em->find(
+ ToolLaunch::class,
+ $request->request->getInt('id')
+);
+
+if (empty($attemptId)
+ || null === $toolLaunch
+ || $toolLaunch->getCourse()->getId() !== api_get_course_entity()->getId()
+) {
+ api_not_allowed(true);
+}
+
+$plugin = XApiPlugin::create();
+
+$activity = new Activity(
+ IRI::fromString($toolLaunch->getActivityId())
+);
+$actor = new Agent(
+ InverseFunctionalIdentifier::withMbox(
+ IRI::fromString('mailto:'.$user->getEmail())
+ ),
+ $user->getCompleteName()
+);
+$state = new State(
+ $activity,
+ $actor,
+ $plugin->generateIri('tool-'.$toolLaunch->getId(), 'state')->getValue()
+);
+
+$nowDate = api_get_utc_datetime(null, false, true)->format('c');
+
+try {
+ $stateDocument = $plugin
+ ->getXApiStateClient(
+ $toolLaunch->getLrsUrl(),
+ $toolLaunch->getLrsAuthUsername(),
+ $toolLaunch->getLrsAuthPassword()
+ )
+ ->getDocument($state);
+
+ $data = $stateDocument->getData()->getData();
+
+ if ($stateDocument->offsetExists($attemptId)) {
+ $data[$attemptId][XApiPlugin::STATE_LAST_LAUNCH] = $nowDate;
+ } else {
+ $data[$attemptId] = [
+ XApiPlugin::STATE_FIRST_LAUNCH => $nowDate,
+ XApiPlugin::STATE_LAST_LAUNCH => $nowDate,
+ ];
+ }
+
+ uasort(
+ $data,
+ function ($attemptA, $attemptB) {
+ $timeA = strtotime($attemptA[XApiPlugin::STATE_LAST_LAUNCH]);
+ $timeB = strtotime($attemptB[XApiPlugin::STATE_LAST_LAUNCH]);
+
+ return $timeB - $timeA;
+ }
+ );
+
+ $documentData = new DocumentData($data);
+} catch (NotFoundException $notFoundException) {
+ $documentData = new DocumentData(
+ [
+ $attemptId => [
+ XApiPlugin::STATE_FIRST_LAUNCH => $nowDate,
+ XApiPlugin::STATE_LAST_LAUNCH => $nowDate,
+ ],
+ ]
+ );
+} catch (Exception $exception) {
+ Display::addFlash(
+ Display::return_message($exception->getMessage(), 'error')
+ );
+
+ header('Location: '.api_get_course_url());
+ exit;
+}
+
+try {
+ $plugin
+ ->getXApiStateClient()
+ ->createOrReplaceDocument(
+ new StateDocument($state, $documentData)
+ );
+} catch (Exception $exception) {
+ Display::addFlash(
+ Display::return_message($exception->getMessage(), 'error')
+ );
+
+ header('Location: '.api_get_course_url());
+ exit;
+}
+
+$lrsUrl = $toolLaunch->getLrsUrl() ?: $plugin->get(XApiPlugin::SETTING_LRS_URL);
+$lrsAuthUsername = $toolLaunch->getLrsAuthUsername() ?: $plugin->get(XApiPlugin::SETTING_LRS_AUTH_USERNAME);
+$lrsAuthPassword = $toolLaunch->getLrsAuthPassword() ?: $plugin->get(XApiPlugin::SETTING_LRS_AUTH_PASSWORD);
+
+$activityLaunchUrl = $toolLaunch->getLaunchUrl().'?'
+ .http_build_query(
+ [
+ 'endpoint' => trim($lrsUrl, "/ \t\n\r\0\x0B"),
+ 'auth' => 'Basic '.base64_encode(trim($lrsAuthUsername).':'.trim($lrsAuthPassword)),
+ 'actor' => Serializer::createSerializer()->serialize($actor, 'json'),
+ 'registration' => $attemptId,
+ 'activity_id' => $toolLaunch->getActivityId(),
+ ],
+ null,
+ '&',
+ PHP_QUERY_RFC3986
+ );
+
+header("Location: $activityLaunchUrl");
diff --git a/public/plugin/xapi/tincan/stats.php b/public/plugin/xapi/tincan/stats.php
new file mode 100644
index 00000000000..b019db5d914
--- /dev/null
+++ b/public/plugin/xapi/tincan/stats.php
@@ -0,0 +1,163 @@
+find(
+ ToolLaunch::class,
+ $request->query->getInt('id')
+);
+
+if (null === $toolLaunch) {
+ header('Location: '.api_get_course_url());
+ exit;
+}
+
+$course = api_get_course_entity();
+$session = api_get_session_entity();
+
+$cidReq = api_get_cidreq();
+
+$plugin = XApiPlugin::create();
+
+$length = 20;
+$page = $request->query->getInt('page', 1);
+$start = ($page - 1) * $length;
+$countStudentList = CourseManager::get_student_list_from_course_code(
+ $course->getCode(),
+ (bool) $session,
+ $session ? $session->getId() : 0,
+ null,
+ null,
+ true,
+ 0,
+ true
+);
+
+$statsUrl = api_get_self().'?'.api_get_cidreq().'&id='.$toolLaunch->getId();
+
+$paginator = new Paginator();
+$pagination = $paginator->paginate([]);
+$pagination->setTotalItemCount($countStudentList);
+$pagination->setItemNumberPerPage($length);
+$pagination->setCurrentPageNumber($page);
+$pagination->renderer = function ($data) use ($statsUrl) {
+ $render = '';
+ if ($data['pageCount'] > 1) {
+ $render = '';
+ }
+
+ return $render;
+};
+
+$students = CourseManager::get_student_list_from_course_code(
+ $course->getCode(),
+ (bool) $session,
+ $session ? $session->getId() : 0,
+ null,
+ null,
+ true,
+ 0,
+ false,
+ $start,
+ $length
+);
+
+$content = '';
+$content .= '';
+
+$loadingMessage = Display::returnFontAwesomeIcon('spinner', '', true, 'fa-pulse').' '.get_lang('Loading');
+
+foreach ($students as $studentInfo) {
+ $content .= Display::panelCollapse(
+ api_get_person_name($studentInfo['firstname'], $studentInfo['lastname']),
+ $loadingMessage,
+ "pnl-student-{$studentInfo['id']}",
+ [
+ 'class' => 'pnl-student',
+ 'data-student' => $studentInfo['id'],
+ 'data-tool' => $toolLaunch->getId(),
+ ],
+ "pnl-student-{$studentInfo['id']}-accordion",
+ "pnl-student-{$studentInfo['id']}-collapse",
+ false
+ );
+}
+
+$content .= '
';
+$content .= $pagination;
+
+// View
+$interbreadcrumb[] = [
+ 'name' => $plugin->get_title(),
+ 'url' => '../start.php',
+];
+
+$htmlHeadXtra[] = "";
+
+$actions = Display::url(
+ Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+ "../start.php?$cidReq"
+);
+
+$view = new Template($toolLaunch->getTitle());
+$view->assign(
+ 'actions',
+ Display::toolbarAction('xapi_actions', [$actions])
+);
+$view->assign('header', $toolLaunch->getTitle());
+$view->assign('content', $content);
+$view->display_one_col_template();
diff --git a/public/plugin/xapi/tincan/stats_attempts.ajax.php b/public/plugin/xapi/tincan/stats_attempts.ajax.php
new file mode 100644
index 00000000000..8339518d9ad
--- /dev/null
+++ b/public/plugin/xapi/tincan/stats_attempts.ajax.php
@@ -0,0 +1,131 @@
+isXmlHttpRequest()
+ || !api_is_allowed_to_edit()
+ || !$course
+) {
+ echo Display::return_message(get_lang('NotAllowed'), 'error');
+ exit;
+}
+
+$plugin = XApiPlugin::create();
+$em = Database::getManager();
+
+$toolLaunch = $em->find(
+ ToolLaunch::class,
+ $request->request->getInt('tool')
+);
+
+$student = api_get_user_entity($request->request->getInt('student'));
+
+if (!$toolLaunch || !$student) {
+ echo Display::return_message(get_lang('NotAllowed'), 'error');
+ exit;
+}
+
+$userIsSubscribedToCourse = CourseManager::is_user_subscribed_in_course(
+ $student->getId(),
+ $course->getCode(),
+ (bool) $session,
+ $session ? $session->getId() : 0
+);
+
+if (!$userIsSubscribedToCourse) {
+ echo Display::return_message(get_lang('NotAllowed'), 'error');
+ exit;
+}
+
+$cidReq = api_get_cidreq();
+
+$xApiStateClient = $plugin->getXApiStateClient(
+ $toolLaunch->getLrsUrl(),
+ $toolLaunch->getLrsAuthUsername(),
+ $toolLaunch->getLrsAuthPassword()
+);
+
+$activity = new Activity(
+ IRI::fromString($toolLaunch->getActivityId())
+);
+
+$actor = new Agent(
+ InverseFunctionalIdentifier::withMbox(
+ IRI::fromString('mailto:'.$student->getEmail())
+ ),
+ $student->getCompleteName()
+);
+
+try {
+ $stateDocument = $xApiStateClient->getDocument(
+ new State(
+ $activity,
+ $actor,
+ $plugin->generateIri('tool-'.$toolLaunch->getId(), 'state')->getValue()
+ )
+ );
+} catch (NotFoundException $notFoundException) {
+ echo Display::return_message(get_lang('NoResults'), 'warning');
+ exit;
+} catch (XApiException $exception) {
+ echo Display::return_message($exception->getMessage(), 'error');
+ exit;
+}
+
+$content = '';
+
+if ($stateDocument) {
+ $i = 1;
+
+ foreach ($stateDocument->getData()->getData() as $attemptId => $attempt) {
+ $firstLaunch = api_convert_and_format_date(
+ $attempt[XApiPlugin::STATE_FIRST_LAUNCH],
+ DATE_TIME_FORMAT_LONG
+ );
+ $lastLaunch = api_convert_and_format_date(
+ $attempt[XApiPlugin::STATE_LAST_LAUNCH],
+ DATE_TIME_FORMAT_LONG
+ );
+
+ $content .= ''
+ .'- '.$plugin->get_lang('ActivityFirstLaunch').'
'
+ .'- '.$firstLaunch.'
'
+ .'- '.$plugin->get_lang('ActivityLastLaunch').'
'
+ .'- '.$lastLaunch.'
'
+ .'
'
+ .Display::toolbarButton(
+ get_lang('ShowAllAttempts'),
+ '#',
+ 'th-list',
+ 'default',
+ [
+ 'class' => 'btn_xapi_attempt_detail',
+ 'data-attempt' => $attemptId,
+ 'data-tool' => $toolLaunch->getId(),
+ 'style' => 'margin-bottom: 20px; margin-left: 180px;',
+ 'role' => 'button',
+ ]
+ );
+
+ $i++;
+ }
+}
+
+echo $content;
diff --git a/public/plugin/xapi/tincan/stats_statements.ajax.php b/public/plugin/xapi/tincan/stats_statements.ajax.php
new file mode 100644
index 00000000000..6d14bf046a9
--- /dev/null
+++ b/public/plugin/xapi/tincan/stats_statements.ajax.php
@@ -0,0 +1,113 @@
+isXmlHttpRequest()
+ || !api_is_allowed_to_edit()
+ || !$course
+) {
+ echo Display::return_message(get_lang('NotAllowed'), 'error');
+ exit;
+}
+
+$plugin = XApiPlugin::create();
+$em = Database::getManager();
+
+$toolLaunch = $em->find(
+ ToolLaunch::class,
+ $request->request->getInt('tool')
+);
+
+$attempt = $request->request->get('attempt');
+
+if (!$toolLaunch || !$attempt) {
+ echo Display::return_message(get_lang('NoResults'), 'error');
+ exit;
+}
+
+$cidReq = api_get_cidreq();
+
+$xapiStatementClient = $plugin->getXApiStatementClient();
+
+$activity = new Activity(
+ IRI::fromString($toolLaunch->getActivityId())
+);
+
+$filter = new StatementsFilter();
+$filter
+ ->byRegistration($attempt);
+
+try {
+ $result = $xapiStatementClient->getStatements($filter);
+} catch (XApiException $xApiException) {
+ echo Display::return_message($xApiException->getMessage(), 'error');
+ exit;
+} catch (Exception $exception) {
+ echo Display::return_message($exception->getMessage(), 'error');
+ exit;
+}
+
+$statements = $result->getStatements();
+
+if (count($statements) <= 0) {
+ echo Display::return_message(get_lang('NoResults'), 'warning');
+ exit;
+}
+
+$table = new HTML_Table(['class' => 'table table-condensed table-bordered table-striped table-hover']);
+$table->setHeaderContents(0, 0, get_lang('CreatedAt'));
+$table->setHeaderContents(0, 1, $plugin->get_lang('Actor'));
+$table->setHeaderContents(0, 2, $plugin->get_lang('Verb'));
+$table->setHeaderContents(0, 3, $plugin->get_lang('ActivityId'));
+
+$i = 1;
+
+$languageIso = api_get_language_isocode(api_get_interface_language());
+
+foreach ($statements as $statement) {
+ $timestampStored = $statement->getCreated() ? api_convert_and_format_date($statement->getCreated()) : '-';
+ $actor = $statement->getActor()->getName();
+ $verb = XApiPlugin::extractVerbInLanguage($statement->getVerb()->getDisplay(), $languageIso);
+ $activity = '';
+
+ $statementObject = $statement->getObject();
+
+ if ($statementObject instanceof Activity) {
+ if (null !== $statementObject->getDefinition()) {
+ $definition = $statementObject->getDefinition();
+
+ if (null !== $definition->getName()) {
+ $activity = XApiPlugin::extractVerbInLanguage($definition->getName(), $languageIso).'
';
+ }
+ }
+
+ $activity .= Display::tag(
+ 'small',
+ $statementObject->getId()->getValue(),
+ ['class' => 'text-muted']
+ );
+ }
+
+ $table->setCellContents($i, 0, $timestampStored);
+ $table->setCellContents($i, 1, $actor);
+ $table->setCellContents($i, 2, $verb);
+ $table->setCellContents($i, 3, $activity);
+
+ $i++;
+}
+
+$table->display();
diff --git a/public/plugin/xapi/tincan/view.php b/public/plugin/xapi/tincan/view.php
new file mode 100644
index 00000000000..9c259d7f377
--- /dev/null
+++ b/public/plugin/xapi/tincan/view.php
@@ -0,0 +1,192 @@
+find(
+ ToolLaunch::class,
+ $request->query->getInt('id')
+);
+
+if (null === $toolLaunch
+ || $toolLaunch->getCourse()->getId() !== api_get_course_entity()->getId()
+) {
+ api_not_allowed(true);
+}
+
+$plugin = XApiPlugin::create();
+
+$activity = new Activity(
+ IRI::fromString($toolLaunch->getActivityId())
+);
+$actor = new Agent(
+ InverseFunctionalIdentifier::withMbox(
+ IRI::fromString('mailto:'.$user->getEmail())
+ ),
+ $user->getCompleteName()
+);
+$state = new State(
+ $activity,
+ $actor,
+ $plugin->generateIri('tool-'.$toolLaunch->getId(), 'state')->getValue()
+);
+
+$cidReq = api_get_cidreq();
+
+try {
+ $stateDocument = $plugin
+ ->getXApiStateClient(
+ $toolLaunch->getLrsUrl(),
+ $toolLaunch->getLrsAuthUsername(),
+ $toolLaunch->getLrsAuthPassword()
+ )
+ ->getDocument($state);
+} catch (NotFoundException $notFoundException) {
+ $stateDocument = null;
+} catch (Exception $exception) {
+ Display::addFlash(
+ Display::return_message($exception->getMessage(), 'error')
+ );
+
+ header('Location: '.api_get_course_url());
+ exit;
+}
+
+$formTarget = $originIsLearnpath ? '_self' : '_blank';
+
+$frmNewRegistration = new FormValidator(
+ 'launch_new',
+ 'post',
+ "launch.php?$cidReq",
+ '',
+ ['target' => $formTarget],
+ FormValidator::LAYOUT_INLINE
+);
+$frmNewRegistration->addHidden('attempt_id', Uuid::uuid4());
+$frmNewRegistration->addHidden('id', $toolLaunch->getId());
+$frmNewRegistration->addButton(
+ 'submit',
+ $plugin->get_lang('LaunchNewAttempt'),
+ 'external-link fa-fw',
+ 'success'
+);
+
+if ($stateDocument) {
+ $row = 0;
+
+ $table = new HTML_Table(['class' => 'table table-hover table-striped']);
+ $table->setHeaderContents($row, 0, $plugin->get_lang('ActivityFirstLaunch'));
+ $table->setHeaderContents($row, 1, $plugin->get_lang('ActivityLastLaunch'));
+ $table->setHeaderContents($row, 2, get_lang('Actions'));
+
+ $row++;
+
+ $langActivityLaunch = $plugin->get_lang('ActivityLaunch');
+
+ foreach ($stateDocument->getData()->getData() as $attemptId => $attempt) {
+ $firstLaunch = api_convert_and_format_date(
+ $attempt[XApiPlugin::STATE_FIRST_LAUNCH],
+ DATE_TIME_FORMAT_LONG
+ );
+ $lastLaunch = api_convert_and_format_date(
+ $attempt[XApiPlugin::STATE_LAST_LAUNCH],
+ DATE_TIME_FORMAT_LONG
+ );
+
+ $frmLaunch = new FormValidator(
+ "launch_$row",
+ 'post',
+ "launch.php?$cidReq",
+ '',
+ ['target' => $formTarget],
+ FormValidator::LAYOUT_INLINE
+ );
+ $frmLaunch->addHidden('attempt_id', $attemptId);
+ $frmLaunch->addHidden('id', $toolLaunch->getId());
+ $frmLaunch->addButton(
+ 'submit',
+ $langActivityLaunch,
+ 'external-link fa-fw',
+ 'default'
+ );
+
+ $table->setCellContents($row, 0, $firstLaunch);
+ $table->setCellContents($row, 1, $lastLaunch);
+ $table->setCellContents($row, 2, $frmLaunch->returnForm());
+
+ $row++;
+ }
+
+ $table->setColAttributes(0, ['class' => 'text-center']);
+ $table->setColAttributes(1, ['class' => 'text-center']);
+ $table->setColAttributes(2, ['class' => 'text-center']);
+}
+
+$interbreadcrumb[] = ['url' => '../start.php', 'name' => $plugin->get_lang('ToolTinCan')];
+
+$pageTitle = $toolLaunch->getTitle();
+$pageContent = '';
+
+if ($toolLaunch->getDescription()) {
+ $pageContent .= PHP_EOL;
+ $pageContent .= "{$toolLaunch->getDescription()}
";
+}
+
+if ($toolLaunch->isAllowMultipleAttempts()
+ || empty($stateDocument)
+) {
+ $pageContent .= Display::div(
+ $frmNewRegistration->returnForm(),
+ ['class' => 'exercise_overview_options']
+ );
+}
+
+if ($stateDocument) {
+ $pageContent .= $table->toHtml();
+}
+
+$actions = '';
+
+if (!$originIsLearnpath) {
+ $actions = Display::url(
+ Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+ '../start.php?'.api_get_cidreq()
+ );
+}
+
+$view = new Template($pageTitle);
+$view->assign('header', $pageTitle);
+
+if ($actions) {
+ $view->assign(
+ 'actions',
+ Display::toolbarAction(
+ 'xapi_actions',
+ [$actions]
+ )
+ );
+}
+$view->assign('content', $pageContent);
+$view->display_one_col_template();
diff --git a/public/plugin/xapi/tool_delete.php b/public/plugin/xapi/tool_delete.php
new file mode 100644
index 00000000000..910e4a76552
--- /dev/null
+++ b/public/plugin/xapi/tool_delete.php
@@ -0,0 +1,39 @@
+find(
+ ToolLaunch::class,
+ $request->query->getInt('delete')
+);
+
+if (null === $toolLaunch
+ || $toolLaunch->getCourse()->getId() !== api_get_course_entity()->getId()
+) {
+ api_not_allowed(true);
+}
+
+$plugin = XApiPlugin::create();
+
+$em = Database::getManager();
+$em->remove($toolLaunch);
+$em->flush();
+
+Display::addFlash(
+ Display::return_message($plugin->get_lang('ActivityDeleted'), 'success')
+);
+
+header('Location: '.api_get_course_url());
+exit;
diff --git a/public/plugin/xapi/tool_edit.php b/public/plugin/xapi/tool_edit.php
new file mode 100644
index 00000000000..fec53f7b3e8
--- /dev/null
+++ b/public/plugin/xapi/tool_edit.php
@@ -0,0 +1,145 @@
+find(
+ ToolLaunch::class,
+ $request->query->getInt('edit')
+);
+
+if (null === $toolLaunch) {
+ header('Location: '.api_get_course_url());
+ exit;
+}
+
+$course = api_get_course_entity();
+$session = api_get_session_entity();
+
+$cidReq = api_get_cidreq();
+
+$plugin = XApiPlugin::create();
+
+$toolIsCmi5 = 'cmi5' === $toolLaunch->getActivityType();
+$toolIsTinCan = !$toolIsCmi5;
+
+$langEditActivity = $plugin->get_lang('EditActivity');
+
+$frmActivity = new FormValidator('frm_activity', 'post', api_get_self()."?$cidReq&edit={$toolLaunch->getId()}");
+$frmActivity->addText('title', get_lang('Title'));
+$frmActivity->addTextarea('description', get_lang('Description'));
+
+if ($toolIsTinCan) {
+ $frmActivity->addButtonAdvancedSettings('advanced_params');
+ $frmActivity->addHtml('');
+ $frmActivity->addCheckBox('allow_multiple_attempts', '', get_lang('AllowMultipleAttempts'));
+ $frmActivity->addHtml('
');
+}
+
+$frmActivity->addButtonAdvancedSettings('lrs_params', $plugin->get_lang('LrsConfiguration'));
+$frmActivity->addHtml('');
+$frmActivity->addText(
+ 'lrs_url',
+ [
+ $plugin->get_lang('lrs_url'),
+ $plugin->get_lang('lrs_url_help'),
+ ],
+ false
+);
+$frmActivity->addText(
+ 'lrs_auth_username',
+ [
+ $plugin->get_lang('lrs_auth_username'),
+ $plugin->get_lang('lrs_auth_username_help'),
+ ],
+ false
+);
+$frmActivity->addText(
+ 'lrs_auth_password',
+ [
+ $plugin->get_lang('lrs_auth_password'),
+ $plugin->get_lang('lrs_auth_password_help'),
+ ],
+ false
+);
+$frmActivity->addHtml('
');
+$frmActivity->addButtonUpdate(get_lang('Update'));
+$frmActivity->applyFilter('title', 'trim');
+$frmActivity->applyFilter('description', 'trim');
+$frmActivity->applyFilter('lrs_url', 'trim');
+$frmActivity->applyFilter('lrs_auth', 'trim');
+
+if ($frmActivity->validate()) {
+ $values = $frmActivity->exportValues();
+
+ $toolLaunch
+ ->setTitle($values['title'])
+ ->setDescription(empty($values['description']) ? null : $values['description']);
+
+ if ($toolIsTinCan && isset($values['allow_multiple_attempts'])) {
+ $toolLaunch->setAllowMultipleAttempts(true);
+ }
+
+ if (!empty($values['lrs_url'])
+ && !empty($values['lrs_auth_username'])
+ && !empty($values['lrs_auth_password'])
+ ) {
+ $toolLaunch
+ ->setLrsUrl($values['lrs_url'])
+ ->setLrsAuthUsername($values['lrs_auth_username'])
+ ->setLrsAuthPassword($values['lrs_auth_password']);
+ }
+
+ $em->persist($toolLaunch);
+ $em->flush();
+
+ Display::addFlash(
+ Display::return_message($plugin->get_lang('ActivityUpdated'), 'success')
+ );
+
+ header('Location: '.api_get_course_url());
+ exit;
+}
+
+$frmActivity->setDefaults(
+ [
+ 'title' => $toolLaunch->getTitle(),
+ 'description' => $toolLaunch->getDescription(),
+ 'allow_multiple_attempts' => $toolLaunch->isAllowMultipleAttempts(),
+ 'lrs_url' => $toolLaunch->getLrsUrl(),
+ 'lrs_auth_username' => $toolLaunch->getLrsAuthUsername(),
+ 'lrs_auth_password' => $toolLaunch->getLrsAuthPassword(),
+ ]
+);
+
+$actions = Display::url(
+ Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+ 'start.php?'.api_get_cidreq()
+);
+
+$pageContent = $frmActivity->returnForm();
+
+$interbreadcrumb[] = ['url' => 'start.php', 'name' => $plugin->get_lang('ToolTinCan')];
+
+$view = new Template($langEditActivity);
+$view->assign('header', $langEditActivity);
+$view->assign(
+ 'actions',
+ Display::toolbarAction(
+ 'xapi_actions',
+ [$actions]
+ )
+);
+$view->assign('content', $pageContent);
+$view->display_one_col_template();
diff --git a/public/plugin/xapi/tool_import.php b/public/plugin/xapi/tool_import.php
new file mode 100644
index 00000000000..7c9fedc598e
--- /dev/null
+++ b/public/plugin/xapi/tool_import.php
@@ -0,0 +1,177 @@
+query->has('lp_id')) {
+ $lp = new learnpath('', $httpRequest->query->getInt('lp_id'), $userId);
+
+ if (!empty($lp->lp_id)) {
+ $pluginIndex = api_get_path(WEB_CODE_PATH)."lp/lp_controller.php?$cidReq&"
+ .http_build_query(['action' => 'add_item', 'type' => 'step', 'lp' => $lp->lp_id, 'lp_build_selected' => 8]);
+ }
+}
+
+$langAddActivity = $plugin->get_lang('AddActivity');
+
+$formAction = api_get_self()."?$cidReq&".($lp ? http_build_query(['lp_id' => $lp->lp_id]) : '');
+
+$frmActivity = new FormValidator('frm_activity', 'post', $formAction);
+$frmActivity->addFile('file', $plugin->get_lang('XApiPackage'));
+$frmActivity->addButtonAdvancedSettings('advanced_params');
+$frmActivity->addHtml('');
+$frmActivity->addText('title', get_lang('Title'), false);
+$frmActivity->addTextarea('description', get_lang('Description'));
+$frmActivity->addCheckBox('allow_multiple_attempts', '', $plugin->get_lang('TinCanAllowMultipleAttempts'));
+$frmActivity->addHtml('
');
+$frmActivity->addButtonAdvancedSettings('lrs_params', $plugin->get_lang('LrsConfiguration'));
+$frmActivity->addHtml('');
+$frmActivity->addText(
+ 'lrs_url',
+ [
+ $plugin->get_lang('lrs_url'),
+ $plugin->get_lang('lrs_url_help'),
+ ],
+ false
+);
+$frmActivity->addText(
+ 'lrs_auth_username',
+ [
+ $plugin->get_lang('lrs_auth_username'),
+ $plugin->get_lang('lrs_auth_username_help'),
+ ],
+ false
+);
+$frmActivity->addText(
+ 'lrs_auth_password',
+ [
+ $plugin->get_lang('lrs_auth_password'),
+ $plugin->get_lang('lrs_auth_password_help'),
+ ],
+ false
+);
+$frmActivity->addHtml('
');
+$frmActivity->addButtonImport(get_lang('Import'));
+$frmActivity->addRule('file', get_lang('ThisFileIsRequired'), 'required');
+$frmActivity->addRule(
+ 'file',
+ $plugin->get_lang('OnlyZipOrXmlAllowed'),
+ 'filetype',
+ ['zip', 'xml']
+);
+$frmActivity->applyFilter('title', 'trim');
+$frmActivity->applyFilter('description', 'trim');
+$frmActivity->applyFilter('lrs_url', 'trim');
+$frmActivity->applyFilter('lrs_auth', 'trim');
+
+if ($frmActivity->validate()) {
+ $values = $frmActivity->exportValues();
+ $zipFileInfo = $_FILES['file'];
+
+ try {
+ $importer = PackageImporter::create($zipFileInfo, $course);
+ $packageFile = $importer->import();
+
+ $parser = PackageParser::create(
+ $importer->getPackageType(),
+ $packageFile,
+ $course,
+ $session
+ );
+ $toolLaunch = $parser->parse();
+ } catch (Exception $e) {
+ Display::addFlash(
+ Display::return_message($e->getMessage(), 'error')
+ );
+
+ header("Location: $pluginIndex");
+ exit;
+ }
+
+ if ('tincan' === $importer->getPackageType() && isset($values['allow_multiple_attempts'])) {
+ $toolLaunch->setAllowMultipleAttempts(true);
+ }
+
+ if (!empty($values['title'])) {
+ $toolLaunch->setTitle($values['title']);
+ }
+
+ if (!empty($values['description'])) {
+ $toolLaunch->setDescription($values['description']);
+ }
+
+ if (!empty($values['lrs_url'])
+ && !empty($values['lrs_auth_username'])
+ && !empty($values['lrs_auth_password'])
+ ) {
+ $toolLaunch
+ ->setLrsUrl($values['lrs_url'])
+ ->setLrsAuthUsername($values['lrs_auth_username'])
+ ->setLrsAuthPassword($values['lrs_auth_password']);
+ }
+
+ $em = Database::getManager();
+ $em->persist($toolLaunch);
+ $em->flush();
+
+ Display::addFlash(
+ Display::return_message($plugin->get_lang('ActivityImported'), 'success')
+ );
+
+ header("Location: $pluginIndex");
+ exit;
+}
+
+$frmActivity->setDefaults(['allow_multiple_attempts' => true]);
+
+$actions = Display::url(
+ Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+ $pluginIndex
+);
+
+$pageContent = $frmActivity->returnForm();
+
+if ($lp) {
+ $interbreadcrumb[] = [
+ 'url' => api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?action=list&'.api_get_cidreq(),
+ 'name' => get_lang('LearningPaths'),
+ ];
+ $interbreadcrumb[] = [
+ 'url' => $pluginIndex,
+ 'name' => $lp->getNameNoTags(),
+ ];
+} else {
+ $interbreadcrumb[] = ['url' => $pluginIndex, 'name' => $plugin->get_lang('ToolTinCan')];
+}
+
+$view = new Template($langAddActivity);
+$view->assign('header', $langAddActivity);
+$view->assign(
+ 'actions',
+ Display::toolbarAction(
+ 'xapi_actions',
+ [$actions]
+ )
+);
+$view->assign('content', $pageContent);
+$view->display_one_col_template();
diff --git a/public/plugin/xapi/uninstall.php b/public/plugin/xapi/uninstall.php
new file mode 100644
index 00000000000..3bcf5724756
--- /dev/null
+++ b/public/plugin/xapi/uninstall.php
@@ -0,0 +1,5 @@
+uninstall();
diff --git a/public/plugin/xapi/views/cmi5_launch.twig b/public/plugin/xapi/views/cmi5_launch.twig
new file mode 100644
index 00000000000..8aa5f8359fe
--- /dev/null
+++ b/public/plugin/xapi/views/cmi5_launch.twig
@@ -0,0 +1,15 @@
+
+
+
+
{{ tool.title }}
+
{{ tool.description }}
+
+
+
+ {{ toc_html }}
+
+
+
+
+
+
{$toolLaunch->getDescription()}
";
}
diff --git a/public/plugin/xapi/tool_delete.php b/public/plugin/xapi/tool_delete.php
index 910e4a76552..086bbaba78c 100644
--- a/public/plugin/xapi/tool_delete.php
+++ b/public/plugin/xapi/tool_delete.php
@@ -1,5 +1,7 @@
setTitle($values['title'])
- ->setDescription(empty($values['description']) ? null : $values['description']);
+ ->setDescription(empty($values['description']) ? null : $values['description'])
+ ;
if ($toolIsTinCan && isset($values['allow_multiple_attempts'])) {
$toolLaunch->setAllowMultipleAttempts(true);
@@ -98,7 +102,8 @@
$toolLaunch
->setLrsUrl($values['lrs_url'])
->setLrsAuthUsername($values['lrs_auth_username'])
- ->setLrsAuthPassword($values['lrs_auth_password']);
+ ->setLrsAuthPassword($values['lrs_auth_password'])
+ ;
}
$em->persist($toolLaunch);
@@ -109,6 +114,7 @@
);
header('Location: '.api_get_course_url());
+
exit;
}
diff --git a/public/plugin/xapi/tool_import.php b/public/plugin/xapi/tool_import.php
index 7c9fedc598e..67dd6497526 100644
--- a/public/plugin/xapi/tool_import.php
+++ b/public/plugin/xapi/tool_import.php
@@ -1,16 +1,19 @@
setLrsUrl($values['lrs_url'])
->setLrsAuthUsername($values['lrs_auth_username'])
- ->setLrsAuthPassword($values['lrs_auth_password']);
+ ->setLrsAuthPassword($values['lrs_auth_password'])
+ ;
}
$em = Database::getManager();
@@ -139,6 +144,7 @@
);
header("Location: $pluginIndex");
+
exit;
}
diff --git a/public/plugin/xapi/uninstall.php b/public/plugin/xapi/uninstall.php
index 3bcf5724756..a13bd5e1cf9 100644
--- a/public/plugin/xapi/uninstall.php
+++ b/public/plugin/xapi/uninstall.php
@@ -1,5 +1,7 @@
uninstall();
From 4e2f0e60a1f62906753ecbdb88d2465ddd90bbba Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <1697880+AngelFQC@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:23:11 -0500
Subject: [PATCH 3/4] Plugin: XApi: Use core entities instead of plugin
entities
See #3943
---
public/plugin/xapi/admin.php | 12 +-
public/plugin/xapi/cmi5/launch.php | 4 +-
public/plugin/xapi/cmi5/view.php | 18 +-
public/plugin/xapi/cron/send_statements.php | 5 +-
public/plugin/xapi/install.php | 7 -
.../src/Controller/StatementGetController.php | 18 +-
.../xapi/src/Entity/ActivityProfile.php | 99 -----
.../plugin/xapi/src/Entity/ActivityState.php | 118 ------
public/plugin/xapi/src/Entity/Cmi5Item.php | 387 ------------------
public/plugin/xapi/src/Entity/InternalLog.php | 244 -----------
public/plugin/xapi/src/Entity/LrsAuth.php | 112 -----
.../Repository/ToolLaunchRepository.php | 88 ----
.../xapi/src/Entity/SharedStatement.php | 112 -----
public/plugin/xapi/src/Entity/ToolLaunch.php | 295 -------------
.../src/Hook/XApiActivityHookObserver.php | 8 +-
.../src/Lrs/ActivitiesProfileController.php | 12 +-
.../src/Lrs/ActivitiesStateController.php | 6 +-
public/plugin/xapi/src/Lrs/LrsRequest.php | 4 +-
.../xapi/src/Lrs/Utils/InternalLogUtil.php | 4 +-
public/plugin/xapi/src/Parser/Cmi5Parser.php | 16 +-
.../plugin/xapi/src/Parser/PackageParser.php | 4 +-
.../plugin/xapi/src/Parser/TinCanParser.php | 6 +-
public/plugin/xapi/src/XApiPlugin.php | 114 +-----
public/plugin/xapi/start.php | 7 +-
public/plugin/xapi/tincan/launch.php | 4 +-
public/plugin/xapi/tincan/stats.php | 4 +-
.../xapi/tincan/stats_attempts.ajax.php | 4 +-
.../xapi/tincan/stats_statements.ajax.php | 4 +-
public/plugin/xapi/tincan/view.php | 4 +-
public/plugin/xapi/tool_delete.php | 4 +-
public/plugin/xapi/tool_edit.php | 4 +-
public/plugin/xapi/uninstall.php | 7 -
src/CoreBundle/Entity/XApiSharedStatement.php | 7 +
src/CoreBundle/Entity/XApiToolLaunch.php | 2 +-
34 files changed, 82 insertions(+), 1662 deletions(-)
delete mode 100644 public/plugin/xapi/install.php
delete mode 100644 public/plugin/xapi/src/Entity/ActivityProfile.php
delete mode 100644 public/plugin/xapi/src/Entity/ActivityState.php
delete mode 100644 public/plugin/xapi/src/Entity/Cmi5Item.php
delete mode 100644 public/plugin/xapi/src/Entity/InternalLog.php
delete mode 100644 public/plugin/xapi/src/Entity/LrsAuth.php
delete mode 100644 public/plugin/xapi/src/Entity/Repository/ToolLaunchRepository.php
delete mode 100644 public/plugin/xapi/src/Entity/SharedStatement.php
delete mode 100644 public/plugin/xapi/src/Entity/ToolLaunch.php
delete mode 100644 public/plugin/xapi/uninstall.php
diff --git a/public/plugin/xapi/admin.php b/public/plugin/xapi/admin.php
index 9bacdc9e5be..f83f55b4fd9 100644
--- a/public/plugin/xapi/admin.php
+++ b/public/plugin/xapi/admin.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\LrsAuth;
+use Chamilo\CoreBundle\Entity\XApiLrsAuth;
use Symfony\Component\HttpFoundation\Request;
$cidReset = true;
@@ -26,7 +26,7 @@
*
* @throws Exception
*/
-function createForm(?LrsAuth $auth = null)
+function createForm(?XApiLrsAuth $auth = null)
{
$pageBaseUrl = api_get_self();
@@ -63,7 +63,7 @@ function createForm(?LrsAuth $auth = null)
if ($form->validate()) {
$values = $form->exportValues();
- $auth = new LrsAuth();
+ $auth = new XApiLrsAuth();
$auth
->setUsername($values['username'])
->setPassword($values['password'])
@@ -94,7 +94,7 @@ function createForm(?LrsAuth $auth = null)
break;
case 'edit':
- $auth = $em->find(LrsAuth::class, $request->query->getInt('id'));
+ $auth = $em->find(XApiLrsAuth::class, $request->query->getInt('id'));
if (null == $auth) {
api_not_allowed(true);
@@ -135,7 +135,7 @@ function createForm(?LrsAuth $auth = null)
break;
case 'delete':
- $auth = $em->find(LrsAuth::class, $request->query->getInt('id'));
+ $auth = $em->find(XApiLrsAuth::class, $request->query->getInt('id'));
if (null == $auth) {
api_not_allowed(true);
@@ -160,7 +160,7 @@ function createForm(?LrsAuth $auth = null)
);
$pageContent = Display::return_message(get_lang('NoData'), 'warning');
- $auths = $em->getRepository(LrsAuth::class)->findAll();
+ $auths = $em->getRepository(XApiLrsAuth::class)->findAll();
if (count($auths) > 0) {
$row = 0;
diff --git a/public/plugin/xapi/cmi5/launch.php b/public/plugin/xapi/cmi5/launch.php
index 466e83ebb97..0291a15be9e 100644
--- a/public/plugin/xapi/cmi5/launch.php
+++ b/public/plugin/xapi/cmi5/launch.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\Cmi5Item;
+use Chamilo\CoreBundle\Entity\XApiCmi5Item;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
use Xabbuh\XApi\Model\Account;
use Xabbuh\XApi\Model\Activity;
@@ -32,7 +32,7 @@
$em = Database::getManager();
-$item = $em->find(Cmi5Item::class, $request->query->getInt('id'));
+$item = $em->find(XApiCmi5Item::class, $request->query->getInt('id'));
$toolLaunch = $item->getTool();
if ($toolLaunch->getId() !== $request->query->getInt('tool')) {
diff --git a/public/plugin/xapi/cmi5/view.php b/public/plugin/xapi/cmi5/view.php
index 955edc4fb3c..61feb914e3d 100644
--- a/public/plugin/xapi/cmi5/view.php
+++ b/public/plugin/xapi/cmi5/view.php
@@ -4,8 +4,8 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\Cmi5Item;
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiCmi5Item;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
use Xabbuh\XApi\Model\LanguageMap;
@@ -19,7 +19,7 @@
$em = Database::getManager();
$toolLaunch = $em->find(
- ToolLaunch::class,
+ XApiToolLaunch::class,
$request->query->getInt('id')
);
@@ -38,18 +38,16 @@
$user = api_get_user_entity(api_get_user_id());
$interfaceLanguage = api_get_interface_language();
-$itemsRepo = $em->getRepository(Cmi5Item::class);
+$itemsRepo = $em->getRepository(XApiCmi5Item::class);
-$query = $em->createQueryBuilder()
- ->select('item')
- ->from(Cmi5Item::class, 'item')
- ->where('item.tool = :tool')
+$query = $itemsRepo->createQueryBuilder('item');
+$query
+ ->where($query->expr()->eq('item.tool', ':tool'))
->setParameter('tool', $toolLaunch->getId())
- ->getQuery()
;
$tocHtml = $itemsRepo->buildTree(
- $query->getArrayResult(),
+ $query->getQuery()->getArrayResult(),
[
'decorate' => true,
'rootOpen' => '',
diff --git a/public/plugin/xapi/cron/send_statements.php b/public/plugin/xapi/cron/send_statements.php
index f19e3be941a..24feaae4b23 100644
--- a/public/plugin/xapi/cron/send_statements.php
+++ b/public/plugin/xapi/cron/send_statements.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\SharedStatement;
+use Chamilo\CoreBundle\Entity\XApiSharedStatement;
use Xabbuh\XApi\Common\Exception\ConflictException;
use Xabbuh\XApi\Common\Exception\XApiException;
use Xabbuh\XApi\Model\StatementId;
@@ -25,7 +25,7 @@
$statementSerializer = new StatementSerializer($serializer);
$notSentSharedStatements = $em
- ->getRepository(SharedStatement::class)
+ ->getRepository(XApiSharedStatement::class)
->findBy(
['uuid' => null, 'sent' => false],
null,
@@ -39,7 +39,6 @@
$client = XApiPlugin::create()->getXapiStatementCronClient();
- /** @var SharedStatement $notSentSharedStatement */
foreach ($notSentSharedStatements as $notSentSharedStatement) {
$notSentStatement = $statementSerializer->deserializeStatement(
json_encode($notSentSharedStatement->getStatement())
diff --git a/public/plugin/xapi/install.php b/public/plugin/xapi/install.php
deleted file mode 100644
index 96ac5bb5d57..00000000000
--- a/public/plugin/xapi/install.php
+++ /dev/null
@@ -1,7 +0,0 @@
-install();
diff --git a/public/plugin/xapi/php-xapi/lrs-bundle/src/Controller/StatementGetController.php b/public/plugin/xapi/php-xapi/lrs-bundle/src/Controller/StatementGetController.php
index f19447b262e..8a98f3f8298 100644
--- a/public/plugin/xapi/php-xapi/lrs-bundle/src/Controller/StatementGetController.php
+++ b/public/plugin/xapi/php-xapi/lrs-bundle/src/Controller/StatementGetController.php
@@ -57,18 +57,12 @@ class StatementGetController
'cursor' => true,
];
- protected $repository;
- protected $statementSerializer;
- protected $statementResultSerializer;
- protected $statementsFilterFactory;
-
- public function __construct(StatementRepositoryInterface $repository, StatementSerializerInterface $statementSerializer, StatementResultSerializerInterface $statementResultSerializer, StatementsFilterFactory $statementsFilterFactory)
- {
- $this->repository = $repository;
- $this->statementSerializer = $statementSerializer;
- $this->statementResultSerializer = $statementResultSerializer;
- $this->statementsFilterFactory = $statementsFilterFactory;
- }
+ public function __construct(
+ protected readonly StatementRepositoryInterface $repository,
+ protected readonly StatementSerializerInterface $statementSerializer,
+ protected readonly StatementResultSerializerInterface $statementResultSerializer,
+ protected readonly StatementsFilterFactory $statementsFilterFactory
+ ) {}
/**
* @return Response
diff --git a/public/plugin/xapi/src/Entity/ActivityProfile.php b/public/plugin/xapi/src/Entity/ActivityProfile.php
deleted file mode 100644
index b4801dc1330..00000000000
--- a/public/plugin/xapi/src/Entity/ActivityProfile.php
+++ /dev/null
@@ -1,99 +0,0 @@
-id;
- }
-
- public function setId(int $id): self
- {
- $this->id = $id;
-
- return $this;
- }
-
- public function getProfileId(): string
- {
- return $this->profileId;
- }
-
- public function setProfileId(string $profileId): self
- {
- $this->profileId = $profileId;
-
- return $this;
- }
-
- public function getActivityId(): string
- {
- return $this->activityId;
- }
-
- public function setActivityId(string $activityId): self
- {
- $this->activityId = $activityId;
-
- return $this;
- }
-
- public function getDocumentData(): array
- {
- return $this->documentData;
- }
-
- public function setDocumentData(array $documentData): self
- {
- $this->documentData = $documentData;
-
- return $this;
- }
-}
diff --git a/public/plugin/xapi/src/Entity/ActivityState.php b/public/plugin/xapi/src/Entity/ActivityState.php
deleted file mode 100644
index f466ab6c70b..00000000000
--- a/public/plugin/xapi/src/Entity/ActivityState.php
+++ /dev/null
@@ -1,118 +0,0 @@
-id;
- }
-
- public function setId(int $id): self
- {
- $this->id = $id;
-
- return $this;
- }
-
- public function getStateId(): string
- {
- return $this->stateId;
- }
-
- public function setStateId(string $stateId): self
- {
- $this->stateId = $stateId;
-
- return $this;
- }
-
- public function getActivityId(): string
- {
- return $this->activityId;
- }
-
- public function setActivityId(string $activityId): self
- {
- $this->activityId = $activityId;
-
- return $this;
- }
-
- public function getAgent(): array
- {
- return $this->agent;
- }
-
- public function setAgent(array $agent): self
- {
- $this->agent = $agent;
-
- return $this;
- }
-
- public function getDocumentData(): array
- {
- return $this->documentData;
- }
-
- public function setDocumentData(array $documentData): self
- {
- $this->documentData = $documentData;
-
- return $this;
- }
-}
diff --git a/public/plugin/xapi/src/Entity/Cmi5Item.php b/public/plugin/xapi/src/Entity/Cmi5Item.php
deleted file mode 100644
index 4401b39ce57..00000000000
--- a/public/plugin/xapi/src/Entity/Cmi5Item.php
+++ /dev/null
@@ -1,387 +0,0 @@
-children = new ArrayCollection();
- }
-
- public function getId(): int
- {
- return $this->id;
- }
-
- public function setId(int $id): self
- {
- $this->id = $id;
-
- return $this;
- }
-
- public function getIdentifier(): string
- {
- return $this->identifier;
- }
-
- public function setIdentifier(string $identifier): self
- {
- $this->identifier = $identifier;
-
- return $this;
- }
-
- public function getType(): string
- {
- return $this->type;
- }
-
- public function setType(string $type): self
- {
- $this->type = $type;
-
- return $this;
- }
-
- public function getTitle(): array
- {
- return $this->title;
- }
-
- public function setTitle(array $title): self
- {
- $this->title = $title;
-
- return $this;
- }
-
- public function getDescription(): array
- {
- return $this->description;
- }
-
- public function setDescription(array $description): self
- {
- $this->description = $description;
-
- return $this;
- }
-
- public function getUrl(): ?string
- {
- return $this->url;
- }
-
- public function setUrl(?string $url): self
- {
- $this->url = $url;
-
- return $this;
- }
-
- public function getActivityType(): ?string
- {
- return $this->activityType;
- }
-
- public function setActivityType(?string $activityType): self
- {
- $this->activityType = $activityType;
-
- return $this;
- }
-
- public function getLaunchMethod(): ?string
- {
- return $this->launchMethod;
- }
-
- public function setLaunchMethod(?string $launchMethod): self
- {
- $this->launchMethod = $launchMethod;
-
- return $this;
- }
-
- public function getMoveOn(): ?string
- {
- return $this->moveOn;
- }
-
- public function setMoveOn(?string $moveOn): self
- {
- $this->moveOn = $moveOn;
-
- return $this;
- }
-
- public function getMasteryScore(): ?float
- {
- return $this->masteryScore;
- }
-
- public function setMasteryScore(?float $masteryScore): self
- {
- $this->masteryScore = $masteryScore;
-
- return $this;
- }
-
- public function getLaunchParameters(): ?string
- {
- return $this->launchParameters;
- }
-
- public function setLaunchParameters(?string $launchParameters): self
- {
- $this->launchParameters = $launchParameters;
-
- return $this;
- }
-
- public function getEntitlementKey(): ?string
- {
- return $this->entitlementKey;
- }
-
- public function setEntitlementKey(?string $entitlementKey): self
- {
- $this->entitlementKey = $entitlementKey;
-
- return $this;
- }
-
- public function getParent(): ?self
- {
- return $this->parent;
- }
-
- public function setParent(?self $parent): self
- {
- $this->parent = $parent;
-
- return $this;
- }
-
- public function getChildren(): ArrayCollection
- {
- return $this->children;
- }
-
- public function setChildren(ArrayCollection $children): self
- {
- $this->children = $children;
-
- return $this;
- }
-
- public function getStatus(): ?string
- {
- return $this->status;
- }
-
- public function setStatus(?string $status): self
- {
- $this->status = $status;
-
- return $this;
- }
-
- public function getTool(): ToolLaunch
- {
- return $this->tool;
- }
-
- public function setTool(ToolLaunch $tool): self
- {
- $this->tool = $tool;
-
- return $this;
- }
-
- public function getRoot(): self
- {
- return $this->root;
- }
-}
diff --git a/public/plugin/xapi/src/Entity/InternalLog.php b/public/plugin/xapi/src/Entity/InternalLog.php
deleted file mode 100644
index 8e43a3a3020..00000000000
--- a/public/plugin/xapi/src/Entity/InternalLog.php
+++ /dev/null
@@ -1,244 +0,0 @@
-id;
- }
-
- public function getUser(): User
- {
- return $this->user;
- }
-
- public function setUser(User $user): self
- {
- $this->user = $user;
-
- return $this;
- }
-
- public function getStatementId(): string
- {
- return $this->statementId;
- }
-
- public function setStatementId(string $statementId): self
- {
- $this->statementId = $statementId;
-
- return $this;
- }
-
- public function getVerb(): string
- {
- return $this->verb;
- }
-
- public function setVerb(string $verb): self
- {
- $this->verb = $verb;
-
- return $this;
- }
-
- public function getObjectId(): string
- {
- return $this->objectId;
- }
-
- public function setObjectId(string $objectId): self
- {
- $this->objectId = $objectId;
-
- return $this;
- }
-
- public function getActivityName(): ?string
- {
- return $this->activityName;
- }
-
- public function setActivityName(?string $activityName): self
- {
- $this->activityName = $activityName;
-
- return $this;
- }
-
- public function getActivityDescription(): ?string
- {
- return $this->activityDescription;
- }
-
- public function setActivityDescription(?string $activityDescription): self
- {
- $this->activityDescription = $activityDescription;
-
- return $this;
- }
-
- public function getScoreScaled(): ?float
- {
- return $this->scoreScaled;
- }
-
- public function setScoreScaled(?float $scoreScaled): self
- {
- $this->scoreScaled = $scoreScaled;
-
- return $this;
- }
-
- public function getScoreRaw(): ?float
- {
- return $this->scoreRaw;
- }
-
- public function setScoreRaw(?float $scoreRaw): self
- {
- $this->scoreRaw = $scoreRaw;
-
- return $this;
- }
-
- public function getScoreMin(): ?float
- {
- return $this->scoreMin;
- }
-
- public function setScoreMin(?float $scoreMin): self
- {
- $this->scoreMin = $scoreMin;
-
- return $this;
- }
-
- public function getScoreMax(): ?float
- {
- return $this->scoreMax;
- }
-
- public function setScoreMax(?float $scoreMax): self
- {
- $this->scoreMax = $scoreMax;
-
- return $this;
- }
-
- public function getCreatedAt(): ?DateTime
- {
- return $this->createdAt;
- }
-
- public function setCreatedAt(?DateTime $createdAt): self
- {
- $this->createdAt = $createdAt;
-
- return $this;
- }
-}
diff --git a/public/plugin/xapi/src/Entity/LrsAuth.php b/public/plugin/xapi/src/Entity/LrsAuth.php
deleted file mode 100644
index 03b15d416eb..00000000000
--- a/public/plugin/xapi/src/Entity/LrsAuth.php
+++ /dev/null
@@ -1,112 +0,0 @@
-id;
- }
-
- public function getUsername(): string
- {
- return $this->username;
- }
-
- public function setUsername(string $username): self
- {
- $this->username = $username;
-
- return $this;
- }
-
- public function getPassword(): string
- {
- return $this->password;
- }
-
- public function setPassword(string $password): self
- {
- $this->password = $password;
-
- return $this;
- }
-
- public function isEnabled(): bool
- {
- return $this->enabled;
- }
-
- public function setEnabled(bool $enabled): self
- {
- $this->enabled = $enabled;
-
- return $this;
- }
-
- public function getCreatedAt(): DateTime
- {
- return $this->createdAt;
- }
-
- public function setCreatedAt(DateTime $createdAt): self
- {
- $this->createdAt = $createdAt;
-
- return $this;
- }
-}
diff --git a/public/plugin/xapi/src/Entity/Repository/ToolLaunchRepository.php b/public/plugin/xapi/src/Entity/Repository/ToolLaunchRepository.php
deleted file mode 100644
index e9431f3e23a..00000000000
--- a/public/plugin/xapi/src/Entity/Repository/ToolLaunchRepository.php
+++ /dev/null
@@ -1,88 +0,0 @@
- $course,
- 'session' => null,
- ];
-
- if ($session) {
- $criteria['session'] = $session;
- }
-
- return $this->findBy($criteria, $orderBy, $limit, $start);
- }
-
- public function countByCourseAndSession(Course $course, ?Session $session = null, $filteredForStudent = false): int
- {
- $qb = $this->createQueryBuilder('tl');
- $qb->select($qb->expr()->count('tl'))
- ->where($qb->expr()->eq('tl.course', ':course'))
- ->setParameter('course', $course)
- ;
-
- if ($session) {
- $qb->andWhere($qb->expr()->eq('tl.session', ':session'))
- ->setParameter('session', $session)
- ;
- } else {
- $qb->andWhere($qb->expr()->isNull('tl.session'));
- }
-
- if ($filteredForStudent) {
- $qb
- ->leftJoin(
- CLpItem::class,
- 'lpi',
- Join::WITH,
- "tl.id = lpi.path AND tl.course = lpi.cId AND lpi.itemType = 'xapi'"
- )
- ->andWhere($qb->expr()->isNull('lpi.path'))
- ;
- }
-
- $query = $qb->getQuery();
-
- return (int) $query->getSingleScalarResult();
- }
-
- public function wasAddedInLp(ToolLaunch $toolLaunch): int
- {
- $qb = $this->getEntityManager()->createQueryBuilder();
-
- return (int) $qb->select($qb->expr()->count('lp'))
- ->from(CLp::class, 'lp')
- ->innerJoin(CLpItem::class, 'lpi', Join::WITH, 'lp.id = lpi.lpId')
- ->where('lpi.itemType = :type')
- ->andWhere('lpi.path = :tool_id')
- ->setParameter('type', TOOL_XAPI)
- ->setParameter('tool_id', $toolLaunch->getId())
- ->getQuery()
- ->getSingleScalarResult();
- }
-}
diff --git a/public/plugin/xapi/src/Entity/SharedStatement.php b/public/plugin/xapi/src/Entity/SharedStatement.php
deleted file mode 100644
index 9475e3a2c13..00000000000
--- a/public/plugin/xapi/src/Entity/SharedStatement.php
+++ /dev/null
@@ -1,112 +0,0 @@
-statement = $statement;
- $this->uuid = $uuid;
- $this->sent = $sent;
- }
-
- public function getId(): int
- {
- return $this->id;
- }
-
- public function getUuid(): ?string
- {
- return $this->uuid;
- }
-
- public function setUuid(?string $uuid): self
- {
- $this->uuid = $uuid;
-
- return $this;
- }
-
- public function getStatement(): array
- {
- return $this->statement;
- }
-
- public function setStatement(array $statement): self
- {
- $this->statement = $statement;
-
- return $this;
- }
-
- public function isSent(): bool
- {
- return $this->sent;
- }
-
- public function setSent(bool $sent): self
- {
- $this->sent = $sent;
-
- return $this;
- }
-}
diff --git a/public/plugin/xapi/src/Entity/ToolLaunch.php b/public/plugin/xapi/src/Entity/ToolLaunch.php
deleted file mode 100644
index 6d9d4f5b8ea..00000000000
--- a/public/plugin/xapi/src/Entity/ToolLaunch.php
+++ /dev/null
@@ -1,295 +0,0 @@
-allowMultipleAttempts = true;
- $this->items = new ArrayCollection();
- }
-
- public function getId(): int
- {
- return $this->id;
- }
-
- public function setId(int $id): ToolLaunch
- {
- $this->id = $id;
-
- return $this;
- }
-
- public function getTitle(): string
- {
- return $this->title;
- }
-
- public function setTitle(string $title): ToolLaunch
- {
- $this->title = $title;
-
- return $this;
- }
-
- public function getDescription(): ?string
- {
- return $this->description;
- }
-
- public function setDescription(?string $description): ToolLaunch
- {
- $this->description = $description;
-
- return $this;
- }
-
- public function getCourse(): Course
- {
- return $this->course;
- }
-
- public function setCourse(Course $course): ToolLaunch
- {
- $this->course = $course;
-
- return $this;
- }
-
- public function getSession(): ?Session
- {
- return $this->session;
- }
-
- public function setSession(?Session $session): ToolLaunch
- {
- $this->session = $session;
-
- return $this;
- }
-
- public function getLaunchUrl(): string
- {
- return $this->launchUrl;
- }
-
- public function setLaunchUrl(string $launchUrl): ToolLaunch
- {
- $this->launchUrl = $launchUrl;
-
- return $this;
- }
-
- public function getActivityId(): ?string
- {
- return $this->activityId;
- }
-
- public function setActivityId(?string $activityId): ToolLaunch
- {
- $this->activityId = $activityId;
-
- return $this;
- }
-
- public function getCreatedAt(): DateTime
- {
- return $this->createdAt;
- }
-
- public function setCreatedAt(DateTime $createdAt): ToolLaunch
- {
- $this->createdAt = $createdAt;
-
- return $this;
- }
-
- public function getActivityType(): ?string
- {
- return $this->activityType;
- }
-
- public function setActivityType(?string $activityType): ToolLaunch
- {
- $this->activityType = $activityType;
-
- return $this;
- }
-
- public function isAllowMultipleAttempts(): bool
- {
- return $this->allowMultipleAttempts;
- }
-
- public function setAllowMultipleAttempts(bool $allowMultipleAttempts): ToolLaunch
- {
- $this->allowMultipleAttempts = $allowMultipleAttempts;
-
- return $this;
- }
-
- public function getLrsUrl(): ?string
- {
- return $this->lrsUrl;
- }
-
- public function setLrsUrl(?string $lrsUrl): ToolLaunch
- {
- $this->lrsUrl = $lrsUrl;
-
- return $this;
- }
-
- public function getLrsAuthUsername(): ?string
- {
- return $this->lrsAuthUsername;
- }
-
- public function setLrsAuthUsername(?string $lrsAuthUsername): ToolLaunch
- {
- $this->lrsAuthUsername = $lrsAuthUsername;
-
- return $this;
- }
-
- public function getLrsAuthPassword(): ?string
- {
- return $this->lrsAuthPassword;
- }
-
- public function setLrsAuthPassword(?string $lrsAuthPassword): ToolLaunch
- {
- $this->lrsAuthPassword = $lrsAuthPassword;
-
- return $this;
- }
-
- public function getItems(): ArrayCollection
- {
- return $this->items;
- }
-
- /**
- * @param \Chamilo\PluginBundle\Entity\XApi\Cmi5Item $cmi5Item
- *
- * @return $this
- */
- public function addItem(Cmi5Item $cmi5Item)
- {
- $cmi5Item->setTool($this);
-
- $this->items->add($cmi5Item);
-
- return $this;
- }
-}
diff --git a/public/plugin/xapi/src/Hook/XApiActivityHookObserver.php b/public/plugin/xapi/src/Hook/XApiActivityHookObserver.php
index c622e5eeecc..15f2ba24b03 100644
--- a/public/plugin/xapi/src/Hook/XApiActivityHookObserver.php
+++ b/public/plugin/xapi/src/Hook/XApiActivityHookObserver.php
@@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\SharedStatement;
+use Chamilo\CoreBundle\Entity\XApiSharedStatement;
use Xabbuh\XApi\Model\Statement;
use Xabbuh\XApi\Serializer\Symfony\Serializer;
use Xabbuh\XApi\Serializer\Symfony\StatementSerializer;
@@ -33,14 +33,12 @@ protected function __construct()
/**
* @throws \Doctrine\ORM\ORMException
* @throws \Doctrine\ORM\OptimisticLockException
- *
- * @return \Chamilo\PluginBundle\Entity\XApi\SharedStatement|null
*/
- protected function saveSharedStatement(Statement $statement)
+ protected function saveSharedStatement(Statement $statement): XApiSharedStatement
{
$statementSerialized = $this->serializeStatement($statement);
- $sharedStmt = new SharedStatement(
+ $sharedStmt = new XApiSharedStatement(
json_decode($statementSerialized, true)
);
diff --git a/public/plugin/xapi/src/Lrs/ActivitiesProfileController.php b/public/plugin/xapi/src/Lrs/ActivitiesProfileController.php
index 6ea1ed6e840..391750b15fb 100644
--- a/public/plugin/xapi/src/Lrs/ActivitiesProfileController.php
+++ b/public/plugin/xapi/src/Lrs/ActivitiesProfileController.php
@@ -6,7 +6,7 @@
namespace Chamilo\PluginBundle\XApi\Lrs;
-use Chamilo\PluginBundle\Entity\XApi\ActivityProfile;
+use Chamilo\CoreBundle\Entity\XApiActivityProfile;
use Database;
use Symfony\Component\HttpFoundation\Response;
@@ -21,9 +21,9 @@ public function get(): Response
$activityId = $this->httpRequest->query->get('activityId');
$em = Database::getManager();
- $profileRepo = $em->getRepository(ActivityProfile::class);
+ $profileRepo = $em->getRepository(XApiActivityProfile::class);
- /** @var ActivityProfile $activityProfile */
+ /** @var XApiActivityProfile $activityProfile */
$activityProfile = $profileRepo->findOneBy(
[
'profileId' => $profileId,
@@ -52,9 +52,9 @@ public function put(): Response
$documentData = $this->httpRequest->getContent();
$em = Database::getManager();
- $profileRepo = $em->getRepository(ActivityProfile::class);
+ $profileRepo = $em->getRepository(XApiActivityProfile::class);
- /** @var ActivityProfile $activityProfile */
+ /** @var XApiActivityProfile $activityProfile */
$activityProfile = $profileRepo->findOneBy(
[
'profileId' => $profileId,
@@ -63,7 +63,7 @@ public function put(): Response
);
if (empty($activityProfile)) {
- $activityProfile = new ActivityProfile();
+ $activityProfile = new XApiActivityProfile();
$activityProfile
->setProfileId($profileId)
->setActivityId($activityId)
diff --git a/public/plugin/xapi/src/Lrs/ActivitiesStateController.php b/public/plugin/xapi/src/Lrs/ActivitiesStateController.php
index 56c3398e390..b980fb1a71e 100644
--- a/public/plugin/xapi/src/Lrs/ActivitiesStateController.php
+++ b/public/plugin/xapi/src/Lrs/ActivitiesStateController.php
@@ -5,7 +5,7 @@
namespace Chamilo\PluginBundle\XApi\Lrs;
-use Chamilo\PluginBundle\Entity\XApi\ActivityState;
+use Chamilo\CoreBundle\Entity\XApiActivityState;
use Database;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
@@ -101,14 +101,14 @@ public function put(): Response
$em = Database::getManager();
if (empty($state)) {
- $state = new ActivityState();
+ $state = new XApiActivityState();
$state
->setActivityId($activityId)
->setAgent(json_decode($agent, true))
->setStateId($stateId)
;
} else {
- $state = $em->find(ActivityState::class, $state['id']);
+ $state = $em->find(XApiActivityState::class, $state['id']);
}
$state->setDocumentData(json_decode($documentData, true));
diff --git a/public/plugin/xapi/src/Lrs/LrsRequest.php b/public/plugin/xapi/src/Lrs/LrsRequest.php
index 8b550e66c78..b4f4389def6 100644
--- a/public/plugin/xapi/src/Lrs/LrsRequest.php
+++ b/public/plugin/xapi/src/Lrs/LrsRequest.php
@@ -6,7 +6,7 @@
namespace Chamilo\PluginBundle\XApi\Lrs;
-use Chamilo\PluginBundle\Entity\XApi\LrsAuth;
+use Chamilo\CoreBundle\Entity\XApiLrsAuth;
use Database;
use Exception;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
@@ -85,7 +85,7 @@ private function validateAuth(): bool
list($username, $password) = $parts;
$auth = Database::getManager()
- ->getRepository(LrsAuth::class)
+ ->getRepository(XApiLrsAuth::class)
->findOneBy(
['username' => $username, 'password' => $password, 'enabled' => true]
)
diff --git a/public/plugin/xapi/src/Lrs/Utils/InternalLogUtil.php b/public/plugin/xapi/src/Lrs/Utils/InternalLogUtil.php
index 6f5518f51e5..24b4fa364b0 100644
--- a/public/plugin/xapi/src/Lrs/Utils/InternalLogUtil.php
+++ b/public/plugin/xapi/src/Lrs/Utils/InternalLogUtil.php
@@ -6,7 +6,7 @@
namespace Chamilo\PluginBundle\XApi\Lrs\Util;
-use Chamilo\PluginBundle\Entity\XApi\InternalLog;
+use Chamilo\CoreBundle\Entity\XApiInternalLog;
use Database;
use UserManager;
use Xabbuh\XApi\Model\Activity;
@@ -33,7 +33,7 @@ public static function saveStatementForInternalLog(Statement $statement): void
$languageIso = api_get_language_isocode();
$statementVerbString = XApiPlugin::extractVerbInLanguage($statement->getVerb()->getDisplay(), $languageIso);
- $internalLog = new InternalLog();
+ $internalLog = new XApiInternalLog();
$internalLog
->setUser($user)
->setVerb($statementVerbString)
diff --git a/public/plugin/xapi/src/Parser/Cmi5Parser.php b/public/plugin/xapi/src/Parser/Cmi5Parser.php
index a869edc378c..e939ff5bb15 100644
--- a/public/plugin/xapi/src/Parser/Cmi5Parser.php
+++ b/public/plugin/xapi/src/Parser/Cmi5Parser.php
@@ -6,8 +6,8 @@
namespace Chamilo\PluginBundle\XApi\Parser;
-use Chamilo\PluginBundle\Entity\XApi\Cmi5Item;
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiCmi5Item;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\DomCrawler\Crawler;
/**
@@ -15,14 +15,14 @@
*/
class Cmi5Parser extends PackageParser
{
- public function parse(): ToolLaunch
+ public function parse(): XApiToolLaunch
{
$content = file_get_contents($this->filePath);
$xml = new Crawler($content);
$courseNode = $xml->filterXPath('//courseStructure/course');
- $toolLaunch = new ToolLaunch();
+ $toolLaunch = new XApiToolLaunch();
$toolLaunch
->setTitle(
current(
@@ -74,13 +74,13 @@ private function getLanguageStrings(Crawler $node)
}
/**
- * @return array|\Chamilo\PluginBundle\Entity\XApi\Cmi5Item[]
+ * @return array
*/
- private function generateToC(Crawler $xml)
+ private function generateToC(Crawler $xml): array
{
$blocksMap = [];
- /** @var array|Cmi5Item[] $items */
+ /** @var array|XApiCmi5Item[] $items */
$items = $xml
->filterXPath('//*')
->reduce(
@@ -94,7 +94,7 @@ function (Crawler $node, $i) use (&$blocksMap) {
list($id, $activityType, $launchMethod, $moveOn, $masteryMode) = $node->extract($attributes)[0];
- $item = new Cmi5Item();
+ $item = new XApiCmi5Item();
$item
->setIdentifier($id)
->setType($node->nodeName())
diff --git a/public/plugin/xapi/src/Parser/PackageParser.php b/public/plugin/xapi/src/Parser/PackageParser.php
index bca1575acad..15a0f0d5457 100644
--- a/public/plugin/xapi/src/Parser/PackageParser.php
+++ b/public/plugin/xapi/src/Parser/PackageParser.php
@@ -8,7 +8,7 @@
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Session;
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Exception;
/**
@@ -60,5 +60,5 @@ public static function create(string $packageType, string $filePath, Course $cou
}
}
- abstract public function parse(): ToolLaunch;
+ abstract public function parse(): XApiToolLaunch;
}
diff --git a/public/plugin/xapi/src/Parser/TinCanParser.php b/public/plugin/xapi/src/Parser/TinCanParser.php
index af5b568cd4d..aa3e876a1be 100644
--- a/public/plugin/xapi/src/Parser/TinCanParser.php
+++ b/public/plugin/xapi/src/Parser/TinCanParser.php
@@ -6,7 +6,7 @@
namespace Chamilo\PluginBundle\XApi\Parser;
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\DomCrawler\Crawler;
/**
@@ -14,7 +14,7 @@
*/
class TinCanParser extends PackageParser
{
- public function parse(): ToolLaunch
+ public function parse(): XApiToolLaunch
{
$content = file_get_contents($this->filePath);
@@ -25,7 +25,7 @@ public function parse(): ToolLaunch
$nodeDescription = $activityNode->filter('description');
$nodeLaunch = $activityNode->filter('launch');
- $toolLaunch = new ToolLaunch();
+ $toolLaunch = new XApiToolLaunch();
$toolLaunch
->setCourse($this->course)
->setSession($this->session)
diff --git a/public/plugin/xapi/src/XApiPlugin.php b/public/plugin/xapi/src/XApiPlugin.php
index b58094aaf47..9d034c57904 100644
--- a/public/plugin/xapi/src/XApiPlugin.php
+++ b/public/plugin/xapi/src/XApiPlugin.php
@@ -2,21 +2,14 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ActivityProfile;
-use Chamilo\PluginBundle\Entity\XApi\ActivityState;
-use Chamilo\PluginBundle\Entity\XApi\Cmi5Item;
-use Chamilo\PluginBundle\Entity\XApi\InternalLog;
-use Chamilo\PluginBundle\Entity\XApi\LrsAuth;
-use Chamilo\PluginBundle\Entity\XApi\SharedStatement;
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver;
use Doctrine\ORM\ORMException;
-use Doctrine\ORM\Tools\SchemaTool;
use GuzzleHttp\RequestOptions;
use Http\Adapter\Guzzle6\Client;
use Http\Message\MessageFactory\GuzzleMessageFactory;
-use Ramsey\Uuid\Uuid;
+use Symfony\Component\Uid\Uuid;
use Xabbuh\XApi\Client\Api\StatementsApiClientInterface;
use Xabbuh\XApi\Client\XApiClientBuilder;
use Xabbuh\XApi\Model\Agent;
@@ -93,34 +86,6 @@ public static function create()
*/
public function install()
{
- $em = Database::getManager();
-
- $tablesExists = $em->getConnection()->getSchemaManager()->tablesExist(
- [
- 'xapi_shared_statement',
- 'xapi_tool_launch',
- 'xapi_lrs_auth',
- 'xapi_cmi5_item',
- 'xapi_activity_state',
- 'xapi_activity_profile',
- 'xapi_internal_log',
-
- 'xapi_attachment',
- 'xapi_object',
- 'xapi_result',
- 'xapi_verb',
- 'xapi_extensions',
- 'xapi_context',
- 'xapi_actor',
- 'xapi_statement',
- ]
- );
-
- if ($tablesExists) {
- return;
- }
-
- $this->installPluginDbTables();
$this->installInitialConfig();
$this->addCourseTools();
$this->installHook();
@@ -132,7 +97,6 @@ public function install()
public function uninstall()
{
$this->uninstallHook();
- $this->uninstallPluginDbTables();
$this->deleteCourseTools();
}
@@ -172,39 +136,6 @@ public function uninstallHook()
return 1;
}
- public function uninstallPluginDbTables()
- {
- $em = Database::getManager();
- $pluginEm = self::getEntityManager();
-
- $schemaTool = new SchemaTool($em);
- $schemaTool->dropSchema(
- [
- $em->getClassMetadata(ActivityProfile::class),
- $em->getClassMetadata(ActivityState::class),
- $em->getClassMetadata(SharedStatement::class),
- $em->getClassMetadata(ToolLaunch::class),
- $em->getClassMetadata(LrsAuth::class),
- $em->getClassMetadata(Cmi5Item::class),
- $em->getClassMetadata(InternalLog::class),
- ]
- );
-
- $pluginSchemaTool = new SchemaTool($pluginEm);
- $pluginSchemaTool->dropSchema(
- [
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Attachment::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\StatementObject::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Result::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Verb::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Extensions::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Context::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Actor::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Statement::class),
- ]
- );
- }
-
/**
* @param string|null $lrsUrl
* @param string|null $lrsAuthUsername
@@ -507,7 +438,7 @@ public function getLpResourceBlock(int $lpId)
$session = api_get_session_entity();
$tools = Database::getManager()
- ->getRepository(ToolLaunch::class)
+ ->getRepository(XApiToolLaunch::class)
->findByCourseAndSession($course, $session);
$importIcon = Display::return_icon('import_scorm.png');
@@ -525,7 +456,6 @@ public function getLpResourceBlock(int $lpId)
)
.'';
- /** @var ToolLaunch $tool */
foreach ($tools as $tool) {
$toolAnchor = Display::url(
Security::remove_XSS($tool->getTitle()),
@@ -553,48 +483,12 @@ public function getLpResourceBlock(int $lpId)
return $return;
}
- /**
- * @throws \Doctrine\ORM\Tools\ToolsException
- */
- private function installPluginDbTables()
- {
- $em = Database::getManager();
- $pluginEm = self::getEntityManager();
-
- $schemaTool = new SchemaTool($em);
- $schemaTool->createSchema(
- [
- $em->getClassMetadata(SharedStatement::class),
- $em->getClassMetadata(ToolLaunch::class),
- $em->getClassMetadata(LrsAuth::class),
- $em->getClassMetadata(Cmi5Item::class),
- $em->getClassMetadata(ActivityState::class),
- $em->getClassMetadata(ActivityProfile::class),
- $em->getClassMetadata(InternalLog::class),
- ]
- );
-
- $pluginSchemaTool = new SchemaTool($pluginEm);
- $pluginSchemaTool->createSchema(
- [
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Attachment::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\StatementObject::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Result::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Verb::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Extensions::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Context::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Actor::class),
- $pluginEm->getClassMetadata(\XApi\Repository\Doctrine\Mapping\Statement::class),
- ]
- );
- }
-
/**
* @throws \Exception
*/
private function installInitialConfig()
{
- $uuidNamespace = Uuid::uuid1();
+ $uuidNamespace = Uuid::v1()->toRfc4122();
$pluginName = $this->get_name();
$urlId = api_get_current_access_url_id();
diff --git a/public/plugin/xapi/start.php b/public/plugin/xapi/start.php
index 3c8438fa35d..d50db19a27b 100644
--- a/public/plugin/xapi/start.php
+++ b/public/plugin/xapi/start.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
require_once __DIR__.'/../../main/inc/global.inc.php';
@@ -16,7 +16,7 @@
$isAllowedToEdit = api_is_allowed_to_edit();
$em = Database::getManager();
-$toolLaunchRepo = $em->getRepository(ToolLaunch::class);
+$toolLaunchRepo = $em->getRepository(XApiToolLaunch::class);
$course = api_get_course_entity();
$session = api_get_session_entity();
@@ -27,7 +27,7 @@
$table = new SortableTable(
'tbl_xapi',
function () use ($em, $course, $session, $isAllowedToEdit) {
- return $em->getRepository(ToolLaunch::class)
+ return $em->getRepository(XApiToolLaunch::class)
->countByCourseAndSession($course, $session, !$isAllowedToEdit)
;
},
@@ -36,7 +36,6 @@ function ($start, $limit, $orderBy, $orderDir) use ($toolLaunchRepo, $course, $s
$data = [];
- /** @var ToolLaunch $toolLaunch */
foreach ($tools as $toolLaunch) {
$wasAddedInLp = $toolLaunchRepo->wasAddedInLp($toolLaunch);
diff --git a/public/plugin/xapi/tincan/launch.php b/public/plugin/xapi/tincan/launch.php
index 459721ca2c4..d1d0d3f7035 100644
--- a/public/plugin/xapi/tincan/launch.php
+++ b/public/plugin/xapi/tincan/launch.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
use Xabbuh\XApi\Common\Exception\NotFoundException;
use Xabbuh\XApi\Model\Activity;
@@ -29,7 +29,7 @@
$attemptId = $request->request->get('attempt_id');
$toolLaunch = $em->find(
- ToolLaunch::class,
+ XApiToolLaunch::class,
$request->request->getInt('id')
);
diff --git a/public/plugin/xapi/tincan/stats.php b/public/plugin/xapi/tincan/stats.php
index fd0b98d84ba..5abad6f01a0 100644
--- a/public/plugin/xapi/tincan/stats.php
+++ b/public/plugin/xapi/tincan/stats.php
@@ -3,7 +3,7 @@
declare(strict_types=1);
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Knp\Component\Pager\Paginator;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
@@ -17,7 +17,7 @@
$em = Database::getManager();
$toolLaunch = $em->find(
- ToolLaunch::class,
+ XApiToolLaunch::class,
$request->query->getInt('id')
);
diff --git a/public/plugin/xapi/tincan/stats_attempts.ajax.php b/public/plugin/xapi/tincan/stats_attempts.ajax.php
index 2376d494edc..88b1ac6625f 100644
--- a/public/plugin/xapi/tincan/stats_attempts.ajax.php
+++ b/public/plugin/xapi/tincan/stats_attempts.ajax.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
use Xabbuh\XApi\Common\Exception\NotFoundException;
use Xabbuh\XApi\Common\Exception\XApiException;
@@ -34,7 +34,7 @@
$em = Database::getManager();
$toolLaunch = $em->find(
- ToolLaunch::class,
+ XApiToolLaunch::class,
$request->request->getInt('tool')
);
diff --git a/public/plugin/xapi/tincan/stats_statements.ajax.php b/public/plugin/xapi/tincan/stats_statements.ajax.php
index d3edcc3152a..2185ce155fa 100644
--- a/public/plugin/xapi/tincan/stats_statements.ajax.php
+++ b/public/plugin/xapi/tincan/stats_statements.ajax.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
use Xabbuh\XApi\Common\Exception\XApiException;
use Xabbuh\XApi\Model\Activity;
@@ -31,7 +31,7 @@
$em = Database::getManager();
$toolLaunch = $em->find(
- ToolLaunch::class,
+ XApiToolLaunch::class,
$request->request->getInt('tool')
);
diff --git a/public/plugin/xapi/tincan/view.php b/public/plugin/xapi/tincan/view.php
index e571a020996..2765161e1f0 100644
--- a/public/plugin/xapi/tincan/view.php
+++ b/public/plugin/xapi/tincan/view.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
use Xabbuh\XApi\Common\Exception\NotFoundException;
use Xabbuh\XApi\Model\Activity;
@@ -28,7 +28,7 @@
$em = Database::getManager();
$toolLaunch = $em->find(
- ToolLaunch::class,
+ XApiToolLaunch::class,
$request->query->getInt('id')
);
diff --git a/public/plugin/xapi/tool_delete.php b/public/plugin/xapi/tool_delete.php
index 086bbaba78c..3776965fb48 100644
--- a/public/plugin/xapi/tool_delete.php
+++ b/public/plugin/xapi/tool_delete.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
require_once __DIR__.'/../../main/inc/global.inc.php';
@@ -17,7 +17,7 @@
$em = Database::getManager();
$toolLaunch = $em->find(
- ToolLaunch::class,
+ XApiToolLaunch::class,
$request->query->getInt('delete')
);
diff --git a/public/plugin/xapi/tool_edit.php b/public/plugin/xapi/tool_edit.php
index d5747a1be06..c357d184a48 100644
--- a/public/plugin/xapi/tool_edit.php
+++ b/public/plugin/xapi/tool_edit.php
@@ -4,7 +4,7 @@
/* For licensing terms, see /license.txt */
-use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
+use Chamilo\CoreBundle\Entity\XApiToolLaunch;
use Symfony\Component\HttpFoundation\Request as HttpRequest;
require_once __DIR__.'/../../main/inc/global.inc.php';
@@ -17,7 +17,7 @@
$em = Database::getManager();
$toolLaunch = $em->find(
- ToolLaunch::class,
+ XApiToolLaunch::class,
$request->query->getInt('edit')
);
diff --git a/public/plugin/xapi/uninstall.php b/public/plugin/xapi/uninstall.php
deleted file mode 100644
index a13bd5e1cf9..00000000000
--- a/public/plugin/xapi/uninstall.php
+++ /dev/null
@@ -1,7 +0,0 @@
-uninstall();
diff --git a/src/CoreBundle/Entity/XApiSharedStatement.php b/src/CoreBundle/Entity/XApiSharedStatement.php
index 48fba8e14fd..8138c9a8a3d 100644
--- a/src/CoreBundle/Entity/XApiSharedStatement.php
+++ b/src/CoreBundle/Entity/XApiSharedStatement.php
@@ -28,6 +28,13 @@ class XApiSharedStatement
#[ORM\Column]
private ?bool $sent = null;
+ public function __construct(array $statement, string $uuid = null, bool $sent = false)
+ {
+ $this->statement = $statement;
+ $this->uuid = Uuid::fromString($uuid);
+ $this->sent = $sent;
+ }
+
public function getId(): ?int
{
return $this->id;
diff --git a/src/CoreBundle/Entity/XApiToolLaunch.php b/src/CoreBundle/Entity/XApiToolLaunch.php
index cbdd7761f83..f76032777d9 100644
--- a/src/CoreBundle/Entity/XApiToolLaunch.php
+++ b/src/CoreBundle/Entity/XApiToolLaunch.php
@@ -46,7 +46,7 @@ class XApiToolLaunch
private ?string $activityType = null;
#[ORM\Column]
- private ?bool $allowMultipleAttempts = null;
+ private ?bool $allowMultipleAttempts = true;
#[ORM\Column(length: 255, nullable: true)]
private ?string $lrsUrl = null;
From 8be4bfa5eb0e8455c3c3953d0e5d17373238550a Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <1697880+AngelFQC@users.noreply.github.com>
Date: Wed, 3 Jul 2024 18:19:00 -0500
Subject: [PATCH 4/4] Plugin: XApi: Get changes from fixes for 1.11.x
See #3943
---
.../src/Model/StatementsFilterFactory.php | 1 +
.../lrs-bundle/src/Resources/config/routing.xml | 2 +-
.../src/StatementRepository.php | 14 ++++++++++++--
src/CoreBundle/Entity/XApiObject.php | 2 +-
src/CoreBundle/Entity/XApiVerb.php | 8 ++++----
.../Schema/V200/Version20240515094800.php | 4 ++--
6 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/public/plugin/xapi/php-xapi/lrs-bundle/src/Model/StatementsFilterFactory.php b/public/plugin/xapi/php-xapi/lrs-bundle/src/Model/StatementsFilterFactory.php
index ba0e2c43c1a..7a5e35aef11 100644
--- a/public/plugin/xapi/php-xapi/lrs-bundle/src/Model/StatementsFilterFactory.php
+++ b/public/plugin/xapi/php-xapi/lrs-bundle/src/Model/StatementsFilterFactory.php
@@ -84,6 +84,7 @@ public function createFromParameterBag(ParameterBag $parameters)
$filter->descending();
}
+ $filter->cursor($parameters->getInt('cursor'));
$filter->limit($parameters->getInt('limit'));
return $filter;
diff --git a/public/plugin/xapi/php-xapi/lrs-bundle/src/Resources/config/routing.xml b/public/plugin/xapi/php-xapi/lrs-bundle/src/Resources/config/routing.xml
index 27c4d2bc101..f0e75024fb3 100644
--- a/public/plugin/xapi/php-xapi/lrs-bundle/src/Resources/config/routing.xml
+++ b/public/plugin/xapi/php-xapi/lrs-bundle/src/Resources/config/routing.xml
@@ -13,7 +13,7 @@
- xapi_lrs.controller.statement.post:postStatement
+ xapi_lrs.controller.statement.post:postStatements
statement
true
diff --git a/public/plugin/xapi/php-xapi/repository-doctrine-orm/src/StatementRepository.php b/public/plugin/xapi/php-xapi/repository-doctrine-orm/src/StatementRepository.php
index 4efa0036a51..a32e2d47c4f 100644
--- a/public/plugin/xapi/php-xapi/repository-doctrine-orm/src/StatementRepository.php
+++ b/public/plugin/xapi/php-xapi/repository-doctrine-orm/src/StatementRepository.php
@@ -38,15 +38,25 @@ public function findStatements(array $criteria)
$criteria['context'] = $contexts;
}
+ if (!empty($criteria['verb'])) {
+ $verbs = $this->_em->getRepository(Verb::class)->findBy(['id' => $criteria['verb']]);
+
+ $criteria['verb'] = $verbs;
+ }
+
unset(
$criteria['registration'],
$criteria['related_activities'],
$criteria['related_agents'],
$criteria['ascending'],
- $criteria['limit']
);
- return parent::findBy($criteria, ['created' => 'ASC']);
+ return parent::findBy(
+ $criteria,
+ ['created' => 'ASC'],
+ $criteria['limit'] ?? null,
+ $criteria['cursor'] ?? null
+ );
}
public function storeStatement(Statement $mappedStatement, $flush = true): void
diff --git a/src/CoreBundle/Entity/XApiObject.php b/src/CoreBundle/Entity/XApiObject.php
index 719dc24f92e..16615605997 100644
--- a/src/CoreBundle/Entity/XApiObject.php
+++ b/src/CoreBundle/Entity/XApiObject.php
@@ -90,7 +90,7 @@ class XApiObject
/**
* @var Collection
*/
- #[ORM\OneToMany(mappedBy: 'group', targetEntity: self::class)]
+ #[ORM\OneToMany(mappedBy: 'group', targetEntity: self::class, cascade: ['persist', 'remove'])]
#[ORM\JoinColumn(referencedColumnName: 'identifier')]
private Collection $members;
diff --git a/src/CoreBundle/Entity/XApiVerb.php b/src/CoreBundle/Entity/XApiVerb.php
index 79094d26e33..a348571512b 100644
--- a/src/CoreBundle/Entity/XApiVerb.php
+++ b/src/CoreBundle/Entity/XApiVerb.php
@@ -20,8 +20,8 @@ class XApiVerb
#[ORM\Column(length: 255)]
private ?string $id = null;
- #[ORM\Column]
- private array $display = [];
+ #[ORM\Column(nullable: true)]
+ private ?array $display = null;
public function getIdentifier(): ?int
{
@@ -40,12 +40,12 @@ public function setId(string $id): static
return $this;
}
- public function getDisplay(): array
+ public function getDisplay(): ?array
{
return $this->display;
}
- public function setDisplay(array $display): static
+ public function setDisplay(?array $display): static
{
$this->display = $display;
diff --git a/src/CoreBundle/Migrations/Schema/V200/Version20240515094800.php b/src/CoreBundle/Migrations/Schema/V200/Version20240515094800.php
index 5f65b2a296d..dcede6cc807 100644
--- a/src/CoreBundle/Migrations/Schema/V200/Version20240515094800.php
+++ b/src/CoreBundle/Migrations/Schema/V200/Version20240515094800.php
@@ -52,9 +52,9 @@ public function up(Schema $schema): void
}
if ($hasTblVerb) {
- $this->addSql("ALTER TABLE xapi_verb CHANGE display display LONGTEXT NOT NULL COMMENT '(DC2Type:json)'");
+ $this->addSql("ALTER TABLE xapi_verb CHANGE display display LONGTEXT NULL COMMENT '(DC2Type:json)'");
} else {
- $this->addSql("CREATE TABLE xapi_verb (identifier INT AUTO_INCREMENT NOT NULL, id VARCHAR(255) NOT NULL, display LONGTEXT NOT NULL COMMENT '(DC2Type:json)', PRIMARY KEY(identifier)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB ROW_FORMAT = DYNAMIC");
+ $this->addSql("CREATE TABLE xapi_verb (identifier INT AUTO_INCREMENT NOT NULL, id VARCHAR(255) NOT NULL, display LONGTEXT NULL COMMENT '(DC2Type:json)', PRIMARY KEY(identifier)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB ROW_FORMAT = DYNAMIC");
}
if ($hasTblObject) {