瀏覽代碼

fixed query - removed '0', added krs and regon in search MSIG

Piotr Labudda 7 年之前
父節點
當前提交
09de8ee771
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 2 0
      tools/Bocian.php
  2. 1 1
      tools/Bocian.php.addItemToRaport.js

+ 2 - 0
tools/Bocian.php

@@ -1760,7 +1760,9 @@ public function showPowiazaniaEnergaRumKontrahenciPowiazania($items) {
 		if (empty($wordsQuery)) throw new Exception("Empty search");
 		$searchableFields = [];
 		$searchableFields[] = 'nazwa';
+		$searchableFields[] = 'krs';
 		$searchableFields[] = 'nip';
+		$searchableFields[] = 'regon';
 		$searchableFields[] = 'S_miejscowosc';
 		$searchParams = [ 'ogc:Filter' => $this->generateOgcFilterFromWords($wordsQuery, $searchableFields) ];
 		$items = ACL::getAclByNamespace('default_db/BI_audit_MSIG/BI_audit_MSIG')->buildQuery(array_merge([

+ 1 - 1
tools/Bocian.php.addItemToRaport.js

@@ -50,7 +50,7 @@ function filterByHelper(option, text) {
   var words = ( (text.indexOf(' ') > 0)
     ? text.split(' ')
     : [ text ]
-  ).map(function (word) { return word.trim().toLowerCase(); })
+  ).map(function (word) { return word.trim().replace(/^[0]+/g, '').toLowerCase(); })
   .filter(function (word) { return word.length > 2; });
   var foundWords = words.filter(function (word) {
     return (label.indexOf(word) > -1);