Fixed issued brought about by new bootstrap-vue version

This commit is contained in:
PMKuipers 2023-08-22 16:47:37 +02:00
parent 90e2de1c44
commit 656e7737df
10 changed files with 35 additions and 23 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -779,6 +779,7 @@ export default {
methods: { methods: {
}, },
template: ` template: `
<div class="r-item-invalid">
<b-card no-body class="r-item-invalid"> <b-card no-body class="r-item-invalid">
<b-row no-gutters> <b-row no-gutters>
<b-col md="1"> <b-col md="1">
@ -791,6 +792,7 @@ export default {
</b-col> </b-col>
</b-row> </b-row>
</b-card> </b-card>
</div>
`, `,
}); });
@ -884,7 +886,8 @@ export default {
}, },
}, },
template: ` template: `
<b-card no-body :class="'r-item-competency completion-'+value.completion"> <div :class="'r-item-competency completion-'+value.completion">
<b-card no-body >
<b-row no-gutters> <b-row no-gutters>
<b-col md="1"> <b-col md="1">
<span <span
@ -892,8 +895,8 @@ export default {
v-b-popover.hover.top="startdate+' - '+enddate" v-b-popover.hover.top="startdate+' - '+enddate"
:class="'r-timing-indicator timing-'+value.course.timing"></span> :class="'r-timing-indicator timing-'+value.course.timing"></span>
</b-col> </b-col>
<b-col md="11"> <b-col md="11" class="align-items-center">
<b-card-body class="align-items-center"> <b-card-body >
<template v-if='value.course.completion'> <template v-if='value.course.completion'>
<r-progress-circle v-if='["failed", "progress","incomplete"].includes(value.completion)' <r-progress-circle v-if='["failed", "progress","incomplete"].includes(value.completion)'
:value='value.course.completion.progress' :value='value.course.completion.progress'
@ -975,7 +978,7 @@ export default {
:course='value.course' :course='value.course'
:guestmode='guestmode'></r-item-studentcompletion> :guestmode='guestmode'></r-item-studentcompletion>
</b-modal> </b-modal>
</b-card> </b-card></div>
`, `,
}); });
@ -1382,7 +1385,8 @@ export default {
}, },
}, },
template: ` template: `
<b-card no-body :class="'r-item-competency '+ (value.course.amteacher?'r-course-am-teacher':'')"> <div :class="'r-item-competency '+ (value.course.amteacher?'r-course-am-teacher':'')">
<b-card no-body>
<div class='d-flex flex-wrap mr-0 ml-0'> <div class='d-flex flex-wrap mr-0 ml-0'>
<div> <div>
<span <span
@ -1390,8 +1394,8 @@ export default {
v-b-popover.hover.top="startdate+' - '+enddate" v-b-popover.hover.top="startdate+' - '+enddate"
:class="'r-timing-indicator timing-'+value.course.timing"></span> :class="'r-timing-indicator timing-'+value.course.timing"></span>
</div> </div>
<div class="flex-fill"> <div class="flex-fill align-items-center">
<b-card-body class="align-items-center"> <b-card-body>
<a v-b-modal="'r-item-course-details-'+value.id" <a v-b-modal="'r-item-course-details-'+value.id"
:href="(!guestmode)?('/course/view.php?id='+value.course.id):'#'" :href="(!guestmode)?('/course/view.php?id='+value.course.id):'#'"
@click.prevent.stop='' @click.prevent.stop=''
@ -1449,6 +1453,7 @@ export default {
</b-modal> </b-modal>
</b-card> </b-card>
</div>
`, `,
}); });

View File

@ -2838,7 +2838,8 @@ export default {
methods: { methods: {
}, },
template: ` template: `
<b-card no-body class="t-item-invalid"> <div class="t-item-invalid">
<b-card no-body >
<b-row no-gutters> <b-row no-gutters>
<b-col md="1"> <b-col md="1">
<span class="t-timing-indicator timing-invalid"></span> <span class="t-timing-indicator timing-invalid"></span>
@ -2850,6 +2851,7 @@ export default {
</b-col> </b-col>
</b-row> </b-row>
</b-card> </b-card>
</div>
`, `,
}); });
@ -2974,7 +2976,8 @@ export default {
}, },
template: ` template: `
<b-card no-body class="t-item-course"> <div class="t-item-course">
<b-card no-body >
<div class='d-flex flex-wrap mr-0 ml-0'> <div class='d-flex flex-wrap mr-0 ml-0'>
<div> <div>
<span <span
@ -2982,8 +2985,8 @@ export default {
v-b-popover.hover.top="startdate+' - '+enddate" v-b-popover.hover.top="startdate+' - '+enddate"
:class="'t-timing-indicator timing-'+value.course.timing"></span> :class="'t-timing-indicator timing-'+value.course.timing"></span>
</div> </div>
<div class="flex-fill"> <div class="flex-fill align-items-center">
<b-card-body class="align-items-center"> <b-card-body >
<a class="t-item-course-config" <a class="t-item-course-config"
v-b-modal="'t-item-course-config-'+value.id" v-b-modal="'t-item-course-config-'+value.id"
href="#" @click.prevent="" href="#" @click.prevent=""
@ -3037,7 +3040,7 @@ export default {
:course='value.course' :course='value.course'
></t-item-course-completion> ></t-item-course-completion>
</b-modal> </b-modal>
</b-card> </b-card></div>
`, `,
}); });

File diff suppressed because one or more lines are too long

View File

@ -97,9 +97,9 @@ print $OUTPUT->header();
<div class="m-buttonbar" style="margin-bottom: 1em;"> <div class="m-buttonbar" style="margin-bottom: 1em;">
<a href='#' v-if='activestudyplan' @click.prevent='closeStudyplan'><i style='font-size: 150%;' class='fa fa-chevron-left'></i> <?php t('back');?></a> <a href='#' v-if='activestudyplan' @click.prevent='closeStudyplan'><i style='font-size: 150%;' class='fa fa-chevron-left'></i> <?php t('back');?></a>
<span v-if='activestudyplan'><?php t("studyplan_select"); ?></span>&nbsp; <span v-if='activestudyplan'><?php t("studyplan_select"); ?></span>&nbsp;
<b-dropdown v-if='activestudyplan' lazy :text='dropdown_title'> <b-form-select v-if='activestudyplan' lazy :text='dropdown_title'>
<b-dropdown-item-button v-for='(studyplan,planindex) in studyplans' :key='studyplan.id' @click='selectStudyplan(studyplan)'>{{ studyplan.name }}</b-dropdown-item> <b-form-select-option v-for='(studyplan,planindex) in studyplans' :key='studyplan.id' @click='selectStudyplan(studyplan)'>{{ studyplan.name }}</b-form-select-option>
</b-dropdown>&nbsp; </b-form-select>&nbsp;
<t-studyplan-edit <t-studyplan-edit
@creating="" @creating=""
@created="onStudyPlanCreated" @created="onStudyPlanCreated"

View File

@ -1,6 +1,6 @@
<?php <?php
$plugin->component = 'local_treestudyplan'; // Recommended since 2.0.2 (MDL-26035). Required since 3.0 (MDL-48494) $plugin->component = 'local_treestudyplan'; // Recommended since 2.0.2 (MDL-26035). Required since 3.0 (MDL-48494)
$plugin->version = 2023082100; // YYYYMMDDHH (year, month, day, iteration) $plugin->version = 2023082101; // YYYYMMDDHH (year, month, day, iteration)
$plugin->requires = 2021051700; // YYYYMMDDHH (This is the release version for Moodle 3.11) $plugin->requires = 2021051700; // YYYYMMDDHH (This is the release version for Moodle 3.11)
$plugin->dependencies = [ $plugin->dependencies = [

View File

@ -89,9 +89,9 @@ print $OUTPUT->header();
<div class="m-buttonbar" style="margin-bottom: 1em;"> <div class="m-buttonbar" style="margin-bottom: 1em;">
<a href='#' v-if='displayedstudyplan' @click.prevent='closeStudyplan'><i style='font-size: 150%;' class='fa fa-chevron-left'></i> <?php t('back');?></a> <a href='#' v-if='displayedstudyplan' @click.prevent='closeStudyplan'><i style='font-size: 150%;' class='fa fa-chevron-left'></i> <?php t('back');?></a>
<span v-if='displayedstudyplan'><?php t("studyplan_select"); ?></span>&nbsp; <span v-if='displayedstudyplan'><?php t("studyplan_select"); ?></span>&nbsp;
<b-dropdown v-if='displayedstudyplan'lazy :text='dropdown_title'> <b-form-select v-if='displayedstudyplan' lazy :text='dropdown_title'>
<b-dropdown-item-button v-for='(studyplan,planindex) in studyplans' :key='studyplan.id' @click='selectStudyplan(studyplan)'>{{ studyplan.name }}</b-dropdown-item> <b-form-select-option v-for='(studyplan,planindex) in studyplans' :key='studyplan.id' @click='selectStudyplan(studyplan)'>{{ studyplan.name }}</b-form-select-option>
</b-dropdown>&nbsp; </b-form-select>&nbsp;
<b-button variant='primary' v-if='associatedstudents && associatedstudents.length > 0' v-b-toggle.toolbox-sidebar><?php t('selectstudent_btn') ?></b-button> <b-button variant='primary' v-if='associatedstudents && associatedstudents.length > 0' v-b-toggle.toolbox-sidebar><?php t('selectstudent_btn') ?></b-button>
</div> </div>
<div class='t-studyplan-container'> <div class='t-studyplan-container'>