瀏覽代碼

Resize course image in skill report - refs BT#9084

Angel Fernando Quiroz Campos 10 年之前
父節點
當前提交
84931760a5

+ 42 - 10
main/social/my_skills_report.php

@@ -43,12 +43,23 @@ if ($isStudent) {
         $tableRow = array(
             'skillName' => $resultData['name'],
             'achievedAt' => api_format_date($resultData['acquired_skill_at'], DATE_FORMAT_NUMBER),
-            'courseImage' => Display::return_icon('course.png', null, null, ICON_SIZE_BIG, null, true),
+            'courseImage' => Display::return_icon('course.png', null, null, ICON_SIZE_MEDIUM, null, true),
             'courseName' => $resultData['title']
         );
 
-        if (file_exists(api_get_path(SYS_COURSE_PATH) . "{$resultData['directory']}/course-pic85x85.png")) {
-            $tableRow['courseImage'] = api_get_path(WEB_COURSE_PATH) . "{$resultData['directory']}/course-pic85x85.png";
+        $imageSysPath = sprintf("%s%s/course-pic.png", api_get_path(SYS_COURSE_PATH), $resultData['directory']);
+
+        if (file_exists($imageSysPath)) {
+            $thumbSysPath = sprintf("%s%s/course-pic32.png", api_get_path(SYS_COURSE_PATH), $resultData['directory']);
+            $thumbWebPath = sprintf("%s%s/course-pic32.png", api_get_path(WEB_COURSE_PATH), $resultData['directory']);
+
+            if (!file_exists($thumbSysPath)) {
+                $courseImageThumb = new Image($imageSysPath);
+                $courseImageThumb->resize(32, 32, 0);
+                $courseImageThumb->send_image($thumbSysPath);
+            }
+
+            $tableRow['courseImage'] = $thumbWebPath;
         }
 
         $tableRows[] = $tableRow;
@@ -80,12 +91,23 @@ if ($isStudent) {
                 'completeName' => $followedStudents[$selectedStudent]['completeName'],
                 'skillName' => $resultData['name'],
                 'achievedAt' => api_format_date($resultData['acquired_skill_at'], DATE_FORMAT_NUMBER),
-                'courseImage' => Display::return_icon('course.png', null, null, ICON_SIZE_BIG, null, true),
+                'courseImage' => Display::return_icon('course.png', null, null, ICON_SIZE_MEDIUM, null, true),
                 'courseName' => $resultData['title']
             );
 
-            if (file_exists(api_get_path(SYS_COURSE_PATH) . "{$resultData['directory']}/course-pic85x85.png")) {
-                $tableRow['courseImage'] = api_get_path(WEB_COURSE_PATH) . "{$resultData['directory']}/course-pic85x85.png";
+            $imageSysPath = sprintf("%s%s/course-pic.png", api_get_path(SYS_COURSE_PATH), $resultData['directory']);
+
+            if (file_exists($imageSysPath)) {
+                $thumbSysPath = sprintf("%s%s/course-pic32.png", api_get_path(SYS_COURSE_PATH), $resultData['directory']);
+                $thumbWebPath = sprintf("%s%s/course-pic32.png", api_get_path(WEB_COURSE_PATH), $resultData['directory']);
+
+                if (!file_exists($thumbSysPath)) {
+                    $courseImageThumb = new Image($imageSysPath);
+                    $courseImageThumb->resize(32, 32, 0);
+                    $courseImageThumb->send_image($thumbSysPath);
+                }
+
+                $tableRow['courseImage'] = $thumbWebPath;
             }
 
             $tableRows[] = $tableRow;
@@ -147,11 +169,21 @@ if ($isStudent) {
     foreach ($tableRows as &$row) {
         $row['completeName'] = api_get_person_name($row['firstname'], $row['lastname']);
         $row['achievedAt'] = api_format_date($row['acquired_skill_at'], DATE_FORMAT_NUMBER);
+        $row['courseImage'] = Display::return_icon('course.png', null, null, ICON_SIZE_MEDIUM, null, true);
+
+        $imageSysPath = sprintf("%s%s/course-pic.png", api_get_path(SYS_COURSE_PATH), $row['c_directory']);
+
+        if (file_exists($imageSysPath)) {
+            $thumbSysPath = sprintf("%s%s/course-pic32.png", api_get_path(SYS_COURSE_PATH), $row['c_directory']);
+            $thumbWebPath = sprintf("%s%s/course-pic32.png", api_get_path(WEB_COURSE_PATH), $row['c_directory']);
+
+            if (!file_exists($thumbSysPath)) {
+                $courseImageThumb = new Image($imageSysPath);
+                $courseImageThumb->resize(32, 32, 0);
+                $courseImageThumb->send_image($thumbSysPath);
+            }
 
-        if (file_exists(api_get_path(SYS_COURSE_PATH) . $row['c_directory'] . '/course-pic85x85.png')) {
-            $row['courseImage'] = api_get_path(WEB_COURSE_PATH) . $row['c_directory'] . '/course-pic85x85.png';
-        } else {
-            $row['courseImage'] = Display::return_icon('course.png', null, null, ICON_SIZE_BIG, null, true);
+            $row['courseImage'] = $thumbWebPath;
         }
     }
 

+ 2 - 2
main/template/default/skill/drh_report.tpl

@@ -59,7 +59,7 @@
             {% for row in rows %}
                 <tr>
                     {% if action == 'filterByCourse' %}
-                        <td><img src="{{ row.courseImage }}" alt="{{ row.c_name }}" width="64"> {{ row.c_name }}</td>
+                        <td><img src="{{ row.courseImage }}" alt="{{ row.c_name }}"> {{ row.c_name }}</td>
                         <td>{{ row.skill_name }}</td>
                         <td>{{ row.completeName }}</td>
                         <td>{{ row.achievedAt }}</td>
@@ -67,7 +67,7 @@
                         <td>{{ row.skill_name }}</td>
                         <td>{{ row.completeName }}</td>
                         <td>{{ row.achievedAt }}</td>
-                        <td><img src="{{ row.courseImage }}" alt="{{ row.c_name }}" width="64"> {{ row.c_name }}</td>
+                        <td><img src="{{ row.courseImage }}" alt="{{ row.c_name }}"> {{ row.c_name }}</td>
                     {% endif %}
                 </tr>
             {% endfor %}

+ 1 - 1
main/template/default/skill/student_boss_report.tpl

@@ -33,7 +33,7 @@
                     <td>{{ row.completeName }}</td>
                     <td>{{ row.skillName }}</td>
                     <td>{{ row.achievedAt }}</td>
-                    <td><img src="{{ row.courseImage }}" alt="{{ row.courseName }}" width="64"> {{ row.courseName }}</td>
+                    <td><img src="{{ row.courseImage }}" alt="{{ row.courseName }}"> {{ row.courseName }}</td>
                 </tr>
             {% endfor %}
         </tbody>

+ 1 - 1
main/template/default/skill/student_report.tpl

@@ -20,7 +20,7 @@
                 <tr>
                     <td>{{ row.skillName }}</td>
                     <td>{{ row.achievedAt }}</td>
-                    <td><img src="{{ row.courseImage }}" alt="{{ row.courseName }}" width="64"> {{ row.courseName }}</td>
+                    <td><img src="{{ row.courseImage }}" alt="{{ row.courseName }}" width="32"> {{ row.courseName }}</td>
                 </tr>
             {% endfor %}
         </tbody>