Minor: RemedialCourse: Flinci fix #18221 - refs BT#18221

pull/3886/head
Carlos Alvarado 5 years ago committed by Angel Fernando Quiroz Campos
parent 20753e5af1
commit 61b198d963
  1. 10
      main/exercise/exercise.class.php
  2. 9
      main/exercise/exercise.php

@ -9662,7 +9662,6 @@ class Exercise
'href' => '#!', 'href' => '#!',
'onclick' => 'showUserToSendNotificacion(this)', 'onclick' => 'showUserToSendNotificacion(this)',
'data-link' => 'exercise.php?'.api_get_cidreq().'&choice=send_reminder&sec_token='.$token.'&exerciseId='.$row['id'], 'data-link' => 'exercise.php?'.api_get_cidreq().'&choice=send_reminder&sec_token='.$token.'&exerciseId='.$row['id'],
] ]
); );
} }
@ -11052,15 +11051,16 @@ class Exercise
return (isset($data[0]) && isset($data[0]['total'])) ? $data[0]['total'] : 0; return (isset($data[0]) && isset($data[0]['total'])) ? $data[0]['total'] : 0;
} }
$usersArray = []; $usersArray = [];
foreach($data as $index =>$item){ foreach ($data as $index => $item) {
if(isset($item['user_id'])){ if (isset($item['user_id'])) {
if(!isset($usersArray[$item['user_id']])){ if (!isset($usersArray[$item['user_id']])) {
$usersArray[$item['user_id']] = api_get_user_info($item['user_id']); $usersArray[$item['user_id']] = api_get_user_info($item['user_id']);
} }
$userData = $usersArray[$item['user_id']]; $userData = $usersArray[$item['user_id']];
$data[$index]['user_name']=$userData['complete_name']; $data[$index]['user_name'] = $userData['complete_name'];
} }
} }
return $data; return $data;
} }

@ -487,12 +487,12 @@ if ($is_allowedToEdit) {
)); ));
break; break;
case 'send_reminder_to': case 'send_reminder_to':
$toUsers = isset($_GET['users'])?$_GET['users']:null; $toUsers = isset($_GET['users']) ? $_GET['users'] : null;
if( if (
!empty($toUsers) && !empty($toUsers) &&
!empty($exerciseId) !empty($exerciseId)
) { ) {
$toUsers = explode(',',$toUsers); $toUsers = explode(',', $toUsers);
api_set_more_memory_and_time_limits(); api_set_more_memory_and_time_limits();
Exercise::notifyUsersOfTheExercise( Exercise::notifyUsersOfTheExercise(
$exerciseId, $exerciseId,
@ -501,7 +501,7 @@ if ($is_allowedToEdit) {
$toUsers $toUsers
); );
echo json_encode([ echo json_encode([
'message'=>Display::return_message( 'message' => Display::return_message(
get_lang('AnnounceSentByEmail'), get_lang('AnnounceSentByEmail'),
'confirmation' 'confirmation'
), ),
@ -510,7 +510,6 @@ if ($is_allowedToEdit) {
exit(); exit();
break; break;
case 'send_reminder': case 'send_reminder':
$users = Exercise::getUsersInExercise( $users = Exercise::getUsersInExercise(
$objExerciseTmp->id, $objExerciseTmp->id,
$courseId, $courseId,

Loading…
Cancel
Save