Changeset 4935


Ignore:
Timestamp:
08/16/11 16:46:01 (10 years ago)
Author:
roberto.santosjunior
Message:

Ticket #1820 - Evento sem duração em conflito com outro não é apresentado.r4920

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/calendar/inc/class.bocalendar.inc.php

    r4759 r4935  
    17581758                        elseif ($GLOBALS['phpgw']->datetime->date_compare($event['start']['year'],$event['start']['month'],$event['start']['mday'],$event['end']['year'],$event['end']['month'],$event['end']['mday']) == 0) 
    17591759                        { 
    1760                                 if ($GLOBALS['phpgw']->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0) == 1) 
     1760                                if ( ($GLOBALS['phpgw']->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0) == 1) 
     1761                                   ||($GLOBALS['phpgw']->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0) == 0) ) 
    17611762                                { 
    17621763                                        $error = 47; 
  • trunk/phpgwapi/inc/class.common.inc.php

    r3966 r4935  
    18391839                                case 46: $s .= lang('Recurrent appointments must have a final date').'.'; 
    18401840                                        break; 
    1841                                 case 47: $s .= lang('The starting time can not be greater than end time').'.'; 
     1841                                case 47: $s .= lang('End time can not be less than or equal to start time').'.'; 
    18421842                                        break; 
    18431843                                case 99: $s .= lang('The attachment is to big').'.'; 
Note: See TracChangeset for help on using the changeset viewer.