[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7288] Added filters on arena-list
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [7288] Added filters on arena-list |
|
Date: |
Mon, 23 May 2011 08:14:38 +0000 |
Revision: 7288
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7288
Author: erikhl
Date: 2011-05-23 08:14:37 +0000 (Mon, 23 May 2011)
Log Message:
-----------
Added filters on arena-list
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soarena.inc.php
trunk/activitycalendar/inc/class.uiarena.inc.php
trunk/activitycalendar/inc/model/class.arena.inc.php
trunk/activitycalendar/setup/phpgw_no.lang
trunk/activitycalendar/setup/setup.inc.php
trunk/activitycalendar/setup/tables_current.inc.php
trunk/activitycalendar/setup/tables_update.inc.php
trunk/activitycalendar/templates/base/arena_list_partial.php
Modified: trunk/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soarena.inc.php 2011-05-23 07:42:55 UTC
(rev 7287)
+++ trunk/activitycalendar/inc/class.soarena.inc.php 2011-05-23 08:14:37 UTC
(rev 7288)
@@ -51,43 +51,16 @@
}
$order = "ORDER BY
{$this->marshal($sort_field,'field')} $dir";
}
-/* if($search_for)
+ if($search_for)
{
$query = $this->marshal($search_for,'string');
$like_pattern = "'%".$search_for."%'";
$like_clauses = array();
switch($search_type){
- case "name":
- $like_clauses[] = "party.first_name
$this->like $like_pattern";
- $like_clauses[] = "party.last_name
$this->like $like_pattern";
- $like_clauses[] = "party.company_name
$this->like $like_pattern";
- break;
- case "address":
- $like_clauses[] = "party.address_1
$this->like $like_pattern";
- $like_clauses[] = "party.address_2
$this->like $like_pattern";
- $like_clauses[] = "party.postal_code
$this->like $like_pattern";
- $like_clauses[] = "party.place
$this->like $like_pattern";
- break;
- case "identifier":
- $like_clauses[] = "party.identifier
$this->like $like_pattern";
- break;
- case "reskontro":
- $like_clauses[] = "party.reskontro
$this->like $like_pattern";
- break;
- case "result_unit_number":
- $like_clauses[] =
"party.result_unit_number $this->like $like_pattern";
- break;
case "all":
- $like_clauses[] = "party.first_name
$this->like $like_pattern";
- $like_clauses[] = "party.last_name
$this->like $like_pattern";
- $like_clauses[] = "party.company_name
$this->like $like_pattern";
- $like_clauses[] = "party.address_1
$this->like $like_pattern";
- $like_clauses[] = "party.address_2
$this->like $like_pattern";
- $like_clauses[] = "party.postal_code
$this->like $like_pattern";
- $like_clauses[] = "party.place
$this->like $like_pattern";
- $like_clauses[] = "party.identifier
$this->like $like_pattern";
- $like_clauses[] = "party.comment
$this->like $like_pattern";
- $like_clauses[] = "party.reskontro
$this->like $like_pattern";
+ default:
+ $like_clauses[] = "arena.arena_name
$this->like $like_pattern";
+ $like_clauses[] = "arena.address
$this->like $like_pattern";
break;
}
@@ -96,7 +69,7 @@
{
$clauses[] = '(' . join(' OR ', $like_clauses)
. ')';
}
- }*/
+ }
$filter_clauses = array();
@@ -105,18 +78,29 @@
$filter_clauses[] = "arena.id = {$id}";
}
- //$filter_clauses[] = "show_in_portal";
-/*
- // All parties with contracts of type X
- if(isset($filters['party_type']))
+ if(isset($filters['active']))
{
- $party_type =
$this->marshal($filters['party_type'],'int');
- if(isset($party_type) && $party_type > 0)
+ if($filters['active'] == 'active')
{
- $filter_clauses[] = "contract.location_id =
{$party_type}";
+ $filter_clauses[] = "arena.active = TRUE";
+ }
+ else if($filters['active'] == 'inactive')
+ {
+ $filter_clauses[] = "NOT arena.active";
+ }
+ }
+
+ if(isset($filters['arena_type']))
+ {
+ if($filters['arena_type'] == 'internal')
+ {
+ $filter_clauses[] = "NOT
arena.internal_arena_id IS NULL";
}
+ else if($filters['arena_type'] == 'not_internal')
+ {
+ $filter_clauses[] = "arena.internal_arena_id IS
NULL";
+ }
}
-*/
if(count($filter_clauses))
{
@@ -124,6 +108,9 @@
}
$condition = join(' AND ', $clauses);
+ //var_dump($filters);
+ //var_dump($filter_clauses);
+ //var_dump($condition);
if($return_count) // We should only return a count
{
@@ -135,6 +122,7 @@
$columns[] = 'arena.arena_name';
$columns[] = 'arena.address';
$columns[] = 'arena.internal_arena_id';
+ $columns[] = 'arena.active';
$cols = implode(',',$columns);
}
@@ -158,6 +146,7 @@
$arena->set_arena_name($this->unmarshal($this->db->f('arena_name'), 'string'));
$arena->set_address($this->unmarshal($this->db->f('address'), 'string'));
$arena->set_internal_arena_id($this->unmarshal($this->db->f('internal_arena_id'),
'int'));
+
$arena->set_active($this->unmarshal($this->db->f('active'), 'bool'));
}
return $arena;
}
Modified: trunk/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiarena.inc.php 2011-05-23 07:42:55 UTC
(rev 7287)
+++ trunk/activitycalendar/inc/class.uiarena.inc.php 2011-05-23 08:14:37 UTC
(rev 7288)
@@ -157,7 +157,7 @@
switch($query_type)
{
case 'all_arenas':
- $filters = array();
+ $filters = array('arena_type' =>
phpgw::get_var('arena_type'), 'active' => phpgw::get_var('active'));
$result_objects =
activitycalendar_soarena::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
$object_count =
activitycalendar_soarena::get_instance()->get_count($search_for, $search_type,
$filters);
break;
Modified: trunk/activitycalendar/inc/model/class.arena.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.arena.inc.php 2011-05-23
07:42:55 UTC (rev 7287)
+++ trunk/activitycalendar/inc/model/class.arena.inc.php 2011-05-23
08:14:37 UTC (rev 7288)
@@ -11,6 +11,7 @@
protected $internal_arena_id;
protected $address;
protected $reference;
+ protected $active;
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
@@ -48,6 +49,16 @@
return $this->arena_name;
}
+ public function set_active(bool $active)
+ {
+ $this->active = (bool)$active;
+ }
+
+ public function is_active()
+ {
+ return $this->active;
+ }
+
public function set_address($address)
{
$this->address = $address;
@@ -78,7 +89,8 @@
'id' => $this->get_id(),
'arena_name' => $this->get_arena_name(),
'internal_arena_id' =>
activitycalendar_soarena::get_instance()->get_building_name($this->get_internal_arena_id()),
- 'address' => $this->get_address()
+ 'address' => $this->get_address(),
+ 'active' => $this->is_active()
);
}
}
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2011-05-23 07:42:55 UTC (rev
7287)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2011-05-23 08:14:37 UTC (rev
7288)
@@ -330,7 +330,7 @@
description activitycalendar no Beskrivelse
date_start activitycalendar no Startdato
date_end activitycalendar no Sluttdato
-special_adaptation activitycalendar no Spesialtilpasset for
utviklingshemmede
+special_adaptation activitycalendar no Spesielt tilpasset for
utviklingshemmede
target activitycalendar no Målgruppe
contact_person_1 activitycalendar no Kontaktperson 1
contact_person_2 activitycalendar no Kontaktperson 2
@@ -370,4 +370,5 @@
state_4 activitycalendar no Behandlet
state_5 activitycalendar no Avvist
activity_import activitycalendar no Importer aktiviteter
-office activitycalendar no Kontor
\ No newline at end of file
+office activitycalendar no Kontor
+activity_helptext activitycalendar no Før ny aktivitet kan
registreres må du sjekke at organisasjon/gruppe finnes og er oppdatert, og at
arena finnes og er oppdatert.
\ No newline at end of file
Modified: trunk/activitycalendar/setup/setup.inc.php
===================================================================
--- trunk/activitycalendar/setup/setup.inc.php 2011-05-23 07:42:55 UTC (rev
7287)
+++ trunk/activitycalendar/setup/setup.inc.php 2011-05-23 08:14:37 UTC (rev
7288)
@@ -1,6 +1,6 @@
<?php
$setup_info['activitycalendar']['name'] = 'activitycalendar';
- $setup_info['activitycalendar']['version'] = '0.1.1';
+ $setup_info['activitycalendar']['version'] = '0.1.2';
$setup_info['activitycalendar']['app_order'] = 60;
$setup_info['activitycalendar']['enable'] = 1;
$setup_info['activitycalendar']['app_group'] = 'office';
Modified: trunk/activitycalendar/setup/tables_current.inc.php
===================================================================
--- trunk/activitycalendar/setup/tables_current.inc.php 2011-05-23 07:42:55 UTC
(rev 7287)
+++ trunk/activitycalendar/setup/tables_current.inc.php 2011-05-23 08:14:37 UTC
(rev 7288)
@@ -30,7 +30,8 @@
'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
'internal_arena_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
'arena_name' => array('type' =>
'varchar','precision' => '255','nullable' => false),
- 'address' => array('type' =>
'varchar','precision' => '255','nullable' => True)
+ 'address' => array('type' =>
'varchar','precision' => '255','nullable' => True),
+ 'active' => array('type' => 'bool','nullable'
=> true,'default' => True)
),
'pk' => array('id'),
'fk' => array(),
Modified: trunk/activitycalendar/setup/tables_update.inc.php
===================================================================
--- trunk/activitycalendar/setup/tables_update.inc.php 2011-05-23 07:42:55 UTC
(rev 7287)
+++ trunk/activitycalendar/setup/tables_update.inc.php 2011-05-23 08:14:37 UTC
(rev 7288)
@@ -15,4 +15,16 @@
$GLOBALS['setup_info']['activitycalendar']['currentver'] =
'0.1.1';
return $GLOBALS['setup_info']['activitycalendar']['currentver'];
}
+
+ $test[] = '0.1.1';
+ function activitycalendar_upgrade0_1_1()
+ {
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('activity_arena','active',array(
+ 'type' => 'bool',
+ 'default' => 'true'
+ ));
+
+ $GLOBALS['setup_info']['activitycalendar']['currentver'] =
'0.1.2';
+ return $GLOBALS['setup_info']['activitycalendar']['currentver'];
+ }
?>
\ No newline at end of file
Modified: trunk/activitycalendar/templates/base/arena_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/arena_list_partial.php
2011-05-23 07:42:55 UTC (rev 7287)
+++ trunk/activitycalendar/templates/base/arena_list_partial.php
2011-05-23 08:14:37 UTC (rev 7288)
@@ -64,7 +64,7 @@
'index.php?menuaction=activitycalendar.uiarena.query&phpgw_return_as=json<?php
echo $url_add_on; ?>&editable=<?php echo $editable ? "true" : "false"; ?>',
columnDefs,
'<?php echo $list_id ?>_form',
- ['<?php echo $list_id ?>_ctrl_search_query'],
+ ['<?php echo $list_id ?>_ctrl_search_query','<?php echo
$list_id ?>_ctrl_toggle_arena_type','<?php echo $list_id
?>_ctrl_toggle_active'],
'<?php echo $list_id ?>_container',
'<?php echo $list_id ?>_paginator',
'<?php echo $list_id ?>',
@@ -114,16 +114,15 @@
<label class="toolbar_element_label"
for="ctrl_toggle_arena_type"><?php echo lang('arena_type') ?></label>
<select name="arena_type" id="<?php echo $list_id
?>_ctrl_toggle_arena_type">
<option value="all"><?php echo lang('all') ?></option>
- <option value="1"><?php echo lang('internal')
?></option>
- <option value="2" ><?php echo lang('not_internal')
?></option>
+ <option value="internal"><?php echo lang('internal')
?></option>
+ <option value="not_internal" ><?php echo
lang('not_internal') ?></option>
</select>
-<!-- <label class="toolbar_element_label" for="<?php //echo $list_id
?>_ctrl_toggle_active"><?php //echo lang('marked_as') ?></label>
- <select name="active" id="<?php //echo $list_id
?>_ctrl_toggle_active">
- <option value="all"><?php //echo
lang('not_available_nor_hidden') ?></option>
- <option value="active"><?php //echo
lang('available_for_pick') ?></option>
- <option value="inactive"><?php //echo
lang('hidden_for_pick') ?></option>
+ <label class="toolbar_element_label" for="<?php echo $list_id
?>_ctrl_toggle_active"><?php echo lang('marked_as') ?></label>
+ <select name="active" id="<?php echo $list_id
?>_ctrl_toggle_active">
+ <option value="all" <?php echo ($status == 'all') ?
'selected' : ''?>><?php echo lang('all') ?></option>
+ <option value="active" <?php echo ($status == 'active')
? 'selected' : ''?>><?php echo lang('active') ?></option>
+ <option value="inactive" <?php echo ($status ==
'inactive') ? 'selected' : ''?>><?php echo lang('inactive') ?></option>
</select>
- -->
</fieldset>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7288] Added filters on arena-list,
Erik Holm-Larsen <=