Ticket list: Internal notes dedicated counters

Author: xaviqv

src/Controllers/TicketsController.php

@@ -150,11 +150,12 @@ public function data($ticketList = 'active')
 			->with('owner.department.ancestor')
 			->withCount('allAttachments')
 			->withCount(['comments' => function($query) use($currentLevel){
-				$query->countable()->forLevel($currentLevel);
+				$query->countable()->forLevel($currentLevel)->where('type', '!=', 'note');
 			}])
 			->withCount(['recentComments' => function($query) use($currentLevel){
-				$query->countable()->forLevel($currentLevel);
-			}]);
+				$query->countable()->forLevel($currentLevel)->where('type', '!=', 'note');
+			}])
+            ->withCount('internalNotes');
 
         $collection = $datatables->of($collection);
 
@@ -225,8 +226,11 @@ public function renderTicketTable($collection)
 				$field.=$ticket->recent_comments_count.' ';
 			}
 			if ($ticket->comments_count>0){
-				$field.='<span class="fa fa-comment tooltip-info comment" title="'.trans('panichd::lang.table-info-comments-total', ['num'=>$ticket->comments_count]).($ticket->recent_comments_count>0 ? ' '.trans('panichd::lang.table-info-comments-recent', ['num'=>$ticket->recent_comments_count]) : '').'"></span>';
+				$field.=$ticket->comments_count . ' <span class="fa fa-comments tooltip-info comment" title="'.trans('panichd::lang.table-info-comments-total', ['num'=>$ticket->comments_count]).($ticket->recent_comments_count>0 ? ' '.trans('panichd::lang.table-info-comments-recent', ['num'=>$ticket->recent_comments_count]) : '').'"></span>';
 			}
+			if ($this->member->currentLevel() >= 2 and $ticket->internal_notes_count > 0){
+			    $field.= ' ' . $ticket->internal_notes_count . ' <span class="fa fa-pencil-alt tooltip-info comment" title="' . trans('panichd::lang.table-info-notes-total', ['num' => $ticket->internal_notes_count]) . '"></span>';
+            }
 
 			return $field;
 		});

src/Models/Ticket.php

@@ -227,7 +227,7 @@ public function comments()
     }
 
 	/**
-     * Get Ticket comments.
+     * Get Ticket comments updated recently
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -236,6 +236,17 @@ public function recentComments()
         return $this->hasMany('PanicHD\PanicHD\Models\Comment', 'ticket_id')->where('panichd_comments.updated_at','>', Carbon::yesterday());
     }
 
+    /*
+     * Get Ticket internal notes only
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function internalNotes()
+    {
+        return $this->hasMany('PanicHD\PanicHD\Models\Comment', 'ticket_id')->where('panichd_comments.type','note');
+    }
+
+
     /**
      * Ticket attachments (NOT including its comments attachments).
 	 *

src/Translations/ca/lang.php

@@ -41,6 +41,7 @@
   'table-info-attachments-total'     => ':num fitxers adjunts',
   'table-info-comments-total'        => ':num comentaris totals.',
   'table-info-comments-recent'       => ':num recents.',
+  'table-info-notes-total'           => ':num notes internes',
 
   'calendar-active'            => 'Va començar :description',
   'calendar-active-today'      => 'Ha començat :description',

src/Translations/en/lang.php

@@ -41,8 +41,9 @@
   'table-info-attachments-total'     => ':num attached files',
   'table-info-comments-total'        => ':num Total comments.',
   'table-info-comments-recent'       => ':num recent ones.',
+  'table-info-notes-total'           => ':num internal notes',
 
-  'calendar-active'            => 'Started :description',
+        'calendar-active'            => 'Started :description',
   'calendar-active-today'      => 'Started :description',
   'calendar-active-future'     => 'Starts :description',
   'calendar-expired'           => 'Expired :description',