[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9372] property: invoice: refresh voucher list
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9372] property: invoice: refresh voucher list |
|
Date: |
Fri, 11 May 2012 11:06:53 +0000 |
Revision: 9372
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9372
Author: sigurdne
Date: 2012-05-11 11:06:52 +0000 (Fri, 11 May 2012)
Log Message:
-----------
property: invoice: refresh voucher list
Modified Paths:
--------------
trunk/property/js/portico/ajax_invoice.js
Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js 2012-05-11 10:50:04 UTC (rev
9371)
+++ trunk/property/js/portico/ajax_invoice.js 2012-05-11 11:06:52 UTC (rev
9372)
@@ -2,176 +2,19 @@
// When janitor is selected, vouchers are fetched from db and voucer
select list is populated
$("#janitor_lid").change(function () {
-// var janitor_lid = $(this).val();
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
-
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- var htmlString = "";
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
- success: function(data) {
- if( data != null)
- {
- if(data.sessionExpired)
- {
- alert('Sesjonen er utløpt - du
må logge inn på nytt');
- return;
- }
-
- htmlString = "<option>" + data.length
+ " bilag funnet</option>"
- var obj = data;
-
- $.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
- });
-
- $("#voucher_id_filter").html(
htmlString );
- }
- else
- {
- htmlString += "<option>Ingen
bilag</option>"
- $("#voucher_id_filter").html(
htmlString );
- }
- }
- });
-
+ update_voucher_filter();
});
$("#supervisor_lid").change(function () {
-// var janitor_lid = $(this).val();
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
-
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- var htmlString = "";
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
- success: function(data) {
- if( data != null)
- {
- if(data.sessionExpired)
- {
- alert('Sesjonen er utløpt - du
må logge inn på nytt');
- return;
- }
-
- htmlString = "<option>" + data.length
+ " bilag funnet</option>"
- var obj = data;
-
- $.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
- });
-
- $("#voucher_id_filter").html(
htmlString );
- }
- else
- {
- htmlString += "<option>Ingen
bilag</option>"
- $("#voucher_id_filter").html(
htmlString );
- }
- }
- });
-
+ update_voucher_filter();
});
$("#budget_responsible_lid").change(function () {
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
-
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- var htmlString = "";
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
- success: function(data) {
- if( data != null)
- {
- if(data.sessionExpired)
- {
- alert('Sesjonen er utløpt - du
må logge inn på nytt');
- return;
- }
-
- htmlString = "<option>" + data.length
+ " bilag funnet</option>"
- var obj = data;
-
- $.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
- });
-
- $("#voucher_id_filter").html(
htmlString );
- }
- else
- {
- htmlString += "<option>Ingen
bilag</option>"
- $("#voucher_id_filter").html(
htmlString );
- }
- }
- });
-
+ update_voucher_filter();
});
-
$("#search").click(function(e){
- var janitor_lid = $("#janitor_lid").val();
- var supervisor_lid = $("#supervisor_lid").val();
- var budget_responsible_lid = $("#budget_responsible_lid").val();
- var query = $("#query").val();
- var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
- var requestUrl = phpGWLink('index.php', oArgs, true);
-
- var htmlString = "";
-
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
- success: function(data) {
- if( data != null)
- {
- if(data.sessionExpired)
- {
- alert('Sesjonen er utløpt - du
må logge inn på nytt');
- return;
- }
-
- htmlString = "<option>" + data.length
+ " bilag funnet</option>"
- var obj = data;
-
- $.each(obj, function(i) {
- htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
- });
-
- $("#voucher_id_filter").html(
htmlString );
- }
- else
- {
- htmlString += "<option>Ingen
bilag</option>"
- $("#voucher_id_filter").html(
htmlString );
- }
- }
- });
+ update_voucher_filter();
});
$("#voucher_id_filter").change(function () {
@@ -185,17 +28,12 @@
$("#invoice_id").html( '' );
$("#kid_nr").html( '' );
$("#vendor").html('' );
-// $("#janitor").html( '' );
-// $("#supervisor").html( '' );
-// $("#budget_responsible").html( '' );
$("#close_order_orig").val( '' );
$("#my_initials").val( '' );
$("#sign_orig").val( '' );
$("#invoice_date").html( '' );
$("#payment_date").html( '' );
$("#b_account_id").val( '' );
-// $("#amount").html( '' );
-// $("#approved_amount").html( '' );
$("#currency").html( '' );
$("#oppsynsmannid").html( '' );
$("#saksbehandlerid").html( '' );
@@ -239,9 +77,6 @@
}
}
});
-
-
- // document.getElementById('image_content').src = '';
});
$("#approve_line").live("click", function(e){
@@ -327,8 +162,8 @@
}
$("#receipt").html(htmlString);
-
update_form_values(line_id,
voucher_id_orig);
+ update_voucher_filter();
}
}
});
@@ -336,6 +171,50 @@
});
+
+function update_voucher_filter(){
+ var janitor_lid = $("#janitor_lid").val();
+ var supervisor_lid = $("#supervisor_lid").val();
+ var budget_responsible_lid = $("#budget_responsible_lid").val();
+ var query = $("#query").val();
+
+ var oArgs = {menuaction:'property.uiinvoice2.get_vouchers'};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl + "&janitor_lid=" + janitor_lid +
"&supervisor_lid=" + supervisor_lid + "&budget_responsible_lid=" +
budget_responsible_lid + "&query=" + query,
+ success: function(data) {
+ if( data != null)
+ {
+ if(data.sessionExpired)
+ {
+ alert('Sesjonen er utløpt - du må logge
inn på nytt');
+ return;
+ }
+
+ htmlString = "<option>" + data.length + "
bilag funnet</option>"
+ var obj = data;
+
+ $.each(obj, function(i) {
+ htmlString += "<option value='" +
obj[i].id + "'>" + obj[i].name + "</option>";
+ });
+
+ $("#voucher_id_filter").html( htmlString );
+ }
+ else
+ {
+ htmlString += "<option>Ingen bilag</option>"
+ $("#voucher_id_filter").html( htmlString );
+ }
+ }
+ });
+}
+
+
function update_form_values( line_id, voucher_id_orig ){
var oArgs = {menuaction:'property.uiinvoice2.get_single_line'};
var requestUrl = phpGWLink('index.php', oArgs, true);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9372] property: invoice: refresh voucher list,
Sigurd Nes <=