bluerock/app
bluerock/app
2
0
Fork 0
Code Issues 8 Pull requests Projects Releases 9 Packages 1 Wiki Activity

Merge pull request 'Feat: add start numbers to speed flowchart (fixes #30)' (#31) from feat/startnumbers-in-speed-tree into main
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
Reviewed-on: #31
This commit is contained in:
Dorian Zedler 2022-08-11 12:15:17 +02:00
commit 38bdf15f40
2 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
resources/qml/Components/SpeedFlowChart.qml
View file

@ -222,7 +222,7 @@ Item {
ListView { ListView {
id: roundListView id: roundListView
property int columnWidth: height * 0.3 property int columnWidth: height * 0.4
property int columnHeight: height property int columnHeight: height
anchors { anchors {
@ -386,8 +386,6 @@ Item {
height: roundItem.tileSize height: roundItem.tileSize
//scale: 0.9 //scale: 0.9
color: Material.dialogColor color: Material.dialogColor
border.color: "lightgrey"
border.width: 0
radius: height * 0.2 radius: height * 0.2
Column { Column {
@ -409,13 +407,15 @@ Item {
Label { Label {
Layout.preferredHeight: parent.height Layout.preferredHeight: parent.height
Layout.preferredWidth: parent.width * 0.15 Layout.preferredWidth: parent.width * 0.08
height: parent.height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
font.pixelSize: height * 0.7 font.pixelSize: height * 0.4
fontSizeMode: Text.Fit font.bold: true
minimumPixelSize: 1 opacity: 0.7
text: matchItm.thisMatchData[index] !== undefined ? text: matchItm.thisMatchData[index] !== undefined ?
( (
@ -428,7 +428,8 @@ Item {
Label { Label {
Layout.preferredHeight: parent.height Layout.preferredHeight: parent.height
Layout.fillWidth: true Layout.maximumWidth: parent.width * 0.6
height: parent.height height: parent.height
@ -443,13 +444,50 @@ Item {
text: matchItm.thisMatchData[index] !== undefined ? matchItm.thisMatchData[index]['firstname'] + " " + matchItm.thisMatchData[index]['lastname'] :"-" text: matchItm.thisMatchData[index] !== undefined ? matchItm.thisMatchData[index]['firstname'] + " " + matchItm.thisMatchData[index]['lastname'] :"-"
} }
Rectangle {
Layout.preferredHeight: parent.height * 0.8
Layout.preferredWidth: parent.width * 0.13
radius: height / 2
border.width: 1
border.color: Material.frameColor
color: "transparent"
Label {
anchors.fill: parent
padding: parent.parent.height * 0.1
leftPadding: padding * 2
rightPadding: leftPadding
font.pixelSize: parent.height * 0.5
font.bold: true
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
text: matchItm.thisMatchData[index] !== undefined ? matchItm.thisMatchData[index]["start_number"]:""
}
}
Item {
Layout.fillHeight: true
Layout.fillWidth: true
}
Label { Label {
Layout.preferredHeight: parent.height Layout.preferredHeight: parent.height
Layout.preferredWidth: parent.width * 0.15
height: parent.height height: parent.height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignRight
font.pixelSize: height * 0.5 font.pixelSize: height * 0.5
font.bold: matchItm.winnerIndex === index
color: matchItm.winnerIndex === index ? Material.color(Material.Green):Material.primaryTextColor
text: matchItm.thisMatchData[index] !== undefined && matchItm.thisMatchData[index]['result'+matchItm.thisRound] !== undefined ? text: matchItm.thisMatchData[index] !== undefined && matchItm.thisMatchData[index]['result'+matchItm.thisRound] !== undefined ?
( parseFloat(matchItm.thisMatchData[index]['result'+matchItm.thisRound]) ? ( parseFloat(matchItm.thisMatchData[index]['result'+matchItm.thisRound]) ?

1
resources/qml/main.qml
View file

@ -199,6 +199,7 @@ Window {
//openWidget({person: 6623}) //openWidget({person: 6623})
//console.log(JSON.stringify(serverConn.getParamsFromUrl(""))) //console.log(JSON.stringify(serverConn.getParamsFromUrl("")))
//openWidgetFromUrl("https://l.bluerock.dev/?comp=11501&cat=GER_M") //openWidgetFromUrl("https://l.bluerock.dev/?comp=11501&cat=GER_M")
//openWidgetFromUrl("https://www.digitalrock.de/egroupware/ranking/json.php?cat=12&comp=12171&type=")
} }
FontLoader { FontLoader {