diff --git a/webapp/ipe_fetcher/liazo.py b/webapp/ipe_fetcher/liazo.py index 2543b6c..7cfeafb 100644 --- a/webapp/ipe_fetcher/liazo.py +++ b/webapp/ipe_fetcher/liazo.py @@ -54,6 +54,6 @@ class Liazo: aquilenetEligStatus=FAIEligibilityStatus(isEligible=False, reasonNotEligible="", ftthStatus=""), othersEligStatus=FAIEligibilityStatus(isEligible=False, reasonNotEligible="", ftthStatus=""), ) - print("add building ", building) + buildings[idImm] = building return buildings diff --git a/webapp/templates/app.js b/webapp/templates/app.js index 4e7e711..f04a7c6 100644 --- a/webapp/templates/app.js +++ b/webapp/templates/app.js @@ -1,5 +1,6 @@ const minZoomForRequest = 17; const urlADSL='https://tools.aquilenet.fr/cgi-bin/recherchend.cgi' +const urlTestFTTH='https://tools.aquilenet.fr/cgi-bin/test.cgi' const streetTypeConversion = new Map(); streetTypeConversion.set("aire", "aire") @@ -146,35 +147,40 @@ function updateEligData(map, eligData) { } let messageElig = `` eligTestApi=`eligtest/ftth?idImm=${building.idImm}&codePostal=${building.codePostal}&axione=${building.aquilenetEligStatus.isEligible}&liazo=${building.fdnEligStatus.isEligible}` + // éligible chez Aquilenet, lien pour le test if (building.aquilenetEligStatus.isEligible) { - messageElig = `
Fibre deployee et disponible par Aquilenet !`
- // messageElig += `
Tester l'eligibilite par Aquilenet`
- // if (building.fdnEligStatus.isEligible) {
- // messageElig += " et FDN"
- // }
- // messageElig += ""
- messageElig += "
Fibre deployee et disponible par Aquilenet !
` + const zip=encodeURIComponent(building.codePostal); + const idImm=encodeURIComponent(building.idImm); + messageElig += `Fibre deployee mais pas chez Axione !`
messageElig += `
Tester l'eligibilite par Kosc et Bouygues
Fibre deployee mais non eligible Aquilenet, desole :(
` + // Pas de fibre il semblerait, proposer un test ADSL Aquilenet } else { messageElig = `Fibre non deployee :(
` - zip=encodeURIComponent(building.codePostal); - comm=encodeURIComponent(building.commune); - convertType = streetTypeConversion.get(building.typeVoieImm.toLowerCase()); + const zip=encodeURIComponent(building.codePostal); + const comm=encodeURIComponent(building.commune); + let convertType = streetTypeConversion.get(building.typeVoieImm.toLowerCase()); if (! convertType) { convertType = building.typeVoieImm; } - street=encodeURIComponent(`${convertType} ${building.nomVoieImm}`) - street_nb=encodeURIComponent(building.numVoieImm) + const street=encodeURIComponent(`${convertType} ${building.nomVoieImm}`) + const street_nb=encodeURIComponent(building.numVoieImm) messageElig += `