diff --git a/apps/maarch_entreprise/class/class_contacts_v2_Abstract.php b/apps/maarch_entreprise/class/class_contacts_v2_Abstract.php index 02f25a3e2910070274df23fd53e654788cfcf7f9..01f8f48d74b77567255c4cd8d149c6dbfbaa2af3 100755 --- a/apps/maarch_entreprise/class/class_contacts_v2_Abstract.php +++ b/apps/maarch_entreprise/class/class_contacts_v2_Abstract.php @@ -1389,7 +1389,7 @@ abstract class contacts_v2_Abstract extends Database <tr> <?php $contactController = new \Contact\controllers\ContactController(); - if (!$contactController->avaiblaibleReferential()) { + if (!$numDepList = $contactController->avaiblaibleReferential()) { $stateRef = 'disabled'; $stateRefInfo = _WARNING_REF; $stateRefCss = 'opacity:0.5;'; @@ -1402,27 +1402,15 @@ abstract class contacts_v2_Abstract extends Database </div> <div id="refSearch" style="display:none;"> <select id="numDep" style="display:inline-block;width:10%;" onchange="reloadTypeahead(this);"> - <?php for ($i = 1; $i < 10; ++$i) { - echo "<option value='0{$i}'>0{$i}</option>"; + <?php foreach ($numDepList as $key => $value) { + echo "<option value='{$value}'>{$value}</option>"; } ?> - <?php for ($i = 10; $i < 20; ++$i) { - echo "<option value='{$i}'>{$i}</option>"; - } - echo "<option value='2A'>2A</option>"; - echo "<option value='2B'>2B</option>"; ?> - - <?php for ($i = 21; $i < 96; ++$i) { - echo "<option value='{$i}'>{$i}</option>"; - } ?> - <?php for ($i = 971; $i < 978; ++$i) { - echo "<option value='{$i}'>{$i}</option>"; - } - echo "<option value='987'>987</option>"; ?> + </select> <div class="typeahead__container" style="width: 100%;display:inline-block;"> <div class="typeahead__field"> <span class="typeahead__query"> - <input placeholder="<?php echo _REF_SEARCH.' du 01'; ?>" style="margin-left:0px;" class="<?php echo $fieldAddressClass; ?>" name="searchAddress" autocomplete="off" type="text" id="searchAddress" value=""/> + <input placeholder="<?php echo _REF_SEARCH.' du '.$numDepList[0]; ?>" style="margin-left:0px;" class="<?php echo $fieldAddressClass; ?>" name="searchAddress" autocomplete="off" type="text" id="searchAddress" value=""/> </span> </div> @@ -1450,7 +1438,7 @@ abstract class contacts_v2_Abstract extends Database url: "../../rest/autocomplete/banAddresses", data: { address: "{{query}}", - department: "01" + department: $j("#numDep").val() } } }, diff --git a/apps/maarch_entreprise/js/functions.js b/apps/maarch_entreprise/js/functions.js index 25a8b72c6f38e3411a9c90b0f2c032daa9afa774..b86bce525c139e58645ead190c314747dfd29a61 100755 --- a/apps/maarch_entreprise/js/functions.js +++ b/apps/maarch_entreprise/js/functions.js @@ -3812,7 +3812,6 @@ function toggleRefMaarch() { $j(".refMaarch input").removeClass("readonly"); $j(".refMaarch input").prop("readonly", false); } - console.log('toto'); } function setRefAdresse(item) { diff --git a/src/app/contact/controllers/ContactController.php b/src/app/contact/controllers/ContactController.php index 996279b0a9d4e0a2fbdf153d3cd29aa2d5ead05d..5c978026da554f0362b685d1d6bc8fa6d470552e 100644 --- a/src/app/contact/controllers/ContactController.php +++ b/src/app/contact/controllers/ContactController.php @@ -173,6 +173,12 @@ class ContactController } if ($files = glob($banDirectory.'ban/indexes/'.'/*')) { $empty_files = false; + $arrayNumDep = array(); + foreach ($files as $key => $value) { + array_push($arrayNumDep, basename($value)); + } + + return $arrayNumDep; } if (!$empty_folder && !$empty_files) {