[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7414]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [7414] |
|
Date: |
Wed, 22 Jun 2011 07:52:13 +0000 |
Revision: 7414
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7414
Author: erikhl
Date: 2011-06-22 07:52:13 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soarena.inc.php
trunk/activitycalendar/inc/class.uiactivities.inc.php
trunk/activitycalendar/inc/class.uiarena.inc.php
trunk/activitycalendar/setup/phpgw_no.lang
trunk/activitycalendar/templates/base/arena.php
Modified: trunk/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soarena.inc.php 2011-06-22 06:09:50 UTC
(rev 7413)
+++ trunk/activitycalendar/inc/class.soarena.inc.php 2011-06-22 07:52:13 UTC
(rev 7414)
@@ -278,5 +278,22 @@
}
return $ret;
}
+
+ public function get_address($search)
+ {
+ $result_arr = array();
+ $result_arr[] = "<option>Ingen</option>";
+ if($search)
+ {
+ $sql = "select * from fm_streetaddress where
UPPER(descr) like UPPER('{$search}%')";
+ $this->db->query($sql, __LINE__, __FILE__);
+ while($this->db->next_record()){
+ //$result_arr = $this->db->f('name');
+ $result_arr[] = "<option value='" .
$this->db->f('descr') . "'>" . $this->db->f('descr') . "</option>";
+ }
+ }
+ $result = implode(' ' , $result_arr);
+ return $result;
+ }
}
?>
\ No newline at end of file
Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php 2011-06-22
06:09:50 UTC (rev 7413)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php 2011-06-22
07:52:13 UTC (rev 7414)
@@ -18,7 +18,8 @@
'add' => true,
'edit' => true,
'download' => true,
- 'send_mail' => true
+ 'send_mail' => true,
+ 'get_organization_groups' => true
);
public function __construct()
@@ -392,5 +393,41 @@
}
}
}
+
+ public function get_organization_groups()
+ {
+ $GLOBALS['phpgw_info']['flags']['noheader'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+
+ $org_id = phpgw::get_var('orgid');
+ $group_id = phpgw::get_var('groupid');
+ $returnHTML = "<option value='0'>Ingen gruppe valgt</option>";
+ if($org_id)
+ {
+ $groups =
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null,
null, array('org_id' => $org_id));
+ foreach ($groups as $group) {
+ if(isset($group))
+ {
+ //$res_g = $group->serialize();
+ $selected = "";
+ if($group_id && $group_id > 0)
+ {
+ $gr_id = (int)$group_id;
+ if($gr_id ==
(int)$group->get_id())
+ {
+ $selected_group = "
selected";
+ }
+ }
+ $group_html[] = "<option value='" .
$group->get_id() . "'". $selected_group . ">" . $group->get_name() .
"</option>";
+ }
+ }
+ $html = implode(' ' , $group_html);
+ $returnHTML = $returnHTML . ' ' . $html;
+ }
+
+
+ return $returnHTML;
+ }
}
?>
Modified: trunk/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiarena.inc.php 2011-06-22 06:09:50 UTC
(rev 7413)
+++ trunk/activitycalendar/inc/class.uiarena.inc.php 2011-06-22 07:52:13 UTC
(rev 7414)
@@ -37,8 +37,8 @@
*/
public function get_address_search()
{
- $search_string = phpgw::get_var('address_txt');
- var_dump($search_string);
+ $search_string = phpgw::get_var('search');
+ //var_dump($search_string);
return
activitycalendar_soarena::get_instance()->get_address($search_string);
}
@@ -103,7 +103,7 @@
// ... set all parameters
$arena->set_internal_arena_id(phpgw::get_var('internal_arena_id'));
$arena->set_arena_name(phpgw::get_var('arena_name'));
- $arena->set_address(phpgw::get_var('address'));
+ $arena->set_address(phpgw::get_var('address') .
' ' . phpgw::get_var('address_no'));
if(activitycalendar_soarena::get_instance()->store($arena)) // ... and then try
to store the object
{
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2011-06-22 06:09:50 UTC (rev
7413)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2011-06-22 07:52:13 UTC (rev
7414)
@@ -378,4 +378,5 @@
mail_body_state_4 activitycalendar no Ditt tips er behandlet
og publisert i kommuneportalen. Mvh %1 kulturkontor
mail_body_state_5 activitycalendar no Ditt tips er behandlet,
men vil ikke bli publisert i kommuneportalen. Mvh %1 kulturkontor
send_mail activitycalendar no Send e-post
-marked_as activitycalendar no Status
\ No newline at end of file
+marked_as activitycalendar no Status
+address_number activitycalendar no Nummer
\ No newline at end of file
Modified: trunk/activitycalendar/templates/base/arena.php
===================================================================
--- trunk/activitycalendar/templates/base/arena.php 2011-06-22 06:09:50 UTC
(rev 7413)
+++ trunk/activitycalendar/templates/base/arena.php 2011-06-22 07:52:13 UTC
(rev 7414)
@@ -3,15 +3,29 @@
include("common.php");
?>
-<script xmlns:php="http://php.net/xsl"; type="text/javascript">
-var endpoint = 'activitycalendar';
+<script type="text/javascript">
-YAHOO.activitycalendar.autocompleteHelper('index.php?menuaction=' + endpoint +
'.uiarena.get_address&address=true&phpgw_return_as=json&',
- 'field_address_txt',
- 'field_address_hidden',
- 'address_container',
- 'descr'
-);
+function get_address_search()
+{
+ var address = document.getElementById('address_txt').value;
+ var div_address = document.getElementById('address_container');
+
+ url =
"index.php?menuaction=activitycalendar.uiarena.get_address_search&phpgw_return_as=json&search="
+ address;
+
+var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
+var divcontent_end = "</select>";
+
+ var callback = {
+ success: function(response){
+ div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end;
+ },
+ failure: function(o) {
+ alert("AJAX doesn't work"); //FAILURE
+ }
+ }
+ var trans = YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
+
+}
</script>
<div class="identifier-header">
@@ -83,10 +97,9 @@
if ($editable)
{
?>
- <input type="text"
name="address" id="address" value="<?php echo $arena->get_address() ?>" />
- <div class="autocomplete">
- <input
id="field_address_hidden" name="address_hidden" type="hidden" value=""><input
name="address_txt" type="text" id="field_address_txt" value=""><div
id="address_container"></div>
- </div>
+ <input type="text"
name="address" id="address_txt" value="<?php echo $arena->get_address() ?>"
onkeyup="javascript:get_address_search()"/>
+ <div
id="address_container"></div>
+ <label
for="address_number"><?php echo lang('address_number') ?></label><input
type="text" name="address_no" id="address_no"/>
<?php
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7414],
Erik Holm-Larsen <=