[Fmsystem-commits] [7279]

[Erik Holm-Larsen]

Revision: 7279
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7279
Author:   erikhl
Date:     2011-05-10 08:57:32 +0000 (Tue, 10 May 2011)
Log Message:
-----------


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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-10 08:13:05 UTC 
(rev 7278)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-10 08:57:32 UTC 
(rev 7279)
@@ -325,8 +325,7 @@
        
        function get_district_from_name($name)
        {
-               $this->db->query("SELECT district_id FROM fm_part_of_town where 
name like UPPER('{$name}') ", __LINE__, __FILE__);
-               $this->db->query($sql, __LINE__, __FILE__);
+               $this->db->query("SELECT district_id FROM fm_part_of_town where 
name like UPPER('%{$name}%') ", __LINE__, __FILE__);
                while($this->db->next_record()){
                        $result = $this->db->f('district_id');
                }       

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-05-10 
08:13:05 UTC (rev 7278)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-05-10 
08:57:32 UTC (rev 7279)
@@ -73,6 +73,7 @@
                
                $categories = 
activitycalendar_soactivity::get_instance()->get_categories();
                $targets = 
activitycalendar_soactivity::get_instance()->get_targets();
+               $offices = 
activitycalendar_soactivity::get_instance()->select_district_list();
                $districts = 
activitycalendar_soactivity::get_instance()->select_district_list();
                                
                // Retrieve the arena object or create a new one
@@ -108,6 +109,7 @@
                                
$activity->set_group_id(phpgw::get_var('group_id'));
                                
$activity->set_arena(phpgw::get_var('arena_id'));
                                
$activity->set_district(phpgw::get_var('district'));
+                               $activity->set_office(phpgw::get_var('office'));
                                $activity->set_state(phpgw::get_var('state'));
                                
$activity->set_category(phpgw::get_var('category'));
                                $target_array = phpgw::get_var('target');
@@ -137,6 +139,7 @@
                                'categories' => $categories,
                                'targets' => $targets,
                                'districts' => $districts,
+                               'offices' => $offices,
                                'editable' => true,
                                'message' => isset($message) ? $message : 
phpgw::get_var('message'),
                                'error' => isset($error) ? $error : 
phpgw::get_var('error')

Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang  2011-05-10 08:13:05 UTC (rev 
7278)
+++ trunk/activitycalendar/setup/phpgw_no.lang  2011-05-10 08:57:32 UTC (rev 
7279)
@@ -369,4 +369,5 @@
 state_3        activitycalendar        no      Akseptert
 state_4        activitycalendar        no      Behandlet
 state_5        activitycalendar        no      Avvist
-activity_import        activitycalendar        no      Importer aktiviteter
\ No newline at end of file
+activity_import        activitycalendar        no      Importer aktiviteter
+office activitycalendar        no      Kontor
\ No newline at end of file

Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php  2011-05-10 08:13:05 UTC 
(rev 7278)
+++ trunk/activitycalendar/templates/base/activity.php  2011-05-10 08:57:32 UTC 
(rev 7279)
@@ -222,22 +222,22 @@
                                        ?>
                                </dd>
                                <dt>
-                                       <?php if($activity->get_district() || 
$editable) { ?>
-                                       <label for="district"><?php echo 
lang('district') ?></label>
+                                       <?php if($activity->get_office() || 
$editable) { ?>
+                                       <label for="office"><?php echo 
lang('office') ?></label>
                                        <?php  } ?>
                                </dt>
                                <dd>
                                        <?php
                                        if ($editable)
                                        {
-                                               $selected_district = 
$activity->get_district();
+                                               $selected_office = 
$activity->get_office();
                                        ?>
-                                               <select name="district">
-                                                       <option value="0">Ingen 
bydel valgt</option>
+                                               <select name="office">
+                                                       <option value="0">Ingen 
kontor valgt</option>
                                                        <?php
-                                                       foreach($districts as 
$district)
+                                                       foreach($offices as 
$office)
                                                        {
-                                                               echo "<option 
".($selected_district == $district['id'] ? 'selected="selected"' : "")." 
value=\"{$district['id']}\">".$district['name']."</option>";
+                                                               echo "<option 
".($selected_office == $office['id'] ? 'selected="selected"' : "")." 
value=\"{$office['id']}\">".$office['name']."</option>";
                                                        }
                                                        ?>
                                                </select>