Styling tweaks

This commit is contained in:
PMKuipers 2023-12-11 22:56:59 +01:00
parent bfcd41dd81
commit f3bf55598d
4 changed files with 12 additions and 9 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1149,7 +1149,7 @@ export default {
case "failed": case "failed":
return "times"; return "times";
case "progress": case "progress":
return "exclamation"; return "";
case "completed": case "completed":
return "check"; return "check";
case "good": case "good":
@ -1235,20 +1235,21 @@ export default {
<template v-if='!value.course.enrolled'> <template v-if='!value.course.enrolled'>
{{text.not_enrolled}} {{text.not_enrolled}}
<i v-b-popover.top <i v-b-popover.top
class="r-course-result fa fa-exclamation-triangle t-not-enrolled-alert" class="fa fa-exclamation-triangle t-not-enrolled-alert"
:title="text.student_not_tracked"></i> :title="text.student_not_tracked"></i>
</template> </template>
<template v-else-if='hasprogressinfo'> <template v-else-if='hasprogressinfo && !value.course.showprogressbar'>
{{text['completion_'+value.completion]}}
<r-progress-circle v-if='["failed", "progress","incomplete"].includes(value.completion)' <r-progress-circle v-if='["failed", "progress","incomplete"].includes(value.completion)'
:value='courseprogress' :value='courseprogress'
:max='1' :max='1'
:min='0' :min='0'
:class="'r-course-result r-completion-'+value.completion" :class="'r-progress-circle-popup r-completion-'+value.completion"
:icon='circle_icon(value.completion)' :icon='circle_icon(value.completion)'
:title="text['completion_'+value.completion]" :title="text['completion_'+value.completion]"
></r-progress-circle> ></r-progress-circle>
<i v-else v-b-popover.top <i v-else v-b-popover.top
:class="'r-course-result fa fa-'+completion_icon(value.completion)+ :class="'fa fa-'+completion_icon(value.completion)+
' r-completion-'+value.completion" ' r-completion-'+value.completion"
:title="text['completion_'+value.completion]"></i> :title="text['completion_'+value.completion]"></i>
</template> </template>

View File

@ -583,9 +583,11 @@ class courseinfo {
if(strlen($value) > 0) { if(strlen($value) > 0) {
$value .= ", "; $value .= ", ";
} }
$value .= $contact["username"] . "(".$contact["role"]["name"].")"; $value .= $contact["username"];
}
if (empty($value)) {
$value = get_string("none");
} }
return [$value, "text", $value]; return [$value, "text", $value];
} else if (strpos( $fieldname , "customfield_") === 0) { } else if (strpos( $fieldname , "customfield_") === 0) {
$fieldshortname = substr($fieldname, strlen("customfield_")); $fieldshortname = substr($fieldname, strlen("customfield_"));