chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use iid instead of id see BT#12212

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent ea6e24f9fc
commit 1996736626
2 changed files with 33 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 65
      main/mySpace/myStudents.php
  2. 4
      main/work/work.lib.php

65
main/mySpace/myStudents.php
Unescape View File

@ -1308,7 +1308,7 @@ if (!empty($student_id)) {
} }
require_once '../work/work.lib.php'; require_once '../work/work.lib.php';
$userworks = getWorkPerUser($student_id, $courseInfo['real_id'], $sessionId); $userWorks = getWorkPerUser($student_id, $courseInfo['real_id'], $sessionId);
echo ' echo '
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
@ -1324,44 +1324,43 @@ if (!empty($student_id)) {
</thead> </thead>
<tbody> <tbody>
'; ';
$workingTime = api_get_configuration_value('considered_working_time');
foreach ($userWorks as $work) {
$work = $work['work'];
foreach ($work->user_results as $key => $results) {
echo '<tr>';
echo '<td>' . $work->title . '</td>';
$documentNumber = $key + 1;
echo '<td class="text-center"><a href="' . api_get_path(WEB_CODE_PATH) . 'work/view.php?cidReq=' . $course_code . '&id_session=' . $sessionId .'&id=' . $results['id'] . '">(' . $documentNumber . ')</a></td>';
$qualification = !empty($results['qualification']) ? $results['qualification'] : '-';
echo '<td class="text-center">' . $qualification. '</td>';
echo '<td class="text-center">' . $results['formatted_date']. '</td>';
$assignment = get_work_assignment_by_id($work->id, $courseInfo['real_id']);
echo '<td class="text-center">';
if (!empty($assignment['expires_on'])) {
echo api_convert_and_format_date($assignment['expires_on']);
}
echo '</td>';
foreach ($userworks as $work) { $fieldValue = new ExtraFieldValue('work');
$work = $work['work']; $resultExtra = $fieldValue->getAllValuesForAnItem(
foreach ($work->user_results as $key => $results) { $work->iid,
echo '<tr>'; true
echo '<td>' . $work->title . '</td>'; );
$documentNumber = $key + 1;
echo '<td class="text-center"><a href="' . api_get_path(WEB_CODE_PATH) . 'work/view.php?cidReq=' . $course_code . '&id_session=' . $sessionId .'&id=' . $results['id'] . '">(' . $documentNumber . ')</a></td>';
$qualification = !empty($results['qualification']) ? $results['qualification'] : '-';
echo '<td class="text-center">' . $qualification. '</td>';
echo '<td class="text-center">' . $results['formatted_date']. '</td>';
$assignment = get_work_assignment_by_id($work->id, $courseInfo['real_id']);
echo '<td class="text-center">';
if (!empty($assignment['expires_on'])) {
echo api_convert_and_format_date($assignment['expires_on']);
}
echo '</td>';
$fieldValue = new ExtraFieldValue('work');
$resultExtra = $fieldValue->getAllValuesForAnItem(
$work->id,
true
);
foreach ($resultExtra as $field) { foreach ($resultExtra as $field) {
$field = $field['value']; $field = $field['value'];
if (api_get_configuration_value('considered_working_time') == $field->getField()->getVariable()) { if ($workingTime == $field->getField()->getVariable()) {
echo '<td class="text-center">' . $field->getValue() . '</td>'; echo '<td class="text-center">' . $field->getValue() . '</td>';
}
} }
echo '</tr>';
} }
echo '</tr>';
} }
}
echo ' echo '</tbody>
</tbody>
</table> </table>
</div> </div>
'; ';

4
main/work/work.lib.php
Unescape View File

@ -3832,14 +3832,13 @@ function processWorkForm(
// Get the "considered work time" defined for this work // Get the "considered work time" defined for this work
$fieldValue = new ExtraFieldValue('work'); $fieldValue = new ExtraFieldValue('work');
$resultExtra = $fieldValue->getAllValuesForAnItem( $resultExtra = $fieldValue->getAllValuesForAnItem(
$workInfo['id'], $workId,
true true
); );
$workingTime = null; $workingTime = null;
foreach ($resultExtra as $field) { foreach ($resultExtra as $field) {
$field = $field['value']; $field = $field['value'];
if ($consideredWorkingTime == $field->getField()->getVariable()) { if ($consideredWorkingTime == $field->getField()->getVariable()) {
$workingTime = $field->getValue(); $workingTime = $field->getValue();
} }
@ -3847,7 +3846,6 @@ function processWorkForm(
// If no time was defined, or a time of "0" was set, do nothing // If no time was defined, or a time of "0" was set, do nothing
if (!empty($workingTime)) { if (!empty($workingTime)) {
// If some time is set, get the list of docs handed in by // If some time is set, get the list of docs handed in by
// this student (to make sure we count the time only once) // this student (to make sure we count the time only once)
$userWorks = get_work_user_list( $userWorks = get_work_user_list(

Write Preview
Loading…
Cancel
Save