[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14753] more fixes
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14753] more fixes |
|
Date: |
Thu, 18 Feb 2016 18:24:13 +0000 |
Revision: 14753
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14753
Author: sigurdne
Date: 2016-02-18 18:23:21 +0000 (Thu, 18 Feb 2016)
Log Message:
-----------
more fixes
Modified Paths:
--------------
trunk/phpgwapi/templates/base/datatable_jquery.xsl
trunk/phpgwapi/templates/portico/head.inc.php
trunk/property/inc/class.boinvoice.inc.php
trunk/property/inc/class.boproject.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.sobudget.inc.php
trunk/property/inc/class.soinvoice.inc.php
trunk/property/inc/class.solocation.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uientity.inc.php
trunk/property/inc/class.uigab.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/templates/base/columns.xsl
Modified: trunk/phpgwapi/templates/base/datatable_jquery.xsl
===================================================================
--- trunk/phpgwapi/templates/base/datatable_jquery.xsl 2016-02-17 17:50:47 UTC
(rev 14752)
+++ trunk/phpgwapi/templates/base/datatable_jquery.xsl 2016-02-18 18:23:21 UTC
(rev 14753)
@@ -30,6 +30,7 @@
<xsl:template name="datatable">
<script type="text/javascript">
var number_of_toolbar_items = 0;
+ var filter_selects = [];
</script>
<xsl:call-template name="jquery_phpgw_i18n"/>
<xsl:apply-templates select="form" />
@@ -212,6 +213,9 @@
<xsl:variable name="name">
<xsl:value-of select="name"/>
</xsl:variable>
+
<script type="text/javascript">
+
filter_selects.push('<xsl:value-of select="$name"/>');
+
</script>
<select id="{$name}" name="{$name}">
<xsl:for-each select="list">
<xsl:variable name="id">
@@ -637,14 +641,7 @@
},
</xsl:when>
</xsl:choose>
-// {
-// extend: 'copyHtml5',
-// text: "<xsl:value-of
select="php:function('lang', 'copy')"/>"
-// },
-// 'csvHtml5',
'excelHtml5',
-// 'pdfHtml5'
-// 'excelFlash',
<xsl:choose>
<xsl:when test="download">
,{
@@ -681,9 +678,9 @@
</xsl:when>
</xsl:choose>
];
+ var action_def = [
<xsl:choose>
<xsl:when test="//datatable/actions !=
''">
- var action_def = [
<xsl:for-each
select="//datatable/actions">
<xsl:choose>
<xsl:when
test="type = 'custom'">
@@ -824,6 +821,12 @@
InitContextMenu = true;
}
}
+
+ if(button_def.length > 10)
+ {
+ group_buttons = true;
+ }
+
]]>
if($(document).width() < 1000)
{
@@ -918,6 +921,16 @@
aoData.columns = {};
aoData.columns[column] =
column_to_keep;
}
+
+ var select = null;
+ for (var i = 0; i <
filter_selects.length; i++)
+ {
+ select = $("#" +
filter_selects[i]);
+ var select_name =
select.prop("name");
+ var select_value =
select.val();
+ aoData[select_name] =
select_value;
+ }
+
},
fnCreatedRow : function( nRow, aData,
iDataIndex ){
},
Modified: trunk/phpgwapi/templates/portico/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/portico/head.inc.php 2016-02-17 17:50:47 UTC
(rev 14752)
+++ trunk/phpgwapi/templates/portico/head.inc.php 2016-02-18 18:23:21 UTC
(rev 14753)
@@ -22,7 +22,6 @@
phpgw::import_class('phpgwapi.jquery');
phpgwapi_jquery::load_widget('core');
- phpgwapi_jquery::load_widget('layout');
$javascripts = array
(
@@ -36,6 +35,7 @@
if( !$GLOBALS['phpgw_info']['flags']['noframework'] &&
!$GLOBALS['phpgw_info']['flags']['nonavbar'] )
{
+ phpgwapi_jquery::load_widget('layout');
phpgwapi_jquery::load_widget('treeview');
$GLOBALS['phpgw_info']['user']['preferences']['common']['sidecontent'] =
'ajax_menu';//ajax_menu|jsmenu
Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.boinvoice.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -137,21 +137,9 @@
function read_invoice( $data )
{
- if (!phpgw::get_var('paid', 'bool'))
- {
-// $voucher_id = $this->query &&
ctype_digit($this->query) ? $this->query : 0;
- }
-
$start_date =
$this->bocommon->date_to_timestamp($data['start_date']);
$end_date =
$this->bocommon->date_to_timestamp($data['end_date']);
- /* $invoice = $this->so->read_invoice(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'user_lid' => $this->user_lid,'cat_id' =>
$this->cat_id, 'paid' => $paid,
-
'start_date'=>$start_date,'end_date'=>$end_date,'vendor_id'=>$vendor_id,
-
'loc1'=>$loc1,'workorder_id'=>$workorder_id,'allrows'=>$this->allrows,
- 'voucher_id'=>$voucher_id,'b_account_class'
=>$this->b_account_class,
- 'district_id' => $this->district_id, 'invoice_id' =>
$invoice_id, 'ecodimb' => $ecodimb, 'project_id' => $project_id)); */
-
$invoice = $this->so->read_invoice(array(
'start' => $data['start'],
'query' => $data['query'],
@@ -171,7 +159,8 @@
'district_id' => $this->district_id,
'invoice_id' => $data['invoice_id'],
'ecodimb' => $data['ecodimb'],
- 'project_id' => ($data['project_id']) ?
$data['project_id'] : 0
+ 'project_id' => ($data['project_id']) ?
$data['project_id'] : 0,
+ 'results' => $data['results']
)
);
@@ -214,9 +203,6 @@
function read_invoice_sub( $data )
{
- /* $invoice = $this->so->read_invoice_sub(array('start'
=> $this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'user_lid' => $this->user_lid,'cat_id' =>
$this->cat_id,'voucher_id'=>$voucher_id,'paid' => $paid, 'results' =>
$this->results,'allrows'=>$this->allrows)); */
-
$invoice = $this->so->read_invoice_sub(array(
'start' => $data['start'],
'query' => $data['query'],
Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.boproject.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -485,6 +485,7 @@
'sort' => $data['sort'],
'order' => $data['order'],
'allrows' => isset($data['allrows']) ?
$data['allrows'] : '',
+ 'results' => $data['results'],
'dry_run' => $data['dry_run'],
'filter' => $this->filter,
'cat_id' => $this->cat_id,
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2016-02-17 17:50:47 UTC
(rev 14752)
+++ trunk/property/inc/class.boworkorder.inc.php 2016-02-18 18:23:21 UTC
(rev 14753)
@@ -525,14 +525,6 @@
{
$data['allrows'] = true;
}
-
- /* $workorder = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'filter' => $this->filter,'cat_id' =>
$this->cat_id,'status_id' => $this->status_id,
- 'wo_hour_cat_id' => $this->wo_hour_cat_id,
-
'start_date'=>$start_date,'end_date'=>$end_date,'allrows'=>$data['allrows'],
- 'b_group'=>$this->b_group,'ecodimb'=>$this->ecodimb,
'paid'=>$this->paid,'b_account' => $this->b_account,
- 'district_id' =>
$this->district_id,'dry_run'=>$data['dry_run'], 'criteria' =>
$this->get_criteria($this->criteria_id),
- 'obligation' => $this->obligation, 'filter_year' =>
$this->filter_year) ); */
$workorder = $this->so->read(array(
'start' => $data['start'],
'query' => $data['query'],
@@ -551,6 +543,7 @@
'b_account' => $this->b_account,
'district_id' => $this->district_id,
'dry_run' => $data['dry_run'],
+ 'results' => $data['results'],
'criteria' =>
$this->get_criteria($this->criteria_id),
'obligation' => $this->obligation,
'filter_year' => $this->filter_year
Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.sobudget.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -89,6 +89,7 @@
$revision = isset($data['revision']) ?
$data['revision'] : '';
$cat_id = isset($data['cat_id']) &&
$data['cat_id'] ? $data['cat_id'] : 0;
$dimb_id = isset($data['dimb_id']) &&
$data['dimb_id'] ? $data['dimb_id'] : 0;
+ $results = isset($data['results']) &&
$data['results'] ? (int)$data['results'] : 0;
}
$cat_ids = $this->get_sub_cats($cat_id);
@@ -169,7 +170,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__, $results);
}
else
{
@@ -212,6 +213,7 @@
$year = isset($data['year']) ? $data['year'] :
'';
$grouping = isset($data['grouping']) ?
$data['grouping'] : '';
$revision = isset($data['revision']) ?
$data['revision'] : '';
+ $results = isset($data['results']) &&
$data['results'] ? (int)$data['results'] : 0;
}
if ($order)
@@ -261,7 +263,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__, $results);
}
else
{
@@ -524,6 +526,7 @@
$dimb_id = isset($data['dimb_id']) && $data['dimb_id']
? (int)$data['dimb_id'] : 0;
$org_unit_id = isset($data['org_unit_id']) &&
$data['org_unit_id'] ? (int)$data['org_unit_id'] : 0;
$direction = isset($data['direction']) &&
$data['direction'] ? $data['direction'] : 'expenses';
+ $results = isset($data['results']) && $data['results']
? (int)$data['results'] : 0;
if (!$year)
{
@@ -1131,8 +1134,14 @@
if (!$allrows)
{
- $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) ?
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) :
15;
-
+ if ($results)
+ {
+ $num_rows = $results;
+ }
+ else
+ {
+ $num_rows =
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) ?
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']) :
15;
+ }
//_debug_array(array($start,$this->total_records,$this->total_records,$num_rows));
$page = ceil(( $start / $this->total_records )
* ($this->total_records / $num_rows));
Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.soinvoice.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -86,7 +86,9 @@
$district_id = isset($data['district_id']) ?
$data['district_id'] : '';
$invoice_id = $data['invoice_id'] ? $data['invoice_id']
: '';
$ecodimb = isset($data['ecodimb']) ? $data['ecodimb'] :
'';
+ $results = isset($data['results']) && $data['results']
? (int)$data['results'] : 0;
+
$join_tables = '';
$filtermethod = '';
$querymethod = '';
@@ -239,7 +241,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__);
+ $this->db->limit_query($sql . $ordermethod,
$start, __LINE__, __FILE__, $results);
}
else
{
Modified: trunk/property/inc/class.solocation.inc.php
===================================================================
--- trunk/property/inc/class.solocation.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.solocation.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -168,7 +168,11 @@
$entity['related'][] = array
(
'entity_link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uiproject.index',
- 'query' => $location_code,
'criteria_id' => 4)), //criteria 4 is for location_code
+ 'query' => $location_code,
+ 'criteria_id' => 4, //criteria
4 is for location_code
+ 'status_id' => 'all',
+ 'filter_year' => 'all')
+ ),
'name' => lang('project') . "
[{$hits}]",
'descr' => lang('project')
);
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2016-02-17 17:50:47 UTC
(rev 14752)
+++ trunk/property/inc/class.soworkorder.inc.php 2016-02-18 18:23:21 UTC
(rev 14753)
@@ -169,6 +169,7 @@
$filter_year = isset($data['filter_year']) ?
$data['filter_year'] : '';
$tender_deadline = isset($data['tender_deadline']) &&
$data['tender_deadline'] ? (int)$data['tender_deadline'] : 0;
$inspection_on_completion =
isset($data['inspection_on_completion']) && $data['inspection_on_completion'] ?
(int)$data['inspection_on_completion'] : 0;
+ $results = (isset($data['results']) ? $data['results']
: 0);
$GLOBALS['phpgw']->config->read();
$sql = $this->bocommon->fm_cache('sql_workorder' .
!!$search_vendor . '_' . !!$wo_hour_cat_id . '_' . !!$b_group);
@@ -788,7 +789,7 @@
if (!$allrows)
{
- $this->db->limit_query($sql_end, $start,
__LINE__, __FILE__);
+ $this->db->limit_query($sql_end, $start,
__LINE__, __FILE__, $results);
}
else
{
Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.uientity.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -1201,7 +1201,8 @@
)),
'allrows' => true,
'editor_action' => '',
- 'field' => array()
+ 'field' => array(),
+ 'query' =>
phpgw::get_var('location_code')
)
);
Modified: trunk/property/inc/class.uigab.inc.php
===================================================================
--- trunk/property/inc/class.uigab.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.uigab.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -216,6 +216,7 @@
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
+ $location_code = phpgw::get_var('location_code');
$appname = lang('gab');
$function_msg = lang('list gab');
@@ -244,6 +245,7 @@
)),
'allrows' => true,
'editor_action' => '',
+ 'query' => $location_code,
'field' => array()
)
);
@@ -332,6 +334,18 @@
'address' => lang('Address')
);
+ if($location_code)
+ {
+ $set_location_code = <<<JS
+
+ $(
'#location_code').val('{$location_code}');
+JS;
+ }
+ else
+ {
+ $set_location_code = '';
+ }
+
$code = "var inputFilters = " .
json_encode($inputFilters);
$code .= <<<JS
@@ -339,23 +353,25 @@
function initCompleteDatatable(oSettings, json,
oTable)
{
$('#datatable-container_filter').empty();
- $.each(inputFilters, function(i, val)
- {
+ $.each(inputFilters, function(i, val)
+ {
$('#datatable-container_filter').append('<input type="text" placeholder="Search
'+val+'" id="'+i+'" />');
});
+ {$set_location_code}
+
var valuesInputFilter = {};
$.each(inputFilters, function(i, val)
{
valuesInputFilter[i] = '';
$( '#' + i).on( 'keyup change',
function ()
- {
+ {
if (
$.trim($(this).val()) != $.trim(valuesInputFilter[i]) )
- {
+ {
filterData(i,
$(this).val());
valuesInputFilter[i] = $(this).val();
- }
+ }
});
});
};
@@ -392,7 +408,7 @@
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
'allrows' => phpgw::get_var('length', 'int') ==
-1,
- 'location_code' => $location_code,
+ 'location_code' => $location_code ?
$location_code : $search['value'],
'gaards_nr' => $gaards_nr,
'bruksnr' => $bruksnr,
'feste_nr' => $feste_nr,
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.uiproject.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -254,9 +254,14 @@
'list' => $values_combo_box[2]
);
- $values_combo_box[3] =
$this->bo->select_status_list('filter', $this->status_id);
+ $values_combo_box[3] =
$this->bo->select_status_list('filter');
array_unshift($values_combo_box[3], array('id' =>
'all', 'name' => lang('all')));
array_unshift($values_combo_box[3], array('id' =>
'open', 'name' => lang('open')));
+
+ foreach ($values_combo_box[3] as &$_entry)
+ {
+ $_entry['selected'] = $_entry['id'] ==
$this->status_id ? 1 : 0;
+ }
$combos[] = array
(
'type' => 'filter',
@@ -406,7 +411,8 @@
)),
'allrows' => true,
'editor_action' => '',
- 'field' => array()
+ 'field' => array(),
+ 'query' => phpgw::get_var('query')
)
);
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/inc/class.uitts.inc.php 2016-02-18 18:23:21 UTC (rev
14753)
@@ -860,7 +860,7 @@
'new_item' =>
self::link(array('menuaction' => 'property.uitts.add')),
'editor_action' =>
self::link(array('menuaction' => 'property.uitts.edit_survey_title')),
'field' => $this->_get_fields(),
- 'group_buttons' => true,
+ 'query' => phpgw::get_var('query')
)
);
@@ -1028,7 +1028,6 @@
}
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
-
self::render_template_xsl('datatable_jquery', $data);
}
Modified: trunk/property/templates/base/columns.xsl
===================================================================
--- trunk/property/templates/base/columns.xsl 2016-02-17 17:50:47 UTC (rev
14752)
+++ trunk/property/templates/base/columns.xsl 2016-02-18 18:23:21 UTC (rev
14753)
@@ -1,16 +1,17 @@
<!-- $Id$ -->
<xsl:template name="app_data">
- <xsl:choose>
- <xsl:when test="columns">
- <xsl:apply-templates select="columns"/>
- </xsl:when>
- </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="columns">
+ <xsl:apply-templates select="columns"/>
+ </xsl:when>
+ </xsl:choose>
</xsl:template>
<!-- New template-->
<xsl:template match="columns">
- <div align="left">
+ <div align="left">
+ <form method="post" name="form" action="{form_action}" class=
"pure-form pure-form-aligned">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
@@ -21,42 +22,44 @@
</tr>
</xsl:when>
</xsl:choose>
- <xsl:variable name="form_action">
- <xsl:value-of select="form_action"/>
- </xsl:variable>
- <form method="post" name="form"
action="{$form_action}">
- <tr>
- <td valign="top">
- <b>
- <xsl:value-of
select="lang_columns"/>
- </b>
- </td>
- </tr>
+ </table>
+
+ <fieldset>
+ <legend>
+ <xsl:value-of select="lang_columns"/>
+ </legend>
+ <div class="pure-g">
<xsl:apply-templates
select="column_list"/>
- <tr height="50">
- <td>
- <xsl:variable
name="lang_save">
- <xsl:value-of
select="lang_save"/>
- </xsl:variable>
- <input type="submit"
name="values[save]" value="{$lang_save}">
- <xsl:attribute
name="title">
-
<xsl:value-of select="lang_save_statustext"/>
- </xsl:attribute>
- </input>
- </td>
- </tr>
- </form>
- </table>
- </div>
+ </div>
+ </fieldset>
+
+ <tr height="50">
+ <td>
+ <xsl:variable name="lang_save">
+ <xsl:value-of
select="lang_save"/>
+ </xsl:variable>
+ <input type="submit"
name="values[save]" value="{$lang_save}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="lang_save_statustext"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </form>
+ </div>
</xsl:template>
<!-- New template-->
<xsl:template match="column_list">
- <xsl:variable name="id">
- <xsl:value-of select="id"/>
- </xsl:variable>
- <tr>
- <td>
+ <xsl:variable name="id">
+ <xsl:value-of select="id"/>
+ </xsl:variable>
+ <div class="pure-u-1 pure-u-sm-1-3">
+ <div class="pure-u-1">
+ <div class="pure-control-group">
+ <label>
+ <xsl:value-of select="name"/>
+ </label>
<xsl:choose>
<xsl:when test="selected">
<input id="column{$id}"
name="values[columns][]" value="{$id}" checked="checked" type="checkbox"/>
@@ -65,7 +68,7 @@
<input id="column{$id}"
name="values[columns][]" value="{$id}" type="checkbox"/>
</xsl:otherwise>
</xsl:choose>
- <xsl:value-of select="name"/>
- </td>
- </tr>
+ </div>
+ </div>
+ </div>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14753] more fixes,
Sigurd Nes <=