improvement: allow to filter by major technology of existing node

chilek · Aug 14, 2023 · 5b892a5 · 5b892a5
1 parent 58e1898
commit 5b892a5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/modules/netranges.php b/modules/netranges.php
@@ -438,10 +438,13 @@ function getBuildings(array $filter)
             ) : '')
         );
     }
+    $majortechs = isset($filter['majortechs']) && is_array($filter['majortechs']) ?
+        Utils::filterIntegers(array_values($filter['majortechs'])) : array();
+
     if (empty($buildings)) {
         $buildings = array();
     } else {
-        foreach ($buildings as &$building) {
+        foreach ($buildings as $key => &$building) {
             $city_id = intval($building['city_id']);
             $street_id = intval($building['street_id']);
             $street_ident = intval($building['street_ident']);
@@ -457,6 +460,12 @@ function getBuildings(array $filter)
                 $building['customers'] = array();
                 $building['existing'] = 0;
             }
+            if (!empty($majortechs)
+                && (!isset($nodes[$city_id][$street_ident][$building_num])
+                || !array_intersect($majortechs,
+                        array_keys($nodes[$city_id][$street_ident][$building_num]['linktechnologies'])))) {
+                unset($buildings[$key]);
+            }
         }
         unset($building);
         if (!empty($existing)) {
@@ -828,6 +837,7 @@ function getBuildings(array $filter)
 $SMARTY->assign(array(
     'filter' => $filter,
     'linktechnologies' => $SIDUSIS_LINKTECHNOLOGIES,
+    'linktechnologiesall' => $LINKTECHNOLOGIES,
     'linkspeeds' => $linkspeeds,
     'range'=> $range,
     'unique_total' => $unique_total,

diff --git a/templates/default/net/netranges.html b/templates/default/net/netranges.html
@@ -282,6 +282,19 @@ <h1>{$layout.pagetitle}</h1>
                                     <option value="2"{if $filter.type == 2} selected{/if}>{trans("<!netrange>theoretical")}</option>
                                 </select>
                             </label>
+                            <label class="filter-item">
+                                {trans("<!netrange>Major technology")}
+                                <select name="filter[majortechs][]" form="netranges" class="filter-element lms-ui-multiselect"
+                                        multiple data-default-value='{trans("— ignore —")}'>
+                                    {foreach $linktechnologiesall as $key => $type}
+                                        <option disabled>{$_LINKTYPES[$key]}</option>
+                                        {foreach $type as $key => $link}
+                                            <option value="{$key}" {if is_array($filter.majortechs)
+                                                && in_array($key, $filter.majortechs)} selected{/if}>{$link}</option>
+                                        {/foreach}
+                                    {/foreach}
+                                </select>
+                            </label>
                             <span class="filter-item">
                                 <span>
                                     {trans("<!netrange>Services")}