Merge pull request #677 from bulfaitelo/fix4

Alteração na busca
RamonSilva20 · Apr 21, 2020 · b6e6bad · b6e6bad
2 parents cfd79c2 + ba7637f
commit b6e6bad
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Todas as alterações serão documentadas neste arquivo
 Formato baseado em [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 e [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.5.1] - 2020-04-21
+
+### Changed
+- Adicionando Descrição na busca geral, juntamente da coluna no resultado. [@bulfaitelo](https://github.com/bulfaitelo)
+
 ## [4.5.0] - 2020-04-19
 
 ### Added

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 ![MapOS](https://raw.githubusercontent.com/RamonSilva20/mapos/master/assets/img/logo.png)
 
-![version](https://img.shields.io/badge/version-4.5.0-blue.svg?longCache=true&style=flat-square)
+![version](https://img.shields.io/badge/version-4.5.1-blue.svg?longCache=true&style=flat-square)
 ![license](https://img.shields.io/badge/license-MIT-green.svg?longCache=true&style=flat-square)
 ![theme](https://img.shields.io/badge/theme-Matrix--Admin-lightgrey.svg?longCache=true&style=flat-square)
 ![issues](https://img.shields.io/github/issues/RamonSilva20/mapos.svg?longCache=true&style=flat-square)

diff --git a/application/config/config.php b/application/config/config.php
@@ -4,7 +4,7 @@
 /**
  * App current version
  */
-$config['app_version'] = '4.5.0';
+$config['app_version'] = '4.5.1';
 
 /**
  * Nome do sistema

diff --git a/application/models/Mapos_model.php b/application/models/Mapos_model.php
@@ -59,7 +59,8 @@ public function pesquisar($termo)
         $data['clientes'] = $this->db->get('clientes')->result();
 
         // buscando os
-        $this->db->like('idOs', $termo);
+        $this->db->like('idOs', $termo);        
+        $this->db->or_like('descricaoProduto', $termo);
         $this->db->limit(5);
         $data['os'] = $this->db->get('os')->result();
 

diff --git a/application/views/mapos/pesquisa.php b/application/views/mapos/pesquisa.php
@@ -163,6 +163,7 @@
                         <tr style="backgroud-color: #2D335B">
                             <th>#</th>
                             <th>Data Inicial</th>
+                            <th>Descrição</th>
                             <th>Defeito</th>
                             <th></th>
                         </tr>
@@ -178,6 +179,7 @@
                             echo '<tr>';
                             echo '<td>' . $r->idOs . '</td>';
                             echo '<td>' . $dataInicial . '</td>';
+                            echo '<td>' . $r->descricaoProduto . '</td>';
                             echo '<td>' . $r->defeito . '</td>';
                             echo '<td>';
                             if ($this->permission->checkPermission($this->session->userdata('permissao'), 'vOs')) {