DataObjects/Mtrack_ticket.php

diff --git a/DataObjects/Mtrack_ticket.php b/DataObjects/Mtrack_ticket.php
index 2895cfd..4080c82 100644 (file)
--- a/DataObjects/Mtrack_ticket.php
+++ b/DataObjects/Mtrack_ticket.php
@@ -219,12 +219,12 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
             switch ($q['query']['viewtype']) {
                 case 'active':
                     // hide "on hold" and closed..
-                    $this->whereAdd("join_status_id.name NOT IN('closed', 'on hold', 'CLOSED') OR  {$tn}.status  = 0");
+                    $this->whereAdd("join_status_id.name NOT IN('closed', 'ON_HOLD', 'CLOSED') OR  {$tn}.status  = 0");
                     $this->whereAdd("{$tn}.milestone_id = 0 OR join_milestone_id_id.on_hold = 0");
                     break;
                 
                 case 'on-hold':
-                    $this->whereAdd("join_status_id.name = 'on hold' ");
+                    $this->whereAdd("join_status_id.name = 'ON_HOLD' ");
                     $this->whereAdd("{$tn}.milestone_id = 0 OR join_milestone_id_id.on_hold = 0");
                     break;
                 
@@ -255,11 +255,11 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                     break;
                 
                 case 'pending':
-                    $this->whereAdd("join_status_id.name IN ('resolved', 'needs review' )");
+                    $this->whereAdd("join_status_id.name IN ('REVIEW_BY_ADMIN', 'REVIEW_BY_CLIENT )");
                     break;
                 
                 case 'in-progress':
-                    $this->whereAdd("join_status_id.name IN ('in progress' )");
+                    $this->whereAdd("join_status_id.name IN ('IN_PROGRESS' )");
                     break;
                     
                 case 'all': 
@@ -452,7 +452,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                    $this->orderBy("
                         case
                             when join_status_id.display_name = 'in progress' then 1
-                            when join_status_id.display_name = 'resolved' then -1
+                            when join_status_id.display_name = 'REVIEW_BY_ADMIN' then -1
                             else 0
                         end DESC,
                        (case when join_milestone_id_id.duedate is null then 1 else 0 end) ASC,
@@ -477,7 +477,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                 $this->orderBy("
                         case
                             when join_status_id.display_name = 'in progress' then 1
-                            when join_status_id.display_name = 'resolved' then -1
+                            when join_status_id.display_name = 'REVIEW_BY_ADMIN' then -1
                             else 0
                         end DESC,
                         join_priority_id_id.seqid $direction, {$tn}.seqid ASC
@@ -489,7 +489,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                 $this->orderBy("
                         case
                             when join_status_id.display_name = 'in progress' then 1
-                            when join_status_id.display_name = 'resolved' then -1
+                            when join_status_id.display_name = 'REVIEW_BY_ADMIN' then -1
                             else 0
                         end DESC,
                         join_priority_id_id.seqid ASC,