[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7413]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [7413] |
|
Date: |
Wed, 22 Jun 2011 06:09:51 +0000 |
Revision: 7413
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7413
Author: erikhl
Date: 2011-06-22 06:09:50 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendar/inc/class.soorganization.inc.php
trunk/activitycalendar/inc/class.uiarena.inc.php
trunk/activitycalendar/inc/class.uiorganization.inc.php
trunk/activitycalendar/js/activitycalendar/common.js
trunk/activitycalendar/templates/base/activity.php
trunk/activitycalendar/templates/base/arena.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-06-22 05:26:56 UTC
(rev 7412)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-06-22 06:09:50 UTC
(rev 7413)
@@ -850,10 +850,10 @@
function add_group($group_info)
{
- $name = $org_info['name'];
- $orgid = $org_info['organization_id'];
- $description = $org_info['description'];
- $activity_id = $org_info['activity_id'];
+ $name = $group_info['name'];
+ $orgid = $group_info['organization_id'];
+ $description = $group_info['description'];
+ $activity_id = $group_info['activity_id'];
$show_in_portal = 1;
$columns[] = 'name';
@@ -863,9 +863,9 @@
$columns[] = 'show_in_portal';
$cols = implode(',',$columns);
- $values[] = "{$name}";
- $values[] = "{$description}";
- $values[] = "{$orgid}";
+ $values[] = "'{$name}'";
+ $values[] = "'{$description}'";
+ $values[] = "'{$orgid}'";
$values[] = $activity_id;
$values[] = $show_in_portal;
$vals = implode(',',$values);
@@ -902,10 +902,10 @@
function add_contact_person_org($contact)
{
- $name = $contact2['name'];
- $phone = $contact2['phone'];
- $mail = $contact2['mail'];
- $org_id = $contact2['org_id'];
+ $name = $contact['name'];
+ $phone = $contact['phone'];
+ $mail = $contact['mail'];
+ $org_id = $contact['org_id'];
$ssn = '';
$columns[] = 'name';
@@ -915,10 +915,10 @@
$columns[] = 'organization_id';
$cols = implode(',',$columns);
- $values[] = "{$name}";
- $values[] = "{$ssn}";
- $values[] = "{$phone}";
- $values[] = "{$mail}";
+ $values[] = "'{$name}'";
+ $values[] = "'{$ssn}'";
+ $values[] = "'{$phone}'";
+ $values[] = "'{$mail}'";
$values[] = $org_id;
$vals = implode(',',$values);
@@ -934,10 +934,10 @@
function add_contact_person_group($contact)
{
- $name = $contact2['name'];
- $phone = $contact2['phone'];
- $mail = $contact2['mail'];
- $org_id = $contact2['group_id'];
+ $name = $contact['name'];
+ $phone = $contact['phone'];
+ $mail = $contact['mail'];
+ $org_id = $contact['group_id'];
$columns[] = 'name';
$columns[] = 'phone';
@@ -945,9 +945,9 @@
$columns[] = 'group_id';
$cols = implode(',',$columns);
- $values[] = "{$name}";
- $values[] = "{$phone}";
- $values[] = "{$mail}";
+ $values[] = "'{$name}'";
+ $values[] = "'{$phone}'";
+ $values[] = "'{$mail}'";
$values[] = $org_id;
$vals = implode(',',$values);
Modified: trunk/activitycalendar/inc/class.soorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soorganization.inc.php 2011-06-22
05:26:56 UTC (rev 7412)
+++ trunk/activitycalendar/inc/class.soorganization.inc.php 2011-06-22
06:09:50 UTC (rev 7413)
@@ -62,6 +62,9 @@
case "district":
$like_clauses[] = "org.district
$this->like $like_pattern";
break;
+ default:
+ $like_clauses[] = "org.name $this->like
$like_pattern";
+ break;
}
@@ -73,6 +76,11 @@
$filter_clauses = array();
$filter_clauses[] = "show_in_portal=1";
+
+ if(isset($filters[$this->get_id_field_name()])){
+ $id =
$this->marshal($filters[$this->get_id_field_name()],'int');
+ $filter_clauses[] = "org.id = {$id}";
+ }
/*
// All parties with contracts of type X
Modified: trunk/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiarena.inc.php 2011-06-22 05:26:56 UTC
(rev 7412)
+++ trunk/activitycalendar/inc/class.uiarena.inc.php 2011-06-22 06:09:50 UTC
(rev 7413)
@@ -12,7 +12,8 @@
'query' => true,
'view' => true,
'add' => true,
- 'edit' => true
+ 'edit' => true,
+ 'get_address_search' => true
);
public function __construct()
@@ -31,6 +32,16 @@
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiarena.edit'));
}
+ /**
+ * Public method.
+ */
+ public function get_address_search()
+ {
+ $search_string = phpgw::get_var('address_txt');
+ var_dump($search_string);
+ return
activitycalendar_soarena::get_instance()->get_address($search_string);
+ }
+
public function index()
{
// No messages so far
Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php 2011-06-22
05:26:56 UTC (rev 7412)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php 2011-06-22
06:09:50 UTC (rev 7413)
@@ -12,7 +12,10 @@
(
'index' => true,
'query' => true,
- 'get_organization_groups' => true
+ 'changed_organizations' => true,
+ 'get_organization_groups' => true,
+ 'show' => true,
+ 'edit' => true
);
public function __construct()
@@ -32,6 +35,11 @@
$this->render('organization_list.php');
}
+ public function changed_organizations()
+ {
+ $this->render('organization_list_changed.php');
+ }
+
public function index_json()
{
$organizations =
activitycalendar_soorganization::get_instance()->get(); //get organizations
@@ -53,7 +61,59 @@
return $this->yui_results($organizations);
}
+ public function edit()
+ {
+ $id = (int)phpgw::get_var('id');
+ $type = phpgw::get_var('type');
+ if($type)
+ {
+ //var_dump($type);
+ $so = activitycalendar_sogroup::get_instance();
+ }
+ else
+ {
+ //var_dump('org');
+ $so = activitycalendar_soorganization::get_instance();
+ }
+ }
+ public function show()
+ {
+ $id = (int)phpgw::get_var('id');
+ $type = phpgw::get_var('type');
+ if($type)
+ {
+ //var_dump($type);
+ $so = activitycalendar_sogroup::get_instance();
+ $group = $so->get(null, null, null, null, null, null,
array('id' => $id));
+
+ return $this->render('group.php', array
+ (
+ 'group' => $group,
+ 'editable' => true,
+ 'message' => isset($message) ? $message
: phpgw::get_var('message'),
+ 'error' => isset($error) ? $error :
phpgw::get_var('error')
+ )
+ );
+ }
+ else
+ {
+ //var_dump('org');
+ $so = activitycalendar_soorganization::get_instance();
+ $org = $so->get(null, null, null, null, null, null,
array('id' => $id));
+
+ return $this->render('organization.php', array
+ (
+ 'organization' => $org,
+ 'editable' => true,
+ 'message' => isset($message) ? $message
: phpgw::get_var('message'),
+ 'error' => isset($error) ? $error :
phpgw::get_var('error')
+ )
+ );
+ }
+ }
+
+
/**
* (non-PHPdoc)
@@ -254,6 +314,27 @@
}
$value['labels'][] = lang('show');
break;
+
+ case 'changed_organizations':
+ $value['ajax'][] = false;
+ if($value['organization_id'] != '' &&
$value['organization_id'] != null){
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show', 'id' => $value['id'], 'type' =>
'group')));
+ }
+ else
+ {
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show', 'id' => $value['id'])));
+ }
+ $value['labels'][] = lang('show');
+ $value['ajax'][] = false;
+ if($value['organization_id'] != '' &&
$value['organization_id'] != null){
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.show', 'id' => $value['id'], 'type' =>
'group')));
+ }
+ else
+ {
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'activitycalendar.uiorganization.edit', 'id' => $value['id'])));
+ }
+ $value['labels'][] = lang('edit');
+ break;
}
}
}
Modified: trunk/activitycalendar/js/activitycalendar/common.js
===================================================================
--- trunk/activitycalendar/js/activitycalendar/common.js 2011-06-22
05:26:56 UTC (rev 7412)
+++ trunk/activitycalendar/js/activitycalendar/common.js 2011-06-22
06:09:50 UTC (rev 7413)
@@ -258,7 +258,7 @@
}
}
-/*
+
YAHOO.activitycalendar.autocompleteHelper = function(url, field, hidden,
container, label_attr) {
label_attr = label_attr || 'name';
var myDataSource = new YAHOO.util.DataSource(url);
@@ -269,20 +269,19 @@
fields: [label_attr, 'id']
};
myDataSource.maxCacheEntries = 5;
- console.log(myDataSource);
- console.log(field);
- console.log(container);
- console.log(YAHOO.widget.AutoComplete);
+ //console.log(myDataSource);
+ //console.log(field);
+ //console.log(container);
+ //console.log(YAHOO.widget.AutoComplete);
var ac = new YAHOO.widget.AutoComplete(field, container, myDataSource);
ac.queryQuestionMark = false;
ac.resultTypeList = false;
ac.forceSelection = true;
- console.log(ac);
+ //console.log(ac);
ac.itemSelectEvent.subscribe(function(sType, aArgs) {
- console.log(aArgs[2]);
+ //console.log(aArgs[2]);
YAHOO.util.Dom.get(hidden).value = aArgs[2].id;
});
return ac;
};
-*/
\ No newline at end of file
Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php 2011-06-22 05:26:56 UTC
(rev 7412)
+++ trunk/activitycalendar/templates/base/activity.php 2011-06-22 06:09:50 UTC
(rev 7413)
@@ -10,24 +10,20 @@
function get_available_groups()
{
var org_id = document.getElementById('organization_id').value;
- var group_select = document.getElementById('group_id');
- //alert(group_select);
+ var div_select = document.getElementById('group_select');
+
<?php if($activity->get_group_id()){?>
- url =
"index.php?menuaction=activitycalendar.uiorganization.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+ url =
"index.php?menuaction=activitycalendar.uiactivities.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
<?php }else{?>
- url =
"index.php?menuaction=activitycalendar.uiorganization.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+ url =
"index.php?menuaction=activitycalendar.uiactivities.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
<?php }?>
+
+var divcontent_start = "<select name=\"group_id\" id=\"group_id\">";
+var divcontent_end = "</select>";
-/* $.ajax({url: url,
- success: function(response) {
- $("#group_id").innerHTML = response;
- }
- });
-*/
var callback = {
success: function(response){
- //alert("det funker");
- group_select.innerHTML =
JSON.parse(response.responseText);
+ div_select.innerHTML = divcontent_start
+ JSON.parse(response.responseText) + divcontent_end;
},
failure: function(o) {
alert("AJAX doesn't work"); //FAILURE
@@ -41,7 +37,6 @@
{
get_available_groups();
});
-
</script>
<div class="yui-content">
@@ -113,9 +108,11 @@
if ($editable)
{
?>
- <select name="group_id"
id="group_id">
- <option value="0">Ingen
gruppe valgt</option>
- </select>
+ <div id="group_select">
+ <select name="group_id"
id="group_id">
+ <option
value="0">Ingen gruppe valgt</option>
+ </select>
+ </div>
<?php
?>
<?php
@@ -273,8 +270,8 @@
}
else
{
- if($activity->get_district()){
- echo
$act_so->get_district_name($activity->get_district());
+ if($activity->get_office()){
+ echo
$act_so->get_office_name($activity->get_office());
}
}
?>
Modified: trunk/activitycalendar/templates/base/arena.php
===================================================================
--- trunk/activitycalendar/templates/base/arena.php 2011-06-22 05:26:56 UTC
(rev 7412)
+++ trunk/activitycalendar/templates/base/arena.php 2011-06-22 06:09:50 UTC
(rev 7413)
@@ -3,6 +3,17 @@
include("common.php");
?>
+<script xmlns:php="http://php.net/xsl"; type="text/javascript">
+var endpoint = 'activitycalendar';
+
+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'
+);
+</script>
+
<div class="identifier-header">
<h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/custom/contact.png" /><?php echo lang('arena') ?></h1>
<div>
@@ -73,6 +84,9 @@
{
?>
<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>
<?php
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7413],
Erik Holm-Larsen <=