[Fmsystem-commits] [8096]

[Erik Holm-Larsen]

Revision: 8096
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8096
Author:   erikhl
Date:     2011-11-14 07:04:46 +0000 (Mon, 14 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendar/inc/model/class.activity.inc.php
    trunk/activitycalendar/setup/phpgw_no.lang
    trunk/activitycalendar/templates/base/activity_list_partial.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-14 06:51:06 UTC 
(rev 8095)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-11-14 07:04:46 UTC 
(rev 8096)
@@ -152,6 +152,10 @@
                        $activity_state = 
$this->marshal($filters['activity_state'],'int');
                        $filter_clauses[] = "activity.state = 
{$activity_state}";
                }
+               if(isset($filters['activity_category']) && 
$filters['activity_category'] != 'all'){
+                       $activity_category = 
$this->marshal($filters['activity_category'],'int');
+                       $filter_clauses[] = "activity.category = 
{$activity_category}";
+               }
                if(isset($filters['activity_district'])){
                        if($filters['activity_district'] != 'all')
                        {

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-14 
06:51:06 UTC (rev 8095)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-11-14 
07:04:46 UTC (rev 8096)
@@ -288,7 +288,7 @@
                                break;
                        case 'all_activities':
                        default:
-                               $filters = array('activity_state' => 
phpgw::get_var('activity_state'), 'activity_district' => 
phpgw::get_var('activity_district'), 'user_id' => $uid);
+                               $filters = array('activity_state' => 
phpgw::get_var('activity_state'), 'activity_category' => 
phpgw::get_var('activity_category'), 'activity_district' => 
phpgw::get_var('activity_district'), 'user_id' => $uid);
                                $result_objects = 
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects, 
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
                                $object_count = 
activitycalendar_soactivity::get_instance()->get_count($search_for, 
$search_type, $filters);
                                break;

Modified: trunk/activitycalendar/inc/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php     2011-11-14 
06:51:06 UTC (rev 8095)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php     2011-11-14 
07:04:46 UTC (rev 8096)
@@ -246,8 +246,14 @@
                public function serialize()
                {
                        $date_format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
-                       if(isset($this->organization_id) && 
$this->get_organization_id() > 0)
+                       if(isset($this->group_id) && $this->get_group_id() > 0)
                        {
+                               $contact_1 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_1());
+                               $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_2());
+                               $desc = 
activitycalendar_sogroup::get_instance()->get_description($this->get_group_id());
+                       }
+                       else if(isset($this->organization_id) && 
$this->get_organization_id() > 0)
+                       {
                                if($this->get_new_org())
                                {
                                        $org_name = 
activitycalendar_soorganization::get_instance()->get_organization_name_local($this->get_organization_id());
@@ -262,13 +268,7 @@
                                        $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_2());
                                        $desc = 
activitycalendar_soorganization::get_instance()->get_description($this->get_organization_id());
                                }
-                       }
-                       else if(isset($this->group_id) && $this->get_group_id() 
> 0)
-                       {
-                               $contact_1 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_1());
-                               $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_2());
-                               $desc = 
activitycalendar_sogroup::get_instance()->get_description($this->get_group_id());
-                       }
+                       } 
                        else
                        {
                                $contact_1 = "";

Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang  2011-11-14 06:51:06 UTC (rev 
8095)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2011-11-14 07:04:46 UTC (rev 
8096)
@@ -367,8 +367,8 @@
 state_0        activitycalendar        no      Ingen
 state_1        activitycalendar        no      Ny
 state_2        activitycalendar        no      Endring
-state_3        activitycalendar        no      Akseptert
-state_4        activitycalendar        no      Behandlet
+state_3        activitycalendar        no      Publisert
+state_4        activitycalendar        no      Publisert
 state_5        activitycalendar        no      Avvist
 activity_import        activitycalendar        no      Importer aktiviteter
 office activitycalendar        no      Hovedansvarlig kulturkontor

Modified: trunk/activitycalendar/templates/base/activity_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/activity_list_partial.php     
2011-11-14 06:51:06 UTC (rev 8095)
+++ trunk/activitycalendar/templates/base/activity_list_partial.php     
2011-11-14 07:04:46 UTC (rev 8096)
@@ -114,7 +114,7 @@
                
'index.php?menuaction=activitycalendar.uiactivities.query&amp;phpgw_return_as=json<?php
 echo $url_add_on; ?>&amp;editable=<?php echo $editable ? "true" : "false"; ?>',
                columnDefs,
                '<?php echo $list_id ?>_form',
-               ['<?php echo $list_id ?>_ctrl_toggle_activity_state', '<?php 
echo $list_id ?>_ctrl_toggle_activity_district', '<?php echo $list_id 
?>_ctrl_search_query'],
+               ['<?php echo $list_id ?>_ctrl_toggle_activity_state', '<?php 
echo $list_id ?>_ctrl_toggle_activity_district', '<?php echo $list_id 
?>_ctrl_toggle_activity_category', '<?php echo $list_id ?>_ctrl_search_query'],
                '<?php echo $list_id ?>_container',
                '<?php echo $list_id ?>_paginator',
                '<?php echo $list_id ?>',
@@ -207,6 +207,19 @@
                        }
                        ?>
                </select>
+               <label class="toolbar_element_label" 
for="ctrl_toggle_activity_category"><?php echo lang('category') ?></label>
+               <?php
+                       $categories = 
activitycalendar_soactivity::get_instance()->get_categories(); 
+               ?>
+               <select name="activity_category" id="<?php echo $list_id 
?>_ctrl_toggle_activity_category">
+                       <option value="all"><?php echo lang('all') ?></option>
+                       <?php
+                       foreach($categories as $category)
+                       {
+                               echo "<option 
value=\"{$category->get_id()}\">".$category->get_name()."</option>";
+                       }
+                       ?>
+               </select>
        </fieldset>