Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Formulaire signalement usager] Affichage des entreprises labellisées pour les territoires inactifs #353

Merged
merged 7 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ import './controllers/component_file_auto_submit';
import './controllers/list_signalement';
import './controllers/list_entreprises';
import './controllers/list_employes';
import './controllers/list_entreprises_publiques';

import './controllers/weekly_slider';
16 changes: 13 additions & 3 deletions assets/controllers/form_signalement_front.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ class PunaisesFrontSignalementController {
CLOSED_STEP_LIST = [
'home',
'info_usager',
'autotraitement_info',
'autotraitement_sent',
];
SOCIAL_STEP_LIST = [
'home',
Expand All @@ -59,6 +57,11 @@ class PunaisesFrontSignalementController {
init() {
self = this;
$('.btn-next').on('click', function(){
if (!self.isTerritoryOpen && self.stepStr === 'info_usager') {
self.submitAdd();
return;
}

self.refreshStep(1);
});
$('.btn-next-next').on('click', function(){
Expand Down Expand Up @@ -588,6 +591,7 @@ class PunaisesFrontSignalementController {
}

submitAdd() {
$('.front-signalement #step-info_usager .btn-next').attr('disabled', 'disabled');
$('.front-signalement #step-professionnel_info .btn-next-next').attr('disabled', 'disabled');
$('.front-signalement #step-autotraitement_info .btn-next-next').attr('disabled', 'disabled');
if (self.isLogementSocial) {
Expand All @@ -603,8 +607,14 @@ class PunaisesFrontSignalementController {
processData:false,

success: function() {
if (!self.isTerritoryOpen) {
let codePostal = $('input#code-postal').val();
window.location.href = $('input#url-entreprises-publiques').val() + codePostal;
return;
}

let nbStep = 2;
if (!self.isTerritoryOpen || self.isLogementSocial) {
if (self.isLogementSocial) {
nbStep = 1;
}
self.refreshStep(nbStep);
Expand Down
13 changes: 13 additions & 0 deletions assets/controllers/list_entreprises_publiques.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import $ from 'jquery';

$(function() {
if ($('select#select-entreprises-order').length > 0) {
startListeEntreprisesPubliquesApp();
}
});

function startListeEntreprisesPubliquesApp() {
$('select#select-entreprises-order').on('change', function() {
window.location.href = $('select#select-entreprises-order').data('redirect') + '&order=' + $('select#select-entreprises-order').val()
});
}
4 changes: 4 additions & 0 deletions assets/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -929,4 +929,8 @@ span.image-caption {

.leaflet-control-zoom a {
background-image: none !important;
}

.fr-links-group.display-list-block > li {
display: block;
}
2 changes: 2 additions & 0 deletions config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ doctrine:
string_functions:
YEAR: DoctrineExtensions\Query\Mysql\Year
DATEDIFF: DoctrineExtensions\Query\Mysql\DateDiff
numeric_functions:
rand: DoctrineExtensions\Query\Mysql\Rand

when@test:
doctrine:
Expand Down
26 changes: 26 additions & 0 deletions migrations/Version20231002145606.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

declare(strict_types=1);

namespace DoctrineMigrations;

use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;

final class Version20231002145606 extends AbstractMigration
{
public function getDescription(): string
{
return 'add entity entreprise_publique';
}

public function up(Schema $schema): void
{
$this->addSql('CREATE TABLE entreprise_publique (id INT AUTO_INCREMENT NOT NULL, nom VARCHAR(255) NOT NULL, adresse VARCHAR(255) NOT NULL, url VARCHAR(255) DEFAULT NULL, telephone VARCHAR(255) DEFAULT NULL, zip VARCHAR(3) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB');
}

public function down(Schema $schema): void
{
$this->addSql('DROP TABLE entreprise_publique');
}
}
5 changes: 5 additions & 0 deletions scripts/upload-s3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ else
aws s3 cp data/signalement/signalements_${uuid}.csv s3://${BUCKET_URL}/csv/ ${debug}
aws s3 ls s3://${BUCKET_URL}/csv/signalements_${uuid}.csv
;;
"entreprisespubliques")
echo "Upload entreprises.csv to cloud..."
aws s3 cp data/entreprises.csv s3://${BUCKET_URL}/csv/ ${debug}
aws s3 ls s3://${BUCKET_URL}/csv/entreprises.csv
;;
*)
echo "Invalid argument. Please use 'grid' or 'signalement' or 'image' or 'mapping-doc' or 'process-all'"
;;
Expand Down
217 changes: 217 additions & 0 deletions src/Command/GetEntreprisePubliqueCommand.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
<?php

namespace App\Command;

use App\Service\Import\CsvParser;
use App\Service\Import\EntreprisePublique\EntreprisePubliqueImportLoader;
use App\Service\Upload\UploadHandlerService;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\NonUniqueResultException;
use DOMDocument;
use DOMXPath;
use League\Flysystem\FilesystemException;
use League\Flysystem\FilesystemOperator;
use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;

#[AsCommand(
name: 'app:get-entreprise-publique',
description: 'Get entreprise publique to csv file',
)]
class GetEntreprisePubliqueCommand extends Command
{
private const DISTANT_URL = 'https://cs3d-expertise-punaises.fr/zone/';
private const SLUGS = [
'01' => '01-ain',
'02' => '02-aisne',
'03' => '03-allier',
'04' => '04-alpes-de-haute-provence',
'05' => '05-hautes-alpes',
'06' => '06-alpes-maritimes',
'07' => '07-ardeche',
'08' => '08-ardennes',
'09' => '09-ariege',
'10' => '10-aube',
'11' => '11-aude',
'12' => '12-aveyron',
'13' => '13-bouches-du-rhone',
'14' => '14-calvados',
'15' => '15-cantal',
'16' => '16-charente',
'17' => '17-charente-maritime',
'18' => '18-cher',
'19' => '19-correze',
'21' => '21-cote-dor',
'22' => '22-cotes-darmor',
'23' => '23-creuse',
'24' => '24-dordogne',
'25' => '25-doubs',
'26' => '26-drome',
'27' => '27-eure',
'28' => '28-eure-et-loir',
'29' => '29-finistere',
'2A' => '2a-corse-du-sud',
'2B' => '2b-haute-corse',
'30' => '30-gard',
'31' => '31-haute-garonne',
'32' => '32-gers',
'33' => '33-gironde',
'34' => '34-herault',
'35' => '35-ille-et-vilaine',
'36' => '36-indre',
'37' => '37-indre-et-loire',
'38' => '38-isere',
'39' => '39-jura',
'40' => '40-landes',
'41' => '41-loir-et-cher',
'42' => '42-loire',
'43' => '43-haute-loire',
'44' => '44-loire-atlantique',
'45' => '45-loiret',
'46' => '46-lot',
'47' => '47-lot-et-garonne',
'48' => '48-lozere',
'49' => '49-maine-et-loire',
'50' => '50-manche',
'51' => '51-marne',
'52' => '52-haute-marne',
'53' => '53-mayenne',
'54' => '54-meurthe-et-moselle',
'55' => '55-meuse',
'56' => '56-morbihan',
'57' => '57-moselle',
'58' => '58-nievre',
'59' => '59-nord',
'60' => '60-oise',
'61' => '61-orne',
'62' => '62-pas-de-calais',
'63' => '63-puy-de-dome',
'64' => '64-pyrenees-atlantiques',
'65' => '65-hautes-pyrenees',
'66' => '66-pyrenees-orientales',
'67' => '67-bas-rhin',
'68' => '68-haut-rhin',
'69' => '69-rhone',
'70' => '70-haute-saone',
'71' => '71-saone-et-loire',
'72' => '72-sarthe',
'73' => '73-savoie',
'74' => '74-haute-savoie',
'75' => '75-paris',
'76' => '76-seine-maritime',
'77' => '77-seine-et-marne',
'78' => '78-yvelines',
'79' => '79-deux-sevres',
'80' => '80-somme',
'81' => '81-tarn',
'82' => '82-tarn-et-garonne',
'83' => '83-var',
'84' => '84-vaucluse',
'85' => '85-vendee',
'86' => '86-vienne',
'87' => '87-haute-vienne',
'88' => '88-vosges',
'89' => '89-yonne',
'90' => '90-territoire-de-belfort',
'91' => '91-essonne',
'92' => '92-hauts-de-seine',
'93' => '93-seine-st-denis',
'94' => '94-val-de-marne',
'95' => '95-val-doise',
'971' => '971-guadeloupe',
'972' => '972-martinique',
'973' => '973-guyane',
'974' => '974-la-reunion',
'976' => '976-mayotte',
];

public function __construct(
private CsvParser $csvParser,
private ParameterBagInterface $parameterBag,
private EntityManagerInterface $entityManager,
private FilesystemOperator $fileStorage,
private UploadHandlerService $uploadHandlerService,
private EntreprisePubliqueImportLoader $entreprisePubliqueImportLoader,
) {
parent::__construct();
}

/**
* @throws FilesystemException
* @throws NonUniqueResultException
*/
protected function execute(InputInterface $input, OutputInterface $output): int
{
$io = new SymfonyStyle($input, $output);

$dataToSave = [];
foreach (self::SLUGS as $zip => $slug) {
$this->parseUrl($dataToSave, $zip, $slug);
}

$csvFileName = $this->parameterBag->get('uploads_tmp_dir').'entreprises.csv';
$file = fopen($csvFileName, 'w');
$entete = ['zip', 'nom', 'adresse', 'url', 'telephone'];
fputcsv($file, $entete);
foreach ($dataToSave as $row) {
fputcsv($file, $row);
}
fclose($file);

return Command::SUCCESS;
}

private function parseUrl(array &$dataToSave, $zip, $slug)
{
$htmlContent = file_get_contents(self::DISTANT_URL.$slug.'/');

libxml_use_internal_errors(true);
$dom = new DOMDocument();
$dom->loadHTML($htmlContent);
$xpath = new DOMXPath($dom);
$postsDiv = $xpath->query('//div[@id="posts"]')->item(0);
if ($postsDiv) {
$childDivs = $xpath->query('./div', $postsDiv);

foreach ($childDivs as $childDiv) {
$h1Query = $xpath->query('.//h1', $childDiv);
if ($h1Query->item(0)) {
$entrepriseItem = [
'zip' => $zip,
'nom' => '',
'adresse' => '',
'url' => '',
'telephone' => '',
];

$name = $h1Query->item(0)->textContent;
$entrepriseItem['nom'] = $name;

$locationQuery = $xpath->query('.//li[@class="location"]//a', $childDiv);
if ($locationQuery->item(0)) {
$location = $locationQuery->item(0)->textContent;
$entrepriseItem['adresse'] = $location;
}

$websiteQuery = $xpath->query('.//li[@class="website"]/a', $childDiv);
if ($websiteQuery->item(0)) {
$websiteLink = $websiteQuery->item(0)->getAttribute('href');
$entrepriseItem['url'] = $websiteLink;
}

$telephoneQuery = $xpath->query('.//li[@class="telephone"]', $childDiv);
if ($telephoneQuery->item(0)) {
$telephone = $telephoneQuery->item(0)->getAttribute('data-tel');
$entrepriseItem['telephone'] = $telephone;
}

$dataToSave[] = $entrepriseItem;
}
}
}
}
}
Loading
Loading