[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9506] Bugfix:
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [9506] Bugfix: |
|
Date: |
Tue, 05 Jun 2012 07:50:45 +0000 |
Revision: 9506
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9506
Author: erikhl
Date: 2012-06-05 07:50:44 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Bugfix:
* Address-search does not show selected address inn address-field - Fixed
* Districts are removed when transferring org/group to booking - Fixed
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendar/inc/class.soarena.inc.php
trunk/activitycalendar/inc/class.sogroup.inc.php
trunk/activitycalendar/inc/class.soorganization.inc.php
trunk/activitycalendar/inc/class.uiorganization.inc.php
trunk/activitycalendar/templates/base/activity.php
trunk/activitycalendar/templates/base/arena.php
trunk/activitycalendar/templates/base/group.php
trunk/activitycalendar/templates/base/organization.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-06-05 07:40:42 UTC
(rev 9505)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-06-05 07:50:44 UTC
(rev 9506)
@@ -1362,7 +1362,7 @@
$activity->set_title($this->unmarshal($this->db->f('title'), 'string'));
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
$activity->set_group_id($this->unmarshal($this->db->f('group_id'), 'int'));
-
$activity->set_district($this->unmarshal($this->db->f('district'), 'int'));
+
$activity->set_district($this->unmarshal($this->db->f('district'), 'string'));
$activity->set_office($this->unmarshal($this->db->f('office'), 'int'));
$activity->set_category($this->unmarshal($this->db->f('category'), 'int'));
$activity->set_state($this->unmarshal($this->db->f('state'), 'int'));
Modified: trunk/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soarena.inc.php 2012-06-05 07:40:42 UTC
(rev 9505)
+++ trunk/activitycalendar/inc/class.soarena.inc.php 2012-06-05 07:50:44 UTC
(rev 9506)
@@ -289,13 +289,18 @@
public function get_address($search)
{
$result_arr = array();
+ $curr_index=0;
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');
+ //if($curr_index == 0){
+ //$result_arr[] = "<option value='0'>Velg
gateadresse</option>";
+ //}
$result_arr[] = "<option value='" .
$this->db->f('descr') . "'>" . $this->db->f('descr') . "</option>";
+ //$curr_index++;
}
}
$result = implode(' ' , $result_arr);
Modified: trunk/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.sogroup.inc.php 2012-06-05 07:40:42 UTC
(rev 9505)
+++ trunk/activitycalendar/inc/class.sogroup.inc.php 2012-06-05 07:50:44 UTC
(rev 9506)
@@ -87,7 +87,7 @@
if(isset($filters['new_groups'])){
$use_local_group = true;
unset($filter_clauses);
- $filter_clauses[] = "activity_group.change_type =
'new'";
+ $filter_clauses[] = "activity_group.change_type = 'new'
OR activity_group.change_type = 'change' ";
if(isset($filters[$this->get_id_field_name()])){
$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
$filter_clauses[] = "activity_group.id = {$id}";
Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php 2012-06-05
07:40:42 UTC (rev 9505)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php 2012-06-05
07:50:44 UTC (rev 9506)
@@ -114,7 +114,7 @@
//$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
//$filter_clauses[] = "org.id = {$id}";
unset($filter_clauses);
- $filter_clauses[] = "org.change_type = 'new'";
+ $filter_clauses[] = "org.change_type = 'new' OR
org.change_type = 'change' ";
if(isset($filters[$this->get_id_field_name()])){
$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
$filter_clauses[] = "org.id = {$id}";
Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-06-05
07:40:42 UTC (rev 9505)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php 2012-06-05
07:50:44 UTC (rev 9506)
@@ -171,13 +171,15 @@
$group_org_id =
$sogroup->get_orgid_from_group($new_group_id);
//get affected activities and update
with new org id
- $update_activities =
$soactivity->get_activities_for_update($new_group_id, true);
+ $update_activities =
$soactivity->get_activities_for_update($id, true);
+ var_dump($update_activities);
foreach($update_activities as $act)
{
$act->set_organization_id($group_org_id);
$act->set_group_id($new_group_id);
$act->set_new_org(false);
$soactivity->store($act);
+ var_dump($act);
}
//set local group as stored
@@ -185,6 +187,10 @@
$group->set_transferred(true);
$sogroup->update_local($group);
$message = lang('messages_saved_form');
+
+ $contact_persons =
$socontact->get_booking_contact_persons($group->get_id(), true);
+ $cp1 = $contact_persons[0];
+ $cp2 = $contact_persons[1];
}
else
{
@@ -444,6 +450,7 @@
$id = (int)phpgw::get_var('id');
$type = phpgw::get_var('type');
$cancel_link = self::link(array('menuaction' =>
'activitycalendar.uiorganization.changed_organizations'));
+ $socontact = activitycalendar_socontactperson::get_instance();
if($type)
{
if(isset($_POST['edit_group'])) // The user has pressed
the save button
@@ -462,12 +469,17 @@
if(count($group_array) > 0){
$keys = array_keys($group_array);
$group = $group_array[$keys[0]];
- _debug_array($group);
+// _debug_array($group);
}
+ $contact_persons =
$socontact->get_local_contact_persons($group->get_id(), true);
+ $cp1 = $contact_persons[0];
+ $cp2 = $contact_persons[1];
$data = array
(
'group' => $group,
+ 'contactperson1' => $cp1,
+ 'contactperson2' => $cp2,
'cancel_link' => $cancel_link,
'message' => $message,
'errorMsgs' => $errorMsgs,
@@ -495,11 +507,15 @@
$org = $org_array[$keys[0]];
}
- //var_dump($org);
+ $contact_persons =
$socontact->get_local_contact_persons($org->get_id());
+ $cp1 = $contact_persons[0];
+ $cp2 = $contact_persons[1];
$data = array
(
'organization' => $org,
+ 'contactperson1' => $cp1,
+ 'contactperson2' => $cp2,
'cancel_link' => $cancel_link,
'message' => $message,
'errorMsgs' => $errorMsgs,
Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php 2012-06-05 07:40:42 UTC
(rev 9505)
+++ trunk/activitycalendar/templates/base/activity.php 2012-06-05 07:50:44 UTC
(rev 9506)
@@ -33,6 +33,42 @@
}
+function get_address_search_cp2()
+{
+ var address = document.getElementById('contact_person_2_address').value;
+ var div_address = document.getElementById('contact2_address_container');
+ div_address.style.display="block";
+
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url = "<?php echo
$ajaxURL?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+
+var divcontent_start = "<select name=\"contact2_address_select\"
id=\"address_cp2\" size=\"5\" onChange='setAddressValue(this)'>";
+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);
+
+}
+
+function setAddressValue(field)
+{
+ if(field.name == 'contact2_address_select')
+ {
+ var address = document.getElementById('contact_person_2_address');
+ var div_address = document.getElementById('contact2_address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+ }
+}
+
YAHOO.util.Event.onDOMReady(function()
{
get_available_groups();
@@ -541,7 +577,8 @@
if ($editable)
{
?>
- <input type="text"
name="contact_person_2_address" id="contact_person_2_address" value="<?php echo
$activity->get_contact_person_2_address() ?>" />
+ <input type="text"
name="contact_person_2_address" id="contact_person_2_address" value="<?php echo
$activity->get_contact_person_2_address() ?>"
onkeyup="javascript:get_address_search_cp2()"/>
+ <div
id="contact2_address_container"></div>
<?php
}
else
Modified: trunk/activitycalendar/templates/base/arena.php
===================================================================
--- trunk/activitycalendar/templates/base/arena.php 2012-06-05 07:40:42 UTC
(rev 9505)
+++ trunk/activitycalendar/templates/base/arena.php 2012-06-05 07:50:44 UTC
(rev 9506)
@@ -7,18 +7,18 @@
function get_address_search()
{
- var address = document.getElementById('address_txt').value;
+ var address = document.getElementById('address').value;
var div_address = document.getElementById('address_container');
+ div_address.style.display="block";
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_start = "<select name=\"address_select\" id=\"address\"
size=\"5\" onChange='setAddressValue(this)'>";
var divcontent_end = "</select>";
-var divcontent_number = " <label for=\"address_number\"><?php echo
lang('address_number') ?></label><input type=\"text\" name=\"address_no\"
id=\"address_no\" size=\"6\"/>"
var callback = {
success: function(response){
- div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end +
divcontent_number;
+ div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end;
},
failure: function(o) {
alert("AJAX doesn't work"); //FAILURE
@@ -27,6 +27,16 @@
var trans = YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
}
+
+function setAddressValue(field)
+{
+ var address = document.getElementById('address');
+ var div_address = document.getElementById('address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+}
+
</script>
<?php echo activitycalendar_uicommon::get_page_message($message) ?>
<div class="identifier-header">
@@ -75,8 +85,9 @@
if ($editable)
{
?>
- <input type="text"
name="address" id="address_txt" value="<?php echo $arena->get_address() ?>"
onkeyup="javascript:get_address_search()"/>
+ <input type="text"
name="address" id="address" 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" size="6"/>
<?php
}
else
Modified: trunk/activitycalendar/templates/base/group.php
===================================================================
--- trunk/activitycalendar/templates/base/group.php 2012-06-05 07:40:42 UTC
(rev 9505)
+++ trunk/activitycalendar/templates/base/group.php 2012-06-05 07:50:44 UTC
(rev 9506)
@@ -27,15 +27,27 @@
<dd><input type="hidden" name="contact1_id"
value="<?php echo $contactperson1->get_id();?>"/></dd>
<dt><label for="contact1_name">Navn</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text" name="contact1_name"
value="<?php echo $contactperson1->get_name();?>"/><br/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_name();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_phone">Telefon</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact1_phone" value="<?php echo $contactperson1->get_phone();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_phone();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_mail">E-post</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact1_email" value="<?php echo $contactperson1->get_email();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_email();?>
+ <?php }?>
</dd>
<?php }?>
<dt><label>Kontaktperson 2</label></dt>
@@ -43,15 +55,27 @@
<dd><input type="hidden" name="contact2_id"
value="<?php echo $contactperson2->get_id();?>"/></dd>
<dt><label for="contact1_name">Navn</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text" name="contact2_name"
value="<?php echo $contactperson2->get_name();?>"/><br/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_name();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_phone">Telefon</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact2_phone" value="<?php echo $contactperson2->get_phone();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_phone();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_mail">E-post</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact2_email" value="<?php echo $contactperson2->get_email();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_email();?>
+ <?php }?>
</dd>
<?php }?>
</dl>
Modified: trunk/activitycalendar/templates/base/organization.php
===================================================================
--- trunk/activitycalendar/templates/base/organization.php 2012-06-05
07:40:42 UTC (rev 9505)
+++ trunk/activitycalendar/templates/base/organization.php 2012-06-05
07:50:44 UTC (rev 9506)
@@ -98,15 +98,27 @@
<dd><input type="hidden" name="contact1_id"
value="<?php echo $contactperson1->get_id();?>"/></dd>
<dt><label for="contact1_name">Navn</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text" name="contact1_name"
value="<?php echo $contactperson1->get_name();?>"/><br/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_name();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_phone">Telefon</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact1_phone" value="<?php echo $contactperson1->get_phone();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_phone();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_mail">E-post</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact1_email" value="<?php echo $contactperson1->get_email();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_email();?>
+ <?php }?>
</dd>
<?php }?>
<?php if($contactperson2){?>
@@ -114,15 +126,27 @@
<dd><input type="hidden" name="contact2_id"
value="<?php echo $contactperson2->get_id();?>"/></dd>
<dt><label for="contact1_name">Navn</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text" name="contact2_name"
value="<?php echo $contactperson2->get_name();?>"/><br/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_name();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_phone">Telefon</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact2_phone" value="<?php echo $contactperson2->get_phone();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_phone();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_mail">E-post</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact2_email" value="<?php echo $contactperson2->get_email();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_email();?>
+ <?php }?>
</dd>
<?php }?>
</dl>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9506] Bugfix:,
Erik Holm-Larsen <=