[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9221] property: invoice
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9221] property: invoice |
|
Date: |
Tue, 24 Apr 2012 18:50:18 +0000 |
Revision: 9221
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9221
Author: sigurdne
Date: 2012-04-24 18:50:16 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
property: invoice
Modified Paths:
--------------
trunk/property/js/portico/ajax_invoice.js
trunk/property/templates/base/css/base.css
trunk/property/templates/base/invoice2.xsl
Modified: trunk/property/js/portico/ajax_invoice.js
===================================================================
--- trunk/property/js/portico/ajax_invoice.js 2012-04-24 13:29:46 UTC (rev
9220)
+++ trunk/property/js/portico/ajax_invoice.js 2012-04-24 18:50:16 UTC (rev
9221)
@@ -249,6 +249,7 @@
var line_id = $(this).val();
var voucher_id_orig = $("#voucher_id").val();
update_form_values(line_id, voucher_id_orig);
+// load_order();
});
@@ -651,3 +652,45 @@
}
});
}
+
+//------------
+
+function load_order( order_id ){
+
+ var order_id = $("#order_id").val( );
+ $("#curtain").show();
+ $("#popupBox").fadeIn("slow");
+
+ //$("#curtain").hide();
+ //$("#popupBox").hide();
+ var oArgs = {menuaction:'property.uiworkorder.edit', id: order_id};
+ var requestUrl = phpGWLink('index.php', oArgs);
+// requestUrl = "http://www.nettavisen.no/";;
+
+//alert(requestUrl); return;
+
+ var htmlString = "";
+ htmlString += "<iframe width=\"100%\" height=\"1000\" src = \"" +
requestUrl + "\" ><p>Your browser does not support iframes.</p></iframe>";
+ $("#popupBox").html( htmlString );
+
+
+ var oArgs = {menuaction:'property.uiinvoice2.get_single_line'};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+/*
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl + "&order_id=" + order_id,
+ success: function(data) {
+ if(data.sessionExpired)
+ {
+ alert('Sesjonen er utløpt - du må logge inn på
nytt');
+ return;
+ }
+ var voucher = data['voucher'];
+
+ }
+ });
+*/
+}
+
Modified: trunk/property/templates/base/css/base.css
===================================================================
--- trunk/property/templates/base/css/base.css 2012-04-24 13:29:46 UTC (rev
9220)
+++ trunk/property/templates/base/css/base.css 2012-04-24 18:50:16 UTC (rev
9221)
@@ -73,40 +73,65 @@
font-weight: bold;
text-align: center;
}
-.yui-dt .yui-dt-hidden
-{
- border-right:0px solid #ff0 !important;
-}
-.yui-tt .bd
-{
- background-color:#fffbeb !important;
- border-color:#D4C237 #A6982B #A6982B;
- border-width:0px !important;
- color:#000000 !important;
- left:0 !important;
- padding:0 !important;
- font-family: tahoma !important;
- font-size: 11px !important;
-}
-.tooltip-table
-{
- width:200px !important;
-}
-.tooltip
-{
- background-color:#0066cc !important;
- color:#FFFFFF !important;
- font-weight: bold !important;
- font-family: tahoma !important;
- font-size: 11px !important;
-}
-.nolink a
-{
- color:#FFFFFF !important;
- text-decoration: none !important;
-}
-.nolink a visited
-{
- color:#FFFFFF !important;
- text-decoration: none !important;
-}
\ No newline at end of file
+.yui-dt .yui-dt-hidden
+{
+ border-right:0px solid #ff0 !important;
+}
+.yui-tt .bd
+{
+ background-color:#fffbeb !important;
+ border-color:#D4C237 #A6982B #A6982B;
+ border-width:0px !important;
+ color:#000000 !important;
+ left:0 !important;
+ padding:0 !important;
+ font-family: tahoma !important;
+ font-size: 11px !important;
+}
+.tooltip-table
+{
+ width:200px !important;
+}
+.tooltip
+{
+ background-color:#0066cc !important;
+ color:#FFFFFF !important;
+ font-weight: bold !important;
+ font-family: tahoma !important;
+ font-size: 11px !important;
+}
+.nolink a
+{
+ color:#FFFFFF !important;
+ text-decoration: none !important;
+}
+.nolink a visited
+{
+ color:#FFFFFF !important;
+ text-decoration: none !important;
+}
+
+#curtain {
+ background: none repeat scroll 0 0 #000000;
+ display: none;
+ height: 100%;
+ left: 0;
+ opacity: 0.5;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 1;
+}
+
+#popupBox {
+ background: none repeat scroll 0 0 #fff;
+ display: none;
+ height: 90%;
+ left: 80px;
+ position: absolute;
+ top: 80px;
+ width: 1200px;
+ z-index: 2;
+}
+
+
Modified: trunk/property/templates/base/invoice2.xsl
===================================================================
--- trunk/property/templates/base/invoice2.xsl 2012-04-24 13:29:46 UTC (rev
9220)
+++ trunk/property/templates/base/invoice2.xsl 2012-04-24 18:50:16 UTC (rev
9221)
@@ -21,63 +21,36 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<style type="text/css">
-#box { width: 200px; height: 5px; background: blue; }
-//select { width: 200px; }
-#voucher_id_filter { width: 800px; }
-#dim_b { width: 200px; }
-#dim_e { width: 200px; }
-#period { width: 200px; }
-#periodization { width: 200px; }
-#periodization_start { width: 200px; }
-#process_code { width: 200px; }
-#tax_code { width: 200px; }
-#approve_as { width: 200px; }
-#_oppsynsmannid { width: 200px; }
-#_saksbehandlerid { width: 200px; }
-#_budsjettansvarligid { width: 200px; }
-.row_on,.th_bright
-{
- background-color: #CCEEFF;
-}
+ <style type="text/css">
+ #box { width: 200px; height: 5px; background: blue; }
+ //select { width: 200px; }
+ #voucher_id_filter { width: 800px; }
+ #dim_b { width: 200px; }
+ #dim_e { width: 200px; }
+ #period { width: 200px; }
+ #periodization { width: 200px; }
+ #periodization_start { width: 200px; }
+ #process_code { width: 200px; }
+ #tax_code { width: 200px; }
+ #approve_as { width: 200px; }
+ #_oppsynsmannid { width: 200px; }
+ #_saksbehandlerid { width: 200px; }
+ #_budsjettansvarligid { width: 200px; }
+ .row_on,.th_bright
+ {
+ background-color: #CCEEFF;
+ }
-.row_off
-{
- background-color: #DDF0FF;
-}
+ .row_off
+ {
+ background-color: #DDF0FF;
+ }
-</style>
+ </style>
-<xsl:call-template name="invoice" />
-
- <!-- DATATABLE DEFINITIONS-->
- <script type="text/javascript">
- var property_js = <xsl:value-of select="property_js"/>;
- var base_java_url = <xsl:value-of
select="base_java_url"/>;
- var datatable = new Array();
- var myColumnDefs = new Array();
- var myButtons = new Array();
- var td_count = <xsl:value-of select="td_count"/>;
-
- <xsl:for-each select="datatable">
- datatable[<xsl:value-of select="name"/>] = [
- {
- values:<xsl:value-of
select="values"/>,
- total_records: <xsl:value-of
select="total_records"/>,
- is_paginator: <xsl:value-of
select="is_paginator"/>,
- edit_action: <xsl:value-of
select="edit_action"/>,
- footer:<xsl:value-of
select="footer"/>
- }
- ]
- </xsl:for-each>
- <xsl:for-each select="myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
- <xsl:for-each select="myButtons">
- myButtons[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
- </script>
-
+ <xsl:call-template name="invoice" />
+ <div id="popupBox"></div>
+ <div id="curtain"></div>
</xsl:template>
<xsl:template name="invoice" xmlns:php="http://php.net/xsl";>
@@ -607,45 +580,36 @@
</xsl:template>
<xsl:template name="datasource-definition" xmlns:php="http://php.net/xsl";>
-</xsl:template>
+ <!-- DATATABLE DEFINITIONS-->
+ <script type="text/javascript">
+ var property_js = <xsl:value-of
select="//property_js"/>;
+ var base_java_url = <xsl:value-of
select="//base_java_url"/>;
+ var datatable = new Array();
+ var myColumnDefs = new Array();
+ var myButtons = new Array();
+ var td_count = <xsl:value-of select="//td_count"/>;
-
-<xsl:template name="datasource-definition_old" xmlns:php="http://php.net/xsl";>
- <script>
- YAHOO.namespace('portico');
-
- YAHOO.portico.columnDefs = [
- <xsl:for-each select="//datatable/field">
+ <xsl:for-each select="//datatable">
+ datatable[<xsl:value-of select="name"/>] = [
{
- key: "<xsl:value-of
select="key"/>",
- <xsl:if test="label">
- label: "<xsl:value-of
select="label"/>",
- </xsl:if>
- sortable: <xsl:value-of
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
- <xsl:if test="hidden">
- hidden: true,
- </xsl:if>
- <xsl:if test="formatter">
- formatter: <xsl:value-of
select="formatter"/>,
- </xsl:if>
- className: "<xsl:value-of
select="className"/>"
- }<xsl:value-of
select="phpgw:conditional(not(position() = last()), ',', '')"/>
- </xsl:for-each>
- ];
+ values:<xsl:value-of
select="values"/>,
+ total_records: <xsl:value-of
select="total_records"/>,
+ is_paginator: <xsl:value-of
select="is_paginator"/>,
+ edit_action: <xsl:value-of
select="edit_action"/>,
+ footer:<xsl:value-of
select="footer"/>
+ }
+ ]
+ </xsl:for-each>
+ <xsl:for-each select="//myColumnDefs">
+ myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
+ </xsl:for-each>
+ <xsl:for-each select="//myButtons">
+ myButtons[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
+ </xsl:for-each>
+ </script>
- var main_source = '<xsl:value-of select="source"/>';
- var main_columnDefs = YAHOO.portico.columnDefs;
- var main_form = 'invoice_queryForm';
- var main_filters = ['voucher_id_filter', 'refresch_voucher_id'];
- var main_container = 'datatable-container';
- var main_table_id = 'datatable';
- var main_pag = 'data_paginator';
- var related_table = new Array('vouchers_table');
-
- setDataSource(main_source, main_columnDefs, main_form,
main_filters, main_container, main_pag, main_table_id, related_table );
-
- </script>
+
</xsl:template>
<!-- options for use with select-->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9221] property: invoice,
Sigurd Nes <=