[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7496] property: prepare for download and filter on s
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7496] property: prepare for download and filter on status for service agreements |
|
Date: |
Thu, 11 Aug 2011 13:14:30 +0000 |
Revision: 7496
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7496
Author: sigurdne
Date: 2011-08-11 13:14:30 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
property: prepare for download and filter on status for service agreements
Modified Paths:
--------------
trunk/property/inc/class.bos_agreement.inc.php
trunk/property/inc/class.uis_agreement.inc.php
trunk/property/js/yahoo/uisagreement.index.js
Modified: trunk/property/inc/class.bos_agreement.inc.php
===================================================================
--- trunk/property/inc/class.bos_agreement.inc.php 2011-08-11 12:01:59 UTC
(rev 7495)
+++ trunk/property/inc/class.bos_agreement.inc.php 2011-08-11 13:14:30 UTC
(rev 7496)
@@ -147,6 +147,12 @@
return $vendor_list;
}
+ //FIXME
+ function select_status_list($format='',$selected='')
+ {
+ return array();
+ }
+
function read()
{
$s_agreement = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php 2011-08-11 12:01:59 UTC
(rev 7495)
+++ trunk/property/inc/class.uis_agreement.inc.php 2011-08-11 13:14:30 UTC
(rev 7496)
@@ -90,6 +90,7 @@
$this->allrows =
$this->bo->allrows;
$this->member_id =
$this->bo->member_id;
$this->p_num =
$this->bo->p_num;
+ $this->status_id =
$this->bo->status_id;
}
function save_sessiondata()
@@ -104,7 +105,8 @@
'cat_id' => $this->cat_id,
'vendor_id' => $this->vendor_id,
'allrows' => $this->allrows,
- 'member_id' => $this->member_id
+ 'member_id' => $this->member_id,
+ 'status_id' => $this->status_id
);
$this->bo->save_sessiondata($data);
}
@@ -191,10 +193,12 @@
'query' =>$this->query,
'role' => $this->role,
'member_id' =>
$this->member_id,
- 'p_num' => $this->p_num
+ 'p_num' => $this->p_num,
+ 'status_id' =>
$this->status_id
));
- $datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index',"
+ $datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index'";
+/*
."sort:'{$this->sort}',"
."order:'{$this->order}',"
."cat_id: '{$this->cat_id}',"
@@ -203,7 +207,7 @@
."p_num: '{$this->p_num}',"
."role:'{$this->role}',"
."member_id:'{$this->member_id}'";
-
+*/
$datatable['config']['allow_allrows'] = true;
$link_data = array
@@ -215,7 +219,8 @@
'filter' =>$this->filter,
'query' =>$this->query,
'role' => $this->role,
- 'member_id' =>
$this->member_id
+ 'member_id' =>
$this->member_id,
+ 'status_id' =>
$this->status_id
);
@@ -231,6 +236,10 @@
$default_value = array
('id'=>'','name'=>lang('no vendor'));
array_unshift
($values_combo_box[2],$default_value);
+ $values_combo_box[3] =
$this->bo->select_status_list('filter',$this->status_id);
+ $default_value = array
('id'=>'','name'=>lang('no status'));
+ array_unshift
($values_combo_box[3],$default_value);
+
$datatable['actions']['form'] = array
(
array
@@ -245,7 +254,8 @@
'filter'
=>$this->filter,
'query'
=>$this->query,
'role'
=> $this->role,
- 'member_id'
=> $this->member_id
+ 'member_id'
=> $this->member_id,
+ 'status_id'
=> $this->status_id
)
),
'fields' => array
@@ -280,6 +290,15 @@
'tab_index' => 3
),
array
+ ( //boton
STATUS
+ 'id' =>
'btn_status_id',
+ 'name'
=> 'status_id',
+ 'value'
=> lang('status'),
+ 'type'
=> 'button',
+ 'style'
=> 'filter',
+
'tab_index' => 4
+ ),
+ array
(
'type'
=> 'button',
'id'
=> 'btn_new',
@@ -316,6 +335,13 @@
))."','','width=300,height=600,scrollbars=1')",
'value'
=> lang('columns'),
'tab_index' => 9
+ ),
+ array
+ (
+ 'type'
=> 'button',
+ 'id'
=> 'btn_export',
+ 'value'
=> lang('download'),
+
'tab_index' => 10
)
),
'hidden_value' => array
@@ -334,6 +360,11 @@
( //div values
combo_box_2
'id' =>
'values_combo_box_2',
'value'
=> $this->bocommon->select2String($values_combo_box[2])
+ ),
+ array
+ ( //div values
combo_box_3
+ 'id' =>
'values_combo_box_3',
+ 'value'
=> $this->bocommon->select2String($values_combo_box[3])
)
)
)
@@ -1590,7 +1621,14 @@
return;
}
$id = phpgw::get_var('id', 'int');
- $list = $this->bo->read_details($id);
+ if($id)
+ {
+ $list = $this->bo->read_details($id);
+ }
+ else
+ {
+ $list = $this->bo->read($id);
+ }
$uicols = $this->bo->uicols;
$this->bocommon->download($list,$uicols['name'],$uicols['descr'],$uicols['input_type']);
}
Modified: trunk/property/js/yahoo/uisagreement.index.js
===================================================================
--- trunk/property/js/yahoo/uisagreement.index.js 2011-08-11 12:01:59 UTC
(rev 7495)
+++ trunk/property/js/yahoo/uisagreement.index.js 2011-08-11 13:14:30 UTC
(rev 7496)
@@ -1,76 +1,78 @@
-//--------------------------------------------------------
-// Declaration of location.index vars
-//--------------------------------------------------------
- //define SelectButton
- var oMenuButton_0, oMenuButton_1, oMenuButton_2;
- var selectsButtons = [
- {order:0,
var_URL:'member_id',name:'btn_member_id',style:'categorybutton',dependiente:''},
- {order:1,
var_URL:'cat_id',name:'btn_cat_id',style:'districtbutton',dependiente:''},
- {order:2,
var_URL:'vendor_id',name:'btn_vendor_id',style:'partOFTownbutton',dependiente:''}
- ];
-
- // define buttons
- var oNormalButton_0, oNormalButton_1;
- var normalButtons = [
- {order:0, name:'btn_search', funct:"onSearchClick"},
- {order:1, name:'btn_new', funct:"onNewClick"}
- ];
-
- // define Text buttons
- var textImput = [
- {order:0, name:'query',id:'txt_query'}
- ];
-
- var toolTips =
- [
- ]
-
- var linktoolTips =
- [
- {name:'btn_columns', title:'Columns', description:'Choose
columns'}
- ]
-
- // define the hidden column in datatable
- var config_values =
- {
- date_search : 0 //if search has link "Data search"
- }
-
- this.particular_setting = function()
- {
- if(flag_particular_setting=='init')
- {
- //focus initial
- oMenuButton_0.focus();
- }
- else if(flag_particular_setting=='update')
- {
- }
- }
-
-/****************************************************************************************/
-
- this.myParticularRenderEvent = function()
- {
- //don't delete it
- }
-
-
-//----------------------------------------------------------
- YAHOO.util.Event.addListener(window, "load", function()
- {
-
YAHOO.util.Dom.getElementsByClassName('toolbar','div')[0].style.display =
'none';
-
- var loader = new YAHOO.util.YUILoader();
- loader.addModule({
- name: "anyone", //module name; must be unique
- type: "js", //can be "js" or "css"
- fullpath: property_js //'property_js' have the path for
property.js, is render in HTML
- });
-
- loader.require("anyone");
-
- //Insert JSON utility on the page
-
- loader.insert();
- });
+//--------------------------------------------------------
+// Declaration of location.index vars
+//--------------------------------------------------------
+ //define SelectButton
+ var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3;
+ var selectsButtons = [
+ {order:0,
var_URL:'member_id',name:'btn_member_id',style:'categorybutton',dependiente:''},
+ {order:1,
var_URL:'cat_id',name:'btn_cat_id',style:'districtbutton',dependiente:''},
+ {order:2,
var_URL:'vendor_id',name:'btn_vendor_id',style:'partOFTownbutton',dependiente:''},
+ {order:3,
var_URL:'status_id',name:'btn_status_id',style:'partOFTownbutton',dependiente:''}
+ ];
+
+ // define buttons
+ var oNormalButton_0, oNormalButton_1, oNormalButton_2;
+ var normalButtons = [
+ {order:0, name:'btn_search', funct:"onSearchClick"},
+ {order:1, name:'btn_new', funct:"onNewClick"},
+ {order:2, name:'btn_export', funct:"onDownloadClick"}
+ ];
+
+ // define Text buttons
+ var textImput = [
+ {order:0, name:'query',id:'txt_query'}
+ ];
+
+ var toolTips =
+ [
+ ]
+
+ var linktoolTips =
+ [
+ {name:'btn_columns', title:'Columns', description:'Choose
columns'}
+ ]
+
+ // define the hidden column in datatable
+ var config_values =
+ {
+ date_search : 0 //if search has link "Data search"
+ }
+
+ this.particular_setting = function()
+ {
+ if(flag_particular_setting=='init')
+ {
+ //focus initial
+ oMenuButton_0.focus();
+ }
+ else if(flag_particular_setting=='update')
+ {
+ }
+ }
+
+/****************************************************************************************/
+
+ this.myParticularRenderEvent = function()
+ {
+ //don't delete it
+ }
+
+
+//----------------------------------------------------------
+ YAHOO.util.Event.addListener(window, "load", function()
+ {
+
YAHOO.util.Dom.getElementsByClassName('toolbar','div')[0].style.display =
'none';
+
+ var loader = new YAHOO.util.YUILoader();
+ loader.addModule({
+ name: "anyone", //module name; must be unique
+ type: "js", //can be "js" or "css"
+ fullpath: property_js //'property_js' have the path for
property.js, is render in HTML
+ });
+
+ loader.require("anyone");
+
+ //Insert JSON utility on the page
+
+ loader.insert();
+ });
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7496] property: prepare for download and filter on status for service agreements,
Sigurd Nes <=