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' => '#!',
'onclick' => 'showUserToSendNotificacion(this)',
'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;
}
$usersArray = [];
foreach($data as $index =>$item){
if(isset($item['user_id'])){
if(!isset($usersArray[$item['user_id']])){
foreach ($data as $index => $item) {
if (isset($item['user_id'])) {
if (!isset($usersArray[$item['user_id']])) {
$usersArray[$item['user_id']] = api_get_user_info($item['user_id']);
}
$userData = $usersArray[$item['user_id']];
$data[$index]['user_name']=$userData['complete_name'];
$data[$index]['user_name'] = $userData['complete_name'];
}
}
return $data;
}

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

Loading…
Cancel
Save