diff --git a/app.json b/app.json index d02d23b..c335168 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ "android", "web" ], - "version": "1.1.1", + "version": "1.2.0", "orientation": "portrait", "primaryColor": "#be1522", "icon": "./assets/android.icon.png", @@ -36,7 +36,7 @@ }, "android": { "package": "fr.amicaleinsat.application", - "versionCode": 8, + "versionCode": 9, "icon": "./assets/android.icon.png", "adaptiveIcon": { "foregroundImage": "./assets/android.adaptive-icon.png", diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js index 9287280..707a011 100644 --- a/screens/HomeScreen.js +++ b/screens/HomeScreen.js @@ -41,7 +41,7 @@ function openWebLink(link) { export default class HomeScreen extends FetchedDataSectionList { constructor() { - super('DATA_URL', REFRESH_TIME); + super(DATA_URL, REFRESH_TIME); } getHeaderTranslation() { @@ -57,7 +57,7 @@ export default class HomeScreen extends FetchedDataSectionList { } createDataset(fetchedData: Object) { - fetchedData = DATA; + // fetchedData = DATA; let newsData = []; let dashboardData = []; if (fetchedData['news_feed'] !== undefined) @@ -255,7 +255,7 @@ export default class HomeScreen extends FetchedDataSectionList { if (startDate > now) validEvents.push(event); else if (endDate !== undefined && endDate !== null) { - if (endDate > now) + if (endDate > now || endDate < startDate) // Display event if it ends the following day validEvents.push(event); } }