[Fmsystem-commits] [17412] controller: new status filter

[sigurdne]

Revision: 17412
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17412
Author:   sigurdne
Date:     2017-12-07 10:13:45 -0500 (Thu, 07 Dec 2017)
Log Message:
-----------
controller: new status filter

Modified Paths:
--------------
    trunk/controller/inc/class.uicomponent.inc.php
    trunk/controller/setup/phpgw_no.lang

Modified: trunk/controller/inc/class.uicomponent.inc.php
===================================================================
--- trunk/controller/inc/class.uicomponent.inc.php      2017-12-07 14:38:10 UTC 
(rev 17411)
+++ trunk/controller/inc/class.uicomponent.inc.php      2017-12-07 15:13:45 UTC 
(rev 17412)
@@ -333,7 +333,8 @@
                                );
                        }
                        $status_list = array(
-                               array('id' => '', 'name' => lang('select 
value')),
+                               array('id' => 'in_queue', 'name' => lang('in 
queue')),
+                               array('id' => 'all', 'name' => lang('All')),
                                array('id' => 'not_performed', 'name' => 
lang('status not done')),
                                array('id' => 'done_with_open_deviation', 
'name' => lang('done with open deviation')),
                        );
@@ -1470,7 +1471,7 @@
                        }
                        unset($_month);
                        $result['time_sum_actual'][0] = $sum_year_actual;
-                       $result['total_records'] = $total_records;
+                       $result['total_records'] = count($data_set);
                        $result['location_filter'] = $location_filter;
                        if ($choose_master)
                        {
@@ -1518,13 +1519,26 @@
 
                        if ($filter_status)
                        {
+                               if ($filter_status == 'in_queue')
+                               {
+                                       switch ($param['status'])
+                                       {
+                               //              case "CONTROL_NOT_DONE":
+                                               case "CONTROL_REGISTERED":
+                                               case "CONTROL_PLANNED":
+                               //              case 
"CONTROL_NOT_DONE_WITH_PLANNED_DATE":
+                                                       break;//continues
+                                               default:
+                                                       return;
+                                       }
+                               }
                                if ($filter_status == 'not_performed')
                                {
                                        switch ($param['status'])
                                        {
                                                case "CONTROL_NOT_DONE":
-                                               //                      case 
"CONTROL_REGISTERED":
-                                               //                      case 
"CONTROL_PLANNED":
+                       //                      case "CONTROL_REGISTERED":
+                       //                      case "CONTROL_PLANNED":
                                                case 
"CONTROL_NOT_DONE_WITH_PLANNED_DATE":
                                                        break;//continues
                                                default:

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2017-12-07 14:38:10 UTC (rev 
17411)
+++ trunk/controller/setup/phpgw_no.lang        2017-12-07 15:13:45 UTC (rev 
17412)
@@ -416,4 +416,5 @@
 plan   controller      no      Planlegg
 modified date  controller      no      Dato siste endring
 modified by    controller      no      Endret av
-set status: done       controller      no      Sett status: utført
\ No newline at end of file
+set status: done       controller      no      Sett status: utført
+in queue       controller      no      I kø
\ No newline at end of file