[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13819]
|
From: |
Nelson Guerra |
|
Subject: |
[Fmsystem-commits] [13819] |
|
Date: |
Mon, 31 Aug 2015 23:57:05 +0000 |
Revision: 13819
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13819
Author: nelson224
Date: 2015-08-31 23:57:05 +0000 (Mon, 31 Aug 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind/rental/js/rental/contract.edit.js
Modified: branches/dev-syncromind/rental/js/rental/contract.edit.js
===================================================================
--- branches/dev-syncromind/rental/js/rental/contract.edit.js 2015-08-31
23:56:40 UTC (rev 13818)
+++ branches/dev-syncromind/rental/js/rental/contract.edit.js 2015-08-31
23:57:05 UTC (rev 13819)
@@ -1,25 +1,21 @@
-var link_not_included_composites = null;
-var link_included_composites = null;
-var set_composite_data = 0;
-var link_not_included_parties = null;
-var link_included_parties = null;
+var set_composite_data = 0;
var set_parties_data = 0;
-
-var link_not_included_price_items = null;
-var link_included_price_items = null;
var set_price_data = 0;
-
var set_invoice_data = 0;
-var link_upload_document = null;
-
function formatterPrice (key, oData)
{
var amount = $.number( oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator ) + ' ' + currency_suffix;
return amount;
}
+function formatterArea (key, oData)
+{
+ var amount = $.number( oData[key], decimalPlaces, decimalSeparator,
thousandsSeparator ) + ' ' + area_suffix;
+ return amount;
+}
+
$(document).ready(function()
{
$("#date_start").change(function(){
@@ -191,13 +187,24 @@
$('#upload_button').on('click', function()
{
+
+ if ($('#ctrl_upoad_path').val() === '') {
+ alert('no file selected');
+ return false;
+ }
+ if ($.trim($('#document_title').val()) === '') {
+ alert('enter document title');
+ return false;
+ }
+
var form = document.forms.namedItem("form_upload");
var file_data = $('#ctrl_upoad_path').prop('files')[0];
var form_data = new FormData(form);
form_data.append('file_path', file_data);
form_data.append('document_type', $('#document_type').val());
form_data.append('document_title', $('#document_title').val());
-
+
+ var nTable = 8;
$.ajax({
url: link_upload_document,
cache: false,
@@ -206,9 +213,13 @@
data: form_data,
type: 'post',
success: function(result){
- alert(result);
+ JqueryPortico.show_message(nTable, result);
+ $('#document_type')[0].selectedIndex = 0;
+ $('#document_title').val('');
+ $('#ctrl_upoad_path').val('');
+ oTable8.fnDraw();
}
- });
+ });
});
});
@@ -234,31 +245,37 @@
/******************************************************************************/
-addComposite = function(oArgs, parameters){
-
- var oTT = TableTools.fnGetInstance( 'datatable-container_2' );
- var selected = oTT.fnGetSelectedData();
- var nTable = 1;
-
- if (selected.length == 0){
- alert('None selected');
- return false;
- }
-
+getRequestData = function(dataSelected, parameters){
+
var data = {};
-
+
$.each(parameters.parameter, function( i, val ) {
data[val.name] = {};
});
var n = 0;
- for ( var n = 0; n < selected.length; ++n )
+ for ( var n = 0; n < dataSelected.length; ++n )
{
$.each(parameters.parameter, function( i, val ) {
- data[val.name][n] = selected[n][val.source];
+ data[val.name][n] = dataSelected[n][val.source];
});
}
+
+ return data;
+};
+addComposite = function(oArgs, parameters){
+
+ var oTT = TableTools.fnGetInstance( 'datatable-container_2' );
+ var selected = oTT.fnGetSelectedData();
+ var nTable = 1;
+
+ if (selected.length == 0){
+ alert('None selected');
+ return false;
+ }
+
+ var data = getRequestData(selected, parameters);
var requestUrl = phpGWLink('index.php', oArgs);
JqueryPortico.execute_ajax(requestUrl, function(result){
@@ -282,20 +299,7 @@
return false;
}
- var data = {};
-
- $.each(parameters.parameter, function( i, val ) {
- data[val.name] = {};
- });
-
- var n = 0;
- for ( var n = 0; n < selected.length; ++n )
- {
- $.each(parameters.parameter, function( i, val ) {
- data[val.name][n] = selected[n][val.source];
- });
- }
-
+ var data = getRequestData(selected, parameters);
var requestUrl = phpGWLink('index.php', oArgs);
JqueryPortico.execute_ajax(requestUrl, function(result){
@@ -326,7 +330,6 @@
window.open(requestUrl,'_self');
};
-
addParty = function(oArgs, parameters){
var oTT = TableTools.fnGetInstance( 'datatable-container_4' );
@@ -338,20 +341,7 @@
return false;
}
- var data = {};
-
- $.each(parameters.parameter, function( i, val ) {
- data[val.name] = {};
- });
-
- var n = 0;
- for ( var n = 0; n < selected.length; ++n )
- {
- $.each(parameters.parameter, function( i, val ) {
- data[val.name][n] = selected[n][val.source];
- });
- }
-
+ var data = getRequestData(selected, parameters);
var requestUrl = phpGWLink('index.php', oArgs);
JqueryPortico.execute_ajax(requestUrl, function(result){
@@ -375,20 +365,7 @@
return false;
}
- var data = {};
-
- $.each(parameters.parameter, function( i, val ) {
- data[val.name] = {};
- });
-
- var n = 0;
- for ( var n = 0; n < selected.length; ++n )
- {
- $.each(parameters.parameter, function( i, val ) {
- data[val.name][n] = selected[n][val.source];
- });
- }
-
+ var data = getRequestData(selected, parameters);
var requestUrl = phpGWLink('index.php', oArgs);
JqueryPortico.execute_ajax(requestUrl, function(result){
@@ -429,21 +406,8 @@
alert('None selected');
return false;
}
-
- var data = {};
-
- $.each(parameters.parameter, function( i, val ) {
- data[val.name] = {};
- });
-
- var n = 0;
- for ( var n = 0; n < selected.length; ++n )
- {
- $.each(parameters.parameter, function( i, val ) {
- data[val.name][n] = selected[n][val.source];
- });
- }
-
+
+ var data = getRequestData(selected, parameters);
var requestUrl = phpGWLink('index.php', oArgs);
JqueryPortico.execute_ajax(requestUrl, function(result){
@@ -467,27 +431,14 @@
alert('None selected');
return false;
}
-
- var data = {};
-
- $.each(parameters.parameter, function( i, val ) {
- data[val.name] = {};
- });
-
- var n = 0;
- for ( var n = 0; n < selected.length; ++n )
- {
- $.each(parameters.parameter, function( i, val ) {
- data[val.name][n] = selected[n][val.source];
- });
- }
-
+
+ var data = getRequestData(selected, parameters);
var requestUrl = phpGWLink('index.php', oArgs);
JqueryPortico.execute_ajax(requestUrl, function(result){
JqueryPortico.show_message(nTable, result);
-
+
oTable5.fnDraw();
oTable0.fnDraw();
@@ -502,7 +453,6 @@
}
var requestUrl = phpGWLink('index.php', oArgs);
-
requestUrl += '&invoice_id=' + $('#invoice_id').val();
window.open(requestUrl,'_self');
@@ -519,20 +469,7 @@
return false;
}
- var data = {};
-
- $.each(parameters.parameter, function( i, val ) {
- data[val.name] = {};
- });
-
- var n = 0;
- for ( var n = 0; n < selected.length; ++n )
- {
- $.each(parameters.parameter, function( i, val ) {
- data[val.name][n] = selected[n][val.source];
- });
- }
-
+ var data = getRequestData(selected, parameters);
var requestUrl = phpGWLink('index.php', oArgs);
JqueryPortico.execute_ajax(requestUrl, function(result){
@@ -553,20 +490,7 @@
return false;
}
- var data = {};
-
- $.each(parameters.parameter, function( i, val ) {
- data[val.name] = {};
- });
-
- var n = 0;
- for ( var n = 0; n < selected.length; ++n )
- {
- $.each(parameters.parameter, function( i, val ) {
- data[val.name][n] = selected[n][val.source];
- });
- }
-
+ var data = getRequestData(selected, parameters);
var requestUrl = phpGWLink('index.php', oArgs);
JqueryPortico.execute_ajax(requestUrl, function(result){
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13819],
Nelson Guerra <=