Skip to content

Commit

Permalink
update searcher
Browse files Browse the repository at this point in the history
  • Loading branch information
@hectorarnau
hectorarnau committed Mar 25, 2020
1 parent ee92355 commit 7485e48
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 18 deletions.
14 changes: 13 additions & 1 deletion src/admin/accions/admin_join.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ public function render()

$params['p_mode']= $p_mode = 'R';
$params['p_acces_type']='A';
$p_action = $params['p_action'];

$params_relation['class_id'] = $params['param1'];
$params_relation['inst_id'] = $params['param2'];
$params_relation['relation_id'] = $params['param9'];
$params_relation['parent_inst_id'] = $params['param11'];
$params_relation['parent_class_id'] = $params['param10'];
$params_relation['child_class_id'] = $params['param12'];


if (isset($params['param12']) && $params['param12']!='') {
$title=EDITORA_NAME." -> ".getMessage('info_joinsearch_object')." ".getClassName($params['param12'])." ".getMessage('info_word_joinwith')." ".getClassName($params['param10']);
Expand All @@ -43,14 +52,17 @@ public function render()
$parent['rel_id'] = $params['param9'];
$parent['inst_id'] = $params['param11'];
$parent['class_id'] = $params['param10'];

}

$viewData = array_merge($menu, [
'title' => $title,
'instances' => $instances_list,
'parents' => $parents,
'p_mode' => $p_mode,
'parent' => $parent
'p_action' => $p_action,
'parent' => $parent,
'params_relation' => $params_relation
]);


Expand Down
4 changes: 2 additions & 2 deletions src/admin/accions/admin_search.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public function render()

if (Session::get('rol_id')==1 || Session::get('rol_id')==2 || $security->getAccess('browseable', $params)) {
$editora = new editoraModel();

$params['p_mode']='V';

$instances = $this->instances->instanceList($params);
Expand All @@ -41,7 +40,8 @@ public function render()
'title' => EDITORA_NAME,
'instances' => $instances,
'term' => $params['param4'],
'status' => $params['param8']
'status' => $params['param8'],
'class_id' => $params['param1']
]);
return response()->view('editora::pages.search_instances', $viewData);
}
Expand Down
2 changes: 1 addition & 1 deletion src/admin/js/popper.min.js
View file

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions src/admin/views/pages/home.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
</span>
<h3 class="tit">{{getMessage('container_ultimos_objetos')}}</h3>
</span>
<div class="form">
<div class="form-group">
<div class="form-group" style="margin-bottom:0;">
<form action="{{ route('editora.action', 'search') }}">
<span class="input-group">
<input id="search_instances" type="text" class="form-control" placeholder="Buscar">
<span class="input-addon">
<input type="text" class="form-control" id="p_search_query" name="p_search_query"
placeholder="Buscar" value="{{ $term ?? null }}">
<button type="submit" class="input-addon">
<i class="icon-magnify"></i>
</span>
</button>
</span>
</div>
</form>
</div>
</div>
</section>
Expand Down
35 changes: 27 additions & 8 deletions src/admin/views/pages/list_instances.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,34 @@
<a href="#" id="showClassSample" role="button" data-toggle="modal" class="btn-square clr-gray"><span class="mdi mdi-file-eye-outline" style="font-size:30px"></span></a>
@endif

<form action="{{ route('editora.action', 'search') }}">
<span class="input-group">
@if(isset($class['id']))<input type="hidden" id="p_class_id" name="p_class_id" value="{{$class['id']}}">@endif
<input type="text" class="form-control" id="p_search_query" name="p_search_query" placeholder="Buscar">
<span class="input-addon">
<i class="icon-magnify"></i>
@if($p_mode=='R' && isset($params_relation))
<form class="form" method="get" action="{{ route('editora.action', $p_action) }}">
<span class="input-group">
<input type="text" class="form-control" id="p_search_query" name="p_search_query" placeholder="Buscar">
<span class="input-addon">
<i class="icon-magnify"></i>
</span>
</span>
</span>
</form>
<input type="hidden" name="p_pagina" value="1"/>
@isset($params_relation['class_id'])<input type="hidden" name="p_class_id" value="{{$params_relation['class_id']}}"/>@endisset
@isset($params_relation['relation_id'])<input type="hidden" name="p_relation_id" value="{{$params_relation['relation_id']}}"/>@endisset
@isset($params_relation['inst_id'])<input type="hidden" name="p_inst_id" value="{{$params_relation['inst_id']}}"/>@endisset
@isset($params_relation['parent_inst_id'])<input type="hidden" name="p_parent_inst_id" value="{{$params_relation['parent_inst_id']}}"/>@endisset
@isset($params_relation['parent_class_id'])<input type="hidden" name="p_parent_class_id" value="{{$params_relation['parent_class_id']}}"/>@endisset
@isset($params_relation['child_class_id'])<input type="hidden" name="p_child_class_id" value="{{$params_relation['child_class_id']}}"/>@endisset
</form>
@else
<form action="{{ route('editora.action', 'search') }}">
<span class="input-group">
@if(isset($class['id']))<input type="hidden" id="p_class_id" name="p_class_id" value="{{$class['id']}}">@endif
<input type="text" class="form-control" id="p_search_query" name="p_search_query" placeholder="Buscar">
<span class="input-addon">
<i class="icon-magnify"></i>
</span>
</span>
</form>
@endif

</div>
</section>
<section class="table-view">
Expand Down
2 changes: 2 additions & 0 deletions src/admin/views/pages/search_instances.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
<span class="input-group">
@if(isset($class['id']))
<input type="hidden" id="p_class_id" name="p_class_id" value="{{$class['id']}}">
@elseif(isset($class_id))
<input type="hidden" id="p_class_id" name="p_class_id" value="{{$class_id}}">
@endif
<input type="text" class="form-control" id="p_search_query" name="p_search_query"
placeholder="Buscar" value="{{ $term ?? null }}">
Expand Down

0 comments on commit 7485e48

Please sign in to comment.