[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.uiworkorder.inc.php template...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.uiworkorder.inc.php template... |
|
Date: |
Tue, 20 Mar 2007 10:56:12 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/03/20 10:56:12
Modified files:
inc : class.uiworkorder.inc.php
templates/base : workorder.xsl
Log message:
Tabs for workorder
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiworkorder.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/workorder.xsl?cvsroot=phpgroupware&r1=1.10&r2=1.11
Patches:
Index: inc/class.uiworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- inc/class.uiworkorder.inc.php 26 Jan 2007 14:53:47 -0000 1.40
+++ inc/class.uiworkorder.inc.php 20 Mar 2007 10:56:12 -0000 1.41
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiworkorder.inc.php,v 1.40 2007/01/26 14:53:47
sigurdne Exp $
+ * @version $Id: class.uiworkorder.inc.php,v 1.41 2007/03/20 10:56:12
sigurdne Exp $
*/
/**
@@ -823,8 +823,22 @@
$msgbox_data = '';
}
+ $GLOBALS['phpgw']->js->validate_file('tabs', 'tabs');
+
+ if(!is_object($GLOBALS['phpgw']->css))
+ {
+ $GLOBALS['phpgw']->css =
createObject('phpgwapi.css');
+ }
+
$GLOBALS['phpgw']->css->validate_file('tabs','phpgwapi');
+
$data = array
(
+ 'lang_project_info'
=> lang('project info'),
+ 'lang_general'
=> lang('general'),
+ 'lang_coordination' =>
lang('coordination'),
+ 'lang_time_and_budget' =>
lang('time and budget'),
+ 'lang_extra'
=> lang('extra'),
+
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'calculate_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.index')),
'lang_calculate' =>
lang('Calculate Workorder'),
Index: templates/base/workorder.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/workorder.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- templates/base/workorder.xsl 4 Jan 2007 14:36:16 -0000 1.10
+++ templates/base/workorder.xsl 20 Mar 2007 10:56:12 -0000 1.11
@@ -1,4 +1,4 @@
-<!-- $Id: workorder.xsl,v 1.10 2007/01/04 14:36:16 sigurdne Exp $ -->
+<!-- $Id: workorder.xsl,v 1.11 2007/03/20 10:56:12 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -319,7 +319,10 @@
</xsl:choose>
<xsl:choose>
<xsl:when test="value_workorder_id!=''">
- <td valign="top">
+ <td>
+ <table>
+ <tr>
+ <td valign="top" >
<xsl:variable
name="calculate_action"><xsl:value-of
select="calculate_action"/>&workorder_id=<xsl:value-of
select="value_workorder_id"/></xsl:variable>
<xsl:variable
name="lang_calculate"><xsl:value-of select="lang_calculate"/></xsl:variable>
<form method="post"
action="{$calculate_action}">
@@ -345,10 +348,91 @@
</input>
</form>
</td>
+ </tr>
+ </table>
+ </td>
</xsl:when>
</xsl:choose>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
<form method="post" name="form" action="{$form_action}">
+
+<div align="center">
+<table class="tabletab">
+ <tr>
+ <th id="tab1" class="activetab" valign="top"
onclick="javascript:tab.display(1);">
+ <table class="basic">
+ <tr>
+ <td id="starttab"></td>
+ <td>
+ <a href="#" tabindex="0" accesskey="1" onfocus="tab.display(1);"
onclick="tab.display(1); return(false);"><xsl:value-of
select="lang_project_info"/></a>
+ </td>
+ <td id="tweentab_r"></td>
+ </tr>
+ </table>
+ </th>
+ <th id="tab2" class="activetab" onclick="javascript:tab.display(2);">
+ <table>
+ <tr>
+ <td id="tweentab_l"></td>
+ <td>
+ <a href="#" tabindex="0" accesskey="2" onfocus="tab.display(2);"
onclick="tab.display(2); return(false);"><xsl:value-of
select="lang_general"/></a>
+ </td>
+ <td id="tweentab_r"></td>
+ </tr>
+ </table>
+ </th>
+ <th id="tab3" class="activetab" onclick="javascript:tab.display(3);">
+ <table>
+ <tr>
+ <td id="tweentab_l"></td>
+ <td>
+ <a href="#" tabindex="0" accesskey="3" onfocus="tab.display(3);"
onclick="tab.display(3); return(false);"><xsl:value-of
select="lang_time_and_budget"/></a>
+ </td>
+ <td id="tweentab_r"></td>
+ </tr>
+ </table>
+ </th>
+ <th id="tab4" class="activetab" onclick="javascript:tab.display(4);">
+ <table>
+ <tr>
+ <td id="tweentab_l"></td>
+ <td>
+ <a href="#" tabindex="0" accesskey="4" onfocus="tab.display(4);"
onclick="tab.display(4); return(false);"><xsl:value-of
select="lang_coordination"/></a>
+ </td>
+ <td id="tweentab_r"></td>
+ </tr>
+ </table>
+ </th>
+ <th id="tab5" class="activetab" onclick="javascript:tab.display(5);">
+ <table>
+ <tr>
+ <td id="tweentab_l"></td>
+ <td>
+ <a href="#" tabindex="0" accesskey="5" onfocus="tab.display(5);"
onclick="tab.display(5); return(false);"><xsl:value-of select="lang_extra"/></a>
+ </td>
+ <td id="tweentab_r"></td>
+ </tr>
+ </table>
+ </th>
+ <th id="tab6" class="activetab" onclick="javascript:tab.display(6);">
+ <table>
+ <tr>
+ <td id="tweentab_l"></td>
+ <td>
+ <a href="#" tabindex="0" accesskey="6" onfocus="tab.display(6);"
onclick="tab.display(6); return(false);"><xsl:value-of
select="lang_history"/></a>
+ </td>
+ <td id="tweentab_r"></td>
+ </tr>
+ </table>
+ </th>
+ </tr>
+</table>
+</div>
+
+<div id="tabcontent1" class="activetab">
+<table class="contenttab">
+
+
<xsl:choose>
<xsl:when test="value_project_id!=''">
<tr>
@@ -464,6 +548,12 @@
<xsl:value-of
select="value_other_branch"/>
</td>
</tr>
+</table>
+</div>
+
+<div id="tabcontent2" class="activetab">
+<table class="contenttab">
+
<xsl:choose>
<xsl:when test="value_workorder_id!=''">
<tr>
@@ -491,61 +581,99 @@
</xsl:when>
</xsl:choose>
<tr>
- <td>
- <xsl:value-of
select="lang_charge_tenant"/>
+ <td valign="top">
+ <xsl:value-of select="lang_title"/>
</td>
<td>
- <xsl:choose>
- <xsl:when test="charge_tenant='1'">
- <input type="checkbox"
name="values[charge_tenant]" value="1" checked="checked"
onMouseout="window.status='';return true;">
+ <input type="text" name="values[title]"
value="{value_title}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_charge_tenant_statustext"/>
+ <xsl:value-of
select="lang_title_statustext"/>
<xsl:text>';
return true;</xsl:text>
</xsl:attribute>
</input>
- </xsl:when>
- <xsl:otherwise>
- <input type="checkbox"
name="values[charge_tenant]" value="1" onMouseout="window.status='';return
true;">
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
+ <xsl:value-of select="lang_descr"/>
+ </td>
+ <td>
+ <textarea cols="60" rows="6"
name="values[descr]" wrap="virtual" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_charge_tenant_statustext"/>
+ <xsl:value-of
select="lang_descr_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="value_descr"/>
+ </textarea>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <xsl:value-of select="lang_status"/>
+ </td>
+ <td>
+ <xsl:call-template
name="status_select"/>
+ </td>
+ </tr>
+ <xsl:choose>
+ <xsl:when test="value_workorder_id!=''">
+ <tr>
+ <td>
+ <xsl:value-of
select="lang_confirm_status"/>
+ </td>
+ <td>
+ <input type="checkbox"
name="values[confirm_status]" value="True" onMouseout="window.status='';return
true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="lang_confirm_statustext"/>
<xsl:text>';
return true;</xsl:text>
</xsl:attribute>
</input>
- </xsl:otherwise>
- </xsl:choose>
</td>
</tr>
+ </xsl:when>
+ </xsl:choose>
+
+</table>
+</div>
+
+<div id="tabcontent3" class="activetab">
+<table class="contenttab">
<tr>
<td valign="top">
- <xsl:value-of select="lang_title"/>
+ <xsl:value-of select="lang_start_date"/>
</td>
<td>
- <input type="text" name="values[title]"
value="{value_title}" onMouseout="window.status='';return true;">
+ <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_title_statustext"/>
+ <xsl:value-of
select="lang_start_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
+
+ <img id="values_start_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of select="lang_descr"/>
+ <xsl:value-of select="lang_end_date"/>
</td>
<td>
- <textarea cols="60" rows="6"
name="values[descr]" wrap="virtual" onMouseout="window.status='';return true;">
+ <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_descr_statustext"/>
+ <xsl:value-of
select="lang_end_date_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
- <xsl:value-of
select="value_descr"/>
- </textarea>
+ </input>
+ <img id="values_end_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
</td>
</tr>
+
+
<xsl:call-template name="vendor_form"/>
<xsl:call-template name="b_account_form"/>
@@ -595,82 +723,59 @@
</td>
</tr>
<tr>
- <td valign="top">
- <xsl:value-of
select="lang_calculation"/>
- </td>
- <td>
- <xsl:value-of
select="value_calculation"/>
- <xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
- <xsl:value-of select="lang_incl_tax"/>
- </td>
- </tr>
- <tr>
- <td valign="top">
- <xsl:value-of
select="lang_actual_cost"/>
- </td>
- <td>
- <xsl:value-of select="actual_cost"/>
- <xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
- </td>
- </tr>
- <tr>
<td>
- <xsl:value-of select="lang_status"/>
+ <xsl:value-of
select="lang_charge_tenant"/>
</td>
<td>
- <xsl:call-template
name="status_select"/>
- </td>
- </tr>
<xsl:choose>
- <xsl:when test="value_workorder_id!=''">
- <tr>
- <td>
- <xsl:value-of
select="lang_confirm_status"/>
- </td>
- <td>
- <input type="checkbox"
name="values[confirm_status]" value="True" onMouseout="window.status='';return
true;">
+ <xsl:when test="charge_tenant='1'">
+ <input type="checkbox"
name="values[charge_tenant]" value="1" checked="checked"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_confirm_statustext"/>
+
<xsl:value-of select="lang_charge_tenant_statustext"/>
<xsl:text>';
return true;</xsl:text>
</xsl:attribute>
</input>
- </td>
- </tr>
</xsl:when>
- </xsl:choose>
- <tr>
- <td valign="top">
- <xsl:value-of select="lang_start_date"/>
- </td>
- <td>
- <input type="text"
id="values_start_date" name="values[start_date]" size="10"
value="{value_start_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
+ <xsl:otherwise>
+ <input type="checkbox"
name="values[charge_tenant]" value="1" onMouseout="window.status='';return
true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_start_date_statustext"/>
+
<xsl:value-of select="lang_charge_tenant_statustext"/>
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
-
- <img id="values_start_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
+ </xsl:otherwise>
+ </xsl:choose>
</td>
</tr>
<tr>
<td valign="top">
- <xsl:value-of select="lang_end_date"/>
+ <xsl:value-of
select="lang_calculation"/>
</td>
<td>
- <input type="text" id="values_end_date"
name="values[end_date]" size="10" value="{value_end_date}" readonly="readonly"
onMouseout="window.status='';return true;" >
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_end_date_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- <img id="values_end_date-trigger"
src="{img_cal}" alt="{lang_datetitle}" title="{lang_datetitle}"
style="cursor:pointer; cursor:hand;" />
+ <xsl:value-of
select="value_calculation"/>
+ <xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
+ <xsl:value-of select="lang_incl_tax"/>
</td>
</tr>
<tr>
+ <td valign="top">
+ <xsl:value-of
select="lang_actual_cost"/>
+ </td>
+ <td>
+ <xsl:value-of select="actual_cost"/>
+ <xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
+ </td>
+ </tr>
+
+</table>
+</div>
+
+<div id="tabcontent4" class="activetab">
+<table class="contenttab">
+
+ <tr>
<td>
<xsl:value-of select="lang_key_fetch"/>
</td>
@@ -708,6 +813,12 @@
</xsl:for-each>
</td>
</tr>
+</table>
+</div>
+
+<div id="tabcontent5" class="activetab">
+<table class="contenttab">
+
<tr>
<xsl:choose>
<xsl:when test="need_approval='yes'">
@@ -715,6 +826,10 @@
<xsl:value-of
select="lang_ask_approval"/>
</td>
<td>
+ <table>
+ <tr>
+ <td>
+
<input type="checkbox"
name="values[approval]" value="True" onMouseout="window.status='';return
true;">
<xsl:attribute
name="onMouseover">
<xsl:text>window.status='</xsl:text>
@@ -722,6 +837,8 @@
<xsl:text>'; return
true;</xsl:text>
</xsl:attribute>
</input>
+ </td>
+ <td>
<input type="text"
name="values[mail_address]" value="{value_approval_mail_address}"
onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
@@ -731,6 +848,9 @@
</xsl:attribute>
</input>
</td>
+ </tr>
+ </table>
+ </td>
</xsl:when>
</xsl:choose>
</tr>
@@ -750,6 +870,9 @@
</textarea>
</td>
</tr>
+</table>
+</div>
+
<tr height="50">
<td>
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
@@ -781,6 +904,8 @@
</td>
</tr>
</table>
+<div id="tabcontent6" class="activetab">
+
<hr noshade="noshade" width="100%" align="center" size="1"/>
<table width="80%" cellpadding="2" cellspacing="2"
align="center">
<xsl:choose>
@@ -802,8 +927,13 @@
</xsl:otherwise>
</xsl:choose>
</table>
+</div>
</div>
<hr noshade="noshade" width="100%" align="center" size="1"/>
+<script language="JavaScript1.1" type="text/javascript">
+ var tab = new
Tabs(6,'activetab','inactivetab','tab','tabcontent','','','tabpage');
+ tab.init();
+</script>
</xsl:template>
<!--
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.uiworkorder.inc.php template...,
Sigurd Nes <=