[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.boproject.inc.php inc/class....
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.boproject.inc.php inc/class.... |
|
Date: |
Sun, 09 Jul 2006 17:47:38 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/07/09 17:47:38
Modified files:
inc : class.boproject.inc.php
class.boworkorder.inc.php
class.soproject.inc.php
class.soworkorder.inc.php
class.uiproject.inc.php
class.uiworkorder.inc.php
setup : phpgw_no.lang
templates/base : project.xsl workorder.xsl
Log message:
Ability to add remarks to history og projects and workorders
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boproject.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boworkorder.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soproject.inc.php?cvsroot=phpgroupware&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soworkorder.inc.php?cvsroot=phpgroupware&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiworkorder.inc.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/property/setup/phpgw_no.lang?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/project.xsl?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/workorder.xsl?cvsroot=phpgroupware&r1=1.7&r2=1.8
Patches:
Index: inc/class.boproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- inc/class.boproject.inc.php 29 Jun 2006 10:06:13 -0000 1.16
+++ inc/class.boproject.inc.php 9 Jul 2006 17:47:38 -0000 1.17
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boproject.inc.php,v 1.16 2006/06/29 10:06:13
sigurdne Exp $
+ * @version $Id: class.boproject.inc.php,v 1.17 2006/07/09 17:47:38
sigurdne Exp $
*/
/**
@@ -352,6 +352,7 @@
switch ($value['status'])
{
case 'R': $type = lang('Re-opened');
break;
+ case 'RM': $type = lang('remark');
break;
case 'X': $type = lang('Closed');
break;
case 'O': $type = lang('Opened');
break;
case 'A': $type = lang('Re-assigned');
break;
Index: inc/class.boworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- inc/class.boworkorder.inc.php 29 Jun 2006 10:06:13 -0000 1.16
+++ inc/class.boworkorder.inc.php 9 Jul 2006 17:47:38 -0000 1.17
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boworkorder.inc.php,v 1.16 2006/06/29 10:06:13
sigurdne Exp $
+ * @version $Id: class.boworkorder.inc.php,v 1.17 2006/07/09 17:47:38
sigurdne Exp $
*/
/**
@@ -287,6 +287,7 @@
switch ($value['status'])
{
case 'R': $type = lang('Re-opened');
break;
+ case 'RM': $type = lang('remark');
break;
case 'X': $type = lang('Closed');
break;
case 'O': $type = lang('Opened');
break;
case 'A': $type = lang('Re-assigned');
break;
Index: inc/class.soproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- inc/class.soproject.inc.php 29 Jun 2006 10:06:13 -0000 1.29
+++ inc/class.soproject.inc.php 9 Jul 2006 17:47:38 -0000 1.30
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soproject.inc.php,v 1.29 2006/06/29 10:06:13
sigurdne Exp $
+ * @version $Id: class.soproject.inc.php,v 1.30 2006/07/09 17:47:38
sigurdne Exp $
*/
/**
@@ -562,6 +562,10 @@
$historylog->add('SO',$project['project_id'],$project['status']);
$historylog->add('TO',$project['project_id'],$project['cat_id']);
$historylog->add('CO',$project['project_id'],$project['coordinator']);
+ if ($project['remark'])
+ {
+
$historylog->add('RM',$project['project_id'],$project['remark']);
+ }
$receipt['message'][] =
array('msg'=>lang('project %1 has been saved',$project['project_id']));
}
@@ -785,6 +789,11 @@
$receipt['notice_owner'][]=lang('Coordinator
changed') . ': ' .
$GLOBALS['phpgw']->accounts->id2name($project['coordinator']);
}
+ if ($project['remark'])
+ {
+
$historylog->add('RM',$project['project_id'],$project['remark']);
+ }
+
$receipt['message'][] = array('msg'=>lang('project %1
has been edited',$project['project_id']));
$this->db->transaction_commit();
Index: inc/class.soworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- inc/class.soworkorder.inc.php 29 Jun 2006 10:06:13 -0000 1.21
+++ inc/class.soworkorder.inc.php 9 Jul 2006 17:47:38 -0000 1.22
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soworkorder.inc.php,v 1.21 2006/06/29 10:06:13
sigurdne Exp $
+ * @version $Id: class.soworkorder.inc.php,v 1.22 2006/07/09 17:47:38
sigurdne Exp $
*/
/**
@@ -525,6 +525,11 @@
{
$this->increment_workorder_id();
$historylog->add('SO',$workorder['workorder_id'],$workorder['status']);
+ if ($workorder['remark'])
+ {
+
$historylog->add('RM',$workorder['workorder_id'],$workorder['remark']);
+ }
+
$receipt['message'][] =
array('msg'=>lang('workorder %1 has been saved',$workorder['workorder_id']));
}
else
@@ -625,6 +630,11 @@
$historylog->add('B',$workorder['workorder_id'],$workorder['budget']);
}
+ if ($workorder['remark'])
+ {
+
$historylog->add('RM',$workorder['workorder_id'],$workorder['remark']);
+ }
+
$receipt['message'][] =
array('msg'=>lang('workorder %1 has been edited',$workorder['workorder_id']));
}
else
Index: inc/class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- inc/class.uiproject.inc.php 29 Jun 2006 10:06:13 -0000 1.29
+++ inc/class.uiproject.inc.php 9 Jul 2006 17:47:38 -0000 1.30
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiproject.inc.php,v 1.29 2006/06/29 10:06:13
sigurdne Exp $
+ * @version $Id: class.uiproject.inc.php,v 1.30 2006/07/09 17:47:38
sigurdne Exp $
*/
/**
@@ -1023,6 +1023,10 @@
'lang_descr_statustext'
=> lang('Enter a description of the project'),
'lang_descr'
=> lang('Description'),
'value_descr'
=> $values['descr'],
+
+ 'lang_remark_statustext'
=> lang('Enter a remark to add to the history of the project'),
+ 'lang_remark'
=> lang('remark'),
+ 'value_remark'
=> $values['remark'],
'lang_done_statustext'
=> lang('Back to the list'),
'lang_save_statustext'
=> lang('Save the project'),
'lang_no_cat'
=> lang('Select category'),
Index: inc/class.uiworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- inc/class.uiworkorder.inc.php 29 Jun 2006 10:06:13 -0000 1.26
+++ inc/class.uiworkorder.inc.php 9 Jul 2006 17:47:38 -0000 1.27
@@ -8,7 +8,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.26 2006/06/29 10:06:13
sigurdne Exp $
+ * @version $Id: class.uiworkorder.inc.php,v 1.27 2006/07/09 17:47:38
sigurdne Exp $
*/
/**
@@ -879,6 +879,11 @@
'lang_descr_statustext' =>
lang('Enter a short description of the workorder'),
'lang_descr' =>
lang('Description'),
'value_descr' =>
$values['descr'],
+
+ 'lang_remark_statustext' =>
lang('Enter a remark to add to the history of the order'),
+ 'lang_remark' =>
lang('remark'),
+ 'value_remark' =>
$values['remark'],
+
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the workorder'),
'lang_no_cat' =>
lang('Select category'),
Index: setup/phpgw_no.lang
===================================================================
RCS file: /sources/phpgroupware/property/setup/phpgw_no.lang,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- setup/phpgw_no.lang 29 Jun 2006 10:06:13 -0000 1.12
+++ setup/phpgw_no.lang 9 Jul 2006 17:47:38 -0000 1.13
@@ -20,8 +20,12 @@
Actual cost property no Faktisk kostnad
Add property no Legg til
add a apartment property no Legg til leilighet
+<<<<<<< phpgw_no.lang
+add an attrib property no Legg til en attibutt
+=======
add a attrib property no Legg til en attibutt
add a budget account property no Legg til en budsjettkonto
+>>>>>>> 1.8
add a building property no legg til bygning
add a category property no Legg til en kategori
add a claim property no Legg til et krav
@@ -38,10 +42,14 @@
add agreement group property no Legg til en avtalegruppe
add a hour property no legg til post
add a hour to this template property no lett til en post til
denne malen
+<<<<<<< phpgw_no.lang
+add an investment property no legg til investering
+=======
add a investment property no legg til investering
Add alarm property no Legg til alarm
Add alarm for selected user property no Legg til alarm for
valgt bruker
add a location property no Legg til en lokalisering
+>>>>>>> 1.8
add a meter property no legg til måler
add a method property no Legg til en metode
add an activity property no legg til aktivitet
@@ -111,7 +119,7 @@
Add this invoice property no Legg til denne fakturaen
Add this vendor to this activity property no legg til denne
leverandøren til denne aktiviteten
add ticket property no legg til melding
-Add Workorder property no Legg til Arbeidsordre
+Add workorder property no Legg til Arbeidsordre
aesthetics property no Estetikk
Aesthetics property no Estetikk
again property no igjen
@@ -168,11 +176,11 @@
attributes for the entity category property no Attributter for
entitet-kategori
attributes for the location type property no Attributter for
lokaliserings type
attributes for the standard property no verdier for standard
-A unique code for this activity property no En unik kode fo
denne aktiviteten
+An unique code for this activity property no En unik kode fo
denne aktiviteten
authorities demands property no Offentlige pålegg
Authorities Demands property no Offentlige pålegg
Auto TAX property no Auto MVA
-b_account property no Budjett konto
+budget account property no Budjett konto
Back to Admin property no Tilbake til Admin
Back to calculation property no Tilbake til kalkulsajon
back to entity property no Returner til entitet
@@ -609,7 +617,7 @@
Enter the name of the property property no angi navn for eiendommen
Enter the name the template property no angi navn for malen
Enter the payment date or the payment delay property no angi
betalingsdato eller antall dager til forfall
-Enter the power_meter property no angi måler
+Enter the power meter property no angi måler
Enter the Property ID property no angi eiendoms ID
Enter the purchase cost property no angi anskaffelses
kostnad
enter the record length property no Angi lengde for datafelt
@@ -940,7 +948,7 @@
No user property no Bruker ikke valgt
No user selected property no Bruker ikke valgt
no vendor property no leverandør ikke valgt
-No workorder bugdet property no Ingen arbeidsordrer er
budsjettert
+No workorder budget property no Ingen arbeidsordrer er
budsjettert
NS3420 property no NS3420
ns3420 description property no NS3420 beskrivelse
Nullable property no Kan være NULL
@@ -988,12 +996,16 @@
Please enter a index ! property no Angi en indeks
Please enter an activity code ! property no angi en
aktivitets kode
Please enter an agreement code ! property no angi en avtale
kode
+<<<<<<< phpgw_no.lang
+Please enter a new index for calculating next value(s)! property
no angi en ny index for beregning av neste verdi(er)!
+=======
Please enter an agreement group code ! property no Angi en
avtale-gruppe-kode
Please enter a name ! property no Angi et navn
Please - enter an amount! property no Angi et beløp!
Please enter a new index for calkulating next value(s)! property
no angi en ny index for beregning av neste verdi(er)!
Please enter an integer ! property no Angi heltall
Please enter an integer for order! property no Angi heltall
for ordrenr
+>>>>>>> 1.8
Please enter a project NAME ! property no angi prosjekt navn
Please enter a Property ID ! property no angi eiendoms ID
Please enter a request TITLE ! property no angi tittel for
anmodning
@@ -1036,7 +1048,7 @@
Please - select type invoice! property no velg type bilag
Please - select type order! property no velg type bestilling
Please - select Vendor! property no velg leverandør
-Please set a initial value ! property no sett initiell verdi
+Please set an initial value! property no sett initiell verdi
Please set a new index ! property no angi ny index
Please type a subject for this ticket ! property no angi
overskrift for denne meldingen
Popup Calendar property no Kalender
Index: templates/base/project.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/project.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- templates/base/project.xsl 29 Jun 2006 10:06:13 -0000 1.7
+++ templates/base/project.xsl 9 Jul 2006 17:47:38 -0000 1.8
@@ -1,4 +1,4 @@
-<!-- $Id: project.xsl,v 1.7 2006/06/29 10:06:13 sigurdne Exp $ -->
+<!-- $Id: project.xsl,v 1.8 2006/07/09 17:47:38 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -528,6 +528,22 @@
</xsl:when>
</xsl:choose>
</tr>
+
+ <tr>
+ <td valign="top">
+ <xsl:value-of select="lang_remark"/>
+ </td>
+ <td>
+ <textarea cols="60" rows="6"
name="values[remark]" wrap="virtual" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_remark_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="value_remark"/>
+ </textarea>
+ </td>
+ </tr>
<tr height="50">
<td>
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
Index: templates/base/workorder.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/workorder.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- templates/base/workorder.xsl 29 Jun 2006 10:06:13 -0000 1.7
+++ templates/base/workorder.xsl 9 Jul 2006 17:47:38 -0000 1.8
@@ -1,4 +1,4 @@
-<!-- $Id: workorder.xsl,v 1.7 2006/06/29 10:06:13 sigurdne Exp $ -->
+<!-- $Id: workorder.xsl,v 1.8 2006/07/09 17:47:38 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -744,6 +744,22 @@
</xsl:when>
</xsl:choose>
</tr>
+
+ <tr>
+ <td valign="top">
+ <xsl:value-of select="lang_remark"/>
+ </td>
+ <td>
+ <textarea cols="60" rows="6"
name="values[remark]" wrap="virtual" onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_remark_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ <xsl:value-of
select="value_remark"/>
+ </textarea>
+ </td>
+ </tr>
<tr height="50">
<td>
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.boproject.inc.php inc/class....,
Sigurd Nes <=