Skip to content

Commit

Permalink
Refactor de la liste des antennes en DTOs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mopolo
Mopolo committed Feb 12, 2025
1 parent 0299660 commit 25a3898
Show file tree
Hide file tree
Showing 30 changed files with 871 additions and 690 deletions.
9 changes: 5 additions & 4 deletions app/Resources/views/admin/members/user_list.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
{% for user in users %}
{% set isActive = user.status == constant('AppBundle\\Association\\Model\\User::STATUS_ACTIVE') %}
{% set isPending = user.status == constant('AppBundle\\Association\\Model\\User::STATUS_PENDING') %}
Expand All @@ -102,11 +103,11 @@
{% endif %}
</td>
<td class="{% if isActive %}actif{% else %}disabled{% endif %}">
{% if user.nearestOffice in offices|keys %}
{% if user.nearestOffice in antennes|keys %}
<span class="ui image label">
<img src="{{ offices[user.nearestOffice].logo_url }}">
{{ offices[user.nearestOffice].label }}
</span>
<img src="{{ antennes[user.nearestOffice].logoUrl }}" />
{{ antennes[user.nearestOffice].label }}
</span>
{% endif %}
</td>
<td style="text-align: right">
Expand Down
6 changes: 3 additions & 3 deletions app/Resources/views/site/company_public_profile.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@

<h2>Présente dans les antennes</h2>
<div class="container">
{% for local_office in offices %}
{% for antenne in antennes %}
<div class="col-md-3 col-sm-12 member-badge">
<img src="{{ local_office.logo_url }}" alt="" /><br />
{{ local_office.label }}
<img src="{{ antenne.logoUrl }}" alt="" /><br />
{{ antenne.label }}
</div>
{% else %}
<div class="col-md-12">
Expand Down
82 changes: 42 additions & 40 deletions app/Resources/views/site/offices.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,80 +338,82 @@
<h2>Liste des antennes</h2>
<div class="super-apero-officies">
<div class="container">
{% for office_code, office in offices %}
{% for antenne in antennes %}
<div class="col-md-6 afup-office"
data-map-key="{{ office_code }}"
{% if office.map is defined %}
data-map-legend-first-point-x="{{ office.map['legend-first-point-x'] }}"
data-map-legend-first-point-y="{{ office.map['legend-first-point-y'] }}"
data-map-legend-second-point-x="{{ office.map['legend-second-point-x'] }}"
data-map-legend-second-point-y="{{ office.map['legend-second-point-y'] }}"
data-map-legend-third-point-x="{{ office.map['legend-third-point-x'] }}"
data-map-legend-third-point-y="{{ office.map['legend-third-point-y'] }}"
data-map-legend-attachment="{{ office.map['legend-attachment'] }}"
data-map-point-latitude="{{ office.map['point-latitude'] }}"
data-map-point-longitude="{{ office.map['point-longitude'] }}"
{% if office.map['legend-second-city-first-point-x'] is defined %}data-map-legend-second-city-first-point-x="{{ office.map['legend-second-city-first-point-x'] }}"{% endif %}
{% if office.map['legend-second-city-first-point-y'] is defined %}data-map-legend-second-city-first-point-y="{{ office.map['legend-second-city-first-point-y'] }}"{% endif %}
{% if office.map['legend-second-city-second-point-x'] is defined %}data-map-legend-second-city-second-point-x="{{ office.map['legend-second-city-second-point-x'] }}"{% endif %}
{% if office.map['legend-second-city-second-point-y'] is defined %}data-map-legend-second-city-second-point-y="{{ office.map['legend-second-city-second-point-y'] }}"{% endif %}
{% if office.map['legend-second-city-third-point-x'] is defined %}data-map-legend-second-city-third-point-x="{{ office.map['legend-second-city-third-point-x'] }}"{% endif %}
{% if office.map['legend-second-city-third-point-y'] is defined %}data-map-legend-second-city-third-point-y="{{ office.map['legend-second-city-third-point-y'] }}"{% endif %}
{% if office.map['point-second-city-latitude'] is defined %}data-map-second-city-point-latitude="{{ office.map['point-second-city-latitude'] }}"{% endif %}
{% if office.map['point-second-city-longitude'] is defined %}data-map-second-city-point-longitude="{{ office.map['point-second-city-longitude'] }}"{% endif %}
data-map-key="{{ antenne.code }}"
{% if antenne.map is defined %}
data-map-legend-first-point-x="{{ antenne.map.firstCity.firstPoint.x }}"
data-map-legend-first-point-y="{{ antenne.map.firstCity.firstPoint.y }}"
data-map-legend-second-point-x="{{ antenne.map.firstCity.secondPoint.x }}"
data-map-legend-second-point-y="{{ antenne.map.firstCity.secondPoint.y }}"
data-map-legend-third-point-x="{{ antenne.map.firstCity.thirdPoint.x }}"
data-map-legend-third-point-y="{{ antenne.map.firstCity.thirdPoint.y }}"
data-map-legend-attachment="{{ antenne.map.legendAttachment }}"
data-map-point-latitude="{{ antenne.map.firstCity.position.latitude }}"
data-map-point-longitude="{{ antenne.map.firstCity.position.longitude }}"
{% if antenne.map.secondCity is not null %}
data-map-legend-second-city-first-point-x="{{ antenne.map.secondCity.firstPoint.x }}"
data-map-legend-second-city-first-point-y="{{ antenne.map.secondCity.firstPoint.y }}"
data-map-legend-second-city-second-point-x="{{ antenne.map.secondCity.secondPoint.x }}"
data-map-legend-second-city-second-point-y="{{ antenne.map.secondCity.secondPoint.y }}"
data-map-legend-second-city-third-point-x="{{ antenne.map.secondCity.thirdPoint.x }}"
data-map-legend-second-city-third-point-y="{{ antenne.map.secondCity.thirdPoint.y }}"
data-map-second-city-point-latitude="{{ antenne.map.secondCity.position.latitude }}"
data-map-second-city-point-longitude="{{ antenne.map.secondCity.position.longitude }}"
{% endif %}
{% endif %}
{% if office.departements is defined %}
data-departements="{{ office.departements|join(',') }}"
{% if antenne.departements is defined %}
data-departements="{{ antenne.departements|join(',') }}"
{% endif %}
{% if office.pays is defined %}
data-pays="{{ office.pays|join(',') }}"
{% if antenne.pays is defined %}
data-pays="{{ antenne.pays|join(',') }}"
{% endif %}
{% if office.map_use_second_color is defined%}
{% if antenne.map.useSecondColor %}
data-use-second-color="1"
{% endif %}
>
<div class="container">
<div class="col-md-2">
<img src="{{ office.logo_url }}" alt="" />
<img src="{{ antenne.logoUrl }}" alt="" />
</div>
<div class="col-md-10">
<h3>{{ office.label }}</h3>
<h3>{{ antenne.label }}</h3>
</div>
</div>
<div class="container">
<div class="row">
{% if office.blog_url is defined %}
<a class="button-inverted" href="{{ office.blog_url }}">
{% if antenne.socials.blog is not null %}
<a class="button-inverted" href="{{ antenne.socials.blog }}">
<i class="fa fa-rss" aria-hidden="true"></i>&nbsp;Blog
</a>
{% endif %}

{% if office.twitter is defined %}
<a class="button-inverted" href="https://twitter.com/{{ office.twitter }}">
{% if antenne.socials.twitter is not null %}
<a class="button-inverted" href="https://twitter.com/{{ antenne.socials.twitter }}">
<i class="fa fa-twitter" aria-hidden="true"></i>&nbsp;Twitter
</a>
{% endif %}

{% if office.linkedin is defined %}
<a class="button-inverted" href="https://www.linkedin.com/company/{{ office.linkedin }}">
{% if antenne.socials.linkedin is not null %}
<a class="button-inverted" href="https://www.linkedin.com/company/{{ antenne.socials.linkedin }}">
<i class="fa fa-linkedin" aria-hidden="true"></i>&nbsp;LinkedIn
</a>
{% endif %}

{% if office.bluesky is defined %}
<a class="button-inverted" href="https://bsky.app/profile/{{ office.bluesky }}">
{% if antenne.socials.bluesky is not null %}
<a class="button-inverted" href="https://bsky.app/profile/{{ antenne.socials.bluesky }}">
<svg style="height:15px; fill:#415e96;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M111.8 62.2C170.2 105.9 233 194.7 256 242.4c23-47.6 85.8-136.4 144.2-180.2c42.1-31.6 110.3-56 110.3 21.8c0 15.5-8.9 130.5-14.1 149.2C478.2 298 412 314.6 353.1 304.5c102.9 17.5 129.1 75.5 72.5 133.5c-107.4 110.2-154.3-27.6-166.3-62.9l0 0c-1.7-4.9-2.6-7.8-3.3-7.8s-1.6 3-3.3 7.8l0 0c-12 35.3-59 173.1-166.3 62.9c-56.5-58-30.4-116 72.5-133.5C100 314.6 33.8 298 15.7 233.1C10.4 214.4 1.5 99.4 1.5 83.9c0-77.8 68.2-53.4 110.3-21.8z"/></svg> Bluesky
</a>
{% endif %}

{% if office.meetup_urlname is defined %}
<a class="button-inverted" href="https://www.meetup.com/fr-FR/{{ office.meetup_urlname }}">
{% if antenne.meetup is not null %}
<a class="button-inverted" href="https://www.meetup.com/fr-FR/{{ antenne.meetup.urlName }}">
<i class="fa fa-meetup" aria-hidden="true"></i>&nbsp;Meetup
</a>
{% endif %}
{% if office.youtube is defined %}
<a class="button-inverted" href="{{ office.youtube }}">

{% if antenne.socials.youtube is not null %}
<a class="button-inverted" href="{{ antenne.socials.youtube }}">
<i class="fa fa-youtube" aria-hidden="true"></i>&nbsp;Youtube
</a>
{% endif %}
Expand Down
12 changes: 6 additions & 6 deletions app/Resources/views/site/talks/list.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@

<div class="super-apero-officies">
<div class="container">
{% for office_code, office in offices %}
{% if office.youtube is defined %}
{% for antenne in antennes %}
{% if antenne.socials.youtube is not null %}
<div class="col-md-6 afup-office">
<div class="container">
<div class="col-sm-12 col-md-2 txtcenter">
<img src="{{ office.logo_url }}" alt="" />
<img src="{{ antenne.logoUrl }}" alt="" />
</div>
<div class="col-sm-12 col-md-5 txtcenter">
<h3 style="line-height: 4em; vertical-align: center">{{ office.label }}</h3>
<h3 style="line-height: 4em; vertical-align: center">{{ antenne.label }}</h3>
</div>
<div class="col-sm-12 col-md-5 txtcenter">
<a class="button-inverted" href="{{ office.youtube }}">
<i class="fa fa-youtube" aria-hidden="true"></i>&nbsp;Youtube
<a class="button-inverted" href="{{ antenne.socials.youtube }}">
<i class="fa fa-youtube" aria-hidden="true"></i>&nbsp;YouTube
</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/config/services.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ services:
AppBundle\Association\Factory\UserFactory:
autowire: true

AppBundle\Offices\OfficesCollection:
AppBundle\Antennes\AntennesCollection:
autowire: true

AppBundle\Mailchimp\EventEventSubscriber:
Expand Down
52 changes: 52 additions & 0 deletions sources/AppBundle/Antennes/Antenne.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?php

declare(strict_types=1);

namespace AppBundle\Antennes;

/**
* @readonly
*/
final class Antenne
{
public string $code;
public string $label;
public ?Meetup $meetup;
public string $logoUrl;
public Socials $socials;
public ?Map $map;

/** @var array<string>|null */
public ?array $departments;

/** @var array<string>|null */
public ?array $pays;

public bool $hideOnOfficesPage;

/**
* @param string[] $departments
* @param string[]|null $pays
*/
public function __construct(
string $code,
string $label,
?Meetup $meetup,
string $logoUrl,
Socials $socials,
?Map $map,
?array $departments = null,
?array $pays = null,
bool $hideOnOfficesPage = false
) {
$this->code = $code;
$this->label = $label;
$this->meetup = $meetup;
$this->logoUrl = $logoUrl;
$this->socials = $socials;
$this->map = $map;
$this->hideOnOfficesPage = $hideOnOfficesPage;
$this->departments = $departments;
$this->pays = $pays;
}
}
Loading

0 comments on commit 25a3898

Please sign in to comment.