From 2a3c0aed0c3b98242c3394577879ef7365a2dc89 Mon Sep 17 00:00:00 2001 From: Thomas Dutrion Date: Tue, 26 May 2026 22:40:17 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20mise=20=C3=A0=20jour=20des=20antennes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # sources/AppBundle/Antennes/AntenneRepository.php --- .../AppBundle/Antennes/AntenneRepository.php | 365 +++++++++--------- .../features/Admin/Antennes/List.feature | 2 +- 2 files changed, 191 insertions(+), 176 deletions(-) diff --git a/sources/AppBundle/Antennes/AntenneRepository.php b/sources/AppBundle/Antennes/AntenneRepository.php index 7525aba25..4b4c8c7f9 100644 --- a/sources/AppBundle/Antennes/AntenneRepository.php +++ b/sources/AppBundle/Antennes/AntenneRepository.php @@ -70,372 +70,387 @@ public function getOrderedLabelsByKey(): array private function makeAntennes(): void { $this->add(new Antenne( - 'bordeaux', - 'Bordeaux', - new Meetup('bordeaux-php-meetup', '18197674'), - '/images/offices/bordeaux.svg', - new Socials( + code: 'bordeaux', + label: 'Bordeaux', + meetup: new Meetup('bordeaux-php-meetup', '18197674'), + logoUrl: '/images/offices/bordeaux.svg', + socials: new Socials( + blog: 'https://bordeaux.afup.org', twitter: 'AFUP_Bordeaux', linkedin: 'afup-bordeaux', bluesky: 'bordeaux.afup.org', ), - new Map( - false, - LegendAttachment::Right, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Right, + firstCity: new City( new Point(330, 440), new Point(270, 500), new Point(230, 500), new Position(44.837912, -0.579541), ), ), - ['33'], + departments: ['33'], )); $this->add(new Antenne( - 'limoges', - 'Limoges', - new Meetup('afup-limoges-php', '23162834'), - '/images/offices/limoges.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UCPYMUpcC3b5zd-hVNGEWHAA', + code: 'limoges', + label: 'Limoges', + meetup: new Meetup('afup-limoges-php', '23162834'), + logoUrl: '/images/offices/limoges.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afuplimoges780', blog: 'https://limoges.afup.org', twitter: 'AFUP_Limoges', linkedin: 'afup-limoges', ), - new Map( - false, - LegendAttachment::Right, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Right, + firstCity: new City( new Point(410, 380), new Point(320, 380), new Point(230, 430), new Position(45.85, 1.25), ), ), - ['87'], + departments: ['87'], )); $this->add(new Antenne( - 'lille', - 'Hauts de France', - new Meetup('afup-hauts-de-france-php', '23840677'), - '/images/offices/hdf.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UCkMGtNcB-VeqMlQ9p2JMIKg', + code: 'lille', + label: 'Hauts de France', + meetup: new Meetup('afup-hauts-de-france-php', '23840677'), + logoUrl: '/images/offices/hdf.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afuphautsdefrance8344', + blog: 'https://hdf.afup.org', twitter: 'afup_hdf', linkedin: 'afup-hdf', bluesky: 'hdf.afup.org', ), - new Map( - false, - LegendAttachment::Left, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Left, + firstCity: new City( new Point(490, 55), new Point(530, 30), new Point(605, 20), new Position(50.637222, 3.063333), ), - new City( + secondCity: new City( new Point(490, 55), new Point(530, 30), new Point(460, 110), new Position(49.894054, 2.295847), ), ), - ['59', '80'], + departments: ['59', '80'], )); $this->add(new Antenne( - 'luxembourg', - 'Luxembourg', - new Meetup('afup-luxembourg-php', '19631843'), - '/images/offices/luxembourg.svg', - new Socials( + code: 'luxembourg', + label: 'Luxembourg', + meetup: new Meetup('afup-luxembourg-php', '19631843'), + logoUrl: '/images/offices/luxembourg.svg', + socials: new Socials( blog: 'https://luxembourg.afup.org', twitter: 'afup_luxembourg', + linkedin: 'afup-luxembourg', ), - new Map( - false, - LegendAttachment::Left, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Left, + firstCity: new City( new Point(630, 130), new Point(660, 140), new Point(717, 140), new Position(49.61, 6.13333), ), ), - null, - ['lux'], + pays: ['lux'], )); $this->add(new Antenne( - 'lyon', - 'Lyon', - new Meetup('afup-lyon-php', '19630036'), - '/images/offices/lyon.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UCSHpe_EYwK0ZhitIJPGSjlQ', + code: 'lyon', + label: 'Lyon', + meetup: new Meetup('afup-lyon-php', '19630036'), + logoUrl: '/images/offices/lyon.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afuplyon', blog: 'https://lyon.afup.org', twitter: 'AFUP_Lyon', linkedin: 'afup-lyon', bluesky: 'lyon.afup.org', ), - new Map( - false, - LegendAttachment::Left, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Left, + firstCity: new City( new Point(570, 380), new Point(680, 320), new Point(710, 320), new Position(45.759723, 4.842223), ), ), - ['69'], + departments: ['69'], )); $this->add(new Antenne( - 'marseille', - 'Aix-Marseille', - new Meetup('afup-aix-marseille-php', '18152912'), - '/images/offices/marseille.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UC77cQ1izl155u6Y8daMZYiA', + code: 'marseille', + label: 'Aix-Marseille', + meetup: new Meetup('afup-aix-marseille-php', '18152912'), + logoUrl: '/images/offices/marseille.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@AFUPAixMarseille', blog: 'https://aix-marseille.afup.org', twitter: 'AFUP_AixMrs', ), - new Map( - false, - LegendAttachment::Top, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Top, + firstCity: new City( new Point(600, 540), new Point(600, 600), new Point(600, 600), new Position(43.296346, 5.36988923), ), ), - ['13'], + departments: ['13'], )); $this->add(new Antenne( - 'montpellier', - 'Montpellier', - new Meetup('montpellier-php-meetup', '18724486'), - '/images/offices/montpellier.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UCr9f4-DksVhdv45q2245HeQ', + code: 'montpellier', + label: 'Montpellier', + meetup: new Meetup('montpellier-php-meetup', '18724486'), + logoUrl: '/images/offices/montpellier.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afupmontpellier6846', + blog: 'https://montpellier.afup.org', twitter: 'afup_mtp', linkedin: 'montpellier-afup', bluesky: 'montpellier.afup.org', ), - new Map( - false, - LegendAttachment::Top, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Top, + firstCity: new City( new Point(530, 520), new Point(470, 590), new Point(470, 670), new Position(43.611944, 3.877222), ), ), - ['34'], + departments: ['34'], )); $this->add(new Antenne( - 'nantes', - 'Nantes', - new Meetup('afup-nantes-php', '23839991'), - '/images/offices/nantes.svg', - new Socials( + code: 'nantes', + label: 'Nantes', + meetup: new Meetup('afup-nantes-php', '23839991'), + logoUrl: '/images/offices/nantes.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@AFUPNantes', blog: 'https://nantes.afup.org', twitter: 'afup_nantes', linkedin: 'afup-nantes', + bluesky: 'nantes.afup.org', ), - new Map( - true, - LegendAttachment::Right, - new City( + map: new Map( + useSecondColor: true, + legendAttachment: LegendAttachment::Right, + firstCity: new City( new Point(285, 290), new Point(180, 290), new Point(180, 290), new Position(47.21806, -1.55278), ), ), - ['44'], + departments: ['44'], )); $this->add(new Antenne( - 'paris', - 'Paris', - new Meetup('afup-paris-php', '19629965'), - '/images/offices/paris.svg', - new Socials( + code: 'paris', + label: 'Paris', + meetup: new Meetup('afup-paris-php', '19629965'), + logoUrl: '/images/offices/paris.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afupparis', + blog: 'https://paris.afup.org', twitter: 'afup_paris', + linkedin: 'afup-paris', bluesky: 'paris.afup.org', ), - new Map( - false, - LegendAttachment::Right, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Right, + firstCity: new City( new Point(460, 180), new Point(400, 60), new Point(360, 60), new Position(48.856578, 2.351828), ), ), - ['75', '77', '78', '91', '92', '93', '94', '95'], + departments: ['75', '77', '78', '91', '92', '93', '94', '95'], )); $this->add(new Antenne( - 'poitiers', - 'Poitiers', - new Meetup('afup-poitiers-php', '23106095'), - '/images/offices/poitiers.svg', - new Socials( + code: 'poitiers', + label: 'Poitiers', + meetup: new Meetup('afup-poitiers-php', '23106095'), + logoUrl: '/images/offices/poitiers.svg', + socials: new Socials( + blog: 'https://poitiers.afup.org', twitter: 'afup_poitiers', linkedin: 'afup-poitiers', bluesky: 'poitiers.afup.org', ), - new Map( - false, - LegendAttachment::Right, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Right, + firstCity: new City( new Point(365, 330), new Point(285, 360), new Point(180, 360), new Position(46.581945, 0.336112), ), ), - ['86'], + departments: ['86'], )); $this->add(new Antenne( - 'reims', - 'Reims', - new Meetup('afup-reims-php', '23255694'), - '/images/offices/reims.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UCmkMmVqrt7eI7YMZovew_xw', + code: 'reims', + label: 'Reims', + meetup: new Meetup('afup-reims-php', '23255694'), + logoUrl: '/images/offices/reims.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afupreims5347', twitter: 'afup_reims', ), - new Map( - false, - LegendAttachment::Left, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Left, + firstCity: new City( new Point(540, 150), new Point(600, 70), new Point(650, 70), new Position(49.26278, 4.03472), ), ), - ['51'], + departments: ['51'], )); $this->add(new Antenne( - 'rennes', - 'Rennes', - new Meetup('afup-rennes', '22364687'), - '/images/offices/rennes.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UCv1VGfqKhygjTOZkdVUWfpQ', + code: 'rennes', + label: 'Rennes', + meetup: new Meetup('afup-rennes', '22364687'), + logoUrl: '/images/offices/rennes.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afuprennes7058', blog: 'https://rennes.afup.org', twitter: 'AFUP_Rennes', linkedin: 'afup-rennes', ), - new Map( - false, - LegendAttachment::Bottom, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Bottom, + firstCity: new City( new Point(285, 220), new Point(150, 220), new Point(120, 170), new Position(48.114722, -1.679444), ), ), - ['35'], + departments: ['35'], )); $this->add(new Antenne( - 'toulouse', - 'Toulouse', - new Meetup('aperophp-toulouse', '19947513'), - '/images/offices/toulouse.svg', - new Socials( + code: 'toulouse', + label: 'Toulouse', + meetup: new Meetup('aperophp-toulouse', '19947513'), + logoUrl: '/images/offices/toulouse.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afuptoulouse3302', blog: 'https://toulouse.afup.org', twitter: 'afup_toulouse', - linkedin: 'https://www.linkedin.com/company/afup-toulouse/', + linkedin: 'afup-toulouse', ), - new Map( - false, - LegendAttachment::Top, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Top, + firstCity: new City( new Point(420, 520), new Point(290, 590), new Point(290, 600), new Position(43.604482, 1.443962), ), ), - ['31'], + departments: ['31'], )); $this->add(new Antenne( - 'lorraine', - 'Lorraine', - new Meetup('afup-lorraine-php', '26854931'), - '/images/offices/lorraine.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UC08QRZncvlgWxUbVbmUs42Q', + code: 'lorraine', + label: 'Lorraine', + meetup: new Meetup('afup-lorraine-php', '26854931'), + logoUrl: '/images/offices/lorraine.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afuplorraine', + blog: 'https://lorraine.afup.org', twitter: 'AFUP_Lorraine', linkedin: 'afup-lorraine', bluesky: 'lorraine.afup.org', ), - new Map( - false, - LegendAttachment::Left, - new City( - new Point(650, 160), - new Point(700, 220), - new Point(740, 220), - new Position(49.0685, 6.6151), + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Left, + firstCity: new City( // Nancy + new Point(630, 190), + new Point(680, 250), + new Point(720, 250), + new Position(48.6921, 6.1844), + ), + secondCity: new City( // Metz + new Point(630, 140), + new Point(680, 200), + new Point(720, 200), + new Position(49.1193, 6.1757), ), ), - ['54', '55', '57', '88'], + departments: ['54', '55', '57', '88'], )); $this->add(new Antenne( - 'clermont', - 'Clermont', - null, - '/images/offices/empty.svg', - new Socials(), - null, - null, - null, - true, + code: 'clermont', + label: 'Clermont', + meetup: null, + logoUrl: '/images/offices/empty.svg', + socials: new Socials(), + map: null, + hideOnOfficesPage: true, )); $this->add(new Antenne( - 'tours', - 'Tours', - new Meetup('afup-tours-php', '28638984'), - '/images/offices/tours.svg', - new Socials( - youtube: 'https://www.youtube.com/channel/UCtKhGIofgKM9ecrdZNyn_pA', + code: 'tours', + label: 'Tours', + meetup: new Meetup('afup-tours-php', '28638984'), + logoUrl: '/images/offices/tours.svg', + socials: new Socials( + youtube: 'https://www.youtube.com/@afuptours6345', blog: 'https://tours.afup.org', twitter: 'AFUP_Tours', linkedin: 'afup-tours', ), - new Map( - false, - LegendAttachment::Right, - new City( + map: new Map( + useSecondColor: false, + legendAttachment: LegendAttachment::Left, + firstCity: new City( new Point(380, 270), new Point(240, 90), new Point(200, 90), new Position(47.380001068115234, 0.6899999976158142), ), ), - [''], + departments: ['37'], )); } } diff --git a/tests/behat/features/Admin/Antennes/List.feature b/tests/behat/features/Admin/Antennes/List.feature index 27175e69c..ae8b74e1c 100644 --- a/tests/behat/features/Admin/Antennes/List.feature +++ b/tests/behat/features/Admin/Antennes/List.feature @@ -14,7 +14,7 @@ Feature: Administration - Partie Antennes And the "tr[data-qa='antenne-lyon']" element should contain "youtube.com" And the "tr[data-qa='antenne-luxembourg']" element should contain "twitter.com" - And the "tr[data-qa='antenne-nantes']" element should not contain "youtube.com" + And the "tr[data-qa='antenne-nantes']" element should contain "youtube.com" And the "tr[data-qa='antenne-montpellier']" element should contain "Active" And the "tr[data-qa='antenne-clermont']" element should contain "Inactive"