Ticket #4817 - Courses improvements.

unacms · Oct 18, 2024 · 083bd82 · 083bd82
1 parent dc4aa32
commit 083bd82
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 16 deletions.
diff --git a/modules/boonex/courses/classes/BxCoursesFormContentNode.php b/modules/boonex/courses/classes/BxCoursesFormContentNode.php
@@ -33,8 +33,8 @@ public function __construct($aInfo, $oTemplate = false)
 
         if(isset($this->aInputs['passing']))
             $this->aInputs['passing']['values'] = [
-                ['key' => 0, 'value' => _t('_bx_courses_form_content_node_input_passing_all')],
-                ['key' => 1, 'value' => _t('_bx_courses_form_content_node_input_passing_alternate')]
+                ['key' => BX_COURSES_CND_PASSING_ALL, 'value' => _t('_bx_courses_form_content_node_input_passing_all')],
+                ['key' => BX_COURSES_CND_PASSING_ALTERNATE, 'value' => _t('_bx_courses_form_content_node_input_passing_alternate')]
             ];
     }
 

diff --git a/modules/boonex/courses/classes/BxCoursesGridCntDataManage.php b/modules/boonex/courses/classes/BxCoursesGridCntDataManage.php
@@ -129,6 +129,9 @@ protected function _getActionBack($sType, $sKey, $a, $isSmall = false, $isDisabl
         $sUrl = $this->_sPageUrl;
         if(!empty($this->_aNodeInfo['parent_id']))
             $sUrl = bx_append_url_params($sUrl, ['parent_id' => $this->_aNodeInfo['parent_id']]);
+
+        if($this->_bIsApi)
+            return array_merge($a, ['name' => $sKey, 'type' => 'link', 'link' => bx_api_get_relative_url($sUrl)]);
 
         $a['attr'] = array_merge($a['attr'], [
             "onclick" => "window.open('" . $sUrl . "', '_self');"
@@ -140,7 +143,7 @@ protected function _getActionBack($sType, $sKey, $a, $isSmall = false, $isDisabl
     protected function _getActionAddSt($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = [])
     {
         if($this->_bIsApi)
-            return array_merge($a, ['name' => $sKey, 'type' => 'modal', 'action' => $sKey, 'values' => $this->_getValues(BX_COURSES_CND_USAGE_ST)]);
+            return array_merge($a, ['name' => $sKey, 'type' => 'menu', 'action' => $sKey, 'values' => $this->_getValues(BX_COURSES_CND_USAGE_ST)]);
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 
@@ -153,7 +156,7 @@ protected function _getActionAddSt($sType, $sKey, $a, $isSmall = false, $isDisab
     protected function _getActionAddAt($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = [])
     {
         if($this->_bIsApi)
-            return array_merge($a, ['name' => $sKey, 'type' => 'modal', 'action' => $sKey, 'values' => $this->_getValues(BX_COURSES_CND_USAGE_AT)]);
+            return array_merge($a, ['name' => $sKey, 'type' => 'menu', 'action' => $sKey, 'values' => $this->_getValues(BX_COURSES_CND_USAGE_AT)]);
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 

diff --git a/modules/boonex/courses/classes/BxCoursesGridCntStructureManage.php b/modules/boonex/courses/classes/BxCoursesGridCntStructureManage.php
@@ -322,12 +322,15 @@ protected function _getCellAdded($mixedValue, $sKey, $aField, $aRow)
     protected function _getActionBack($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = [])
     {
         if(empty($this->_aParentInfo))
-            return '';
+            return $this->_bIsApi ? [] : '';
 
         $sUrl = $this->_sPageUrl;
         if(!empty($this->_aParentInfo['parent_id']))
             $sUrl = bx_append_url_params($sUrl, ['parent_id' => $this->_aParentInfo['parent_id']]);
 
+        if($this->_bIsApi)
+            return array_merge($a, ['name' => $sKey, 'type' => 'link', 'link' => bx_api_get_relative_url($sUrl)]);
+
         $a['attr'] = array_merge($a['attr'], [
             "onclick" => "window.open('" . $sUrl . "','_self');"
     	]);

diff --git a/modules/boonex/courses/classes/BxCoursesModule.php b/modules/boonex/courses/classes/BxCoursesModule.php
@@ -9,6 +9,14 @@
  * @{
  */
 
+/**
+ * How to pass a lesson's steps:
+ * 0 - all at once, the order is not important
+ * 1 - alternate, the order is important
+ */
+define('BX_COURSES_CND_PASSING_ALL', 0);
+define('BX_COURSES_CND_PASSING_ALTERNATE', 1);
+
 /**
  * Content data usage:
  * st - step,

diff --git a/modules/boonex/courses/classes/BxCoursesTemplate.php b/modules/boonex/courses/classes/BxCoursesTemplate.php
@@ -430,7 +430,8 @@ public function entryNode($aContentInfo, $aParams = [])
             'index' => $aNode['order'],
             'sample' => $this->_oConfig->getContentNodeTitle($aNode['level']),
             'title' => $aNode['title'],
-            'text' => $aNode['text']
+            'text' => $aNode['text'],
+            'passing' => $aNode['passing']
         ];
 
         if($this->_bIsApi)
@@ -478,6 +479,9 @@ protected function _entryNodeItems($iProfileId, $iContentId, $aNode, $iUsage)
         $sTxtUndefined = _t('_undefined');
         $sTxtPass = _t('_bx_courses_txt_pass');
 
+        $bUsageSt = $iUsage == BX_COURSES_CND_USAGE_ST;
+        $bUsageAt = $iUsage == BX_COURSES_CND_USAGE_AT;
+
         $aResults = [];
         if(!empty($aDataItems) && is_array($aDataItems))
             foreach($aDataItems as $iIndex => $aDataItem) {
@@ -489,8 +493,10 @@ protected function _entryNodeItems($iProfileId, $iContentId, $aNode, $iUsage)
                 if(($sMethod = 'get_link') && bx_is_srv($aDataItem['content_type'], $sMethod))
                     $sLink = bx_srv($aDataItem['content_type'], $sMethod, [$aDataItem['content_id']]);
 
+                $bPassed = $bUsageSt && $this->_oModule->isDataPassed($iProfileId, $aDataItem);
+
                 $aTmplVarsPass = [true];
-                $bTmplVarsPass = $iUsage == BX_COURSES_CND_USAGE_ST && $sLink && !$this->_oModule->isDataPassed($iProfileId, $aDataItem) && ((int)$aNode['passing'] == 0 || $iIndex == 0 || $this->_oModule->isDataPassed($iProfileId, $aDataItems[$iIndex - 1]));
+                $bTmplVarsPass = $bUsageSt && !$bPassed && $sLink && ((int)$aNode['passing'] == BX_COURSES_CND_PASSING_ALL || $iIndex == 0 || $this->_oModule->isDataPassed($iProfileId, $aDataItems[$iIndex - 1]));
                 if($bTmplVarsPass) {
                     $aTmplVarsPass = [
                         'js_object' => $sJsObject,
@@ -510,28 +516,48 @@ protected function _entryNodeItems($iProfileId, $iContentId, $aNode, $iUsage)
                 if(!$sTitle)
                     $sTitle = $sTxtUndefined;
 
-                $bTmplVarsShowLink = $iUsage == BX_COURSES_CND_USAGE_AT && $sLink;
+                $bTmplVarsShowLink = $bUsageAt && $sLink;
                 $aTmplVarsShowLink = $bTmplVarsShowLink ? [
                     'link' => $sLink,
                     'title' => $sTitle
                 ] : [true];
 
+                $bTmplVarsShowSize = false;
+                $aTmplVarsShowSize = [true];
+                $bTmplVarsShowDownload = false;
+                $aTmplVarsShowDownload = [true];
+                if($bUsageAt && ($bTmplVarsShowSize = ($sMethod = 'get_file') && bx_is_srv($aDataItem['content_type'], $sMethod))) {
+                    $aFileInfo = bx_srv($aDataItem['content_type'], $sMethod, [$aDataItem['content_id']]);
+                    if(!empty($aFileInfo) && is_array($aFileInfo)) {
+                        $aTmplVarsShowSize['size'] = _t_format_size($aFileInfo['size']);
+
+                        $bTmplVarsShowDownload = !empty($aFileInfo['url_download']);
+                        $aTmplVarsShowDownload = [
+                            'link' => $aFileInfo['url_download']
+                        ];
+                    }
+                }
+
                 if($this->_bIsApi) {
                     $sText = '';
                     if(($sMethod = 'get_text') &&  bx_is_srv($aDataItem['content_type'], $sMethod))
                         $sText = bx_srv($aDataItem['content_type'], $sMethod, [$aDataItem['content_id']]);
 
-                    $aResults[] = [
+                    $aResults[] = array_merge([
                         'id' => $aDataItem['id'],
                         'type' => $sType,
                         'title' => $sTitle,
                         'text' => $sText,
                         'image' => $sImageUrl,
-                        'link_view' => $bTmplVarsShowLink ? bx_api_get_relative_url($sLink) : '',
-                        'link_pass' => $bTmplVarsPass ? bx_api_get_relative_url($sLink) : '',
-                        'link_title' => $sTxtPass,
-                        'status' => '???' //TODO: Some status is needed. Ask Roman.
-                    ];
+                    ], ($bUsageSt ? [
+                        'pass_link' => $bTmplVarsPass ? bx_api_get_relative_url($sLink) : '',
+                        'pass_title' => $sTxtPass,
+                        'passed' => $bPassed
+                    ] : [
+                        'size' => $bTmplVarsShowSize ? $aTmplVarsShowSize['size'] : '',
+                        'view_link' => $bTmplVarsShowLink ? bx_api_get_relative_url($sLink) : '',
+                        'download_link' => $bTmplVarsShowDownload ? bx_api_get_relative_url($aTmplVarsShowDownload['link']) : '',
+                    ]));
                 }
                 else 
                     $aResults[] = [
@@ -558,10 +584,18 @@ protected function _entryNodeItems($iProfileId, $iContentId, $aNode, $iUsage)
                                 'title' => $sTitle,
                             ]
                         ],
+                        'bx_if:show_size' => [
+                            'condition' => $bTmplVarsShowSize,
+                            'content' => $aTmplVarsShowSize
+                        ],
                         'bx_if:show_pass' => [
                             'condition' => $bTmplVarsPass,
                             'content' => $aTmplVarsPass
-                        ]
+                        ],
+                        'bx_if:show_download' => [
+                            'condition' => $bTmplVarsShowDownload,
+                            'content' => $aTmplVarsShowDownload
+                        ],
                     ];
             }
 

diff --git a/modules/boonex/courses/install/langs/en.xml b/modules/boonex/courses/install/langs/en.xml
@@ -458,7 +458,7 @@
     <string name="_bx_courses_txt_data_type_bx_videos"><![CDATA[video]]></string>
     <string name="_bx_courses_txt_data_usage_0"><![CDATA[step]]></string>
     <string name="_bx_courses_txt_data_usage_1"><![CDATA[attachment]]></string>
-
+    <string name="_bx_courses_txt_download"><![CDATA[Download]]></string>
 
     <string name="_bx_courses_msg_performed"><![CDATA[The action was successfully performed.]]></string>
     <string name="_bx_courses_err_price_duplicate"><![CDATA[Similar pricing plan is already exists.]]></string>

diff --git a/modules/boonex/courses/template/node_view.html b/modules/boonex/courses/template/node_view.html
@@ -20,11 +20,17 @@
                             <bx_if:show_link><a href="__link__" target="_blank">__title__</a></bx_if:show_link>
                             <bx_if:show_text>__title__</bx_if:show_text>
                         </div>
+                        <bx_if:show_size>
+                            <div class="bx-courses-nid-size">__size__</div>
+                        </bx_if:show_size>
                     </div>
                     <div class="bx-courses-ni-action flex items-center">
                         <bx_if:show_pass>
                             <a class="bx-btn bx-btn-small" href="__link__" onclick="javascript:return __js_object__.passData(this, __id__);">__title__</a>
                         </bx_if:show_pass>
+                        <bx_if:show_download>
+                            <a class="bx-btn bx-btn-small" href="__link__"><bx_text:_bx_courses_txt_download /></a>
+                        </bx_if:show_download>
                     </div>
                 </div>
             </bx_repeat:items>

diff --git a/modules/boonex/russian/data/langs/bx_courses/ru.xml b/modules/boonex/russian/data/langs/bx_courses/ru.xml
@@ -457,6 +457,7 @@
     <string name="_bx_courses_txt_data_type_bx_videos"><![CDATA[видео]]></string>
     <string name="_bx_courses_txt_data_usage_0"><![CDATA[шаг]]></string>
     <string name="_bx_courses_txt_data_usage_1"><![CDATA[вложение]]></string>
+    <string name="_bx_courses_txt_download"><![CDATA[Скачать]]></string>
 
     <string name="_bx_courses_msg_performed"><![CDATA[Действие было успешно выполнено.]]></string>
     <string name="_bx_courses_err_price_duplicate"><![CDATA[Аналогичный ценовой план уже существует.]]></string>