[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16714] update javascript table callback
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16714] update javascript table callback |
|
Date: |
Tue, 9 May 2017 10:24:29 -0400 (EDT) |
Revision: 16714
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16714
Author: sigurdne
Date: 2017-05-09 10:24:29 -0400 (Tue, 09 May 2017)
Log Message:
-----------
update javascript table callback
Modified Paths:
--------------
trunk/phpgwapi/js/jquery/common.js
trunk/property/inc/class.botts.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/js/portico/condition_survey.js
trunk/property/js/portico/custom.edit.js
trunk/property/js/portico/invoice.list_sub.js
trunk/property/js/portico/project.edit.js
trunk/property/js/portico/request.edit.js
trunk/property/js/portico/tenant_claim.edit.js
trunk/property/js/portico/tts.view.js
trunk/property/js/portico/wo_hour.deviation.js
trunk/property/js/portico/wo_hour.index.js
Modified: trunk/phpgwapi/js/jquery/common.js
===================================================================
--- trunk/phpgwapi/js/jquery/common.js 2017-05-09 10:59:46 UTC (rev 16713)
+++ trunk/phpgwapi/js/jquery/common.js 2017-05-09 14:24:29 UTC (rev 16714)
@@ -489,7 +489,7 @@
}
try
{
- window['local_DrawCallback' + num](oTable);
+ window['local_DrawCallback' + num](container);
}
catch (err)
{
Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php 2017-05-09 10:59:46 UTC (rev
16713)
+++ trunk/property/inc/class.botts.inc.php 2017-05-09 14:24:29 UTC (rev
16714)
@@ -1959,7 +1959,8 @@
*/
if(isset($fullmakter[0]))
{
- if($amount > 5000 && $amount <= 100000)
+// if($amount > 5000 && $amount <= 100000)
+ if($amount > 50000 && $amount <= 100000)
{
$supervisor_lid =
strtolower($fullmakter[0]['inntil100k']);
}
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2017-05-09 10:59:46 UTC (rev
16713)
+++ trunk/property/inc/class.uitts.inc.php 2017-05-09 14:24:29 UTC (rev
16714)
@@ -2203,6 +2203,12 @@
$need_approval =
isset($this->bo->config->config_data['workorder_approval']) ?
$this->bo->config->config_data['workorder_approval'] : '';
+
+ //temporary
+ $test_user = $this->acl->check('.ticket.order',
16, 'property');
+
+ $need_approval = $need_approval && $test_user ?
true : false;
+
// approval
}
Modified: trunk/property/js/portico/condition_survey.js
===================================================================
--- trunk/property/js/portico/condition_survey.js 2017-05-09 10:59:46 UTC
(rev 16713)
+++ trunk/property/js/portico/condition_survey.js 2017-05-09 14:24:29 UTC
(rev 16714)
@@ -19,9 +19,9 @@
$(api.column(i).footer()).html("<div align=\"right\">" + amount +
"</div>");
};
-this.local_DrawCallback3 = function (oTable)
+this.local_DrawCallback2 = function (container)
{
- var api = oTable2.api();
+ var api = $("#" + container).dataTable().api();
for (i = 0; i < columns2.length; i++)
{
Modified: trunk/property/js/portico/custom.edit.js
===================================================================
--- trunk/property/js/portico/custom.edit.js 2017-05-09 10:59:46 UTC (rev
16713)
+++ trunk/property/js/portico/custom.edit.js 2017-05-09 14:24:29 UTC (rev
16714)
@@ -11,9 +11,9 @@
i : 0;
};
-this.local_DrawCallback1 = function (oTable)
+this.local_DrawCallback1 = function (container)
{
- var oTable = $('#datatable-container_0').dataTable();
+ var oTable = $("#" + container).dataTable();
// var api = oTable.api();
// api.columns('.sorting').order('asc');
oTable.fnSort([[2, 'asc']]);
Modified: trunk/property/js/portico/invoice.list_sub.js
===================================================================
--- trunk/property/js/portico/invoice.list_sub.js 2017-05-09 10:59:46 UTC
(rev 16713)
+++ trunk/property/js/portico/invoice.list_sub.js 2017-05-09 14:24:29 UTC
(rev 16714)
@@ -1,6 +1,7 @@
-this.local_DrawCallback1 = function ()
+this.local_DrawCallback0 = function (container)
{
- var api = oTable0.api();
+ var api = $("#" + container).dataTable().api();
+
var data = api.ajax.json();
for (i = 0; i < columns0.length; i++)
Modified: trunk/property/js/portico/project.edit.js
===================================================================
--- trunk/property/js/portico/project.edit.js 2017-05-09 10:59:46 UTC (rev
16713)
+++ trunk/property/js/portico/project.edit.js 2017-05-09 14:24:29 UTC (rev
16714)
@@ -67,9 +67,9 @@
}
};
-this.local_DrawCallback1 = function ()
+this.local_DrawCallback1 = function (container)
{
- var api = oTable1.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
@@ -95,9 +95,9 @@
});
}
-this.local_DrawCallback2 = function ()
+this.local_DrawCallback2 = function (container)
{
- var api = oTable2.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
Modified: trunk/property/js/portico/request.edit.js
===================================================================
--- trunk/property/js/portico/request.edit.js 2017-05-09 10:59:46 UTC (rev
16713)
+++ trunk/property/js/portico/request.edit.js 2017-05-09 14:24:29 UTC (rev
16714)
@@ -1,7 +1,7 @@
-this.local_DrawCallback2 = function ()
+this.local_DrawCallback2 = function (container)
{
- var api = oTable2.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
Modified: trunk/property/js/portico/tenant_claim.edit.js
===================================================================
--- trunk/property/js/portico/tenant_claim.edit.js 2017-05-09 10:59:46 UTC
(rev 16713)
+++ trunk/property/js/portico/tenant_claim.edit.js 2017-05-09 14:24:29 UTC
(rev 16714)
@@ -12,16 +12,16 @@
};
-this.local_DrawCallback1 = function (oTable)
+this.local_DrawCallback0 = function (container)
{
- var api = oTable.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
// var columns = ["6"];
// $(api.column(5).footer()).html("<div align=\"right\">Sum</div>");
- for (i = 0; i < columns.length; i++)
+ for (i = 0; i < columns0.length; i++)
{
- if (columns[i]['data'] === 'budget')
+ if (columns0[i]['data'] === 'budget' || columns0[i]['data'] ===
'actual_cost')
{
data = api.column(i, {page: 'current'}).data();
pageTotal = data.length ?
@@ -30,7 +30,7 @@
return intVal(a) + intVal(b);
}) : 0;
- $(api.column(i).footer()).html("<div align=\"right\">"
+ pageTotal + "</div>");
+ $(api.column(i).footer()).html("<div align=\"right\">"
+ $.number(pageTotal, 0, ',', '.') + "</div>");
}
}
Modified: trunk/property/js/portico/tts.view.js
===================================================================
--- trunk/property/js/portico/tts.view.js 2017-05-09 10:59:46 UTC (rev
16713)
+++ trunk/property/js/portico/tts.view.js 2017-05-09 14:24:29 UTC (rev
16714)
@@ -2,10 +2,9 @@
var vendor_id = 0;
var amount = 0;
-this.local_DrawCallback4 = function ()
+this.local_DrawCallback4 = function (container)
{
- //console.log(oTable4);
- var api = oTable4.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
@@ -31,10 +30,9 @@
});
};
-this.local_DrawCallback5 = function ()
+this.local_DrawCallback5 = function (container)
{
- //console.log(oTable4);
- var api = oTable5.api();
+ var api = $("#" + container).dataTable().api();
// Remove the formatting to get integer data for summation
var intVal = function (i)
{
Modified: trunk/property/js/portico/wo_hour.deviation.js
===================================================================
--- trunk/property/js/portico/wo_hour.deviation.js 2017-05-09 10:59:46 UTC
(rev 16713)
+++ trunk/property/js/portico/wo_hour.deviation.js 2017-05-09 14:24:29 UTC
(rev 16714)
@@ -7,13 +7,13 @@
i : 0;
};
-this.local_DrawCallback1 = function (oTable)
+this.local_DrawCallback0 = function (container)
{
- var api = oTable.api();
+ var api = $("#" + container).dataTable().api();
- for (i = 0; i < columns.length; i++)
+ for (i = 0; i < columns0.length; i++)
{
- if (columns[i]['data'] === 'amount')
+ if (columns0[i]['data'] === 'amount')
{
data = api.column(i, {page: 'current'}).data();
pageTotal = data.length ?
Modified: trunk/property/js/portico/wo_hour.index.js
===================================================================
--- trunk/property/js/portico/wo_hour.index.js 2017-05-09 10:59:46 UTC (rev
16713)
+++ trunk/property/js/portico/wo_hour.index.js 2017-05-09 14:24:29 UTC (rev
16714)
@@ -1,6 +1,6 @@
-this.local_DrawCallback2 = function (oTable)
+this.local_DrawCallback0 = function (container)
{
- var api = oTable.api();
+ var api = $("#" + container).dataTable().api();
var data = api.ajax.json();
$('#value_sum_calculation').html($.number(data.table_sum.value_sum_calculation,
2, ',', '.'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16714] update javascript table callback,
sigurdne <=