Changeset d56297c

Timestamp:

Dec 6, 2019, 11:09:42 AM (3 years ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

07ea77e

Parents:

6e371e3 (diff), dc2189b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

lazersib <blacklight@…> (06/12/19 11:09:42)

git-committer:

GitHub <noreply@…> (06/12/19 11:09:42)

Message:

Merge pull request #12 from magnatiwe/search_inn_show_only_name_after_select

Поиск агента по ИНН

Location:

web

Files:

• css/jquery/jquery.autocomplete.js (modified) (1 diff)
• include/doc.nulltype.php (modified) (2 diffs)
• include/doc.s.agent.php (modified) (1 diff)

web/css/jquery/jquery.autocomplete.js

@@ -169 +169 @@
 
         function selectItem(li) {
+                if (options.formatSelectedItem) li = options.formatSelectedItem(li);
                 if (!li) {
                         li = document.createElement("li");

web/include/doc.nulltype.php

@@ -1897 +1897 @@
                                 cacheLength:10,
                                 maxItemsToShow:15,
+                                formatSelectedItem: function(li) { 
+                                        if(li.querySelector('em').dataset.name)
+                                                li.selectValue = li.querySelector('em').dataset.name;
+                                        return li; 
+                                },
                                 formatItem:agliFormat,
                                 onItemSelect:agselectItem,
@@ -1906 +1911 @@
                         var result = 
                                 row[0] + 
-                                \"<em class='qnt'> тел . \" + row[2] + \"</em>\";
+                                \"<em class='qnt' data-name = '\"+row[4]+\"'> тел . \" + row[2] + \"</em>\";
                         return result;
                 }

web/include/doc.s.agent.php

@@ -89 +89 @@
                         ");
                 while ($nxt = $res->fetch_row()) {
+                        $name = $nxt[0];
                         if(intval($q) == $q && intval($q) != 0) {
                                 list($nxt[0],$nxt[3])=[$nxt[3],$nxt[0]];
                         }
-                        $tmpl->addContent("$nxt[0] ".($nxt[3] ? "($nxt[3])" : "")."|$nxt[1]|$nxt[2]|$nxt[3]\n");
+                        $tmpl->addContent("$nxt[0] ".($nxt[3] ? "($nxt[3])" : "")."|$nxt[1]|$nxt[2]|$nxt[3]|$name\n");
                 }
         } elseif ($opt == 'jgetcontracts') {