Fixed broken cohort association

This commit is contained in:
PMKuipers 2023-09-02 20:34:33 +02:00
parent 39e1e14dcd
commit 9c576a4dcc
6 changed files with 31 additions and 13 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

@ -390,7 +390,7 @@ export default {
@click.prevent='' @click.prevent=''
class='text-danger' class='text-danger'
v-b-modal="'t-studyplan-'+value.id+'-advanced'" v-b-modal="'t-studyplan-'+value.id+'-advanced'"
><i class='fa fa-cog'></i>{{text.advanced_tools}}</a> ><i class='fa fa-wrench'></i> {{text.advanced_tools}}</a>
<b-modal v-if="value.advanced" <b-modal v-if="value.advanced"
:id="'t-studyplan-'+value.id+'-advanced'" :id="'t-studyplan-'+value.id+'-advanced'"
size="lg" size="lg"
@ -685,9 +685,9 @@ export default {
` `
<span class='s-studyplan-edit'> <span class='s-studyplan-edit'>
<b-button :variant="variant" v-if='type == "button"' @click.prevent='editPlanStart()' <b-button :variant="variant" v-if='type == "button"' @click.prevent='editPlanStart()'
><slot><i class='fa fa-pencil'></i></slot></b-button> ><slot><i class='fa fa-gear'></i></slot></b-button>
<a variant="variant" v-else href='#' @click.prevent='editPlanStart()' <a variant="variant" v-else href='#' @click.prevent='editPlanStart()'
><slot><i class='fa fa-pencil'></i></slot></a> ><slot><i class='fa fa-gear'></i></slot></a>
<b-modal <b-modal
v-model="show" v-model="show"
size="lg" size="lg"
@ -861,7 +861,7 @@ export default {
}, },
cohortOptionModel(c){ cohortOptionModel(c){
return { return {
val: c.id, value: c.id,
text: c.name + ' (' + c.context.path.join(' / ') + ')', text: c.name + ' (' + c.context.path.join(' / ') + ')',
}; };
}, },
@ -1186,9 +1186,9 @@ export default {
` `
<span class='t-period-edit'> <span class='t-period-edit'>
<b-button :variant="variant" v-if='type == "button"' @click.prevent='editStart()' <b-button :variant="variant" v-if='type == "button"' @click.prevent='editStart()'
><slot><i class='fa fa-pencil'></i></slot></b-button> ><slot><i class='fa fa-gear'></i></slot></b-button>
<a variant="variant" v-else href='#' @click.prevent='editStart()' <a variant="variant" v-else href='#' @click.prevent='editStart()'
><slot><i class='fa fa-pencil'></i></slot></a> ><slot><i class='fa fa-gear'></i></slot></a>
<b-modal <b-modal
v-model="show" v-model="show"
size="lg" size="lg"
@ -1551,7 +1551,7 @@ export default {
</span> </span>
<span class='control editable'> <span class='control editable'>
<t-studyplan-edit v-model="value" @moved="movedStudyplan" <t-studyplan-edit v-model="value" @moved="movedStudyplan"
><i class='fa fa-pencil'></i> {{text.edit$core}}</t-studyplan-edit> ><i class='fa fa-gear'></i> {{text.edit$core}}</t-studyplan-edit>
</span> </span>
<span class='control editable'> <span class='control editable'>
<t-studyplan-associate <t-studyplan-associate
@ -1797,7 +1797,7 @@ export default {
:data-studyline="value.id" ref="main" :data-studyline="value.id" ref="main"
><div class="t-studyline-handle" :style="'background-color: ' + value.color"></div> ><div class="t-studyline-handle" :style="'background-color: ' + value.color"></div>
<div class="t-studyline-title"> <div class="t-studyline-title">
<abbr v-b-tooltip.hover :title="value.name">{{ value.shortname }}</abbr> <abbr v-b-tooltip.hover.right :title="value.name">{{ value.shortname }}</abbr>
</div> </div>
</div> </div>
`, `,

View File

@ -243,10 +243,12 @@
.path-local-treestudyplan .r-studyline-title abbr, .path-local-treestudyplan .r-studyline-title abbr,
.features-treestudyplan .t-studyline-title abbr, .features-treestudyplan .t-studyline-title abbr,
.features-treestudyplan .r-studyline-title abbr { .features-treestudyplan .r-studyline-title abbr {
display: inline-block; display: inline;
vertical-align: middle; vertical-align: middle;
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
cursor: default;
width: fit-content;
} }
.path-local-treestudyplan svg.empty-slot circle, .path-local-treestudyplan svg.empty-slot circle,
.features-treestudyplan svg.empty-slot circle { .features-treestudyplan svg.empty-slot circle {
@ -377,6 +379,10 @@
border-top-left-radius: 16px; border-top-left-radius: 16px;
border-top-right-radius: 16px; border-top-right-radius: 16px;
} }
.path-local-treestudyplan .s-studyline-header-period abbr,
.features-treestudyplan .s-studyline-header-period abbr {
cursor: default;
}
.path-local-treestudyplan .s-studyline-header-heading, .path-local-treestudyplan .s-studyline-header-heading,
.features-treestudyplan .s-studyline-header-heading { .features-treestudyplan .s-studyline-header-heading {
margin-top: 16px; margin-top: 16px;

View File

@ -151,10 +151,12 @@
.t-studyline-title abbr, .t-studyline-title abbr,
.r-studyline-title abbr { .r-studyline-title abbr {
display: inline-block; display: inline;
vertical-align: middle; vertical-align: middle;
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
cursor: default;
width: fit-content;
} }
svg.empty-slot circle { svg.empty-slot circle {
@ -279,6 +281,10 @@
border-top-right-radius: 16px; border-top-right-radius: 16px;
} }
.s-studyline-header-period abbr {
cursor: default;
}
.s-studyline-header-heading { .s-studyline-header-heading {
margin-top: 16px; margin-top: 16px;
} }

View File

@ -243,10 +243,12 @@
.path-local-treestudyplan .r-studyline-title abbr, .path-local-treestudyplan .r-studyline-title abbr,
.features-treestudyplan .t-studyline-title abbr, .features-treestudyplan .t-studyline-title abbr,
.features-treestudyplan .r-studyline-title abbr { .features-treestudyplan .r-studyline-title abbr {
display: inline-block; display: inline;
vertical-align: middle; vertical-align: middle;
font-weight: bold; font-weight: bold;
font-style: italic; font-style: italic;
cursor: default;
width: fit-content;
} }
.path-local-treestudyplan svg.empty-slot circle, .path-local-treestudyplan svg.empty-slot circle,
.features-treestudyplan svg.empty-slot circle { .features-treestudyplan svg.empty-slot circle {
@ -377,6 +379,10 @@
border-top-left-radius: 16px; border-top-left-radius: 16px;
border-top-right-radius: 16px; border-top-right-radius: 16px;
} }
.path-local-treestudyplan .s-studyline-header-period abbr,
.features-treestudyplan .s-studyline-header-period abbr {
cursor: default;
}
.path-local-treestudyplan .s-studyline-header-heading, .path-local-treestudyplan .s-studyline-header-heading,
.features-treestudyplan .s-studyline-header-heading { .features-treestudyplan .s-studyline-header-heading {
margin-top: 16px; margin-top: 16px;