From ed0773a1b9bffb4b761b02504a042daabad076ba Mon Sep 17 00:00:00 2001
From: Jeremy Guiselin <jeremy.guiselin@student.ecp.fr>
Date: Mon, 23 Jan 2017 12:35:45 +0100
Subject: [PATCH] toast display translated message + correct score + correct
details page
---
www/js/modules/toast/service.js | 12 +++++++-----
www/js/pages/football-details/controller.js | 4 ++++
www/js/pages/football/controller.js | 2 +-
www/js/pages/tennis-details/controller.js | 8 ++++++--
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/www/js/modules/toast/service.js b/www/js/modules/toast/service.js
index 0f5f626..f0eaa7c 100644
--- a/www/js/modules/toast/service.js
+++ b/www/js/modules/toast/service.js
@@ -18,11 +18,13 @@
return {
show : function (message, duration, location) {
- if (window.cordova) {
- $cordovaToast.show(message, duration, location);
- } else {
- console.log($translate(message));
- }
+ $translate(message).then(function (data) {
+ if (window.cordova) {
+ $cordovaToast.show(message, duration, location);
+ } else {
+ console.log(data);
+ }
+ });
}
};
diff --git a/www/js/pages/football-details/controller.js b/www/js/pages/football-details/controller.js
index 4c7d5d6..62b22c3 100644
--- a/www/js/pages/football-details/controller.js
+++ b/www/js/pages/football-details/controller.js
@@ -47,6 +47,10 @@
Scope functions
**/
+ $scope.isUndefined = function (value) {
+ return typeof value === 'undefined' || value === null;
+ };
+
$scope.myGoBack = function() {
$ionicHistory.goBack();
};
diff --git a/www/js/pages/football/controller.js b/www/js/pages/football/controller.js
index a050343..0b881ad 100644
--- a/www/js/pages/football/controller.js
+++ b/www/js/pages/football/controller.js
@@ -65,7 +65,7 @@
$scope.getLink = function (league) {
if (league.device_status === 'unlock') {
- return 'details({leagueId:' + league.id + '})';
+ return 'football-details({leagueId:' + league.id + '})';
}
return '-';
};
diff --git a/www/js/pages/tennis-details/controller.js b/www/js/pages/tennis-details/controller.js
index 6ce218a..cd83635 100644
--- a/www/js/pages/tennis-details/controller.js
+++ b/www/js/pages/tennis-details/controller.js
@@ -48,6 +48,10 @@
Scope functions
**/
+ $scope.isUndefined = function (value) {
+ return typeof value === 'undefined' || value === null;
+ };
+
$scope.myGoBack = function() {
$ionicHistory.goBack();
};
@@ -116,10 +120,10 @@
var scores = [];
sets.forEach(function (set) {
scores.push(set.split('-'));
- })
+ });
prediction.score = scores;
}
- }
+ };
/**
End Controller functions
--
GitLab