From b5b91be39a0c2c6a6a99c9669bd9baacf423bd62 Mon Sep 17 00:00:00 2001 From: bradymiller Date: Sat, 8 Aug 2009 04:43:54 +0000 Subject: [PATCH] internationalization bug fixes --- .../default/views/day/fancy_template.html | 618 +++++++++++++++++++++ .../default/views/global/fancy_navigation.html | 379 +++++++++++++ 2 files changed, 997 insertions(+) create mode 100644 interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/fancy_template.html create mode 100644 interface/main/calendar/modules/PostCalendar/pntemplates/default/views/global/fancy_navigation.html diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/fancy_template.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/fancy_template.html new file mode 100644 index 000000000..2cde8a4c7 --- /dev/null +++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/day/fancy_template.html @@ -0,0 +1,618 @@ +[-*Smarty*-] +[-*********************************************************************************-] +[-* Copyright (C) 2005-2006 Rod Roark and others *-] +[-* Copyright (C) 2008 CHEMED (Nethanel Vilensky) *-] +[-* *-] +[-* This program is free software; you can redistribute it and/or *-] +[-* modify it under the terms of the GNU General Public License *-] +[-* as published by the Free Software Foundation; either version 2 *-] +[-* of the License, or (at your option) any later version. *-] +[-*********************************************************************************-] + +[-if $PRINT_VIEW == 1-] + [-* The new calendar interface is not printed correctly by Firefox (because of abs. positioned DOM elements) *-] + [-* so we have to use the older interface instead *-] + [-include file="$TPL_NAME/views/day/orig_default.html"-] +[-else-] + +[-config_load file="default.conf"-] +[-*Load the Language Definitions*-] +[-config_load file="lang.$USER_LANG"-] +[-include file="$TPL_NAME/views/header.html"-] +[-* we want to include out stylesheet for this view*-] +[-fetch file="$TPL_STYLE_PATH/day.css" assign="css"-] +[-eval var=$css-] + +[-*Main Navigation*-] +[-include file="$TPL_NAME/views/global/navigation.html"-] + +[-assign var="dayname" value=$DATE|date_format:"%w"-] +[-assign var="day" value=$DATE|date_format:"%d"|string_format:"%1d"-] +[-assign var="month" value=$DATE|date_format:"%m"|string_format:"%1d"-] +[-assign var="year" value=$DATE|date_format:"%Y"|string_format:"%4d"-] + +[-pc_sort_events var="S_EVENTS" sort="time" order="asc" value=$A_EVENTS-] + +
[-* START Column labels *-] + [-foreach from=$providers item=provider-] +
+
[-$provider.lname-]
+ [-/foreach-] +
[-* END Column labels *-] + + +
[-* Main scrollable container *-] + +[-php-] + +//Used for sorting the event later +function compareEvents($a,$b) { + $start_a = $a['start_slot']; + $start_b = $b['start_slot']; + $end_a = $a['end_slot']; + $end_b = $b['end_slot']; + $dur_a = $a['data']['duration']; + $dur_b = $b['data']['duration']; + $cat_a = $a['data']['catid']; + $cat_b = $b['data']['catid']; + + //IN-OUT events are always the lowest in the list and show up right-most in the UI + if (($cat_a == '2') || ($cat_a == '3') || ($cat_a == '4') || ($cat_a == '8') || ($cat_a == '11')) { + return 1; + } + if (($cat_b == '2') || ($cat_b == '3') || ($cat_b == '4') || ($cat_b == '8') || ($cat_b == '11')) { + return -1; + } + + if (($start_a == $start_b) && + ($end_a == $end_b) && + ($dur_a == $dur_b)) {return 0;} //Events are alike + + if ($start_a == $start_b) { //Events start together + if ($dur_a != $dur_b) { //Simply sort by duration + return ($dur_a > $dur_b) ? -1 : 1; + } else { + return 0; + } + } + + if ($start_a < $start_b) { //a starts earlier than b + if ($end_a >= $end_b) { //events share slots + if ($dur_a != $dur_b) { //Simply sort by duration + return ($dur_a > $dur_b) ? -1 : 1; + } else { + return 0; + } + } else { //events do not share slots and $a is earlier than $b + return -1; + } + } + + if ($start_b < $start_a) { //b starts earlier than a + if ($end_b >= $end_a) { //events share slots + if ($dur_a != $dur_b) { //Simply sort by duration + return ($dur_a > $dur_b) ? -1 : 1; + } else { + return 0; + } + } else { //events do not share slots and $b is earlier than $a + return 1; + } + } +} + + //Configuration + + /* + ------------------------ <= $calendar_width => ------------------------------------------- + |<= $line_label_width => | <= $column_width => ||... |... | + ------------------------------------------------------------------------------------------ + |... | ... ||... |... | + ------------------------------------------------------------------------------------------ + + In a couple of places I am adding +1 to sizes. This is to account for extra 1px wide border around elements. + */ + + $day_start_y = 30; //Used for multiday display + + $start_hour = $GLOBALS['schedule_start']; + $end_hour = $GLOBALS['schedule_end']; + + $slot_minutes = $GLOBALS['calendar_interval']; + + if ($PRINT_VIEW != 1) { + $container_width = $_SESSION['pc_framewidth'] - 20; + } else { + $container_width = 900; //Make it fit to a landscape letter-sized paper + } + + $line_height = 80; + + $line_label_width = 40; + $scrollbar_width = 30; + + $calendar_width = $container_width - $scrollbar_width; + + $columns = count($providers); + $column_width = ($calendar_width / $columns) - $line_label_width; + + $hour_slots = 60 / $slot_minutes; + $hour_height = $hour_slots * $slot_height; + + $slots_count = ($end_hour - $start_hour) * $hour_slots + 1; //How many slots will we have per day + $calendar_height = $line_height * ($slots_count + 1) + 20; + + //Generate columns (each column is a provider) + // ['count'] how many columns we have altogether + // ['pid']['index'] which column is it counting from the left (0 based) + // ['pid']['x'] how far from the left edge the column starts (in pixels) + $columns = array('count' => 0); + foreach ($providers as $provider) { + $pid = $provider['id']; + $columns[$pid]['index'] = $columns['count']++; + $columns[$pid]['x'] = (($columns[$pid]['index'] + 1) * ($line_label_width + 1)) + ($column_width * $columns[$pid]['index']); + } + + //Re-Index categories array to make it more usefull + $categories = array(); + foreach ($A_CATEGORY as $category) { + $categories[$category['id']] = $category; + } + + //For each day... + foreach ($A_EVENTS as $date => $event_list) { + + //Generate labels and positions for all the calendar lines + $lines = array(); //This will hold metadata for each visual calendar line + $hour = $start_hour; + $minutes = 0; + + for ($i = 1; $i <= $slots_count; $i++) { + $lines[$i] = array(); + $lines[$i]['index'] = $i; + $lines[$i]['ampm'] = $hour >= 12 ? '2' : '1'; //For the links + $lines[$i]['ampm_char'] = $hour >= 12 ? 'pm' : 'am'; //Visual representation + $lines[$i]['hour'] = $hour > 12 ? $hour - 12 : $hour; + $lines[$i]['min'] = $minutes; + $lines[$i]['date'] = $date; + $lines[$i]['label'] = $lines[$i]['hour'].":".str_pad($minutes, 2, '0', STR_PAD_LEFT).' 
'.$lines[$i]['ampm_char'].' '; + $lines[$i]['y'] = ($i-1) * ($line_height + 1) + $day_start_y; //Where to absolutely position the line + + //Go to the next slot + $minutes += $slot_minutes; + if (($i % $hour_slots) == 0) { //New hour starts + $hour++; + $minutes = 0; + } + } + + $arr_events = $S_EVENTS[$date]; + + $events = array(); //Temporary array for enumerating the events + $slots = array(); //This is the map of slots showing how many events share the slot and the CSS style for IN-OUT events + $provstat = array(); //Used to gray out the slots for which the provider is not available (out of office) + + //Initialize the slot map with defaul values + // ['adj'] Used for adjusting the chip's width and position from the left column edge (see further below) + // ['n'] How many events share the same slot + // ['provstat'] CSS style name as a visual cue that provider is available or not + foreach($providers as $provider) { + $slots[$provider['id']] = array(); + for ($i = 1; $i <= $slots_count; $i++) { + $slots[$provider['id']][$i] = array('adj' => 0, 'n' => 0, 'provstat' => 'cal_slot_out'); + } + } + + //Go through all the events for the day + list($slotkey, $slotevent) = each($arr_events); + for (; isset($slotkey); list($slotkey, $slotevent) = each($arr_events)) { + $starth = substr($slotevent['startTime'], 0, 2); + $startm = substr($slotevent['startTime'], 3, 2); + $providerid = $slotevent['aid']; + + $start_slot = ($starth - $start_hour) * $hour_slots + floor($startm / $slot_minutes) + 1; + $durminutes = ceil($slotevent['duration'] / 60); //Convert from seconds to minutes + + //$durslots is the amount of slots the chip touches, even if it does not fill a complete slot + $durslots = ceil((($startm % $slot_minutes) + $durminutes) / $slot_minutes); + if ($durslots == 0) { //Event should take up at least one slot + $durslots = 1; + $durminutes = $slot_minutes; + } + + if (($start_slot + $durslots) > $slots_count) { //Event should not be longer than visible calendar + $durslots = $slots_count - $start_slot + 1; + $durminutes = $durslots * $slot_minutes; + } + + $end_slot = $start_slot + $durslots; + + //Events such as IN, OUT etc. require special handling (setting the CSS class name in the $slots map) + if ($slotevent['catid'] == 2) { + for ($i = $start_slot; $i <= $slots_count; $i++) { + $slots[$providerid][$i]['provstat'] = 'cal_slot_in'; + } + } + + if ($slotevent['catid'] == 3) { + for ($i = $start_slot; $i <= $slots_count; $i++) { + $slots[$providerid][$i]['provstat'] = 'cal_slot_out'; + } + } + + if ($slotevent['catid'] == 4) { + for ($i = $start_slot; $i < $start_slot + $durslots; $i++) { + $slots[$providerid][$i]['provstat'] = 'cal_slot_out'; + } + } + + if ($slotevent['catid'] == 8) { + for ($i = $start_slot; $i < $start_slot + $durslots; $i++) { + $slots[$providerid][$i]['provstat'] = 'cal_slot_out'; + } + } + //END special events handling + + //Mark slots as taken and count the chips in each slot + for ($i = $start_slot; $i < $end_slot; $i++) { + $slots[$providerid][$i]['n']++; + } + + //Calculate event chip dimensions + $x = $columns[$providerid]['x']; + $y = $lines[$start_slot]['y']; + $w = $column_width; + $h = $durslots * ($line_height + 1) - 2; + + $slotevent['duration'] = $durminutes; //Convert from seconds to minutes + + //Add event to the list for rendering + //attaching the category and event data from the database + if ($slotevent['eid'] != '') { //For some reason empty $slotevent sometimes exist. TODO: Figure out why + $events[$providerid][] = array( + 'left' => $x, + 'top' => $y, + 'width' => $w, + 'height' => $h, + 'start_slot' => $start_slot, + 'end_slot' => $end_slot, + 'category' => $categories[$slotevent['catid']], + 'data' => $slotevent + ); + } + + } + + $ready_events = array(); //This array will hold events with fully adjusted position + + + list($providerid, $events_list) = each($events); + for (; isset($providerid); list($providerid, $events_list) = each($events)) { + +/* Sorting debug: foreach ($events_list as $ev) { + print('ID: '.$ev['data']['eid'].' '); + print('Start: '.$ev['start_slot'].' End:'.$ev['end_slot'].' '); + print('Duration: '.$ev['data']['duration'].' '); + print('Top: '.$ev['top'].' Left:'.$ev['left'].' '); + print('---------------
'); + } + print "#########################################################################Sorting...
";*/ + + //Sort events so that they as much as possible do NOT overlap + usort($events_list, "compareEvents"); + +/* Sorting debug: foreach ($events_list as $ev) { + print('ID: '.$ev['data']['eid'].' '); + print('Start: '.$ev['start_slot'].' End:'.$ev['end_slot'].' '); + print('Duration: '.$ev['data']['duration'].' '); + print('Top: '.$ev['top'].' Left:'.$ev['left'].' '); + print('---------------
'); + } + exit;*/ + + if (!isset($ready_events[$providerid])) {$ready_events[$providerid] = array();} + foreach ($events_list as $event) { + $neighbors = 1; + //Find the max neccesary width divisor (how thin to make this chip) + //by going over each slot the chip overlays and seeing how many others are there + for ($i = $event['start_slot']; $i < $event['end_slot']; $i++) { + if ($slots[$providerid][$i]['n'] > $neighbors) {$neighbors = $slots[$providerid][$i]['n'];} + $slots[$providerid][$i]['adj']++; + } + //Adjust chip position and width (the magic number 3 adjusts for chip borders and the space between chips) + $event['width'] = floor(($column_width - ($neighbors * 3)) / $neighbors); + $event['left'] = $event['left'] + (($event['width'] + 3) * ($slots[$providerid][$event['start_slot']]['adj'] - 1)); + $ready_events[$providerid][] = $event; + } + //usort($ready_events[$providerid], "compareEvents"); + } + + + //Marshall some variables to Smarty engine + $this->assign('container_width', $container_width); + $this->assign('calendar_width', $calendar_width); + $this->assign('date', $date); + $this->assign_by_ref('lines', $lines); + $this->assign('line_height', $line_height); + $this->assign('hour_height', $hour_height); + $this->assign('line_label_width', $line_label_width); + $this->assign('column_width', $column_width); + $this->assign_by_ref('events', $ready_events); + $this->assign_by_ref('slots', $slots); + $this->assign('date_label_y', $day_start_y - 30); + $this->assign('calendar_height', $calendar_height); + +[-/php-] + + +
+
[-php-]echo dateformat(strtotime($date),true); [-/php-]
+ [-foreach from=$lines item=line-] [-* START Lines *-] +
+ [-foreach from=$providers item=provider-] [-* START Columns (Providers) *-] +
+ [-**-] + [-$line.label-]  + [-**-] +
[-* Line label (hour:min) *-] + + [-assign var=pid value=$provider.id-] + [-assign var=lineindex value=$line.index-] +
 
+ [-*php-]print_r($slots);Exit;[-/php*-] + [-/foreach-] [-* END Columns (Providers) *-] +
+ [-/foreach-] [-* END Lines *-] +
+ +
[-* START Events overlay *-] + [-* We should access $events through $provider.id index to only show events for selected providers *-] + [-foreach from=$providers item=provider-] [-* START Columns (Providers) *-] + [-assign var=pid value=$provider.id-] + [-assign var=column value=$events.$pid-] + [-foreach from=$column item=event-] [-* START Events *-] + [-if $event.data.catid eq 2 || $event.data.catid eq 3 || $event.data.catid eq 4 || $event.data.catid eq 8 || $event.data.catid eq 11-] +
+ + [-if $event.data.catid eq 2-] + [-php-] xl('IN','e'); [-/php-] + [-elseif $event.data.catid eq 3-] + [-php-] xl('OUT','e'); [-/php-] + [-elseif $event.data.catid eq 4-] + [-php-] xl('VACATION','e'); [-/php-] + [-elseif $event.data.catid eq 8-] + [-php-] xl('LUNCH','e'); [-/php-] + [-elseif $event.data.catid eq 11-] + [-php-] xl('RESERVED','e'); [-/php-] + [-else-] + [-php-] xl('Not Available','e'); [-/php-] + [-/if-] + +
+ [-else-] +
+

+ [-$event.data.apptstatus-] + + [-$event.data.startTime|date_format:"%I:%M %p"-] + +

+

[-$event.data.duration-][-php-] xl('min','e'); [-/php-]

+

[-$event.data.patient_name|default:'No name'-]

+

[-if $event.data.patient_dob ne ''-][-php-] xl('Age','e'); [-/php-]: [-$event.data.patient_age-][-/if-]

+ [-if $event.data.hometext ne ''-]

[-$event.data.hometext|escape-]

[-/if-] + +
+ [-/if-] + [-/foreach-] [-* END Events *-] + [-/foreach-] [-* END Columns (Providers) *-] +
[-* END Events overlay *-] + + +[-php-] + //For multiday display we have to make the calendar larger + $day_start_y += ($line_height * ($slots_count+1)) + 50; + $calendar_height += $calendar_height; + } + +[-/php-] +
[-* END Main scrollable container *-] + + + + +[-/if-] diff --git a/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/global/fancy_navigation.html b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/global/fancy_navigation.html new file mode 100644 index 000000000..6a89f433f --- /dev/null +++ b/interface/main/calendar/modules/PostCalendar/pntemplates/default/views/global/fancy_navigation.html @@ -0,0 +1,379 @@ + + + + + + + + + + + + + + +[-php-] + + // A_CATEGORY is an ordered array of associative-array categories. + // Keys of interest are: id, name, color, desc, event_duration. + // + // echo "\n"; // debugging + // echo "\n"; // debugging + + $A_CATEGORY =& $this->_tpl_vars['A_CATEGORY']; + + $A_EVENTS =& $this->_tpl_vars['A_EVENTS']; + // $S_EVENTS =& $this->_tpl_vars['S_EVENTS']; // Deleted by Rod + $providers =& $this->_tpl_vars['providers']; + $times =& $this->_tpl_vars['times']; + $interval = $this->_tpl_vars['interval']; + $viewtype = $this->_tpl_vars['VIEW_TYPE']; + $PREV_WEEK_URL = $this->_tpl_vars['PREV_WEEK_URL']; + $NEXT_WEEK_URL = $this->_tpl_vars['NEXT_WEEK_URL']; + $PREV_DAY_URL = $this->_tpl_vars['PREV_DAY_URL']; + $NEXT_DAY_URL = $this->_tpl_vars['NEXT_DAY_URL']; + + $Date = postcalendar_getDate(); + if (!isset($y)) $y = substr($Date, 0, 4); + if (!isset($m)) $m = substr($Date, 4, 2); + if (!isset($d)) $d = substr($Date, 6, 2); + + // echo "\n"; + + // $MULTIDAY = count($A_EVENTS) > 1; // (CHEMED) not needed after week_view template changes + + $provinfo = getProviderInfo('%', true, $_SESSION['pc_facility']); //(CHEMED) + + [-/php-] + +
+ +
+ + [?] + + + + + + + +
+ +
+ + [-php-] + foreach ( array ('day' => xl("Day"), 'week' => xl("Week"), 'month' => xl("Month"), 'year' => xl("Year")) + as $key => $value) { + echo " "; + } + [-/php-] +
+ +
+ + + + [-php-] echo xl("Print"); [-/php-] + +
+ +
+
+
+ +
+ + + + [-php-] + // ============================== + // FACILITY FILTERING (lemonsoftware)(CHEMED) + // $facilities = getFacilities(); // (CHEMED) commented this out + // We only want to see facilities that are a 'service location', + // as 'billing location' facilities should not have any patient appointments + // TODO: Is the above statement true? + $facilities = getServiceFacilities(); + [-/php-] + + + +
+ +
+ +
+ +

+[-php-] + // Show the date/range and its previous- and next-day/week selectors. + $atmp = array_keys($A_EVENTS); + +if ($MULTIDAY) { + echo "<< \n"; + echo dateformat(strtotime($atmp[0])); + echo " - "; + echo dateformat(strtotime($atmp[count($atmp)-1])); + echo " >>\n"; + } else { + echo "<< \n"; + echo dateformat(strtotime($atmp[0]), true); + echo " >>\n"; + } + +[-/php-] +

+ + -- 2.11.4.GIT