Layout tweaks

This commit is contained in:
PMKuipers 2023-08-04 16:54:41 +02:00
parent 97b929e240
commit a05368be97
2 changed files with 11 additions and 45 deletions

View file

@ -1315,14 +1315,14 @@ export default {
}, },
template: ` template: `
<b-card no-body :class="'r-item-competency '+ (value.course.amteacher?'r-course-am-teacher':'')"> <b-card no-body :class="'r-item-competency '+ (value.course.amteacher?'r-course-am-teacher':'')">
<b-row no-gutters> <div class='d-flex flex-wrap mr-0 ml-0'>
<b-col md="1"> <div>
<span <span
:title="text['coursetiming_'+value.course.timing]" :title="text['coursetiming_'+value.course.timing]"
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> </div>
<b-col md="11"> <div class="flex-fill">
<b-card-body class="align-items-center"> <b-card-body class="align-items-center">
<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):'#'"
@ -1331,7 +1331,7 @@ export default {
<r-completion-circle class="r-course-graded" :disabled="!isCompletable" <r-completion-circle class="r-course-graded" :disabled="!isCompletable"
v-model="progress_circle"></r-completion-circle> v-model="progress_circle"></r-completion-circle>
</b-card-body> </b-card-body>
</b-col> </div>
</b-row> </b-row>
<b-modal <b-modal
v-if="true" v-if="true"

View file

@ -2535,7 +2535,6 @@ export default {
}, },
template: ` template: `
<div class="t-item-base" :id="'studyitem-'+value.id"> <div class="t-item-base" :id="'studyitem-'+value.id">
<t-item-competency v-model="value" v-if="value.type == 'competency'" ></t-item-competency>
<t-item-course v-model="value" v-if="value.type == 'course'" <t-item-course v-model="value" v-if="value.type == 'course'"
:plan='plan' ></t-item-course> :plan='plan' ></t-item-course>
<t-item-junction v-model="value" v-if="value.type == 'junction'" ></t-item-junction> <t-item-junction v-model="value" v-if="value.type == 'junction'" ></t-item-junction>
@ -2624,39 +2623,6 @@ export default {
`, `,
}); });
Vue.component('t-item-competency', {
props: {
'value' :{
type: Object,
default: function(){ return null;},
},
},
data() {
return {
dragLine: null,
};
},
methods: {
},
template: `
<b-card no-body class="t-item-competency">
<b-card-body>
<a :id="'t-item-competency-details-'+value.id" href="#"
><i class="fa fa-chevron-down">{{ value.competency.shortname }}</i> </a>
</b-card-body>
<b-popover
placement="bottom"
:target="'t-item-competency-details-'+value.id"
:title="value.competency.shortname+' - ' + value.competency.idnumber"
triggers="click">
<ul class="t-item-module-children">
<li v-for="g in value.competency.children">{{g.shortname}}</li>
</ul>
</b-popover>
</b-card>
`,
});
Vue.component('t-item-course', { Vue.component('t-item-course', {
props: { props: {
'value' :{ 'value' :{
@ -2767,14 +2733,14 @@ export default {
}, },
template: ` template: `
<b-card no-body class="t-item-course"> <b-card no-body class="t-item-course">
<b-row no-gutters> <div class='d-flex flex-wrap mr-0 ml-0'>
<b-col md="1"> <div>
<span <span
:title="text['coursetiming_'+value.course.timing]" :title="text['coursetiming_'+value.course.timing]"
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>
</b-col> </div>
<b-col md="11"> <div class="flex-fill">
<b-card-body class="align-items-center"> <b-card-body class="align-items-center">
<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"
@ -2785,8 +2751,8 @@ export default {
:href="'/course/view.php?id='+value.course.id" :href="'/course/view.php?id='+value.course.id"
@click.prevent.stop="">{{ value.course.displayname }}</a> @click.prevent.stop="">{{ value.course.displayname }}</a>
</b-card-body> </b-card-body>
</b-col> </div>
</b-row> </div>
<b-modal <b-modal
:id="'t-item-course-config-'+value.id" :id="'t-item-course-config-'+value.id"
:title="value.course.displayname + ' - ' + value.course.fullname" :title="value.course.displayname + ' - ' + value.course.fullname"