Kaynağa Gözat

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Angel Fernando Quiroz Campos 5 yıl önce
ebeveyn
işleme
665f0f71b4

+ 11 - 0
main/mySpace/lp_tracking.php

@@ -134,6 +134,17 @@ switch ($action) {
                         $questions[$questionCounter]['options'][] = $interaction;
                         $numberChoices++;
                         break;
+                    case 'matching':
+                        $list = explode(',', $data);
+                        if (!empty($list)) {
+                            foreach ($list as &$item) {
+                                $item = cut($item, 30);
+                            }
+                            $interaction['student_response_formatted'] = implode('<br />', $list);
+                        }
+                        $questions[$questionCounter]['options'][] = $interaction;
+                        $numberChoices++;
+                        break;
                 }
             }
         }

+ 0 - 12
main/template/default/admin/user_information.tpl

@@ -7,34 +7,22 @@
         </div>
         <div class="col-md-8">
             <div class="list-card">
-
                 {{ display.card_widget('FirstLoginInPlatform'|get_lang, user.first_connection, 'calendar') }}
-
                 {{ display.card_widget('LatestLoginInPlatform'|get_lang, user.last_connection, 'calendar') }}
-
                 {% if user.legal %}
                     {{ display.card_widget('LegalAccepted'|get_lang, user.legal.datetime, 'gavel', user.legal.icon) }}
                 {% endif %}
-
             </div>
             {% if social_tool %}
                 <div class="list-box-widget">
-
                     {{ display.box_widget('Friends'|get_lang, user.social.friends, 'users') }}
-
                     {{ display.box_widget('InvitationSent'|get_lang, user.social.invitation_sent, 'paper-plane') }}
-
                     {{ display.box_widget('InvitationReceived'|get_lang, user.social.invitation_received, 'smile-o') }}
-
                     {{ display.box_widget('WallMessagesPosted'|get_lang, user.social.messages_posted, 'comments') }}
-
                     {{ display.box_widget('MessagesSent'|get_lang, user.social.messages_sent, 'envelope') }}
-
                     {{ display.box_widget('MessagesReceived'|get_lang, user.social.message_received, 'envelope-open-o') }}
-
                 </div>
             {% endif %}
-
         </div>
     </div>
 </div>

+ 2 - 2
main/template/default/auth/session_catalog.tpl

@@ -119,11 +119,11 @@
                             	{% endif %}
                             	<div class="block-info">
                                     <ul class="info list-inline">
-                                        <li>
+                                        <li class="course_label_number_courses">
                                             <i class="fa fa-book" aria-hidden="true"></i>
                                             {{ item.nbr_courses ~ ' ' ~ 'Courses'|get_lang }}
                                         </li>
-                                        <li>
+                                        <li class="course_label_number_users">
                                             <i class="fa fa-user" aria-hidden="true"></i>
                                             {{ item.nbr_users ~ ' ' ~ 'NbUsers'|get_lang }}
                                         </li>

+ 1 - 5
main/template/default/my_space/accessoverview.tpl

@@ -1,13 +1,9 @@
 <h2 class="page-header">{{ 'DisplayAccessOverview'|get_lang }}</h2>
-
 {{ form }}
-
 <h3 class="page-header">{{ 'Results'|get_lang }}</h3>
-
 {{ table }}
-
 <script>
-    $(document).on('ready', function () {
+    $(function(){
         var courseIdEl = $('#access_overview_course_id'),
             sessionIdEl = $('#access_overview_session_id');
 

+ 2 - 3
main/template/default/my_space/course_summary.tpl

@@ -1,7 +1,7 @@
 <div class="summary-legend">
     {{ table }}
 </div>
-<script type="text/javascript">
+<script>
     $(function() {
         $('.easypiechart-blue').easyPieChart({
             scaleColor: false,
@@ -9,8 +9,7 @@
             lineWidth:8,
             trackColor: '#f2f2f2'
         });
-    });
-    $(function() {
+
         $('.easypiechart-red').easyPieChart({
             scaleColor: false,
             barColor: '#f9243f',

+ 1 - 8
main/template/default/my_space/index.tpl

@@ -261,7 +261,7 @@
     </div>
 </div>
 
-<script type="text/javascript">
+<script>
     $(function() {
         $('#easypiechart-teal').easyPieChart({
             scaleColor: false,
@@ -269,27 +269,21 @@
             lineWidth:8,
             trackColor: '#f2f2f2'
         });
-    });
 
-    $(function() {
         $('#easypiechart-orange').easyPieChart({
             scaleColor: false,
             barColor: '#ffb53e',
             lineWidth:8,
             trackColor: '#f2f2f2'
         });
-    });
 
-    $(function() {
         $('#easypiechart-red').easyPieChart({
             scaleColor: false,
             barColor: '#f9243f',
             lineWidth:8,
             trackColor: '#f2f2f2'
         });
-    });
 
-    $(function() {
         $('#easypiechart-blue').easyPieChart({
             scaleColor: false,
             barColor: '#30a5ff',
@@ -297,5 +291,4 @@
             trackColor: '#f2f2f2'
         });
     });
-
 </script>

+ 1 - 6
main/template/default/my_space/user_details.tpl

@@ -29,7 +29,6 @@
                     </div>
                     <div class="col-md-4">
                         {{ display.card_widget('FirstLoginInPlatform'|get_lang, user.first_connection, 'calendar') }}
-
                         {{ display.card_widget('LatestLoginInPlatform'|get_lang, user.last_connection, 'calendar') }}
 
                         {% if user.legal %}
@@ -167,25 +166,21 @@
                     </div>
                     <div class="col-md-4">
                         {{ display.card_widget('FirstLoginInPlatform'|get_lang, user.first_connection, 'calendar') }}
-
                         {{ display.card_widget('LatestLoginInPlatform'|get_lang, user.last_connection, 'calendar') }}
-
                         {% if(user.time_spent_course) %}
                             {{ display.card_widget('TimeSpentInTheCourse'|get_lang, user.time_spent_course, 'clock-o') }}
                         {% endif %}
-
                         {% if user.legal %}
                             {{ display.card_widget('LegalAccepted'|get_lang, user.legal.datetime, 'gavel', user.legal.icon) }}
                         {% endif %}
                     </div>
                 </div>
-
             </div>
         </div>
     </div>
 {% endif %}
 
-<script type="text/javascript">
+<script>
     $(function () {
         $('#easypiechart-blue').easyPieChart({
             scaleColor: false,

+ 1 - 2
main/template/default/my_space/user_summary.tpl

@@ -1,8 +1,7 @@
-<script type="text/javascript">
+<script>
     $(function(){
         $('[data-toggle="tooltip"]').tooltip();
     });
-
 </script>
 <div class="summary-legend">
     <ul class="list-legend">

+ 13 - 0
tests/scripts/fix_documents_path.php

@@ -115,6 +115,19 @@ foreach ($courses as $course) {
                     WHERE iid = $id";
             Database::query($sql);
         }
+
+        // Updating Glossary
+        $sql = "SELECT iid, description FROM c_glossary WHERE c_id = $courseId";
+        $result = Database::query($sql);
+        $items = Database::store_result($result);
+        foreach ($items as $item) {
+            $id = $item['iid'];
+            $gdescription = preg_replace($pathToSearch, $newUrlAppend.'/courses/${4}', $item['description']);
+            $gdescription = Database::escape_string($gdescription);
+
+            $sql = "UPDATE c_glossary SET description = '$gdescription' WHERE iid = $id";
+            Database::query($sql);
+        }
     } else {
         echo "<h4>Path doesn't exist</h4>".'<br />';
     }