[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soequipment.inc.php,1.11,1.12
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soequipment.inc.php,1.11,1.12 class.uiapartment.inc.php,1.8,1.9class.uibuilding.inc.php,1.16,1.17 class.uientrance.inc.php,1.9,1.10class.uiequipment.inc.php,1.19,1.20 class.uiproperty.inc.php,1.20,1.21 |
|
Date: |
Sun, 11 May 2003 11:55:13 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv21891/inc
Modified Files:
class.soequipment.inc.php class.uiapartment.inc.php
class.uibuilding.inc.php class.uientrance.inc.php
class.uiequipment.inc.php class.uiproperty.inc.php
Log Message:
no message
Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.soequipment.inc.php 9 Apr 2003 20:14:11 -0000 1.11
--- class.soequipment.inc.php 11 May 2003 15:55:09 -0000 1.12
***************
*** 157,161 ****
while (is_array($equipment_list) &&
list(,$equipment) = each($equipment_list))
{
! $sql = "SELECT c,i,n,t from
fm_equipment_attrib where entity_id ='" . $equipment['equipment_id'] . "' and
attrib_id='$filter'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
--- 157,161 ----
while (is_array($equipment_list) &&
list(,$equipment) = each($equipment_list))
{
! $sql = "SELECT c,i,n,t,d from
fm_equipment_attrib where entity_id ='" . $equipment['equipment_id'] . "' and
attrib_id='$filter'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
***************
*** 164,169 ****
$int_value = $this->db->f('i');
$num_value = $this->db->f('n');
! $date_value = $this->db->f('t');
! $attribute = $char_value .$int_value .
$num_value . $date_value;
if ($attribute)
--- 164,170 ----
$int_value = $this->db->f('i');
$num_value = $this->db->f('n');
! $memo_value = $this->db->f('t');
! $date_value = $this->db->f('d');
! $attribute = $char_value .$int_value .
$num_value . $memo_value . $date_value;
if ($attribute)
Index: class.uiapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiapartment.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uiapartment.inc.php 29 Apr 2003 12:41:31 -0000 1.8
--- class.uiapartment.inc.php 11 May 2003 15:55:09 -0000 1.9
***************
*** 337,342 ****
--- 337,377 ----
));
+
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $sep = '/';
+ $dlarr[strpos($dateformat,'y')] = 'yyyy';
+ $dlarr[strpos($dateformat,'m')] = 'MM';
+ $dlarr[strpos($dateformat,'d')] = 'DD';
+ ksort($dlarr);
+
+ $dateformat= (implode($sep,$dlarr));
+
+ switch(substr($dateformat,0,1))
+ {
+ case 'M':
+ $dateformat_validate=
"javascript:vDateType='1'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'1')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'1')";
+ break;
+ case 'y':
+
$dateformat_validate="javascript:vDateType='2'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'2')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'2')";
+ break;
+ case 'D':
+
$dateformat_validate="javascript:vDateType='3'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'3')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'3')";
+ break;
+ }
+
+
$data = array
(
+ 'lang_dateformat'
=> lang(strtolower($dateformat)),
+ 'dateformat_validate' =>
$dateformat_validate,
+ 'onKeyUp'
=> $onKeyUp,
+ 'onBlur'
=> $onBlur,
+ 'dateformat_source'
=> './'.$this->currentapp.'/inc/dateformat.js',
'street_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.street'),
'location_type'
=> $location_type,
Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uibuilding.inc.php 29 Apr 2003 12:41:31 -0000 1.16
--- class.uibuilding.inc.php 11 May 2003 15:55:09 -0000 1.17
***************
*** 308,313 ****
--- 308,349 ----
'property_name' =>
$values['property_name']));
+
+
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $sep = '/';
+ $dlarr[strpos($dateformat,'y')] = 'yyyy';
+ $dlarr[strpos($dateformat,'m')] = 'MM';
+ $dlarr[strpos($dateformat,'d')] = 'DD';
+ ksort($dlarr);
+
+ $dateformat= (implode($sep,$dlarr));
+
+ switch(substr($dateformat,0,1))
+ {
+ case 'M':
+ $dateformat_validate=
"javascript:vDateType='1'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'1')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'1')";
+ break;
+ case 'y':
+
$dateformat_validate="javascript:vDateType='2'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'2')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'2')";
+ break;
+ case 'D':
+
$dateformat_validate="javascript:vDateType='3'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'3')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'3')";
+ break;
+ }
+
+
$data = array
(
+ 'lang_dateformat'
=> lang(strtolower($dateformat)),
+ 'dateformat_validate' =>
$dateformat_validate,
+ 'onKeyUp'
=> $onKeyUp,
+ 'onBlur'
=> $onBlur,
+ 'dateformat_source'
=> './'.$this->currentapp.'/inc/dateformat.js',
'location_type'
=> $location_type,
'location_data'
=> $location_data,
Index: class.uientrance.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientrance.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uientrance.inc.php 29 Apr 2003 12:41:31 -0000 1.9
--- class.uientrance.inc.php 11 May 2003 15:55:09 -0000 1.10
***************
*** 316,322 ****
--- 316,355 ----
'building_id' =>
$values['building_id'],
));
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $sep = '/';
+ $dlarr[strpos($dateformat,'y')] = 'yyyy';
+ $dlarr[strpos($dateformat,'m')] = 'MM';
+ $dlarr[strpos($dateformat,'d')] = 'DD';
+ ksort($dlarr);
+
+ $dateformat= (implode($sep,$dlarr));
+
+ switch(substr($dateformat,0,1))
+ {
+ case 'M':
+ $dateformat_validate=
"javascript:vDateType='1'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'1')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'1')";
+ break;
+ case 'y':
+
$dateformat_validate="javascript:vDateType='2'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'2')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'2')";
+ break;
+ case 'D':
+
$dateformat_validate="javascript:vDateType='3'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'3')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'3')";
+ break;
+ }
+
$data = array
(
+ 'lang_dateformat'
=> lang(strtolower($dateformat)),
+ 'dateformat_validate' =>
$dateformat_validate,
+ 'onKeyUp'
=> $onKeyUp,
+ 'onBlur'
=> $onBlur,
+ 'dateformat_source'
=> './'.$this->currentapp.'/inc/dateformat.js',
'location_type'
=> $location_type,
'location_data'
=> $location_data,
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uiequipment.inc.php 10 May 2003 19:32:58 -0000 1.19
--- class.uiequipment.inc.php 11 May 2003 15:55:09 -0000 1.20
***************
*** 388,395 ****
(
'lang_dateformat'
=> lang(strtolower($dateformat)),
- 'lang_attributes'
=> lang('Attributes'),
'dateformat_validate' =>
$dateformat_validate,
'onKeyUp'
=> $onKeyUp,
'onBlur'
=> $onBlur,
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
--- 388,396 ----
(
'lang_dateformat'
=> lang(strtolower($dateformat)),
'dateformat_validate' =>
$dateformat_validate,
'onKeyUp'
=> $onKeyUp,
'onBlur'
=> $onBlur,
+ 'dateformat_source'
=> './'.$this->currentapp.'/inc/dateformat.js',
+ 'lang_attributes'
=> lang('Attributes'),
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
***************
*** 398,402 ****
'calendar_gif'
=> './'.$this->currentapp.'/templates/default/images/calendar.gif',
'calendar_source'
=> './'.$this->currentapp.'/inc/calendar.js',
- 'dateformat_source'
=> './'.$this->currentapp.'/inc/dateformat.js',
'dateformat'
=> $dateformat,
'lang_popup_calendar' =>
lang('Popup Calendar'),
--- 399,402 ----
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uiproperty.inc.php 29 Apr 2003 12:41:31 -0000 1.20
--- class.uiproperty.inc.php 11 May 2003 15:55:09 -0000 1.21
***************
*** 260,266 ****
--- 260,299 ----
'property_id' => $property_id
);
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $sep = '/';
+ $dlarr[strpos($dateformat,'y')] = 'yyyy';
+ $dlarr[strpos($dateformat,'m')] = 'MM';
+ $dlarr[strpos($dateformat,'d')] = 'DD';
+ ksort($dlarr);
+
+ $dateformat= (implode($sep,$dlarr));
+
+ switch(substr($dateformat,0,1))
+ {
+ case 'M':
+ $dateformat_validate=
"javascript:vDateType='1'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'1')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'1')";
+ break;
+ case 'y':
+
$dateformat_validate="javascript:vDateType='2'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'2')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'2')";
+ break;
+ case 'D':
+
$dateformat_validate="javascript:vDateType='3'";
+ $onKeyUp =
"DateFormat(this,this.value,event,false,'3')";
+ $onBlur =
"DateFormat(this,this.value,event,true,'3')";
+ break;
+ }
+
$data = array
(
+ 'lang_dateformat'
=> lang(strtolower($dateformat)),
+ 'dateformat_validate' =>
$dateformat_validate,
+ 'onKeyUp'
=> $onKeyUp,
+ 'onBlur'
=> $onBlur,
+ 'dateformat_source'
=> './'.$this->currentapp.'/inc/dateformat.js',
'lang_attributes'
=> lang('Attributes'),
'attributes_header'
=> $attributes_header,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soequipment.inc.php,1.11,1.12 class.uiapartment.inc.php,1.8,1.9class.uibuilding.inc.php,1.16,1.17 class.uientrance.inc.php,1.9,1.10class.uiequipment.inc.php,1.19,1.20 class.uiproperty.inc.php,1.20,1.21,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.73,1.74
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default attributes_view.xsl,1.2,1.3 menu.xsl,1.8,1.9 tts.xsl,1.6,1.7
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.73,1.74
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default attributes_view.xsl,1.2,1.3 menu.xsl,1.8,1.9 tts.xsl,1.6,1.7
- Index(es):