|
|
|
@ -2302,10 +2302,15 @@ function get_work_user_list( |
|
|
|
if ($qualification_exists) { |
|
|
|
if ($qualification_exists) { |
|
|
|
if ($work['qualification'] == '') { |
|
|
|
if ($work['qualification'] == '') { |
|
|
|
$qualification_string = Display::label('-'); |
|
|
|
$qualification_string = Display::label('-'); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
if (empty($work['qualificator_id'])) { |
|
|
|
|
|
|
|
$finalScore = '?? / '.$work_data['qualification']; |
|
|
|
|
|
|
|
$qualification_string = Display::label($finalScore, 'warning'); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$qualification_string = formatWorkScore($work['qualification'], $work_data['qualification']); |
|
|
|
$qualification_string = formatWorkScore($work['qualification'], $work_data['qualification']); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$work['qualification_score'] = $work['qualification']; |
|
|
|
$work['qualification_score'] = $work['qualification']; |
|
|
|
$add_string = ''; |
|
|
|
$add_string = ''; |
|
|
|
@ -2378,11 +2383,6 @@ function get_work_user_list( |
|
|
|
$work['qualification'] = $qualification_string.$feedback.$hasCorrection; |
|
|
|
$work['qualification'] = $qualification_string.$feedback.$hasCorrection; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (empty($work['qualificator_id'])) { |
|
|
|
|
|
|
|
$finalScore = '?? / '.$work_data['qualification']; |
|
|
|
|
|
|
|
$work['qualification'] = Display::label($finalScore, 'warning'); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$work['qualification_only'] = $qualification_string; |
|
|
|
$work['qualification_only'] = $qualification_string; |
|
|
|
|
|
|
|
|
|
|
|
// Date. |
|
|
|
// Date. |
|
|
|
|