fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [7091] frontend: drawings


From: Sigurd Nes
Subject: [Fmsystem-commits] [7091] frontend: drawings
Date: Tue, 08 Mar 2011 21:19:13 +0000

Revision: 7091
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7091
Author:   sigurdne
Date:     2011-03-08 21:19:13 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
frontend: drawings

Modified Paths:
--------------
    trunk/frontend/inc/class.uidrawings.inc.php
    trunk/frontend/js/yahoo/drawing.list.js
    trunk/frontend/templates/base/drawings.xsl

Modified: trunk/frontend/inc/class.uidrawings.inc.php
===================================================================
--- trunk/frontend/inc/class.uidrawings.inc.php 2011-03-08 15:15:43 UTC (rev 
7090)
+++ trunk/frontend/inc/class.uidrawings.inc.php 2011-03-08 21:19:13 UTC (rev 
7091)
@@ -45,6 +45,7 @@
                        
phpgwapi_cache::session_set('frontend','tab',$GLOBALS['phpgw']->locations->get_id('frontend','.drawings'));
                        parent::__construct();
                        $this->location_code = 
$this->header_state['selected_location'];
+//                     $this->location_code = '1102-01';
                }
 
                public function index()
@@ -55,14 +56,12 @@
 
                        $document_list = 
$sodocument->read_at_location(array('start' => $this->start,'query' => 
$this->query,'sort' => $this->sort,'order' => $this->order,
                                'filter' => $this->filter,'location_code' => 
$this->location_code,'doc_type' => $doc_type, 'allrows' => $allrows));
-                       $this->total_records = $this->so->total_records;
-_debug_array($document_list);
-_debug_array($this->location_code);
+                       $total_records = $sodocument->total_records;
 
                        
//----------------------------------------------datatable settings--------
 
                        $content = array();
-                       foreach($invoices as $entry)
+                       foreach($document_list as $entry)
                        {
                                $content[] = array
                                (
@@ -89,8 +88,8 @@
                        $myColumnDefs[0] = array
                        (
                                'name'          => "0",
-                               'values'        =>      json_encode(array(      
array('key' => 
'document_name','label'=>lang('name'),'sortable'=>true,'resizeable'=>true),
-                                                                               
                        array('key' => 
'document_id','label'=>lang('id'),'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
+                               'values'        =>      json_encode(array(      
array('key' => 'document_name','label'=>lang('name'),'sortable'=>true,'hidden' 
=> true,'resizeable'=>true),
+                                                                               
                        array('key' => 
'document_id','label'=>lang('name'),'sortable'=>false,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
                                                                                
                        array('key' => 
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true),
                                                                                
                        array('key' => 
'doc_type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
                                                                                
                        array('key' => 
'document_date','label'=>lang('date'),'sortable'=>true,'resizeable'=>true)
@@ -100,21 +99,31 @@
                        
//----------------------------------------------datatable settings--------
 
 
+                       $datatable = array
+                       (
+                               'property_js'                   => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
+                               'datatable'                             => 
$datavalues,
+                               'myColumnDefs'                  => $myColumnDefs
+                       );
 
-
                        $data = array
                        (
-                               'property_js'                   => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
-                               'datatable'                             => 
$datavalues,
-                               'myColumnDefs'                  => 
$myColumnDefs,
-                               'header'                                
=>$this->header_state,
+                               'header'                                => 
$this->header_state,
                                'tabs'                                  => 
$this->tabs,
-                               'drawings'                              => 
lang('not_implemented')
+                               'drawings'                              => 
array('datatable' => $datatable),
                        );
                        
                $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('app_data' => 
$data));
                
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','drawings'));
-                       $GLOBALS['phpgw']->js->validate_file( 'yahoo', 
'project.edit', 'frontend' );
+                       $GLOBALS['phpgw']->js->validate_file( 'yahoo', 
'drawing.list', 'frontend' );
 
+                       phpgwapi_yui::load_widget('dragdrop');
+                       phpgwapi_yui::load_widget('datatable');
+                       phpgwapi_yui::load_widget('connection');
+                       phpgwapi_yui::load_widget('loader');
+                       phpgwapi_yui::load_widget('paginator');
+
+                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
+                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
                }
     }

Modified: trunk/frontend/js/yahoo/drawing.list.js
===================================================================
--- trunk/frontend/js/yahoo/drawing.list.js     2011-03-08 15:15:43 UTC (rev 
7090)
+++ trunk/frontend/js/yahoo/drawing.list.js     2011-03-08 21:19:13 UTC (rev 
7091)
@@ -1,28 +1,13 @@
 var  myPaginator_0, myDataTable_0
-var  myPaginator_1, myDataTable_1;
-var  myPaginator_2, myDataTable_2;
 
 
/********************************************************************************/
        YAHOO.widget.DataTable.formatLink = function(elCell, oRecord, oColumn, 
oData)
        {
-               elCell.innerHTML = "<a 
href="+datatable[0][0]["edit_action"]+"&id="+oData+">" + oData + "</a>";
+//             console.log(oRecord._oData.document_name);
+               elCell.innerHTML = "<a 
href="+datatable[0][0]["edit_action"]+"&id="+oData+">" + 
oRecord._oData.document_name + "</a>";
        };
 
 
-       YAHOO.widget.DataTable.formatLink_voucher = function(elCell, oRecord, 
oColumn, oData)
-       {
-               if(oData > 0)
-               {
-                       elCell.innerHTML = "<a 
href="+datatable[2][0]["edit_action"]+"&query="+oData+"&voucher_id="+oData+"&user_lid=all>"
 + oData + "</a>";
-               }
-               else
-               {
-                       oData = -1*oData;
-                       elCell.innerHTML = "<a 
href="+datatable[2][0]["edit_action"]+"&voucher_id="+oData+"&user_lid=all&paid=true>"
 + oData + "</a>";          
-               }
-       };
-
-
 
/********************************************************************************/
     
        var FormatterRight = function(elCell, oRecord, oColumn, oData)
        {
@@ -32,46 +17,10 @@
 
/********************************************************************************/
     
        this.myParticularRenderEvent = function()
        {
-               this.addFooterDatatable(myPaginator_0,myDataTable_0);
        }
 
 
/********************************************************************************/
-       this.addFooterDatatable = function(paginator,datatable)
-       {
-               //call getSumPerPage(name of column) in property.js
-               tmp_sum1 = getSumPerPage('budget',2,paginator,datatable);
-               tmp_sum2 = getSumPerPage('calculation',2,paginator,datatable);
-               tmp_sum3 = getSumPerPage('actual_cost',2,paginator,datatable);
-               tmp_sum4 = getSumPerPage('contract_sum',2,paginator,datatable);
 
-               if(typeof(tableYUI)=='undefined')
-               {
-                       tableYUI = 
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[0].parentNode;
-                       tableYUI.setAttribute("id","tableYUI");
-               }
-               else
-               {
-                       tableYUI.deleteTFoot();
-               }
-
-               //Create ROW
-               newTR = document.createElement('tr');
-
-               td_sum('Sum');
-               td_empty(2);
-               td_sum(tmp_sum4);
-               td_sum(tmp_sum1);
-               td_sum(tmp_sum2);
-               td_sum(tmp_sum3);
-               td_empty(3);
-
-               myfoot = tableYUI.createTFoot();
-               myfoot.setAttribute("id","myfoot");
-               myfoot.appendChild(newTR);
-       }
-
- 
/********************************************************************************/
-
 YAHOO.util.Event.addListener(window, "load", function()
 {
        loader = new YAHOO.util.YUILoader();

Modified: trunk/frontend/templates/base/drawings.xsl
===================================================================
--- trunk/frontend/templates/base/drawings.xsl  2011-03-08 15:15:43 UTC (rev 
7090)
+++ trunk/frontend/templates/base/drawings.xsl  2011-03-08 21:19:13 UTC (rev 
7091)
@@ -1,3 +1,4 @@
+<!-- $Id: helpdesk.xsl 6663 2010-12-09 10:45:28Z sigurdne $ -->
 <xsl:template match="drawings" xmlns:php="http://php.net/xsl";>
     <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
     <div class="yui-navset" id="drawing_tabview">
@@ -10,7 +11,7 @@
                                    <xsl:apply-templates 
select="datatable/actions" />  
                                </div>
                            </div>
-                           <div class="drawings">
+                           <div class="tickets">
                                <table cellpadding="2" cellspacing="2" 
width="95%" align="center">
                                                <xsl:choose>
                                                    <xsl:when test="msgbox_data 
!= ''">
@@ -22,7 +23,7 @@
                                                    </xsl:when>
                                                </xsl:choose>
                                            </table>
-
+                               <xsl:apply-templates select="datatable" />
                            </div>
                                </xsl:when>
                                <xsl:otherwise>
@@ -30,10 +31,34 @@
                                <xsl:value-of select="php:function('lang', 
'no_buildings')"/>
                            </div>
                                </xsl:otherwise>
-                       </xsl:choose>
-            
+                       </xsl:choose>  
         </div>
     </div>
+</xsl:template>
 
+<xsl:template name="datatable" match="datatable">
+       <div id="paging_0"> </div>
+       <div id="datatable-container_0"></div>
+       <!--  DATATABLE DEFINITIONS-->
+       <script type="text/javascript">
+               var property_js = <xsl:value-of select="property_js" />;
+               var datatable = new Array();
+               var myColumnDefs = new Array();
+
+               <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"/>,
+                               edit_action             :       <xsl:value-of 
select="edit_action"/>,
+                               is_paginator    :       <xsl:value-of 
select="is_paginator"/>,
+                               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>
+       </script>
 </xsl:template>
-




reply via email to

[Prev in Thread] Current Thread [Next in Thread]