Improve compilatio UI BT#15698

app/Resources/public/css/base.css

@@ -10196,6 +10196,11 @@ ul.dropdown-menu.inner > li > a {
     clear: left;
 }
 
+.compilation_block .progress {
+    margin:0px;
+    width:120px
+}
+
 @media (min-width: 768px) {
     .clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
         clear: left;

main/inc/lib/Compilatio.php

@@ -486,7 +486,7 @@ class Compilatio
             }
         }
 
-        $return .= Display::label($index.'% - '.$pour, $class);
+        $return .= Display::bar_progress($index, true, null, $class);
 
         return $return;
     }
@@ -574,7 +574,6 @@ class Compilatio
      */
     public function giveWorkIdState($workId)
     {
-        $text = '';
         $compilatioImgFolder = api_get_path(WEB_CODE_PATH).'plagiarism/compilatio/img/';
         $courseId = api_get_course_int_id();
         $compilatioId = $this->getCompilatioId($workId, $courseId);
@@ -605,9 +604,7 @@ class Compilatio
                             10,
                             35
                         )
-                        ."<br/><a href='".$urlRapport."' target='_blank'>"
-                        .get_lang('CompilatioAnalysis')
-                        ."</a>";
+                        ."<a href='".$urlRapport."' target='_blank'>".get_lang('CompilatioAnalysis')."</a>";
                     break;
                 case 'ANALYSE_PROCESSING':
                     $actionCompilatio .= "<div style='font-weight:bold;text-align:left'>"
@@ -616,6 +613,7 @@ class Compilatio
                     $actionCompilatio .= "<div style='font-size:80%;font-style:italic;margin-bottom:5px;'>"
                         .get_lang('CompilatioAnalysisPercentage')
                         ."</div>";
+                    $text = [];
                     $text['analysisinqueue'] = get_lang('CompilatioWaitingAnalysis');
                     $text['analysisinfinalization'] = get_lang('CompilatioAnalysisEnding');
                     $text['refresh'] = get_lang('Refresh');

main/inc/lib/display.lib.php

@@ -1999,15 +1999,18 @@ class Display
      * @param int    $percentage      int value between 0 and 100
      * @param bool   $show_percentage
      * @param string $extra_info
+     * @param string $class danger/success/infowarning
      *
      * @return string
      */
-    public static function bar_progress($percentage, $show_percentage = true, $extra_info = '')
+    public static function bar_progress($percentage, $show_percentage = true, $extra_info = '', $class = '')
     {
         $percentage = (int) $percentage;
+        $class = empty($class) ? '' : "progress-bar-$class";
+
         $div = '<div class="progress">
                 <div
-                    class="progress-bar progress-bar-striped"
+                    class="progress-bar progress-bar-striped '.$class.'"
                     role="progressbar"
                     aria-valuenow="'.$percentage.'"
                     aria-valuemin="0"

main/work/work.lib.php

@@ -2235,7 +2235,7 @@ function get_work_user_list(
                 if (!empty($compilation)) {
                     $compilationId = $compilation->getCompilatioId($item_id, $course_id);
                     if ($compilationId) {
-                        $actionCompilatio = "<div id='id_avancement".$item_id."'>
+                        $actionCompilatio = "<div id='id_avancement".$item_id."' class='compilation_block'>
                             ".$loading.'&nbsp;'.get_lang('CompilatioConnectionWithServer').'</div>';
                     } else {
                         $workDirectory = api_get_path(SYS_COURSE_PATH).$course_info['directory'];
@@ -2245,7 +2245,7 @@ function get_work_user_list(
                             $sizeFile = round(filesize($workDirectory.'/'.$work['url']) / 1000000);
                             $actionCompilatio = get_lang('CompilatioFileIsTooBig').': '.format_file_size($sizeFile).'<br />';
                         } else {
-                            $actionCompilatio = "<div id='id_avancement".$item_id."'>"
+                            $actionCompilatio = "<div id='id_avancement".$item_id."' class='compilation_block'>"
                                 ."<a href='javascript:void(0)' class=\"getSingleCompilatio\" onClick='getSingleCompilatio("
                                 .$item_id
                                 .");'>"