[Feature] [#142] 3ème dose #143

pylapp · 2021-11-30T11:32:21Z

Description

Implementation of 3rd shot in the app.

Changes / Definition of done

Related issue

Link to the Github issue #142
Link to the Github issue #150

What I tested

Display of booster shot in UI
Compared results with web front

Regression risks

Nothing identified

Screenshots

Before	After

Checklist

I have installed SwiftLint and made sure code formatting is correct
I have performed a self-review of my own code
I tested my changes on real device
My changes generate no new warnings
I have commented my code in hard-to-understand areas
Any dependent changes have been merged into develop
I have checked there aren't other open Pull Requests for the same update/change

pylapp · 2021-12-02T12:37:50Z

@victor-sarda Ready for review!

rozierguillaume · 2021-12-02T14:50:47Z

😍

…n business objects For issue #142: - Remove Chronodose-related items - Update GUI with segmented control - Tests a11y (dynamic fonts, Voice Over) - Update model to get daily slots from JSON - Request API to populate model - Code decoration with Xcode minimap mark and SPDX headers in modified sources - Add mock data (raw JSON files) and a HOWTO to set up an environment with mock data For issue #150: - Refactor business objects so as to remove the "appointment count" field in VaccinationCentre objects Signed-off-by: Pierre-Yves Lapersonne <dev@pylapersonne.info>

pylapp · 2021-12-03T16:49:00Z

@victor-sarda It's ready (again) for review. I made also a refactor so as to remove a field backend wanted to delete.

pylapp · 2021-12-03T17:00:54Z

HOW-TO.md

@@ -0,0 +1,59 @@
+# FAQ
+
+## Mettre en place un serveur local pour jouer avec des données


"Mettre en place un serveur local pour jouer avec des données comme si renvoyées par le backend"

pylapp · 2021-12-03T17:01:36Z

HOW-TO.md

+    </body>
+</html>
+```
+5. Via un navigateur web, saisir l'URL du site web, ici **http://w.x.y.z:8888**. Un page avec le texte _Youpi !_ doit être affichée ; sinon il y a vraisemblablement un problème de configuration de votre serveur web.


Typo : "Une"

pylapp · 2021-12-03T17:02:42Z

HOW-TO.md

+1. Aller sur [le site web de production](https://vitemadose.covidtracker.fr/)
+2. Ouvrir la console web du navigateur que vous utilisez
+2. Saisir _14000_ et sélectionner _14000 - Caen_
+3. Récupérer (via un onglet supposément nommé _Network_ par exemple) le contenu des fichiers _14.json_ qui aura les infos des centres de vaccination, ainsi que le fichier _creneaux-quotidiens.json_. S'assurer de prendre celui du bon département (URL de la forme _https://vitemadose.gitlab.io/vitemadose/14/creneaux-quotidiens.json_). Récupérer aussi le fichier _stats.json_ et le fichier _departements.json_ (par exemple via l'URL _https://vitemadose.gitlab.io/vitemadose/departements.json_)


"Récupérer via la console du navigateur"

pylapp · 2021-12-03T17:03:27Z

HOW-TO.md

+- dans _stats.json_, pour l'objet **tout_departement**, remplacer la valeur du champ "disponibles" par des nombres reconnaissables
+- dans le fichier _14.json_, changer le nom d'un centre de vaccination
+
+Si toutefois, malgré tout ceci, vous pensez récupérer des données depuis le site web de production, il est possible que la configuration à distance (via _Firebase_)  ait pris la main et écrasé la configuration par défaut renseignée dans le fichier _remote-config.plist_. Auquel cas, y aller plus brutalement en remplaçant la valeur retournée par la propriété calculée `baseUrl` dans l'extension de `RemoteConfiguration` par l'adresse IP du serveur local, comme :


Espace en trop

pylapp · 2021-12-03T17:10:27Z

ViteMaDose.xcodeproj/project.pbxproj

 				INFOPLIST_FILE = ViteMaDose/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = app.vitemadose.debug;
+				PRODUCT_BUNDLE_IDENTIFIER = pylapp.vitemadose.ios;


pylapp · 2021-12-03T17:17:54Z

ViteMaDose/Models/DailySlots.swift

+
+    /// Returns the slots for the given day.
+    /// - Parameter day: The date to use for filtering
+    /// - Returns: Aerray of `DailySlot`, can be empty if nothing found for this `day`


Typo: "Array"

pylapp · 2021-12-03T17:18:54Z

ViteMaDose/Models/DailySlots.swift

+
+public struct Slot: Codable {
+
+    /// Code for the booking platform related to the location when there are slots (e.g. "mesoigner3031" ot "doctolib203443pid88863")


Typo: "where"

pylapp · 2021-12-03T17:19:24Z

ViteMaDose/Models/DailySlots.swift

+        numberOfBoosterShotsSlots() > 0
+    }
+
+    /// - Returns: The number of third shot / booster shot this slot have


Typo: "shots"

pylapp · 2021-12-03T17:19:44Z

ViteMaDose/Models/DailySlots.swift

+        return slotsNumber
+    }
+
+    /// - Returns: The global number of shots this slot have


Typo: "has"

pylapp · 2021-12-03T17:20:59Z

ViteMaDose/Models/DatedSlotsForCentres.swift

+    /// Returns if there is some `Slot` with booster shots for the given `VaccinationCentre` in this `DatedSlotsForCentres`.
+    /// - Parameter centre: The centre to look for booster shots
+    /// - Returns: False if there is no centre stored in this `DatedSlotsForCentres` or if there is no booster shot, true if there are booster shots for this centre.
+    func hasBoosterShot(for centre: VaccinationCentre) -> Bool {


Rename to "hasBoosterShots"

pylapp · 2021-12-03T18:06:27Z

Duplicated in #152, should be closed once comments here have been processed.

pylapp · 2021-12-06T11:16:56Z

See specific branch with copy-pasted evolutions in: https://github.com/CovidTrackerFr/vitemadose-ios/commits/feature/142_third-dose

pylapp mentioned this pull request Nov 30, 2021

[Feature] 3ème dose #142

Closed

pylapp changed the title ~~WIP: [Feature] [#492] 3ème dose~~ WIP: [Feature] [#142] 3ème dose Dec 1, 2021

pylapp mentioned this pull request Dec 1, 2021

[Feature] Slider for location filtering #148

Closed

victor-sarda marked this pull request as draft December 1, 2021 18:47

pylapp changed the title ~~WIP: [Feature] [#142] 3ème dose~~ [Feature] [#142] 3ème dose Dec 2, 2021

pylapp marked this pull request as ready for review December 2, 2021 12:37

pylapp mentioned this pull request Dec 3, 2021

[Refactoring] Remove appointment count from business objects #150

Closed

pylapp requested a review from victor-sarda December 3, 2021 16:48

pylapp self-assigned this Dec 3, 2021

pylapp added enhancement New feature or request high priority refactoring UI labels Dec 3, 2021

pylapp commented Dec 3, 2021

View reviewed changes

pylapp mentioned this pull request Dec 3, 2021

[Feature] [#142] 3rd shot booster management, refactoring #152

Closed

pylapp closed this Dec 6, 2021

pylapp mentioned this pull request Dec 6, 2021

[Changes] SPDX headers in sources, AUTHORS file and mock JSON #157

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Feature] [#142] 3ème dose #143

[Feature] [#142] 3ème dose #143

pylapp commented Nov 30, 2021 •

edited

pylapp commented Dec 2, 2021

rozierguillaume commented Dec 2, 2021

pylapp commented Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp Dec 3, 2021

pylapp commented Dec 3, 2021

pylapp commented Dec 6, 2021

		@@ -0,0 +1,59 @@
		# FAQ

		## Mettre en place un serveur local pour jouer avec des données


		public struct Slot: Codable {

		/// Code for the booking platform related to the location when there are slots (e.g. "mesoigner3031" ot "doctolib203443pid88863")

[Feature] [#142] 3ème dose #143

[Feature] [#142] 3ème dose #143

Conversation

pylapp commented Nov 30, 2021 • edited

Description

Changes / Definition of done

Related issue

What I tested

Regression risks

Screenshots

Checklist

pylapp commented Dec 2, 2021

rozierguillaume commented Dec 2, 2021

pylapp commented Dec 3, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pylapp commented Dec 3, 2021

pylapp commented Dec 6, 2021

pylapp commented Nov 30, 2021 •

edited