notices list calendar info: only date and time but not relative status

Author: xaviqv

src/Models/Ticket.php

@@ -395,14 +395,12 @@ public function getCalendarInfo($question_sign = false, $show = 'field')
 			$color = "text-warning";
 		}
 
-		$date_text = $this->getDateForHumans($date);
-		
 		if ($show == 'description') {
-			// Date description only
-			return '<span class="glyphicon '.$icon.'"></span> '.$title;
+			// Date description
+			return $title;
 		}else{
 			// Full field
-			return "<span class=\"tooltip-info $color\" title=\"$title\" data-toggle=\"tooltip\" data-placement=\"auto bottom\"><span class=\"glyphicon $icon\"></span> $date_text ".($question_sign ? "<span class=\"glyphicon glyphicon-question-sign\"></span>" : "")."</span>";
+			return "<span class=\"tooltip-info $color\" title=\"$title\" data-toggle=\"tooltip\" data-placement=\"auto bottom\"><span class=\"glyphicon $icon\"></span> ".$this->getDateForHumans($date)." ".($question_sign ? "<span class=\"glyphicon glyphicon-question-sign\"></span>" : "")."</span>";
 		}
 	}
 

src/PanicHDServiceProvider.php

@@ -201,6 +201,7 @@ public function boot()
 						->select('panichd_tickets.*')
 						->with('owner.personDepts.department')
 						->with('status')->with('tags')
+						->withCount('allAttachments')
 						->orderByRaw('CASE when status_id="'.Setting::grab('default_close_status_id').'" then 2 else 1 end')
 						->orderByRaw('date(start_date)')
 						->orderBy('panichd_priorities.magnitude', 'desc')

src/Views/notices/index.blade.php

@@ -38,9 +38,13 @@
 					<tr>
 					<td>{{ $notice->id }}</td>
 					<td style="color: {{ $notice->status->color }}">{{ $notice->status->name }}</td>
-					<td style="width: 14em;">{!! $notice->getCalendarInfo(false, 'description') !!}</td>
+					<td style="width: 14em;">{!! $notice->getDateForHumans($notice->limit_date) !!}</td>
 					<td>{{ link_to_route($setting->grab('main_route').'.show', $notice->subject, $notice->id) }}</td>
-					<td>{{ $notice->content }}</td>
+					<td>{{ $notice->content }}
+					@if ($notice->all_attachments_count>0)
+						<br />{{ $notice->all_attachments_count }} <span class="glyphicons glyphicon glyphicon-paperclip tooltip-info attachment" title="{{ trans('panichd::lang.table-info-attachments-total', ['num' => $notice->all_attachments_count]) }}"></span>
+					@endif
+					</td>
 					<td>{{ $notice->intervention }}</td>
 					@if($u->currentLevel() > 1)
 						<td><span title="{{ $u->currentLevel() > 2 ? trans('panichd::lang.show-ticket-creator') . trans('panichd::lang.colon') . $notice->owner->name : '' }}">{{ $notice->owner->ticketit_department == 0 ? trans('panichd::lang.all-depts') : $notice->owner->userDepartment->resume(true) }}</span></td>

src/Views/notices/widget.blade.php

@@ -11,11 +11,15 @@
 			@foreach ($a_notices as $notice)
 				<tr>
 				<td style="width: 14em;">{{ $notice->id }}<br /><span style="font-weight: bold">{{ $notice->status->name }}</span>
-				<div style="margin: 1em 0em 0em 0em; font-weight: bold;">{!! $notice->getCalendarInfo(false, 'description') !!}</div>
+				<div style="margin: 1em 0em 0em 0em; font-weight: bold;"><span class="glyphicon glyphicon-calendar"></span> {!! $notice->getDateForHumans($notice->limit_date) !!}</div>
 
 				</td>
 				<td><div style="margin: 0em 0em 1em 0em;">{{ link_to_route($setting->grab('main_route').'.show', $notice->subject, $notice->id) }}</div>
-				<p>{{ $notice->content }}{{ $notice->intervention }}</p>
+				<p>{{ $notice->content }}
+				@if ($notice->all_attachments_count>0)
+					<br />{{ $notice->all_attachments_count }} <span class="glyphicons glyphicon glyphicon-paperclip tooltip-info attachment" title="{{ trans('panichd::lang.table-info-attachments-total', ['num' => $notice->all_attachments_count]) }}"></span>
+				@endif
+				{{ $notice->intervention }}</p>
 				@foreach ($notice->tags as $tag)
                     <button class="btn btn-default btn-tag" style="pointer-events: none; background-color: {{ $tag->bg_color }}; color: {{ $tag->text_color }}">{{ $tag->name }}</button>
                 @endforeach