Risplay improvements in studyplan overview

This commit is contained in:
PMKuipers 2024-05-24 10:42:29 +02:00
parent 09c6e4b029
commit 582db40016
7 changed files with 105 additions and 39 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

@ -521,22 +521,26 @@ export default {
:class="'q-item-heading ' + ((expansion.items[item.id].expanded)?'expanded':'collapsed')" :class="'q-item-heading ' + ((expansion.items[item.id].expanded)?'expanded':'collapsed')"
:colspan="colspanItem(item)" :colspan="colspanItem(item)"
:rowspan='(expansion.items[item.id].expanded)?1:3' :rowspan='(expansion.items[item.id].expanded)?1:3'
><span class="q-wrap"><a href='#' ><div class="q-wrap"
@click.prevent="toggleItem(item)" ><div class="q-toggle" ><a href='#'
><i v-if="expansion.items[item.id].expanded" @click.prevent="toggleItem(item)"
class='q-chevron fa fa-minus'></i ><i v-if="expansion.items[item.id].expanded"
><i v-else class='q-chevron fa fa-minus'></i
class='q-chevron fa fa-plus'></i ><i v-else
></a class='q-chevron fa fa-plus'></i
>&nbsp;<a style="display: inline-block;" href='#' ></a
@click.prevent="toggleItem(item)" ></div><div class="q-title">
><fittext vertical maxsize="18pt" singleline <fittext vertical maxsize="12pt" minsize="9pt"
><span class='q-label' ><a style="display: inline-block;" href='#'
:title="item.course.displayname" @click.prevent="toggleItem(item)"
v-html="item.course.displayname" ><span class='q-label'
></span :title="item.course.displayname"
></fittext v-html="item.course.displayname"
></a></span ></span
></a
></fittext
></div
></div
></th> ></th>
</template> </template>
</template> </template>

View File

@ -1759,32 +1759,50 @@ body.path-local-treestudyplan .editmode-switch-form > * {
padding-top: 0.25rem; padding-top: 0.25rem;
} }
.path-local-treestudyplan .q-header .q-line-heading, .path-local-treestudyplan .q-header .q-line-heading,
.path-local-treestudyplan .q-header .q-item-heading,
.path-local-treestudyplan .q-header .q-condition-heading { .path-local-treestudyplan .q-header .q-condition-heading {
overflow: hidden;
width: 2rem; width: 2rem;
writing-mode: vertical-rl; writing-mode: vertical-rl;
text-orientation: sideways; text-orientation: sideways;
} }
.path-local-treestudyplan .q-header .q-line-heading .q-chevron, .path-local-treestudyplan .q-header .q-line-heading .q-chevron,
.path-local-treestudyplan .q-header .q-item-heading .q-chevron,
.path-local-treestudyplan .q-header .q-condition-heading .q-chevron { .path-local-treestudyplan .q-header .q-condition-heading .q-chevron {
text-orientation: initial; text-orientation: initial;
writing-mode: horizontal-tb; writing-mode: horizontal-tb;
} }
.path-local-treestudyplan .q-header .q-period-heading, .path-local-treestudyplan .q-header .q-period-heading,
.path-local-treestudyplan .q-header .q-line-heading, .path-local-treestudyplan .q-header .q-line-heading,
.path-local-treestudyplan .q-header .q-item-heading,
.path-local-treestudyplan .q-header .q-condition-heading { .path-local-treestudyplan .q-header .q-condition-heading {
vertical-align: top; vertical-align: top;
} }
.path-local-treestudyplan .q-header .q-line-heading > span.q-wrap { .path-local-treestudyplan .q-header .q-item-heading {
vertical-align: top;
width: 2rem;
}
.path-local-treestudyplan .q-header .q-line-heading > .q-wrap {
display: inline-block; display: inline-block;
height: 7rem; height: 7rem;
} }
.path-local-treestudyplan .q-header .q-item-heading > span.q-wrap { .path-local-treestudyplan .q-header .q-item-heading > .q-wrap {
display: inline-block; display: grid;
height: 7rem; height: 10rem;
white-space: nowrap; white-space: nowrap;
grid: auto/1em 1fr;
overflow: hidden;
}
.path-local-treestudyplan .q-header .q-item-heading > .q-wrap > .q-toggle {
width: 100%;
line-height: 100%;
}
.path-local-treestudyplan .q-header .q-item-heading > .q-wrap > .q-title {
margin-left: auto;
margin-right: auto;
overflow: hidden;
writing-mode: vertical-rl;
text-orientation: sideways;
hyphens: auto;
padding-top: 2px;
width: 100%;
} }
.path-local-treestudyplan .q-header .q-condition-heading { .path-local-treestudyplan .q-header .q-condition-heading {
text-align: left; text-align: left;

View File

@ -30,11 +30,12 @@ use \local_treestudyplan\premium;
require_once($CFG->libdir.'/weblib.php'); require_once($CFG->libdir.'/weblib.php');
$PAGE->set_url("/local/treestudyplan/studyplan-report.php", array());
require_login(); require_login();
// Figure out the context (category or system, based on either category or context parameter). // Figure out the context (category or system, based on either category or context parameter).
$pageid = required_param('page', PARAM_INT); // Category id. $pageid = required_param('page', PARAM_INT); // Category id.
$PAGE->set_url("/local/treestudyplan/result-overview.php", ['page' => $pageid]);
$page = studyplanpage::find_by_id($pageid); $page = studyplanpage::find_by_id($pageid);
$studyplan = $page->studyplan(); $studyplan = $page->studyplan();
$context = $studyplan->context(); $context = $studyplan->context();

View File

@ -49,8 +49,8 @@
} }
.q-line-heading, .q-line-heading,
.q-item-heading,
.q-condition-heading { .q-condition-heading {
overflow: hidden;
width: 2rem; width: 2rem;
writing-mode: vertical-rl; writing-mode: vertical-rl;
text-orientation: sideways; text-orientation: sideways;
@ -62,20 +62,45 @@
.q-period-heading, .q-period-heading,
.q-line-heading, .q-line-heading,
.q-item-heading,
.q-condition-heading { .q-condition-heading {
vertical-align: top; vertical-align: top;
} }
.q-item-heading{
vertical-align: top;
width: 2rem;
}
.q-line-heading > span.q-wrap{ .q-line-heading > .q-wrap{
display:inline-block; display:inline-block;
height: 7rem; height: 7rem;
} }
.q-item-heading > span.q-wrap{ .q-item-heading > .q-wrap{
display:inline-block; display: grid;
height: 7rem; height: 10rem;
white-space: nowrap; white-space: nowrap;
grid: auto / 1em 1fr;
overflow: hidden;
> .q-toggle {
width: 100%;
line-height: 100%;
}
> .q-title {
margin-left: auto;
margin-right: auto;
overflow: hidden;
writing-mode: vertical-rl;
text-orientation: sideways;
hyphens: auto;
padding-top: 2px;
width: 100%;
}
} }
.q-condition-heading { .q-condition-heading {
> span.q-wrap { > span.q-wrap {
display:inline-block; display:inline-block;

View File

@ -1759,32 +1759,50 @@ body.path-local-treestudyplan .editmode-switch-form > * {
padding-top: 0.25rem; padding-top: 0.25rem;
} }
.path-local-treestudyplan .q-header .q-line-heading, .path-local-treestudyplan .q-header .q-line-heading,
.path-local-treestudyplan .q-header .q-item-heading,
.path-local-treestudyplan .q-header .q-condition-heading { .path-local-treestudyplan .q-header .q-condition-heading {
overflow: hidden;
width: 2rem; width: 2rem;
writing-mode: vertical-rl; writing-mode: vertical-rl;
text-orientation: sideways; text-orientation: sideways;
} }
.path-local-treestudyplan .q-header .q-line-heading .q-chevron, .path-local-treestudyplan .q-header .q-line-heading .q-chevron,
.path-local-treestudyplan .q-header .q-item-heading .q-chevron,
.path-local-treestudyplan .q-header .q-condition-heading .q-chevron { .path-local-treestudyplan .q-header .q-condition-heading .q-chevron {
text-orientation: initial; text-orientation: initial;
writing-mode: horizontal-tb; writing-mode: horizontal-tb;
} }
.path-local-treestudyplan .q-header .q-period-heading, .path-local-treestudyplan .q-header .q-period-heading,
.path-local-treestudyplan .q-header .q-line-heading, .path-local-treestudyplan .q-header .q-line-heading,
.path-local-treestudyplan .q-header .q-item-heading,
.path-local-treestudyplan .q-header .q-condition-heading { .path-local-treestudyplan .q-header .q-condition-heading {
vertical-align: top; vertical-align: top;
} }
.path-local-treestudyplan .q-header .q-line-heading > span.q-wrap { .path-local-treestudyplan .q-header .q-item-heading {
vertical-align: top;
width: 2rem;
}
.path-local-treestudyplan .q-header .q-line-heading > .q-wrap {
display: inline-block; display: inline-block;
height: 7rem; height: 7rem;
} }
.path-local-treestudyplan .q-header .q-item-heading > span.q-wrap { .path-local-treestudyplan .q-header .q-item-heading > .q-wrap {
display: inline-block; display: grid;
height: 7rem; height: 10rem;
white-space: nowrap; white-space: nowrap;
grid: auto/1em 1fr;
overflow: hidden;
}
.path-local-treestudyplan .q-header .q-item-heading > .q-wrap > .q-toggle {
width: 100%;
line-height: 100%;
}
.path-local-treestudyplan .q-header .q-item-heading > .q-wrap > .q-title {
margin-left: auto;
margin-right: auto;
overflow: hidden;
writing-mode: vertical-rl;
text-orientation: sideways;
hyphens: auto;
padding-top: 2px;
width: 100%;
} }
.path-local-treestudyplan .q-header .q-condition-heading { .path-local-treestudyplan .q-header .q-condition-heading {
text-align: left; text-align: left;