[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: timetrack changeprofile.php,1.8.2.2,1.8.2.3 deta
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: timetrack changeprofile.php,1.8.2.2,1.8.2.3 detail_report_bycust.php,1.1.2.3,1.1.2.4timesheets.php,1.16.2.5,1.16.2.6 |
|
Date: |
Thu, 20 Mar 2003 00:02:44 -0500 |
Update of /cvsroot/phpgroupware/timetrack
In directory subversions:/tmp/cvs-serv1268
Modified Files:
Tag: Version-0_9_14-branch
changeprofile.php detail_report_bycust.php timesheets.php
Log Message:
Patch #515
Index: changeprofile.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/changeprofile.php,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -r1.8.2.2 -r1.8.2.3
*** changeprofile.php 22 Sep 2002 19:58:02 -0000 1.8.2.2
--- changeprofile.php 20 Mar 2003 05:02:41 -0000 1.8.2.3
***************
*** 103,107 ****
<tr>
<td><?php echo lang('Mobile Phone'); ?>:</td>
- <td>Mobile number:</td>
<td><input name="mobilephn" value="<?php echo $n_mobilephn; ?>"></td>
</tr>
--- 103,106 ----
Index: detail_report_bycust.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/detail_report_bycust.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** detail_report_bycust.php 28 Oct 2002 02:35:06 -0000 1.1.2.3
--- detail_report_bycust.php 20 Mar 2003 05:02:42 -0000 1.1.2.4
***************
*** 167,171 ****
. ' <th width="10%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Date') . '</font></th>'."\n"
. ' <th width="15%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Employee') . '</font></th>'."\n"
! . ' <th width="55%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Type of Work') . '</font></th>'."\n"
. ' <th width="10%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Hours') . '</font></th>'."\n"
. '</tr>'."\n";
--- 167,172 ----
. ' <th width="10%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Date') . '</font></th>'."\n"
. ' <th width="15%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Employee') . '</font></th>'."\n"
! . ' <th width="20%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Type of Work') . '</font></th>'."\n"
! . ' <th width="35%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Work Comments') . '</font></th>'."\n"
. ' <th width="10%" bgcolor="' . $thbg . '"><font
color="#000000">' . lang('Hours') . '</font></th>'."\n"
. '</tr>'."\n";
***************
*** 217,229 ****
. ' <td width="10%" align="center" bgcolor="' .
$tr_color . '"> ' . $wdate[$i] . '</td>'."\n"
. ' <td width="15%" align="center" bgcolor="' .
$tr_color . '">' . $employee . '</td>'."\n"
! . ' <td width="55%" bgcolor="' . $tr_color . '"> ' .
$wcat [$i]. '</td>'."\n"
. ' <td width="10%" align="center" bgcolor="' .
$tr_color . '"> ' . $nhours[$i] . '</td>'."\n"
- . '</tr>'."\n"
- . '<tr>'."\n"
- . ' <td width="10%" bgcolor="' . $tr_color . '">
</td>'."\n"
- . ' <td width="10%" bgcolor="' . $tr_color . '">
</td>'."\n"
- . ' <td width="15%" align="center" bgcolor="' .
$tr_color . '"> </td>'."\n"
- . ' <td width="55%" bgcolor="' . $tr_color . '"> ' .
$comments[$i] . '</td>'."\n"
- . ' <td width="10%" align="center" bgcolor="' .
$tr_color . '"> </td>'."\n"
. '</tr>'."\n";
}
--- 218,224 ----
. ' <td width="10%" align="center" bgcolor="' .
$tr_color . '"> ' . $wdate[$i] . '</td>'."\n"
. ' <td width="15%" align="center" bgcolor="' .
$tr_color . '">' . $employee . '</td>'."\n"
! . ' <td width="20%" bgcolor="' . $tr_color . '"> ' .
$wcat [$i]. '</td>'."\n"
! . ' <td width="35%" bgcolor="' . $tr_color . '"> ' .
$comments[$i] . '</td>'."\n"
. ' <td width="10%" align="center" bgcolor="' .
$tr_color . '"> ' . $nhours[$i] . '</td>'."\n"
. '</tr>'."\n";
}
***************
*** 232,236 ****
. ' <td width="10%" bgcolor="' . $thbg . '"' .
'> </td>'."\n"
. ' <td width="15%" bgcolor="' . $thbg . '"' .
'> </td>'."\n"
! . ' <th width="55%" align="right" bgcolor="' . $thbg . '">' .
lang('Total Hours') . ':</th>'."\n"
. ' <th width="10%" align="center" bgcolor="' . $thbg . '">' .
sprintf("%01.2f",$total_hours) . '</th>'."\n"
. '</tr>'."\n"
--- 227,232 ----
. ' <td width="10%" bgcolor="' . $thbg . '"' .
'> </td>'."\n"
. ' <td width="15%" bgcolor="' . $thbg . '"' .
'> </td>'."\n"
! . ' <td width="20%" bgcolor="' . $thbg . '"' .
'> </td>'."\n"
! . ' <th width="35%" align="right" bgcolor="' . $thbg . '">' .
lang('Total Hours') . ':</th>'."\n"
. ' <th width="10%" align="center" bgcolor="' . $thbg . '">' .
sprintf("%01.2f",$total_hours) . '</th>'."\n"
. '</tr>'."\n"
***************
*** 252,256 ****
echo '<P> <a href="' .
$GLOBALS['phpgw']->link('/timetrack/detail_report_bycust.php',
Array(
! 'job_id' => $job_id,
'friendly' => 1
)+$passstr
--- 248,252 ----
echo '<P> <a href="' .
$GLOBALS['phpgw']->link('/timetrack/detail_report_bycust.php',
Array(
! 'company_id' => $company_id,
'friendly' => 1
)+$passstr
Index: timesheets.php
===================================================================
RCS file: /cvsroot/phpgroupware/timetrack/timesheets.php,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -C2 -r1.16.2.5 -r1.16.2.6
*** timesheets.php 21 Nov 2002 02:22:20 -0000 1.16.2.5
--- timesheets.php 20 Mar 2003 05:02:42 -0000 1.16.2.6
***************
*** 15,22 ****
// Update complete for phpgroupware 0.9.10 - 4/18/2001 (api calls for
accounts and contacts)
! $GLOBALS['phpgw_info']['flags'] = Array(
! 'currentapp' => 'timetrack',
! 'enable_nextmatchs_class' => True
! );
if (@$GLOBALS['_GET']['friendly'] ||
@$GLOBALS['HTTP_GET_VARS']['friendly'])
--- 15,21 ----
// Update complete for phpgroupware 0.9.10 - 4/18/2001 (api calls for
accounts and contacts)
! $GLOBALS['phpgw_info'] = array();
! $GLOBALS['phpgw_info']['flags']['enable_nextmatchs_class'] = 'True';
! $GLOBALS['phpgw_info']['flags']['currentapp'] = 'timetrack';
if (@$GLOBALS['_GET']['friendly'] ||
@$GLOBALS['HTTP_GET_VARS']['friendly'])
***************
*** 404,408 ****
echo '<tr>';
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! echo ' <td colspan="4" align="right" bgcolor="' . $tr_color . '">' .
'Daily Totals' . '</td>';
$mypayhours = 0.0;
for($dayofweek = 1; $dayofweek < 8; $dayofweek++)
--- 403,407 ----
echo '<tr>';
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! echo ' <td colspan="4" align="right" bgcolor="' . $tr_color . '">' .
lang('Daily Totals') . '</td>';
$mypayhours = 0.0;
for($dayofweek = 1; $dayofweek < 8; $dayofweek++)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: timetrack changeprofile.php,1.8.2.2,1.8.2.3 detail_report_bycust.php,1.1.2.3,1.1.2.4timesheets.php,1.16.2.5,1.16.2.6,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: timetrack/inc header.inc.php,1.10.2.2,1.10.2.3
- Next by Date:
[Phpgroupware-cvs] CVS: comic/sql comic_data.sql,1.12,NONE create_tables.mysql,1.8,NONE destroy_tables.mysql,1.1,NONE
- Previous by thread:
[Phpgroupware-cvs] CVS: timetrack/inc header.inc.php,1.10.2.2,1.10.2.3
- Next by thread:
[Phpgroupware-cvs] CVS: comic/sql comic_data.sql,1.12,NONE create_tables.mysql,1.8,NONE destroy_tables.mysql,1.1,NONE
- Index(es):