From 30a29003a9a10d339d52d2fd60fdd6ed5fbda26a Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Sun, 20 Jun 2021 19:38:50 +0200 Subject: [PATCH] re-add ifsc cats just for fun --- resources/qml/Widgets/CalendarWidget.qml | 2 - resources/qml/main.qml | 61 ++++++++++++++++++++++++ sources/bluerockbackend.cpp | 2 +- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/resources/qml/Widgets/CalendarWidget.qml b/resources/qml/Widgets/CalendarWidget.qml index c332684..d2c248f 100644 --- a/resources/qml/Widgets/CalendarWidget.qml +++ b/resources/qml/Widgets/CalendarWidget.qml @@ -110,8 +110,6 @@ DataListView { initFilters() initFavorites() - console.log(JSON.stringify(widgetData)) - if(model && widgetData["competitions"].length > 0){ control.status = 200 control.ready = true diff --git a/resources/qml/main.qml b/resources/qml/main.qml index 15b80d0..3c0466b 100644 --- a/resources/qml/main.qml +++ b/resources/qml/main.qml @@ -51,6 +51,67 @@ Window { // - https://github.com/ralfbecker/ranking/blob/master/sitemgr/digitalrock/sac_calendar.php property var compCats: { + // --- ICC --- + + /*'int' : { + 'label' : 'International', + 'nation' : 'ICC', + 'wettk_reg' : '^[0-9]{2,2}[_^E]{1}[^YJ]{1,1}.*', + 'serie_reg' : '^[0-9]{2,2}_(WC|TR){1,1}.*', + 'rang_title': 'CUWR continuously updated WORLDRANKING', + 'bgcolor' : '#B8C8FF', + 'nat_team_ranking' : '', + 'cat_id' : [68,86]//[68,69,70,86,259] + },*/ + 'worldcup': { + 'label' : 'World Cups', + 'nation' : 'ICC', + 'bgcolor' : '#B8C8FF', + 'sort_rank': 1, + 'cat_id' : [69] + }, + 'youth' : { + 'label' : 'Youth Events', + 'nation' : 'ICC', + 'wettk_reg' : '^[0-9]{2,2}(EYC|_J|_Y){1,1}.*', + 'serie_reg' : '^[0-9]{2,2}_EYC', + 'rang_title': '', + 'bgcolor' : '#D8E8FF', + 'sort_rank': 2, + 'cat_id' : [71,258] + }, + 'cont': { + 'label' : 'Continental Events', + 'nation' : 'ICC', + 'bgcolor' : '#B8C8FF', + 'sort_rank': 3, + 'cat_id' : [262] + }, + 'masters' : { + 'label' : 'Masters and Promo Events', + 'nation' : 'ICC', + 'wettk_reg' : '^[0-9]{2,2}_[^PWERASL]{1}.*', + // 'serie_reg' : '^[0-9]{2,2}_(WC|TR){1,1}.*', + // 'rang_title': 'CUWR continuously updated WORLDRANKING', + 'bgcolor' : '#F0F0F0', + 'sort_rank': 4, + 'cat_id' : [70] + }, + 'para' : { + 'label' : 'Paraclimbing Events', + 'nation' : 'ICC', + 'wettk_reg' : '^[0-9]{2,2}_PE.*', + 'bgcolor' : '#F0F0F0', + 'sort_rank': 5, + 'cat_id' : [256,259] + }, + 'games': { + 'label': 'Games', + 'nation': 'ICC', + 'bgcolor' : '#B8C8FF', + 'sort_rank': 6, + 'cat_id': [68,86] + }, // --- GER --- diff --git a/sources/bluerockbackend.cpp b/sources/bluerockbackend.cpp index 3f6cc03..cc8f307 100644 --- a/sources/bluerockbackend.cpp +++ b/sources/bluerockbackend.cpp @@ -48,7 +48,7 @@ QVariant BlueRockBackend::getWidgetData(QVariantMap params) { requestUrl = requestUrl.left(requestUrl.length() - 1); // remove last '&' - qDebug() << requestUrl; + qWarning() << requestUrl; QVariantMap ret = this->_senddata(QUrl(requestUrl));