- the boulder result rect doesn't have a background if there is no result now
- the selected route is kept when changing cats
This commit is contained in:
parent
0a56d6272f
commit
adbc540c0c
4 changed files with 25 additions and 26 deletions
|
@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
|
||||||
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
|
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
|
||||||
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
# [0.03.1] - UR
|
||||||
|
### Changed
|
||||||
|
- the boulder result rect doesn't have a background if there is no result now
|
||||||
|
- the selected route is kept when changing cats
|
||||||
|
|
||||||
# [0.03.0] - 2019-07-11
|
# [0.03.0] - 2019-07-11
|
||||||
### Added
|
### Added
|
||||||
- it is not possible to pin competitions and only show these
|
- it is not possible to pin competitions and only show these
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<manifest package="com.itsblue.blueROCK" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.03" android:versionCode="12" android:installLocation="auto">
|
<manifest package="com.itsblue.blueROCKtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.03.1" android:versionCode="13" android:installLocation="auto">
|
||||||
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="blueROCK" android:icon="@drawable/icon">
|
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="blueROCK" android:icon="@drawable/icon">
|
||||||
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="blueROCK" android:screenOrientation="unspecified" android:launchMode="singleTop">
|
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="blueROCK" android:screenOrientation="unspecified" android:launchMode="singleTop">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
|
|
|
@ -65,6 +65,7 @@ Page {
|
||||||
// person: personId,
|
// person: personId,
|
||||||
// cat: categoryId,
|
// cat: categoryId,
|
||||||
// nation: nationString ('', 'GER', 'SUI')
|
// nation: nationString ('', 'GER', 'SUI')
|
||||||
|
// route: (int) round
|
||||||
// type: ('','starters', 'nat_team_ranking', 'sektionenwertung', 'regionalzentren'),
|
// type: ('','starters', 'nat_team_ranking', 'sektionenwertung', 'regionalzentren'),
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
@ -83,6 +84,12 @@ Page {
|
||||||
root.ready = false
|
root.ready = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if(ret["status"] === 404 && [WidgetPage.WidgetType.Registration, WidgetPage.WidgetType.Startlist, WidgetPage.WidgetType.Result].includes(root.widgetType) && root.params["route"] !== "") {
|
||||||
|
// if we get a 404 and have startlist, results or registration, the route was not found -> remove round and try again
|
||||||
|
root.params["route"] = ""
|
||||||
|
loadData(root.params)
|
||||||
|
return
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
root.ready = false
|
root.ready = false
|
||||||
}
|
}
|
||||||
|
@ -95,28 +102,13 @@ Page {
|
||||||
if(openLoadingDl)
|
if(openLoadingDl)
|
||||||
loadingDl.open()
|
loadingDl.open()
|
||||||
|
|
||||||
var oldParams = Object.assign({}, root.params)
|
|
||||||
|
|
||||||
// update all the given values
|
// update all the given values
|
||||||
for(var prop in params){
|
Object.assign(root.params, params)
|
||||||
if(params.hasOwnProperty(prop)){
|
|
||||||
if(params[prop] === null){
|
|
||||||
delete root.params[prop]
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
root.params[prop] = params[prop]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
loadData(root.params)
|
loadData(root.params)
|
||||||
|
|
||||||
console.log("ready: " + root.ready + ": " + root.status)
|
console.log("ready: " + root.ready + ": " + root.status)
|
||||||
|
|
||||||
if(root.status !== 200)
|
|
||||||
root.params = oldParams
|
|
||||||
|
|
||||||
|
|
||||||
if(openLoadingDl)
|
if(openLoadingDl)
|
||||||
loadingDl.close()
|
loadingDl.close()
|
||||||
|
|
||||||
|
|
|
@ -165,7 +165,7 @@ DataListView {
|
||||||
target: selector
|
target: selector
|
||||||
onSelectionFinished: {
|
onSelectionFinished: {
|
||||||
if(data.cat !== undefined){
|
if(data.cat !== undefined){
|
||||||
updateData({cat: data.cat, route:""}, true)
|
updateData({cat: data.cat}, true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -306,11 +306,10 @@ DataListView {
|
||||||
resultString = resultString.replace("z", "")
|
resultString = resultString.replace("z", "")
|
||||||
resultString = resultString.replace("b", "")
|
resultString = resultString.replace("b", "")
|
||||||
resultList = resultString.split(" ")
|
resultList = resultString.split(" ")
|
||||||
}
|
|
||||||
|
|
||||||
|
while (resultList.length < 2){
|
||||||
while (resultList.length < 2){
|
resultList.unshift(0)
|
||||||
resultList.unshift(0)
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return resultList
|
return resultList
|
||||||
|
@ -373,8 +372,11 @@ DataListView {
|
||||||
context.arc(radius + offsetX, radius + offsetY, radius, Math.PI, 1.5 * Math.PI);
|
context.arc(radius + offsetX, radius + offsetY, radius, Math.PI, 1.5 * Math.PI);
|
||||||
|
|
||||||
// fill
|
// fill
|
||||||
context.fillStyle = "#b7b7b7";
|
if(resultData[0] !== undefined) {
|
||||||
context.fill();
|
// if there is a result available -> draw background
|
||||||
|
context.fillStyle = "#b7b7b7";
|
||||||
|
context.fill();
|
||||||
|
}
|
||||||
|
|
||||||
// outline
|
// outline
|
||||||
context.lineWidth = 1;
|
context.lineWidth = 1;
|
||||||
|
@ -459,7 +461,7 @@ DataListView {
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
|
||||||
text: boulderResCv.resultData[1]
|
text: boulderResCv.resultData[1] === undefined ? "0":boulderResCv.resultData[1]
|
||||||
}
|
}
|
||||||
|
|
||||||
Label {
|
Label {
|
||||||
|
@ -483,7 +485,7 @@ DataListView {
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
|
||||||
text: boulderResCv.resultData[0]
|
text: boulderResCv.resultData[0] === undefined ? "0":boulderResCv.resultData[0]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue