fix merge request conflict for improve address

2025-06-07 18:44:08 +00:00 · 2021-10-20 15:52:22 +02:00 · 2021-10-20 15:52:22 +02:00 · d1e2257db6
commit d1e2257db6
parent 4f21c7f219 31fd9cee57
4 changed files with 21 additions and 42 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -31,6 +31,8 @@ and this project adheres to

 * Address: zoom on postal code geometry + fix origin of manually entered postal code

+* in the Address vue component, order the postal code and street address by alphabetic and numeric order
+
 * add 3 new fields to PostalCode and adapt postal code command and fixtures

 * [Aside activity] Fixes for aside activity
--- a/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
+++ b/src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php
@ -3,6 +3,7 @@
 namespace Chill\MainBundle\Controller;

 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
 use Symfony\Component\HttpFoundation\Request;

 /**
@ -22,6 +23,15 @@ class AddressReferenceAPIController extends ApiController
               ->setParameter('postal_code', $request->query->get('postal_code'));
            
        }
+ 
+    }
+
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator, $_format)
+    {
+        $query->addOrderBy('e.street', 'ASC');
+        $query->addOrderBy('e.streetNumber', 'ASC');
+
+        return $query;
    }

 }
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@ -135,7 +135,6 @@ EOF;
 85110,ST VINCENT STERLANGES,FR,85276,46.7397220689,-1.08371759277,INSEE
 85110,SIGOURNAIS,FR,85282,46.7140097406,-0.98747730882,INSEE
 85110,CHANTONNAY,FR,85051,46.6690167793,-1.04372588019,INSEE
-85110,CHANTONNAY,FR,85051,46.6690167793,-1.04372588019,INSEE
 85110,ST PROUANT,FR,85266,46.7502017421,-0.974504061491,INSEE
 85120,LA CHAPELLE AUX LYS,FR,85053,46.6221916887,-0.642706103195,INSEE
 85120,VOUVANT,FR,85305,46.5626835135,-0.764380170382,INSEE
@ -156,11 +155,8 @@ EOF;
 85130,ST AUBIN DES ORMEAUX,FR,85198,46.9958175597,-1.04216568722,INSEE
 85140,ESSARTS EN BOCAGE,FR,85084,46.7806739038,-1.22925967851,INSEE
 85140,LA MERLATIERE,FR,85142,46.7557703112,-1.29794577,INSEE
-85140,ESSARTS EN BOCAGE,FR,85084,46.7806739038,-1.22925967851,INSEE
-85140,ESSARTS EN BOCAGE,FR,85084,46.7806739038,-1.22925967851,INSEE
 85140,ST MARTIN DES NOYERS,FR,85246,46.7239461187,-1.20379080965,INSEE
 85140,CHAUCHE,FR,85064,46.8282791899,-1.27090860656,INSEE
-85140,ESSARTS EN BOCAGE,FR,85084,46.7806739038,-1.22925967851,INSEE
 85150,ST MATHURIN,FR,85250,46.5686332748,-1.70787622288,INSEE
 85150,MARTINET,FR,85138,46.6620680463,-1.6772013304,INSEE
 85150,STE FLAIVE DES LOUPS,FR,85211,46.611019489,-1.58031627863,INSEE
@ -170,14 +166,12 @@ EOF;
 85150,LE GIROUARD,FR,85099,46.5726064909,-1.58872487716,INSEE
 85150,LANDERONDE,FR,85118,46.6549237031,-1.57351777893,INSEE
 85150,LES ACHARDS,FR,85152,46.6163645636,-1.65038156849,INSEE
-85150,LES ACHARDS,FR,85152,46.6163645636,-1.65038156849,INSEE
 85150,VAIRE,FR,85298,46.6055340621,-1.74863672042,INSEE
 85160,ST JEAN DE MONTS,FR,85234,46.8021968737,-2.04839789308,INSEE
 85170,BELLEVIGNY,FR,85019,46.7756383534,-1.43313700054,INSEE
 85170,LE POIRE SUR VIE,FR,85178,46.769919754,-1.50488626452,INSEE
 85170,BEAUFOU,FR,85015,46.8191122027,-1.52479250801,INSEE
 85170,DOMPIERRE SUR YON,FR,85081,46.7599858068,-1.37275519417,INSEE
-85170,BELLEVIGNY,FR,85019,46.7756383534,-1.43313700054,INSEE
 85170,LES LUCS SUR BOULOGNE,FR,85129,46.8527299002,-1.48398928084,INSEE
 85170,ST DENIS LA CHEVASSE,FR,85208,46.8325959261,-1.3830312677,INSEE
 85180,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
@ -191,14 +185,11 @@ EOF;
 85200,FONTENAY LE COMTE,FR,85092,46.4563186117,-0.793449510859,INSEE
 85200,MERVENT,FR,85143,46.5325327351,-0.748519927998,INSEE
 85200,DOIX LES FONTAINES,FR,85080,46.3849492327,-0.806840287485,INSEE
-85200,FONTENAY LE COMTE,FR,85092,46.4563186117,-0.793449510859,INSEE
 85200,LONGEVES,FR,85126,46.4722105292,-0.858917690239,INSEE
 85200,ST MARTIN DE FRAIGNEAU,FR,85244,46.4289052087,-0.758948963227,INSEE
 85200,SERIGNE,FR,85281,46.5054321828,-0.848819460581,INSEE
 85200,BOURNEAU,FR,85033,46.5476882922,-0.813838020265,INSEE
 85200,ST MICHEL LE CLOUCQ,FR,85256,46.4861591475,-0.743056336646,INSEE
-85200,AUCHAY SUR VENDEE,FR,85009,46.4474386161,-0.876574265149,INSEE
-85200,DOIX LES FONTAINES,FR,85080,46.3849492327,-0.806840287485,INSEE
 85200,MONTREUIL,FR,85148,46.3973419593,-0.840846860992,INSEE
 85200,L ORBRIE,FR,85167,46.4997145725,-0.77427886573,INSEE
 85210,ST JEAN DE BEUGNE,FR,85233,46.5196817523,-1.10826075013,INSEE
@ -238,12 +229,9 @@ EOF;
 85260,LA COPECHAGNIERE,FR,85072,46.8523980181,-1.34349746898,INSEE
 85260,L HERBERGEMENT,FR,85108,46.9166207979,-1.37033557148,INSEE
 85260,MONTREVERD,FR,85197,46.9277672307,-1.4126154924,INSEE
-85260,MONTREVERD,FR,85197,46.9277672307,-1.4126154924,INSEE
-85260,MONTREVERD,FR,85197,46.9277672307,-1.4126154924,INSEE
 85260,LES BROUZILS,FR,85038,46.8854235235,-1.33186892233,INSEE
 85270,NOTRE DAME DE RIEZ,FR,85189,46.7532179022,-1.8935292542,INSEE
 85270,ST HILAIRE DE RIEZ,FR,85226,46.7432732188,-1.96439228965,INSEE
-85270,ST HILAIRE DE RIEZ,FR,85226,46.7432732188,-1.96439228965,INSEE
 85280,LA FERRIERE,FR,85089,46.7215872927,-1.33469332327,INSEE
 85290,MORTAGNE SUR SEVRE,FR,85151,46.9910941319,-0.946500033344,INSEE
 85290,ST LAURENT SUR SEVRE,FR,85238,46.9506837971,-0.901123752328,INSEE
@ -254,8 +242,6 @@ EOF;
 85300,SALLERTAINE,FR,85280,46.8659054157,-1.94894081389,INSEE
 85310,LA CHAIZE LE VICOMTE,FR,85046,46.6729533879,-1.29188591019,INSEE
 85310,NESMY,FR,85160,46.5921936479,-1.40947698594,INSEE
-85310,LA CHAIZE LE VICOMTE,FR,85046,46.6729533879,-1.29188591019,INSEE
-85310,RIVES DE L YON,FR,85213,46.605637391,-1.3354497172,INSEE
 85310,RIVES DE L YON,FR,85213,46.605637391,-1.3354497172,INSEE
 85310,LE TABLIER,FR,85285,46.5596307281,-1.32788759657,INSEE
 85320,CHATEAU GUIBERT,FR,85061,46.5741109302,-1.25524886228,INSEE
@ -263,11 +249,9 @@ EOF;
 85320,ROSNAY,FR,85193,46.5324344973,-1.3007139449,INSEE
 85320,BESSAY,FR,85023,46.5397253861,-1.17028433093,INSEE
 85320,LA BRETONNIERE LA CLAYE,FR,85036,46.4879459421,-1.26773426545,INSEE
-85320,LA BRETONNIERE LA CLAYE,FR,85036,46.4879459421,-1.26773426545,INSEE
 85320,CORPE,FR,85073,46.5050234767,-1.17034425311,INSEE
 85320,MAREUIL SUR LAY DISSAIS,FR,85135,46.5335825488,-1.22688907859,INSEE
 85320,PEAULT,FR,85171,46.502029199,-1.22708559855,INSEE
-85320,MAREUIL SUR LAY DISSAIS,FR,85135,46.5335825488,-1.22688907859,INSEE
 85320,LA COUTURE,FR,85074,46.523938732,-1.26493227292,INSEE
 85320,MOUTIERS SUR LE LAY,FR,85157,46.5651677306,-1.16826489836,INSEE
 85320,STE PEXINE,FR,85261,46.5596018797,-1.12406235901,INSEE
@ -275,7 +259,6 @@ EOF;
 85340,L ILE D OLONNE,FR,85112,46.570163703,-1.7737502368,INSEE
 85340,LES SABLES D OLONNE,FR,85194,46.5007612799,-1.79255128677,INSEE
 85350,L ILE D YEU,FR,85113,46.7093514816,-2.34712702345,INSEE
-85350,L ILE D YEU,FR,85113,46.7093514816,-2.34712702345,INSEE
 85360,LA TRANCHE SUR MER,FR,85294,46.3564601605,-1.43136322126,INSEE
 85370,MOUZEUIL ST MARTIN,FR,85158,46.4591118412,-0.984449849889,INSEE
 85370,NALLIERS,FR,85159,46.4658962703,-1.03958611312,INSEE
@ -286,7 +269,6 @@ EOF;
 85390,CHAVAGNES LES REDOUX,FR,85066,46.7101499475,-0.915900131393,INSEE
 85390,CHEFFOIS,FR,85067,46.6786935635,-0.782949851125,INSEE
 85390,MOUILLERON ST GERMAIN,FR,85154,46.6612700667,-0.846784201071,INSEE
-85390,MOUILLERON ST GERMAIN,FR,85154,46.6612700667,-0.846784201071,INSEE
 85400,STE GEMME LA PLAINE,FR,85216,46.4732196212,-1.11103084694,INSEE
 85400,LAIROUX,FR,85117,46.4496842668,-1.27114022202,INSEE
 85400,LUCON,FR,85128,46.4510564854,-1.16449285012,INSEE
@ -294,7 +276,6 @@ EOF;
 85400,CHASNAIS,FR,85058,46.4459908481,-1.2385924923,INSEE
 85410,ST LAURENT DE LA SALLE,FR,85237,46.5854041653,-0.922177315485,INSEE
 85410,LA CAILLERE ST HILAIRE,FR,85040,46.6293907412,-0.933153931505,INSEE
-85410,LA CAILLERE ST HILAIRE,FR,85040,46.6293907412,-0.933153931505,INSEE
 85410,ST CYR DES GATS,FR,85205,46.572397925,-0.86344873853,INSEE
 85410,THOUARSAIS BOUILDROUX,FR,85292,46.6062740621,-0.873461023865,INSEE
 85410,CEZAIS,FR,85041,46.5917363748,-0.802618133558,INSEE
@ -310,20 +291,16 @@ EOF;
 85420,RIVES D AUTISE,FR,85162,46.424726987,-0.665995249042,INSEE
 85430,AUBIGNY LES CLOUZEAUX,FR,85008,46.6028241769,-1.46743549114,INSEE
 85430,NIEUL LE DOLENT,FR,85161,46.5676509922,-1.51560194548,INSEE
-85430,AUBIGNY LES CLOUZEAUX,FR,85008,46.6028241769,-1.46743549114,INSEE
 85430,LA BOISSIERE DES LANDES,FR,85026,46.5581861734,-1.44371985689,INSEE
 85440,ST HILAIRE LA FORET,FR,85231,46.4551155186,-1.53048160541,INSEE
 85440,TALMONT ST HILAIRE,FR,85288,46.475786445,-1.62751498166,INSEE
 85440,POIROUX,FR,85179,46.5107890457,-1.53929317556,INSEE
 85440,GROSBREUIL,FR,85103,46.5390090882,-1.6072005484,INSEE
 85440,AVRILLE,FR,85010,46.4744272125,-1.49524360118,INSEE
-85440,TALMONT ST HILAIRE,FR,85288,46.475786445,-1.62751498166,INSEE
 85450,CHAMPAGNE LES MARAIS,FR,85049,46.3735020647,-1.13380723653,INSEE
 85450,LA TAILLEE,FR,85286,46.3852513569,-0.941017792066,INSEE
 85450,CHAILLE LES MARAIS,FR,85042,46.3853555319,-1.01044079362,INSEE
-85450,CHAILLE LES MARAIS,FR,85042,46.3853555319,-1.01044079362,INSEE
 85450,VOUILLE LES MARAIS,FR,85304,46.3891941167,-0.968106001439,INSEE
-85450,CHAILLE LES MARAIS,FR,85042,46.3853555319,-1.01044079362,INSEE
 85450,MOREILLES,FR,85149,46.4218721314,-1.09404530407,INSEE
 85450,PUYRAVAULT,FR,85185,46.3653834101,-1.09115660367,INSEE
 85450,STE RADEGONDE DES NOYERS,FR,85267,46.3694246909,-1.06671995264,INSEE
@ -331,14 +308,10 @@ EOF;
 85460,L AIGUILLON SUR MER,FR,85001,46.304138479,-1.2623239198,INSEE
 85470,BRETIGNOLLES SUR MER,FR,85035,46.6374826705,-1.86324200464,INSEE
 85470,BREM SUR MER,FR,85243,46.6118566989,-1.81003917923,INSEE
-85470,BREM SUR MER,FR,85243,46.6118566989,-1.81003917923,INSEE
 85480,BOURNEZEAU,FR,85034,46.6296975315,-1.14101742229,INSEE
 85480,FOUGERE,FR,85093,46.6617881911,-1.23612691916,INSEE
 85480,ST HILAIRE LE VOUHIS,FR,85232,46.6859198669,-1.15222590884,INSEE
 85480,THORIGNY,FR,85291,46.6179795025,-1.24888057642,INSEE
-85480,BOURNEZEAU,FR,85034,46.6296975315,-1.14101742229,INSEE
-85490,BENET,FR,85020,46.368873213,-0.613959918706,INSEE
-85490,BENET,FR,85020,46.368873213,-0.613959918706,INSEE
 85490,BENET,FR,85020,46.368873213,-0.613959918706,INSEE
 85500,BEAUREPAIRE,FR,85017,46.9050210355,-1.10144867013,INSEE
 85500,ST PAUL EN PAREDS,FR,85259,46.8303789022,-0.964515191283,INSEE
@ -356,12 +329,10 @@ EOF;
 85540,ST VINCENT SUR GRAON,FR,85277,46.5034756656,-1.382954206,INSEE
 85540,LA JONCHERE,FR,85116,46.4358647401,-1.38517843312,INSEE
 85540,ST BENOIST SUR MER,FR,85201,46.4266286403,-1.3399129604,INSEE
-85540,ST VINCENT SUR GRAON,FR,85277,46.5034756656,-1.382954206,INSEE
 85540,CURZON,FR,85077,46.4512376923,-1.30138059216,INSEE
 85540,ST AVAUGOURD DES LANDES,FR,85200,46.5136722903,-1.47528120789,INSEE
 85540,ST CYR EN TALMONDAIS,FR,85206,46.4597334032,-1.33722144355,INSEE
 85550,LA BARRE DE MONTS,FR,85012,46.8722784154,-2.09984018879,INSEE
-85550,LA BARRE DE MONTS,FR,85012,46.8722784154,-2.09984018879,INSEE
 85560,LE BERNARD,FR,85022,46.44832528,-1.43979865314,INSEE
 85560,LONGEVILLE SUR MER,FR,85127,46.4091029013,-1.47711855345,INSEE
 85570,POUILLE,FR,85181,46.5022256779,-0.955223380119,INSEE
@ -381,11 +352,7 @@ EOF;
 85590,ST MARS LA REORTHE,FR,85242,46.8597253005,-0.925777900202,INSEE
 85600,LA BOISSIERE DE MONTAIGU,FR,85025,46.9451858636,-1.1916392484,INSEE
 85600,MONTAIGU VENDEE,FR,85146,46.9759800852,-1.31364530268,INSEE
-85600,MONTAIGU VENDEE,FR,85146,46.9759800852,-1.31364530268,INSEE
 85600,TREIZE SEPTIERS,FR,85295,46.9975586143,-1.23193361154,INSEE
-85600,MONTAIGU VENDEE,FR,85146,46.9759800852,-1.31364530268,INSEE
-85600,MONTAIGU VENDEE,FR,85146,46.9759800852,-1.31364530268,INSEE
-85600,MONTAIGU VENDEE,FR,85146,46.9759800852,-1.31364530268,INSEE
 85610,CUGAND,FR,85076,47.0602388146,-1.25289811103,INSEE
 85610,LA BERNARDIERE,FR,85021,47.0361828072,-1.27390355206,INSEE
 85620,ROCHESERVIERE,FR,85190,46.9274273036,-1.50132208111,INSEE
@ -406,11 +373,8 @@ EOF;
 85700,MONTOURNAIS,FR,85147,46.7502937556,-0.770013941158,INSEE
 85700,POUZAUGES,FR,85182,46.7812581702,-0.828778359084,INSEE
 85700,REAUMUR,FR,85187,46.7145137269,-0.816742537248,INSEE
-85700,SEVREMONT,FR,85090,46.8211105864,-0.854584153953,INSEE
 85700,MENOMBLET,FR,85141,46.7301338667,-0.728654955878,INSEE
 85700,ST MESMIN,FR,85254,46.8005779435,-0.748892533741,INSEE
-85700,SEVREMONT,FR,85090,46.8211105864,-0.854584153953,INSEE
-85700,SEVREMONT,FR,85090,46.8211105864,-0.854584153953,INSEE
 85710,BOIS DE CENE,FR,85024,46.9479643351,-1.89668693466,INSEE
 85710,CHATEAUNEUF,FR,85062,46.916944435,-1.9261131832,INSEE
 85710,LA GARNACHE,FR,85096,46.8977541296,-1.82443040539,INSEE
@ -420,7 +384,6 @@ EOF;
 85770,VIX,FR,85303,46.3543018169,-0.856628326667,INSEE
 85770,LE GUE DE VELLUIRE,FR,85105,46.3675950645,-0.905432724485,INSEE
 85770,L ILE D ELLE,FR,85111,46.3334258655,-0.919100677098,INSEE
-85770,LES VELLUIRE SUR VENDEE,FR,85177,46.4190919441,-0.910475769222,INSEE
 85800,ST GILLES CROIX DE VIE,FR,85222,46.6904708814,-1.91946363327,INSEE
 85800,LE FENOUILLER,FR,85088,46.7161264566,-1.89206667498,INSEE
 85800,GIVRAND,FR,85100,46.6822701061,-1.8787272243,INSEE    
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@ -68,7 +68,9 @@ export default {
         return this.$data.value !== null && typeof this.$data.value.text !== 'undefined';
      },
      cities() {
-         return this.entity.loaded.cities;
+         return this.entity.loaded.cities.sort(
+               (a, b) => Number(a.code) - Number(b.code) || a.name > b.name
+            )
      },
      name: {
         set(value) {
@ -92,7 +94,7 @@ export default {
   },
   methods: {
      transName(value) {
-         return (value.code && value.name) ? `${value.code}-${value.name}` : '';
+         return (value.code && value.name) ? `${value.name} (${value.code})` : '';
      },
      selectCity(value) {
         console.log(value)
@ -103,7 +105,9 @@ export default {
         console.log('writeNew.postcode false, in selectCity');
         this.$emit('getReferenceAddresses', value);
         this.focusOnAddress();
+         if (value.center) {
            this.updateMapCenter(value.center);
+         }
      },
      listenInputSearch(query) {
         //console.log('listenInputSearch', query, this.isCitySelectorOpen);