Skip to content

Commit f84c548

Browse files
committed
Search field for a string in any text field
1 parent e585d6e commit f84c548

2 files changed

Lines changed: 34 additions & 5 deletions

File tree

src/Controllers/TicketsController.php

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,27 @@ public function data($ticketList = 'active')
104104
});
105105
});
106106
}
107+
108+
if (isset($search_fields['any_text_field'])){
109+
$collection->where(function($query) use($search_fields){
110+
$query->where('subject', 'like', '%' . $search_fields['any_text_field'] . '%')
111+
->orWhere('content', 'like', '%' . $search_fields['any_text_field'] . '%')
112+
->orWhere('intervention', 'like', '%' . $search_fields['any_text_field'] . '%')
113+
->orWhereHas('attachments', function($q1) use($search_fields){
114+
$q1->where('original_filename', 'like', '%' . $search_fields['any_text_field'] . '%')
115+
->orWhere('new_filename', 'like', '%' . $search_fields['any_text_field'] . '%')
116+
->orWhere('description', 'like', '%' . $search_fields['any_text_field'] . '%');
117+
})
118+
->orWhereHas('comments', function($q2) use($search_fields) {
119+
$q2->where('content', 'like', '%' . $search_fields['any_text_field'] . '%')
120+
->orWhereHas('attachments', function($q3) use($search_fields){
121+
$q3->where('original_filename', 'like', '%' . $search_fields['any_text_field'] . '%')
122+
->orWhere('new_filename', 'like', '%' . $search_fields['any_text_field'] . '%')
123+
->orWhere('description', 'like', '%' . $search_fields['any_text_field'] . '%');
124+
});
125+
});
126+
});
127+
}
107128
}
108129

109130
}else{
@@ -721,7 +742,7 @@ public function search_results(Request $request)
721742
session()->forget('search_fields');
722743

723744
// Check all fields
724-
$a_fields = array_merge($this->a_search_fields_numeric, $this->a_search_fields_text, ['list', 'start_date', 'limit_date', 'comments', 'attachment_name']);
745+
$a_fields = array_merge($this->a_search_fields_numeric, $this->a_search_fields_text, ['list', 'start_date', 'limit_date', 'comments', 'attachment_name', 'any_text_field']);
725746
foreach ($a_fields as $field){
726747
if($request->filled($field)){
727748
$search_fields[$field] = $request->{$field};

src/Views/tickets/search/form.blade.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<div class="form-group row"><!-- TAGS -->
173173
<label class="col-form-label col-lg-3">{{ trans('panichd::lang.tags') . trans('panichd::lang.colon') }}</label>
174174
<div id="tag_list_container" class="col-lg-9">
175-
@include('panichd::tickets.partials.tags_menu', ['categories' => $a_categories, 'tag_lists' => $c_cat_tags, 'a_tags_selected' => []])
175+
@include('panichd::tickets.partials.tags_menu', ['categories' => $a_categories, 'tag_lists' => $c_cat_tags, 'a_tags_selected' => []])
176176
</div>
177177
</div>
178178

@@ -181,21 +181,21 @@
181181
<div class="form-group row"><!-- DESCRIPTION -->
182182
<label for="content" class="col-lg-3 col-form-label"> *{{trans('panichd::lang.description')}}{{trans('panichd::lang.colon')}}</label>
183183
<div class="col-lg-9">
184-
<textarea class="form-control" rows="2" name="content" cols="50"></textarea>
184+
<textarea class="form-control" rows="2" name="content" cols="50"></textarea>
185185
</div>
186186
</div>
187187

188188
<div class="form-group row"><!-- INTERVENTION -->
189189
<label for="intervention" class="col-lg-3 col-form-label">{{ trans('panichd::lang.intervention') . trans('panichd::lang.colon') }}</label>
190190
<div class="col-lg-9">
191-
<textarea class="form-control" rows="2" name="intervention" cols="50"></textarea>
191+
<textarea class="form-control" rows="2" name="intervention" cols="50"></textarea>
192192
</div>
193193
</div>
194194

195195
<div class="form-group row"><!-- COMMENTS -->
196196
<label for="comments" class="col-lg-3 col-form-label">Comment text{{ trans('panichd::lang.colon') }}</label>
197197
<div class="col-lg-9">
198-
<textarea class="form-control" rows="2" name="comments" cols="50"></textarea>
198+
<textarea class="form-control" rows="2" name="comments" cols="50"></textarea>
199199
</div>
200200
</div>
201201

@@ -210,6 +210,14 @@
210210
</div>
211211
@endif
212212

213+
<div class="form-group row"><!-- FIND IN ANY TEXT FIELD -->
214+
<label for="comments" class="col-lg-3 col-form-label">Any text field{{ trans('panichd::lang.colon') }}</label>
215+
<div class="col-lg-9">
216+
<textarea class="form-control" rows="2" name="any_text_field" cols="50"></textarea>
217+
<div class="help-block">Find in any text field in: Subject, Description, Intervention, Comments or attachment fields</div>
218+
</div>
219+
</div>
220+
213221
</div></div>
214222

215223
<div class="text-center"><!-- SUBMIT BUTTON -->

0 commit comments

Comments
 (0)