From ccc962505d8b3d6f538126fd0057e876636338c9 Mon Sep 17 00:00:00 2001 From: dorian Date: Sun, 8 Dec 2019 11:31:57 +0100 Subject: [PATCH] - fixed styling issues on teacher sub plan --- qml/Forms/EventForm.qml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/qml/Forms/EventForm.qml b/qml/Forms/EventForm.qml index cb4f1d8..af7cda7 100644 --- a/qml/Forms/EventForm.qml +++ b/qml/Forms/EventForm.qml @@ -163,12 +163,13 @@ Page { // label for the hour, replacement, subject and room width: parent.width - 10 + height: text === "" ? 0:undefined wrapMode: Label.Wrap - text: hour + ( replace === "" ? "": ( " | " - + replace + ( subject === "" ? "": ( " | " - + subject + ( room === "" ? "": ( " | " - + room ) ) ) ) ) ) + text: hour + + (replace === "" ? "": ( " | "+ replace )) + + ( subject === "" ? "": ( " | " + subject )) + + ( room === "" ? "": ( " | " + room )) } Label { @@ -176,14 +177,14 @@ Page { // label for the new room (to) and the additional text (text) width: parent.width - 10 + height: text === "" ? 0:undefined wrapMode: Label.Wrap font.pixelSize: gradeLa.font.pixelSize font.bold: true - visible: text !== "" - - text: to !== "" && model.text !== "" ? to + " | " + model.text:model.to + model.text + text: to + + (model.text === " | " || model.text === "" ? "": ( " | "+ model.text )) } } }