From 051ffc5b050f86bdeb9fb92073b31a28e2726fb2 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Wed, 14 Jul 2010 19:02:01 +0300
Subject: [PATCH] Bug #1733: Attendance sheet: Making person name order to
 depend on the internationalization settings.

---
 main/attendance/attendance_sheet.php | 98 +++++++++++++++-------------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index a6bf62c757..55a8a7aaf7 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 /**
-* View (MVC patter) for attendance sheet (list, edit, add) 
+* View (MVC patter) for attendance sheet (list, edit, add)
 * @author Christian Fasanando <christian1827@gmail.com>
 * @package chamilo.attendance
 */
@@ -16,7 +16,7 @@ if (api_is_allowed_to_edit(null, true)) {
 		$param_gradebook = '&gradebook='.$_SESSION['gradebook'];
 	}
 	echo '<div class="actions" style="margin-bottom:30px">';
-	echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('calendar_up.gif',get_lang('AttendanceCalendar')).' '.get_lang('AttendanceCalendar').'</a>';	
+	echo '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.$param_gradebook.'">'.Display::return_icon('calendar_up.gif',get_lang('AttendanceCalendar')).' '.get_lang('AttendanceCalendar').'</a>';
 	echo '</div>';
 
 	$message_information = get_lang('AttendanceSheetDescription');
@@ -26,27 +26,32 @@ if (api_is_allowed_to_edit(null, true)) {
 		Display::display_normal_message($message, false);
 	}
 ?>
-<?php 
+<?php
 
-	if (count($users_in_course) > 0) { 
+	if (count($users_in_course) > 0) {
 	?>
 	<form method="post" action="index.php?action=attendance_sheet_add&<?php echo api_get_cidreq().$param_gradebook ?>&attendance_id=<?php echo $attendance_id?>" >
-	
+
 	<div class="attendance-sheet-content" style="width:100%;background-color:#E1E1E1;border:1px solid gray;margin-top:20px;">
 
 		<div class="attendance-users-table" style="width:40%;float:left;margin:0px;padding:0px;">
 			<table class="data_table" width="100%">
-				<tr class="row_odd" >	
+				<tr class="row_odd" >
 					<th height="65px" width="25px" ><?php echo get_lang('DisplayOrder')?></th>
 					<th width="30px" ><?php echo get_lang('Photo')?></th>
+					<?php if (api_is_western_name_order()) { ?>
+					<th><?php echo get_lang('FirstName')?></th>
+					<th><?php echo get_lang('LastName')?></th>
+					<?php } else { ?>
 					<th><?php echo get_lang('LastName')?></th>
 					<th><?php echo get_lang('FirstName')?></th>
+					<?php } ?>
 					<th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
-				</tr>				
-				<?php 
+				</tr>
+				<?php
 				$i = 1;
 				$class = '';
-				
+
 				foreach ($users_in_course as $data) {
 					$faults = 0;
 					if ($i%2 == 0) {$class='row_odd';}
@@ -55,8 +60,13 @@ if (api_is_allowed_to_edit(null, true)) {
 					<tr class="<?php echo $class ?>">
 					<td height="50px"><center><?php echo $i ?></center></td>
 					<td><?php echo $data['photo'] ?></td>
+					<?php if (api_is_western_name_order()) { ?>
+					<td><?php echo $data['firstname'] ?></td>
+					<td><?php echo $data['lastname'] ?></td>
+					<?php } else { ?>
 					<td><?php echo $data['lastname'] ?></td>
 					<td><?php echo $data['firstname'] ?></td>
+					<?php } ?>
 					<td><center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar'])?$data['result_color_bar']:'none') ?>"><?php echo $data['attendance_result'] ?></div></center></td>
 					</tr>
 				<?php
@@ -75,38 +85,38 @@ if (api_is_allowed_to_edit(null, true)) {
 							$date = $calendar['date'];
 							$time = $calendar['time'];
 							$datetime = $date.'<br />'.$time;
-														
-							$img_lock = Display::return_icon('lock.gif',get_lang('DateUnLock'),array('class'=>'img_lock','id'=>'datetime_column_'.$calendar['id']));													
+
+							$img_lock = Display::return_icon('lock.gif',get_lang('DateUnLock'),array('class'=>'img_lock','id'=>'datetime_column_'.$calendar['id']));
 							if (!empty($calendar['done_attendance'])){
 								$datetime = '<font color="blue">'.$date.'<br />'.$time.'</font>';
 							}
 							$disabled_check = 'disabled';
-							$input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="" disabled />';						
+							$input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="" disabled />';
 							if ($next_attendance_calendar_id == $calendar['id']) {
 								$input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="'.$calendar['id'].'" />';
 								$disabled_check = '';
 								$img_lock = Display::return_icon('unlock.gif',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id']));
-							}										
-					?>							
+							}
+					?>
 							<th height="65px" style="padding:1px 5px;" ><?php echo '<center><div style="font-size:10px;min-width:80px;width:80px;">'.$datetime.'&nbsp;<span id="attendance_lock" style="cursor:pointer">'.$img_lock.'</span><br /><input type="checkbox" id="checkbox_head_'.$calendar['id'].'" '.$disabled_check.' checked />'.$input_hidden.'</div></center>' ?></th>
-					<?php }					
+					<?php }
 					} else { ?>
 						<th height="65px" style="padding:5px;"><span><a href="index.php?<?php echo api_get_cidreq() ?>&action=calendar_list&attendance_id=<?php echo $attendance_id.$param_gradebook ?>">
 						<?php echo Display::return_icon('calendar_up.gif',get_lang('AttendanceCalendar')).' '.get_lang('GoToAttendanceCalendar') ?></a></span></th>
 					<?php } ?>
-				</tr>			
-				<?php 
+				</tr>
+				<?php
 				$i = 0;
-				foreach ($users_in_course as $user) { 
+				foreach ($users_in_course as $user) {
 						$class = '';
 						if ($i%2==0) {$class = 'row_even';}
 						else {$class = 'row_odd';}
-				?>			
+				?>
 					<tr class="<?php echo $class ?>">
-					<?php 
+					<?php
 						if (count($attendant_calendar) > 0 ) {
-							foreach ($attendant_calendar as $calendar) { 
-								$checked = 'checked';							
+							foreach ($attendant_calendar as $calendar) {
+								$checked = 'checked';
 								if (isset($users_presence[$user['user_id']][$calendar['id']]['presence'])) {
 									$presence = $users_presence[$user['user_id']][$calendar['id']]['presence'];
 									if (intval($presence) == 1) {
@@ -123,32 +133,32 @@ if (api_is_allowed_to_edit(null, true)) {
 								}
 					?>
 							<td height="50px" style="<?php echo $style_td ?>" class="checkboxes_col_<?php echo $calendar['id'] ?>"><center><input type="checkbox" name="check_presence[<?php echo $calendar['id'] ?>][]" value="<?php echo $user['user_id'] ?>"  <?php echo $disabled.' '.$checked ?> /><span class="<?php echo 'anchor_'.$calendar['id'] ?>"></span></center></td>
-							
-					<?php 	} 
+
+					<?php 	}
 						} else { ?>
 							<td height="50px" class="checkboxes_col_<?php echo $calendar['id'] ?>"><center>&nbsp;</center></td>
 				  <?php	} ?>
 					</tr>
-				<?php $i++ ; 			
-				} 
-				?>				
+				<?php $i++ ;
+				}
+				?>
 			</table>
 		</div>
 
-		
+
 	</div>
-	
+
 	<div class="clear"></div>
 	<div style="margin-top:20px;"><button type="submit" class="save"><?php echo get_lang('Save') ?></button></div>
 	</form>
-	
-	<?php } else {	
-		echo '<div><a href="'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'">'.get_lang('ThereAreNoRegisteredLearnersInsidetheCourse').'</a></div>';	
+
+	<?php } else {
+		echo '<div><a href="'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'">'.get_lang('ThereAreNoRegisteredLearnersInsidetheCourse').'</a></div>';
 	}
 
 } else {
 	// View for students
-?>	
+?>
 	<h3><?php echo get_lang('AttendanceSheetReport') ?></h3>
 	<?php if(!empty($users_presence)) { ?>
 		<div>
@@ -164,27 +174,27 @@ if (api_is_allowed_to_edit(null, true)) {
 	<br />
 	<center>
 		<table class="data_table">
-				<tr class="row_odd" >	
+				<tr class="row_odd" >
 					<th><?php echo get_lang('AttendanceCalendar')?></th>
-					<th><?php echo get_lang('Attendance')?></th>				
+					<th><?php echo get_lang('Attendance')?></th>
 				</tr>
-				<?php 
-				
+				<?php
+
 				if (!empty($users_presence)) {
 					$i = 0;
-					foreach($users_presence[$user_id] as $presence) { 
+					foreach($users_presence[$user_id] as $presence) {
 						$class = '';
 						if ($i%2==0) {$class = 'row_even';}
-						else {$class = 'row_odd';}	
+						else {$class = 'row_odd';}
 					?>
-					<tr class="<?php echo $class ?>"><td><?php echo Display::return_icon('lp_calendar_event.png',get_lang('DateTime')).' '.$presence['date_time'] ?></td><td><center><?php echo $presence['presence']?Display::return_icon('checkbox_on.gif',get_lang('Presence')):Display::return_icon('checkbox_off.gif',get_lang('Presence')) ?></center></td></tr>					
-				<?php } 
+					<tr class="<?php echo $class ?>"><td><?php echo Display::return_icon('lp_calendar_event.png',get_lang('DateTime')).' '.$presence['date_time'] ?></td><td><center><?php echo $presence['presence']?Display::return_icon('checkbox_on.gif',get_lang('Presence')):Display::return_icon('checkbox_off.gif',get_lang('Presence')) ?></center></td></tr>
+				<?php }
 				} else { ?>
-				<tr><td colspan="2"><center><?php echo get_lang('YouDoNotHaveDoneAttendances')?></center></td></tr>	
+				<tr><td colspan="2"><center><?php echo get_lang('YouDoNotHaveDoneAttendances')?></center></td></tr>
 				<?php }
-				
+
 				?>
-		</table>			
+		</table>
 	</center>
 	</div>
 <?php } ?>
\ No newline at end of file