Skip to content

Commit ca2dc2f

Browse files
committed
List plus and minus icons on intervention column. Affect both content columns if icon is present
1 parent 1713357 commit ca2dc2f

2 files changed

Lines changed: 36 additions & 18 deletions

File tree

src/Controllers/TicketsController.php

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,10 @@ public function renderTicketTable($collection)
203203
$field = '<div style="margin: 0em 0em 1em 0em;">'.$field.'</div>';
204204

205205
if (Setting::grab('list_text_max_length') != 0 and strlen($ticket->content) > (Setting::grab('list_text_max_length')+30)){
206-
$field.= '<div class="jquery_ticket_' . $ticket->id . '_text"><span class="text_minus">' . mb_substr($ticket->content, 0, Setting::grab('list_text_max_length')) . '...</span>'
206+
$field.= '<div class="jquery_ticket_' . $ticket->id . '_text" data-height-plus="" data-height-minus="">'
207+
.'<span class="text_minus">' . mb_substr($ticket->content, 0, Setting::grab('list_text_max_length')) . '...</span>'
207208
.'<span class="text_plus" style="display: none">' . $ticket->content . '</span>'
208-
.' <button class="btn btn-light btn-xs jquery_ticket_text_toggle" data-action="plus" data-height-plus="" data-height-minus="" data-id="' . $ticket->id . '" data-plus-icon="fa fa-minus" data-minus-icon="fa fa-plus"><span class="fa fa-plus"></span></button></div>';
209+
.' <button class="btn btn-light btn-xs jquery_ticket_text_toggle" data-id="' . $ticket->id . '"><span class="fa fa-plus"></span></button></div>';
209210

210211
}else{
211212
$field.= $ticket->content;
@@ -221,9 +222,10 @@ public function renderTicketTable($collection)
221222
if (Setting::grab('subject_content_column') == 'no'){
222223
$collection->editColumn('content', function ($ticket) {
223224
if (Setting::grab('list_text_max_length') != 0 and strlen($ticket->content) > (Setting::grab('list_text_max_length')+30)){
224-
$field = '<div class="jquery_ticket_' . $ticket->id . '_text"><span class="text_minus">' . mb_substr($ticket->content, 0, Setting::grab('list_text_max_length')) . '...</span>'
225+
$field = '<div class="jquery_ticket_' . $ticket->id . '_text" data-height-plus="" data-height-minus="">'
226+
.'<span class="text_minus">' . mb_substr($ticket->content, 0, Setting::grab('list_text_max_length')) . '...</span>'
225227
.'<span class="text_plus" style="display: none">' . $ticket->content . '</span>'
226-
.' <button class="btn btn-light btn-xs jquery_ticket_text_toggle" data-action="plus" data-height-plus="" data-height-minus="" data-id="' . $ticket->id . '" data-plus-icon="fa fa-minus" data-minus-icon="fa fa-plus"><span class="fa fa-plus"></span></button></div>';
228+
.' <button class="btn btn-light btn-xs jquery_ticket_text_toggle" data-id="' . $ticket->id . '"><span class="fa fa-plus"></span></button></div>';
227229

228230
}else{
229231
$field = $ticket->content;
@@ -235,7 +237,17 @@ public function renderTicketTable($collection)
235237
}
236238

237239
$collection->editColumn('intervention', function ($ticket) {
238-
$field=$ticket->intervention;
240+
241+
if (Setting::grab('list_text_max_length') != 0 and strlen($ticket->intervention) > (Setting::grab('list_text_max_length')+30)){
242+
$field = '<div class="jquery_ticket_' . $ticket->id . '_text" data-height-plus="" data-height-minus="">'
243+
.'<span class="text_minus">...' . mb_substr($ticket->intervention, (mb_strlen($ticket->intervention)-Setting::grab('list_text_max_length'))) . '</span>'
244+
.'<span class="text_plus" style="display: none">' . $ticket->intervention . '</span>'
245+
.' <button class="btn btn-light btn-xs jquery_ticket_text_toggle" data-id="' . $ticket->id . '"><span class="fa fa-plus"></span></button></div>';
246+
247+
}else{
248+
$field = $ticket->intervention;
249+
}
250+
239251
if ($ticket->intervention!="" and ($ticket->comments_count>0 or $ticket->hidden)) $field.="<br />";
240252

241253
if($ticket->hidden) $field.= '<span class="fa fa-eye-slash tooltip-info tickethidden" data-toggle="tooltip" title="'.trans('panichd::lang.ticket-hidden').'" style="margin: 0em 0.5em 0em 0em;"></span>';

src/Views/tickets/datatable/events.blade.php

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,27 @@
55
66
// Plus / less buttons for text fields
77
$('.jquery_ticket_text_toggle').click(function(e){
8+
var remove = $(this).find('span.fa').hasClass("fa-plus") ? 'plus' : 'minus';
9+
var action = $(this).find('span.fa').hasClass("fa-plus") ? 'minus' : 'plus';
10+
var id = $(this).data('id');
811
9-
if($(this).find('span.fa').hasClass("fa-plus")){
10-
$(this).prop('data-height-minus', $('.jquery_ticket_' + $(this).data('id') + '_text').height());
11-
$(this).find('span.fa').removeClass('fa-plus').addClass('fa-minus');
12-
$('.jquery_ticket_' + $(this).data('id') + '_text').find('.text_minus').hide();
13-
$('.jquery_ticket_' + $(this).data('id') + '_text').find('.text_plus').css('display', 'inline');
12+
$('.jquery_ticket_' + id + '_text').each(function(){
13+
if (action == 'minus'){
14+
$(this).prop('data-height-minus', $(this).height());
15+
$(this).find('span.fa').removeClass('fa-plus').addClass('fa-minus');
16+
$(this).find('.text_minus').hide();
17+
$(this).find('.text_plus').css('display', 'inline');
18+
19+
$(this).prop('data-height-plus', $(this).height());
20+
$(this).css('height', $(this).prop('data-height-minus')).animate({height: $(this).prop('data-height-plus')}, 500);
21+
}else{
22+
$(this).find('span.fa').removeClass('fa-minus').addClass('fa-plus');
23+
$(this).find('.text_minus').show();
24+
$(this).find('.text_plus').hide();
25+
$(this).css('height', '');
26+
}
27+
});
1428
15-
$(this).prop('data-height-plus', $('.jquery_ticket_' + $(this).data('id') + '_text').height());
16-
$('.jquery_ticket_' + $(this).data('id') + '_text').css('height', $(this).prop('data-height-minus')).animate({height: $(this).prop('data-height-plus')}, 500);
17-
}else{
18-
$(this).find('span.fa').removeClass('fa-minus').addClass('fa-plus');
19-
$('.jquery_ticket_' + $(this).data('id') + '_text').find('.text_minus').show();
20-
$('.jquery_ticket_' + $(this).data('id') + '_text').find('.text_plus').hide();
21-
$('.jquery_ticket_' + $(this).data('id') + '_text').css('height', '');
22-
}
2329
});
2430
2531
// Agent change: Modal for > 4 agents

0 commit comments

Comments
 (0)