[Fmsystem-commits] [7271] fixed multiple select on targets

[Erik Holm-Larsen]

Revision: 7271
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7271
Author:   erikhl
Date:     2011-05-09 08:55:35 +0000 (Mon, 09 May 2011)
Log Message:
-----------
fixed multiple select on targets

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

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-09 06:58:06 UTC 
(rev 7270)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-09 08:55:35 UTC 
(rev 7271)
@@ -352,7 +352,7 @@
        function get_targets()
        {
                $targets = array();
-               $sql = "SELECT * FROM bb_agegroup where active=1";
+               $sql = "SELECT * FROM bb_agegroup where active=1 ORDER BY sort";
                $this->db->query($sql, __LINE__, __FILE__);
                while($this->db->next_record()){
                        $target = new 
activitycalendar_target($this->db->f('id'));

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-05-09 
06:58:06 UTC (rev 7270)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-05-09 
08:55:35 UTC (rev 7271)
@@ -110,7 +110,8 @@
                                
$activity->set_district(phpgw::get_var('district'));
                                $activity->set_state(phpgw::get_var('state'));
                                
$activity->set_category(phpgw::get_var('category'));
-                               $activity->set_target(phpgw::get_var('target'));
+                               $target_array = phpgw::get_var('target');
+                               $activity->set_target(implode(",", 
$target_array));
                                
$activity->set_description(phpgw::get_var('description'));
                                $activity->set_time(phpgw::get_var('time'));
                                $activity->set_contact_persons($persons);

Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php  2011-05-09 06:58:06 UTC 
(rev 7270)
+++ trunk/activitycalendar/templates/base/activity.php  2011-05-09 08:55:35 UTC 
(rev 7271)
@@ -190,16 +190,19 @@
                                </dt>
                                <dd>
                                        <?php
-                                       $current_target_id = 
$activity->get_target();
+                                       $current_target_ids = 
$activity->get_target();
+                                       $current_target_id_array=explode(",", 
$current_target_ids);
+                                       //echo 
$current_target_id_array[0]."*".$current_target_id_array[1];
                                        if ($editable)
                                        {
                                                ?>
-                                               <select name="target">
+                                               <select name="target[]" 
size="<?php echo count($targets)?>" multiple="multiple">
                                                        <option value="0">Ingen 
målgruppe valgt</option>
                                                        <?php
-                                                       foreach($targets as 
$target)
+                                                       foreach($targets as $t)
                                                        {
-                                                               echo "<option 
".($current_target_id == $target->get_id() ? 'selected="selected"' : "")." 
value=\"{$target->get_id()}\">".$target->get_name()."</option>";
+                                                               //echo 
in_array($target->get_id(), $current_target_id_array);
+                                                               echo "<option 
value=\"{$t->get_id()}\" ".(in_array($t->get_id(), $current_target_id_array) ? 
'selected' : "").">".$t->get_name()."</option>";
                                                        }
                                                        ?>
                                                </select>