holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed dayview for conflicts with events starting before prefs[day_start_time]

Browse Source
This commit is contained in:
Ralf Becker 2003-04-12 19:21:22 +00:00
parent d83bbe6280
commit 2fca3a3cb6
3 changed files with 92 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
calendar/inc/class.uicalendar.inc.php
View File

@ -3604,6 +3604,15 @@
return $p->fp('out','view_event'); return $p->fp('out','view_event');
} }
function nm_on_off()
{
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on')
{
return '_on';
}
return '_off';
}
function print_day($params) function print_day($params)
{ {
if(!is_array($params)) if(!is_array($params))
@ -3675,22 +3684,23 @@
print_debug('Date to Eval',$date_to_eval); print_debug('Date to Eval',$date_to_eval);
if($daily[$date_to_eval]['appts']) if($daily[$date_to_eval]['appts'])
{ {
$day_start = mktime(intval($this->bo->prefs['calendar']['workdaystarts']-1),0,0,$params['month'],$params['day'],$params['year']); $day_start = mktime(intval($this->bo->prefs['calendar']['workdaystarts']),-intval($this->bo->prefs['calendar']['interval']),0,$params['month'],$params['day'],$params['year']);
$day_end = mktime(intval($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']); $day_end = mktime(intval($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']);
$starttime = 0; $last_starttime = $starttime = 0;
$endtime = 0; $last_endtime = $endtime = 0;
$events = $this->bo->cached_events[$date_to_eval]; $events = $this->bo->cached_events[$date_to_eval];
$c_events = count($events);
print_debug('Date',$date_to_eval); print_debug('Date',$date_to_eval);
print_debug('Count',$c_events); print_debug('Count',count($events));
for($i=0;$i<$c_events;$i++) $last_ind = -1;
foreach($events as $event)
{ {
$starttime = $this->bo->maketime($events[$i]['start']); if ($event['recur_type']) // calculate start- + end-datetime for recuring events
$endtime = $this->bo->maketime($events[$i]['end']); {
$this->bo->set_recur_date($event,$date_to_eval);
}
$starttime = $this->bo->maketime($event['start']);
$endtime = $this->bo->maketime($event['end']);
if($events[$i]['recur_type'] == MCAL_RECUR_NONE)
{
$ind = 0;
$interval_start = 0; $interval_start = 0;
if ($starttime < $day_start) if ($starttime < $day_start)
{ {
@ -3702,35 +3712,26 @@
} }
else else
{ {
$ind = intval($events[$i]['start']['hour']); $ind = intval($event['start']['hour']);
$interval_start = intval($events[$i]['start']['min'] / intval($this->bo->prefs['calendar']['interval'])); $interval_start = intval($event['start']['min'] / intval($this->bo->prefs['calendar']['interval']));
print_debug('Start Time Minutes',$events[$i]['start']['min']); print_debug('Start Time Minutes',$event['start']['min']);
print_debug('Interval',$interval_start); print_debug('Interval',$interval_start);
} }
}
else
{
$ind = intval($events[$i]['start']['hour']);
$interval_start = intval($events[$i]['start']['min'] / intval($this->bo->prefs['calendar']['interval']));
}
if(($ind < intval($this->bo->prefs['calendar']['workdaystarts'])) || ($ind > intval($this->bo->prefs['calendar']['workdayends']))) if(($ind < intval($this->bo->prefs['calendar']['workdaystarts'])) || ($ind > intval($this->bo->prefs['calendar']['workdayends'])))
{ {
$ind = $ind < intval($this->bo->prefs['calendar']['workdaystarts']) ? 0 : 99; $ind = $ind < intval($this->bo->prefs['calendar']['workdaystarts']) ? 0 : 99;
$interval_start = 0; $interval_start = 0;
} }
if((($ind <> 99) && ($ind <> 0)) && (($starttime <> 0) && ($endtime <> 0)))
{
print_debug('IND before',$ind); print_debug('IND before',$ind);
if($ind <= date('H',$last_endtime-1) && $last_ind) // -1 to allow events to end on a full hour, without blocking the next hour-slot if($ind <= date('H',$last_endtime-1) && $last_ind >= 0) // -1 to allow events to end on a full hour, without blocking the next hour-slot
{ {
$ind = $last_ind; $ind = $last_ind;
$interval_start = $last_interval_start; $interval_start = $last_interval_start;
} }
print_debug('IND after',$ind); print_debug('IND after',$ind);
}
$time[$ind][$interval_start] .= $this->link_to_entry($events[$i],$params['month'],$params['day'],$params['year']); $time[$ind][$interval_start] .= $this->link_to_entry($event,$params['month'],$params['day'],$params['year']);
print_debug('IND',$ind); print_debug('IND',$ind);
print_debug('TIME',$time[$ind][$interval_start]); print_debug('TIME',$time[$ind][$interval_start]);
@ -3743,7 +3744,7 @@
{ {
$endtime = $day_end; $endtime = $day_end;
} }
if ($starttime <> $endtime) if ($starttime != $endtime)
{ {
$rowspan = $rowspan_arr[$ind][$interval_start]; $rowspan = $rowspan_arr[$ind][$interval_start];
if($rowspan == 0 || $last_endtime <= $starttime) if($rowspan == 0 || $last_endtime <= $starttime)
@ -3756,7 +3757,8 @@
} }
$mins = (int)((($endtime - $starttime) / 60) % 60); $mins = (int)((($endtime - $starttime) / 60) % 60);
if(($mins <> 0 && $mins <= intval(60 / intval($this->bo->prefs['calendar']['interval']))) || ($mins == 0 && date('i',$endtime) > intval($this->bo->prefs['calendar']['interval']))) if($mins != 0 && $mins <= intval(60 / intval($this->bo->prefs['calendar']['interval'])) ||
$mins == 0 && date('i',$endtime) > intval($this->bo->prefs['calendar']['interval']))
{ {
$rowspan += 1; $rowspan += 1;
} }
@ -3769,10 +3771,7 @@
} }
$last_ind = $ind; $last_ind = $ind;
$last_interval_start = $interval_start; $last_interval_start = $interval_start;
if ($rowspan <= 1 || !$last_starttime)
{
$last_starttime = $starttime; $last_starttime = $starttime;
}
$last_endtime = $endtime; $last_endtime = $endtime;
print_debug('Time',$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['start']) - $GLOBALS['phpgw']->datetime->tz_offset).' - '.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['end']) - $GLOBALS['phpgw']->datetime->tz_offset)); print_debug('Time',$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['start']) - $GLOBALS['phpgw']->datetime->tz_offset).' - '.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['end']) - $GLOBALS['phpgw']->datetime->tz_offset));
print_debug('Start',$ind); print_debug('Start',$ind);
@ -3786,14 +3785,7 @@
$holiday_names = $daily[$date_to_eval]['holidays']; $holiday_names = $daily[$date_to_eval]['holidays'];
if(!$holiday_names) if(!$holiday_names)
{ {
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == $this->theme['row_on']) $row_to_print = $this->nm_on_off();
{
$row_to_print = '_on';
}
else
{
$row_to_print = '_off';
}
} }
else else
{ {
@ -3804,30 +3796,13 @@
} }
} }
$rowspan = intval($rowspan_arr[0][0]); $rowspan = 0;
// events before workdaystart $i = isset($time[0][0]) ? 0 : (int)$this->bo->prefs['calendar']['workdaystarts'];
if (isset($time[0][0])) $i_end = isset($time[99][0]) ? 99 : (int)$this->bo->prefs['calendar']['workdayends'];
while ($i <= $i_end)
{ {
$var = array('event' => $time[0][0]); $j_end = $i ? 60 / intval($this->bo->prefs['calendar']['interval']) : 1;
if ($rowspan > 1) for($j = 0; $j < $j_end; $j++)
{
$var['extras'] = ' rowspan="'.$rowspan.'"';
}
$this->output_template_array($p,'item','day_event'.$row_to_print,$var);
$var = Array(
'open_link' => '',
'time' => '&nbsp;',
'close_link' => ''
);
$this->output_template_array($p,'item','day_time',$var);
$p->parse('row','day_row',True);
$p->set_var('item','');
}
// events between workdaystart and -end
for ($i=(int)$this->bo->prefs['calendar']['workdaystarts'];$i<=(int)$this->bo->prefs['calendar']['workdayends'];$i++)
{
for($j=0;$j<(60 / intval($this->bo->prefs['calendar']['interval']));$j++)
{ {
$dtime = $this->bo->build_time_for_display(($i * 10000) + (($j *intval($this->bo->prefs['calendar']['interval'])) * 100)); $dtime = $this->bo->build_time_for_display(($i * 10000) + (($j *intval($this->bo->prefs['calendar']['interval'])) * 100));
$p->set_var('extras',''); $p->set_var('extras','');
@ -3839,14 +3814,7 @@
if (isset($time[$i][$j])) if (isset($time[$i][$j]))
{ {
$p->set_var('event',$time[$i][$j]); $p->set_var('event',$time[$i][$j]);
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on') $row_to_print = $this->nm_on_off();
{
$row_to_print = '_on';
}
else
{
$row_to_print = '_off';
}
$p->parse('item','day_event'.$row_to_print,False); $p->parse('item','day_event'.$row_to_print,False);
} }
$rowspan--; $rowspan--;
@ -3854,14 +3822,7 @@
elseif (!isset($time[$i][$j])) elseif (!isset($time[$i][$j]))
{ {
$p->set_var('event','&nbsp;'); $p->set_var('event','&nbsp;');
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on') $row_to_print = $this->nm_on_off();
{
$row_to_print = '_on';
}
else
{
$row_to_print = '_off';
}
$p->parse('item','day_event'.$row_to_print,False); $p->parse('item','day_event'.$row_to_print,False);
} }
else else
@ -3872,17 +3833,12 @@
$p->set_var('extras',' rowspan="'.$rowspan.'"'); $p->set_var('extras',' rowspan="'.$rowspan.'"');
} }
$p->set_var('event',$time[$i][$j]); $p->set_var('event',$time[$i][$j]);
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on') $row_to_print = $this->nm_on_off();
{
$row_to_print = '_on';
}
else
{
$row_to_print = '_off';
}
$p->parse('item','day_event'.$row_to_print,False); $p->parse('item','day_event'.$row_to_print,False);
} }
if (0 < $i && $i < 99)
{
$open_link = ' - '; $open_link = ' - ';
$close_link = ''; $close_link = '';
@ -3904,36 +3860,33 @@
'time' => (intval(substr($dtime,0,strpos($dtime,':')))<10?'0'.$dtime:$dtime), 'time' => (intval(substr($dtime,0,strpos($dtime,':')))<10?'0'.$dtime:$dtime),
'close_link' => $close_link 'close_link' => $close_link
); );
$this->output_template_array($p,'item','day_time',$var);
$p->parse('row','day_row',True);
$p->set_var('event','');
$p->set_var('item','');
}
} // end for
// events after workdayend
if (isset($time[99][0]))
{
$var = array('event' => $time[99][0]);
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on')
{
$row_to_print = '_on';
} }
else else
{ {
$row_to_print = '_off';
}
$this->output_template_array($p,'item','day_event'.$row_to_print,$var);
$var = Array( $var = Array(
'open_link' => '', 'open_link' => '',
'time' => '&nbsp;', 'time' => '&nbsp;',
'close_link' => '' 'close_link' => ''
); );
}
$this->output_template_array($p,'item','day_time',$var); $this->output_template_array($p,'item','day_time',$var);
$p->parse('row','day_row',True); $p->parse('row','day_row',True);
$p->set_var('event','');
$p->set_var('item',''); $p->set_var('item','');
} }
if ($i == 0)
{
$i = (int)$this->bo->prefs['calendar']['workdaystarts'];
}
elseif ($i == (int)$this->bo->prefs['calendar']['workdayends'])
{
$i = 99;
}
else
{
++$i;
}
} // end for
return $p->fp('out','day'); return $p->fp('out','day');
} // end function } // end function

2
calendar/templates/default/day.tpl
View File

@ -18,7 +18,7 @@
{day_events} {day_events}
</table> </table>
</td> </td>
<td valign="top" align="right"> <td align="right">
{small_calendar} {small_calendar}
</td> </td>
</tr> </tr>

2
calendar/templates/default/day_cal.tpl
View File

@ -18,6 +18,6 @@
<td class="cal_holiday"{extras}>{event}</td> <td class="cal_holiday"{extras}>{event}</td>
<!-- END day_event_holiday --> <!-- END day_event_holiday -->
<!-- BEGIN day_time --> <!-- BEGIN day_time -->
<td class="th"><nobr>{open_link}{time}{close_link}</nobr></td> <td class="th" nowrap width="10%">{open_link}{time}{close_link}</td>
<!-- END day_time --> <!-- END day_time -->