Lots if minor style fixes in LP progress bar, lp tracking table and during the exercise creation

skala
Julio Montoya 15 years ago
parent bc43d70f76
commit cd81c2d73b
  1. 4
      main/document/document.inc.php
  2. 7
      main/exercice/exercise_admin.php
  3. 42
      main/mySpace/lp_tracking.php
  4. 5
      main/newscorm/learnpath.class.php
  5. 36
      main/newscorm/lp_list.php
  6. 68
      main/newscorm/lp_stats.php

@ -408,12 +408,12 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0,
if ($is_certificate_mode) {
$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$parent_id.'&amp;move='.$document_id.$req_gid.'&selectcat='.$gradebook_category.'">'.Display::return_icon('move.png', get_lang('Move'),array(), 22).'</a>';
$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'&selectcat='.$gradebook_category.'">'.
$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'&selectcat='.$gradebook_category.'">'.
Display::return_icon($visibility_icon.'.png', get_lang('Move'),array(), 22).'</a>';
} else {
$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$parent_id.'&amp;move='.$document_id.$req_gid.'">'.Display::return_icon('move.png', get_lang('Move'),array(), 22).'</a>';
if(api_is_allowed_to_edit() || api_is_platform_admin()){
$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'">'.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'),'',22).'</a>';
$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'">'.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'),'',22).'</a>';
}
}
if (in_array($path, array('/audio', '/flash', '/images', '/shared_folder', '/video', '/chat_files', '/certificates'))) {

@ -126,10 +126,10 @@ $htmlHeadXtra[] = '<script type="text/javascript">
$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
$htmlHeadXtra[] = '<script type="text/javascript">
function setFocus(){
$("#exercise_title").focus();
$("#exercise_title").focus();
}
$(document).ready(function () {
setFocus();
setFocus();
});
</script>';
@ -158,8 +158,9 @@ if ($form->validate()) {
} else {
$message = 'ExerciseAdded';
}
$exercise_id = $objExercise->id;
api_session_unregister('objExercise');
header('Location:admin.php?message='.$message.'&exerciseId='.$objExercise->id);
header('Location:admin.php?message='.$message.'&exerciseId='.$exercise_id);
exit;
} else {
// DISPLAY FORM

@ -88,52 +88,14 @@ div.description {
font-size: 10px;
color: Silver;
}
.data_table {
border-collapse: collapse;
}
.data_table th {
padding-right: 0px;
border: 1px solid gray;
background-color: #eef;
}
.data_table tr.row_odd {
background-color: #fafafa;
}
.data_table tr.row_odd:hover, .data_table tr.row_even:hover {
background-color: #f0f0f0;
}
.data_table tr.row_even {
background-color: #fff;
}
.data_table td {
padding: 5px;
vertical-align: top;
border-bottom: 1px solid #b1b1b1;
border-right: 1px dotted #e1e1e1;
border-left: 1px dotted #e1e1e1;
}
.margin_table {
margin-left : 3px;
width: 80%;
}
.margin_table td.title {
background-color: #ffff99;
}
.margin_table td.content {
background-color: #ddddff;
}
</style>';
Display :: display_header($nameTools);
$lp_id = intval($_GET['lp_id']);
$sql = 'SELECT name
FROM '.Database::get_course_table(TABLE_LP_MAIN, $_course['db_name']).'
WHERE id='.Database::escape_string($lp_id);
$rs = Database::query($sql);
$sql = 'SELECT name FROM '.Database::get_course_table(TABLE_LP_MAIN, $_course['db_name']).' WHERE id='.$lp_id;
$rs = Database::query($sql);
$lp_title = Database::result($rs, 0, 0);

@ -2056,8 +2056,7 @@ class learnpath {
$progress_height = '16';
$size = str_replace('%', '', $percentage);
$output =
'<table border="0" cellpadding="0" cellspacing="0"><tr><td>' .
$output ='<div style="width:135px">' .
'<img id="progress_img_limit_left" src="' . $css_path . 'bar_1.gif" width="1" height="' . $progress_height . '">' .
'<img id="progress_img_full" src="' . $css_path . 'bar_1u.gif" width="' . $size * $factor . 'px" height="' . $progress_height . '" id="full_portion">' .
'<img id="progress_img_limit_middle" src="' . $css_path . 'bar_1m.gif" width="1" height="' . $progress_height . '">';
@ -2068,7 +2067,7 @@ class learnpath {
$output .= '<img id="progress_img_empty" src="' . $css_path . 'bar_1r.gif" width="0" height="' . $progress_height . '" id="empty_portion">';
}
$output .= '<img id="progress_bar_img_limit_right" src="' . $css_path . 'bar_1.gif" width="1" height="' . $progress_height . '"></td></tr></table>' .
$output .= '<img id="progress_bar_img_limit_right" src="' . $css_path . 'bar_1.gif" width="1" height="' . $progress_height . '"></div>' .
'<div class="progresstext" id="progress_text">' . $text . '</div>';
return $output;

@ -136,7 +136,7 @@ if (!empty($curDirPath)) {
/* CURRENT DIRECTORY */
echo '<tr>';
echo '<th width="40%">'.get_lang('Title').'</th>'.
echo '<th width="70%">'.get_lang('Title').'</th>'.
'<th>'.get_lang('Progress')."</th>";
if ($is_allowed_to_edit) {
//echo '<th>'.get_lang('CourseSettings')."</th>\n" .
@ -145,9 +145,9 @@ if ($is_allowed_to_edit) {
echo '<th>'.get_lang('AuthoringOptions')."</th>";
// Only available for not session mode.
if ($current_session == 0) {
/*if ($current_session == 0) {
echo'<th>'.get_lang('Move')."</th>";
}
}*/
}
echo '</tr>';
@ -256,9 +256,9 @@ if (is_array($flat_list)) {
$lp_theme_css = $mystyle;
if ($display_progress_bar) {
$dsp_progress = '<td width="140px"><div style="width:140px">'.learnpath::get_progress_bar('%',learnpath::get_db_progress($id, api_get_user_id(), '%', '', false, api_get_session_id())).'</div></td>';
$dsp_progress = '<td><div style="width:125px">'.learnpath::get_progress_bar('%',learnpath::get_db_progress($id, api_get_user_id(), '%', '', false, api_get_session_id())).'</div></td>';
} else {
$dsp_progress = '<td width="140px" style="padding-top:1em;"><div style="width:140px">'.learnpath::get_db_progress($id, api_get_user_id(), 'both','',false, api_get_session_id()).'</div></td>';
$dsp_progress = '<td style="padding-top:1em;"><div style="width:125px">'.learnpath::get_db_progress($id, api_get_user_id(), 'both','',false, api_get_session_id()).'</div></td>';
}
if ($is_allowed_to_edit) {
@ -469,31 +469,27 @@ if (is_array($flat_list)) {
// Only active while session mode is not active
if ($current_session == 0) {
if ($details['lp_display_order'] == 1 && $max != 1) {
$dsp_order .= '<td><a href="lp_controller.php?'.api_get_cidreq().'&action=move_lp_down&lp_id='.$id.'">
$dsp_order .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=move_lp_down&lp_id='.$id.'">
'.Display::return_icon('down.png', get_lang('MoveDown'),'','22').'</a>
<img src="../img/blanco.png" border="0" alt="" title="" /></td>';
}
elseif ($current == $max-1 && $max != 1) {
$dsp_order .= '<td><img src="../img/blanco.png" border="0" alt="" title="" /><a href="lp_controller.php?'.api_get_cidreq().'&action=move_lp_up&lp_id='.$id.'">
'.Display::return_icon('up.png', get_lang('MoveUp'),'','22').'</a></td>';
}
elseif ($max == 1) {
$dsp_order = '<td></td>';
}
else {
$dsp_order .= '<td><a href="lp_controller.php?'.api_get_cidreq().'&action=move_lp_down&lp_id='.$id.'">' .
<img src="../img/blanco.png" border="0" alt="" title="" />';
} elseif ($current == $max-1 && $max != 1) {
$dsp_order .= '<img src="../img/blanco.png" border="0" alt="" title="" /><a href="lp_controller.php?'.api_get_cidreq().'&action=move_lp_up&lp_id='.$id.'">
'.Display::return_icon('up.png', get_lang('MoveUp'),'','22').'</a>';
} elseif ($max == 1) {
$dsp_order = '';
} else {
$dsp_order .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=move_lp_down&lp_id='.$id.'">' .
Display::return_icon('down.png', get_lang('MoveDown'),'','22').'</a>';
$dsp_order .= '<a href="lp_controller.php?'.api_get_cidreq().'&action=move_lp_up&lp_id='.$id.'">' .
Display::return_icon('up.png', get_lang('MoveUp'),'','22').'</a></td>';
Display::return_icon('up.png', get_lang('MoveUp'),'','22').'</a>';
}
}
} // end if ($is_allowedToEdit)
echo $dsp_line.$dsp_progress.$dsp_desc.$dsp_export.$dsp_edit.$dsp_build.$dsp_visible.$dsp_publish.$dsp_reinit.$dsp_default_view.$dsp_debug.$dsp_edit_lp.$dsp_disk.$lp_auto_lunch_icon.$export_icon.$dsp_delete.$dsp_order.$dsp_edit_close;
echo "</tr>\n";
echo "</tr>";
$current ++; //counter for number of elements treated
} // end foreach ($flat_list)
// TODO: Erint some user-friendly message if counter is still = 0 to tell nothing can be displayd yet.

@ -73,7 +73,13 @@ if (!empty ($_GET['extend_all'])) {
if ($origin != 'tracking') {
$output .= "<tr><td><h2>" . get_lang('ScormMystatus') . "</h2></td></tr>";
}
$output .= "<tr><td>&nbsp;</td></tr>" . "<tr><td>" . "<table border='0' class='data_table'><tr>\n" . '<td width="16">' . $extend_all_link . '</td>' . '<td colspan="4" class="title"><div class="mystatusfirstrow">' . get_lang('ScormLessonTitle') . "</div></td>\n" . '<td colspan="2" class="title"><div class="mystatusfirstrow">' . get_lang('ScormStatus') . "</div></td>\n" . '<td colspan="2" class="title"><div class="mystatusfirstrow">' . get_lang('ScormScore') . "</div></td>\n" . '<td colspan="2" class="title"><div class="mystatusfirstrow">' . get_lang('ScormTime') . "</div></td><td class='title'><div class='mystatusfirstrow'>" .get_lang('Actions') . "</div></td></tr>\n";
$output .= '<tr><td>&nbsp;</td></tr><tr><td><table border="0" class="data_table"><tr>'.
'<th width="16">' . $extend_all_link . '</td>' .
'<th colspan="4" class="title"><div class="mystatusfirstrow">' . get_lang('ScormLessonTitle') . "</div></td>" .
'<th colspan="2" class="title"><div class="mystatusfirstrow">' . get_lang('ScormStatus') . "</div></td>" .
'<th colspan="2" class="title"><div class="mystatusfirstrow">' . get_lang('ScormScore') . "</div></td>" .
'<th colspan="2" class="title"><div class="mystatusfirstrow">' . get_lang('ScormTime') . "</div></td>".
'<th class="title"><div class="mystatusfirstrow">'.get_lang('Actions') . '</div></td></tr>';
// Going through the items using the $items[] array instead of the database order ensures
// we get them in the same order as in the imsmanifest file, which is rather random when using
@ -207,14 +213,14 @@ if (is_array($list) && count($list) > 0) {
}
$title = $row['mytitle'];
if (empty ($title)) {
if (empty($title)) {
$title = rl_get_resource_name(api_get_course_id(), $lp_id, $row['myid']);
}
if ($row['item_type'] != 'dokeos_chapter') {
$correct_test_link = '-';
$title = Security::remove_XSS($title);
$output .= "<tr class='$oddclass'>\n" . "<td>$extend_link</td>\n" . '<td colspan="4" class="content"><div class="mystatus">' . $title . "</div></td>\n" . '<td colspan="2" class="content"></td>' . "\n" . '<td colspan="2" class="content"></td>' . "\n" . '<td colspan="2" class="content"></td><td class="content"></td>' . "\n" . "</tr>\n";
$output .= "<tr class='$oddclass'>" . "<td>$extend_link</td>" . '<td colspan="4" class="content"><div class="mystatus">' . $title . "</div></td>" . '<td colspan="2" class="content"></td>'.'<td colspan="2" class="content"></td>'.'<td colspan="2" class="content"></td><td class="content"></td>' . "</tr>";
}
$counter++;
@ -249,7 +255,6 @@ if (is_array($list) && count($list) > 0) {
$maxscore = $row['mymaxscore'];
} else {
if ($row['item_type'] == 'sco') {
if (!empty ($row['myviewmaxscore']) && $row['myviewmaxscore'] > 0) {
$maxscore = $row['myviewmaxscore'];
}
@ -287,8 +292,8 @@ if (is_array($list) && count($list) > 0) {
//$view_score = ($score == 0 ? '/' : ($maxscore === 0 ? $score : $score . '/' . float_format($maxscore, 1)));
$view_score = show_score($score, $maxscore, false);
}
$output .= "<tr class='$oddclass'>\n" . "<td></td>\n" . "<td>$extend_attempt_link</td>\n" . '<td colspan="3">' . get_lang('Attempt') . ' ' . $row['iv_view_count'] . "</td>\n"
. '<td colspan="2"><font color="' . $color . '"><div class="mystatus">' . $my_lesson_status . "</div></font></td>\n" . '<td colspan="2"><div class="mystatus" align="center">' . $view_score . "</div></td>\n" . '<td colspan="2"><div class="mystatus">'.$time.'</div></td><td></td></tr>';
$output .= "<tr class='$oddclass'>" . "<td></td>" . "<td>$extend_attempt_link</td>" . '<td colspan="3">' . get_lang('Attempt') . ' ' . $row['iv_view_count'] . "</td>"
. '<td colspan="2"><font color="' . $color . '"><div class="mystatus">' . $my_lesson_status . "</div></font></td>\n" . '<td colspan="2"><div class="mystatus" align="center">' . $view_score . "</div></td>" . '<td colspan="2"><div class="mystatus">'.$time.'</div></td><td></td></tr>';
if (!empty($export_csv)) {
$temp = array ();
@ -330,9 +335,9 @@ if (is_array($list) && count($list) > 0) {
}
$student_response = implode(',',$content_student_response);
}
$output .= "<tr class='$oddclass'>\n" . '<td></td>' . "\n" . '<td></td>' . "\n" . '<td>&nbsp;</td>' . "\n" . '<td>' . $interaction['order_id'] . '</td>' . "\n" . '<td>' . $interaction['id'] . '</td>' . "\n"
. '<td colspan="2">' . $interaction['type'] . "</td>\n"
. '<td>' . $student_response . "</td>\n" . '<td>' . $interaction['result'] . "</td>\n" . '<td>' . $interaction['latency'] . "</td>\n" . '<td>' . $interaction['time'] . "</td>\n<td></td>\n</tr>\n";
$output .= "<tr class='$oddclass'>" . '<td></td>' . '<td></td>' .'<td>&nbsp;</td>' . '<td>' . $interaction['order_id'] . '</td>' .'<td>' . $interaction['id'] . '</td>'
. '<td colspan="2">' . $interaction['type'] . "</td>"
. '<td>' . $student_response . "</td>" . '<td>' . $interaction['result'] . "</td>" . '<td>' . $interaction['latency'] . "</td>" . '<td>' . $interaction['time'] . "</td><td></td></tr>";
$counter++;
}
$list2 = learnpath :: get_iv_objectives_array($row['iv_id']);
@ -342,9 +347,9 @@ if (is_array($list) && count($list) > 0) {
} else {
$oddclass = 'row_even';
}
$output .= "<tr class='$oddclass'>\n" . '<td></td>' . "\n" . '<td></td>' . "\n" . '<td>&nbsp;</td>' . "\n" . '<td>' . $interaction['order_id'] . '</td>' . "\n" . '<td colspan="2">' . $interaction['objective_id'] . '</td>' . "\n" .
$output .= "<tr class='$oddclass'>" . '<td></td>' . '<td></td>'.'<td>&nbsp;</td>' .'<td>' . $interaction['order_id'] . '</td>'. '<td colspan="2">' . $interaction['objective_id'] . '</td>'.
'<td colspan="2">' . $interaction['status'] . "</td>\n" .
'<td>' . $interaction['score_raw'] . "</td>\n" . '<td>' . $interaction['score_max'] . "</td>\n" . '<td>' . $interaction['score_min'] . "</td>\n<td></td>\n</tr>\n";
'<td>' . $interaction['score_raw'] . "</td>" . '<td>' . $interaction['score_max'] . "</td>" . '<td>' . $interaction['score_min'] . "</td><td></td></tr>";
$counter++;
}
}
@ -352,10 +357,10 @@ if (is_array($list) && count($list) > 0) {
} elseif ($num > 0) {
$row = Database :: fetch_array($result);
$my_id = $row['myid'];
$my_lp_id = $row['mylpid'];
$my_lp_view_id = $row['mylpviewid'];
$my_path = $row['path'];
$my_id = $row['myid'];
$my_lp_id = $row['mylpid'];
$my_lp_view_id = $row['mylpviewid'];
$my_path = $row['path'];
$result_disabled_ext_all = false;
@ -398,11 +403,6 @@ if (is_array($list) && count($list) > 0) {
if ($inter_num > 1) {
$extend_link = '<a href="' . api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&extend_attempt_id=' . $row['iv_id'] . $url_suffix . '"><img src="../img/invisible.gif" alt="'.get_lang('ExtendAttemptView').'" title="'.get_lang('ExtendAttemptView').'" border="0"></a>';
}
if (($counter % 2) == 0) {
$oddclass = 'row_odd';
} else {
$oddclass = 'row_even';
}
$lesson_status = $row['mystatus'];
$score = $row['myscore'];
$subtotal_time = $row['mytime'];
@ -414,7 +414,7 @@ if (is_array($list) && count($list) > 0) {
//$time_for_total = $subtotal_time;
//$time = learnpathItem :: get_scorm_time('js', $subtotal_time);
$scoIdentifier = $row['myid'];
$title = $row['mytitle'];
$title = $row['mytitle'];
// Selecting the exe_id from stats attempts tables in order to look the max score value.
if ($origin != 'tracking') {
@ -532,17 +532,17 @@ if (is_array($list) && count($list) > 0) {
$title = Security::remove_XSS($title);
if ( (isset($_GET['lp_id']) && $_GET['lp_id'] == $my_lp_id ) && (isset($_GET['my_lp_id']) && $_GET['my_lp_id'] == $my_id)) {
$output .= "<tr class='$oddclass' >\n" . "<td>$extend_link</td>\n" . '<td colspan="4"><div class="mystatus">' .$title. '</div></td>' . "\n";
$output .= "<tr class='$oddclass' >" . "<td>$extend_link</td>" . '<td colspan="4"><div class="mystatus">' .$title. '</div></td>';
$output .= '<td colspan="2">&nbsp;</td><td colspan="2">&nbsp;</td><td colspan="2">&nbsp;</td><td>'.$correct_test_link.'</td></tr>';
$output .= "</tr>\n";
$output .= "</tr>";
} else {
if ( (isset($_GET['lp_id']) && $_GET['lp_id'] == $my_lp_id ) && (isset($_GET['my_ext_lp_id']) && $_GET['my_ext_lp_id'] == $my_id)) {
$output .= "<tr class='$oddclass' >\n";
$output .= "<tr class='$oddclass'>";
} else {
$output .= "<tr class='$oddclass'>\n";
$output .= "<tr class='$oddclass'>";
}
$output .= "<td>$extend_link</td>\n" . '<td colspan="4"><div class="mystatus">' .$title. '</div></td>' . "\n";
$output .= '<td colspan="2"><font color="' . $color . '"><div class="mystatus">' . $my_lesson_status . "</div></font></td>\n" . '<td colspan="2"><div class="mystatus" align="center">';
$output .= "<td>$extend_link</td>\n" . '<td colspan="4"><div class="mystatus">' .$title. '</div></td>';
$output .= '<td colspan="2"><font color="' . $color . '"><div class="mystatus">' . $my_lesson_status . "</div></font></td>" . '<td colspan="2"><div class="mystatus" align="center">';
if ($row['item_type'] == 'quiz') {
if (!$is_allowed_to_edit && $result_disabled_ext_all) {
$output .= Display::return_icon('invisible.gif', get_lang('ResultsHiddenByExerciseSetting'));
@ -553,8 +553,8 @@ if (is_array($list) && count($list) > 0) {
} else {
$output .= ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score . '/' . $maxscore));
}
$output .= "</div></td>\n" . '<td colspan="2"><div class="mystatus">' . $time . "</div></td><td>$correct_test_link</td>\n";
$output .= "</tr>\n";
$output .= "</div></td>" . '<td colspan="2"><div class="mystatus">' . $time . "</div></td><td>$correct_test_link</td>";
$output .= "</tr>";
}
if (!empty($export_csv)) {
@ -563,13 +563,11 @@ if (is_array($list) && count($list) > 0) {
$temp[] = api_html_entity_decode($my_lesson_status, ENT_QUOTES);
if ($row['item_type'] == 'quiz') {
if (!$is_allowed_to_edit && $result_disabled_ext_all) {
$temp[] = '/';
} else {
$temp[] = ($score == 0 ? '0/'.$maxscore : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1)));
}
} else {
$temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1)));
}
@ -599,9 +597,9 @@ if (is_array($list) && count($list) > 0) {
} else {
$oddclass = 'row_even';
}
$output .= "<tr class='$oddclass'>\n" . '<td></td>' . "\n" . '<td></td>' . "\n" . '<td>&nbsp;</td>' . "\n" . '<td>' . $interaction['order_id'] . '</td>' . "\n" . '<td colspan="2">' . $interaction['objective_id'] . '</td>' . "\n" .
'<td colspan="2">' . $interaction['status'] . "</td>\n" .
'<td>' . $interaction['score_raw'] . "</td>\n" . '<td>' . $interaction['score_max'] . "</td>\n" . '<td>' . $interaction['score_min'] . "</td>\n<td></td>\n</tr>\n";
$output .= "<tr class='$oddclass'>" . '<td></td>' . '<td></td>' . '<td>&nbsp;</td>' . '<td>' . $interaction['order_id'] . '</td>'.'<td colspan="2">' . $interaction['objective_id'] . '</td>'.
'<td colspan="2">' . $interaction['status'] . "</td>" .
'<td>' . $interaction['score_raw'] . "</td>" . '<td>' . $interaction['score_max'] . "</td>" . '<td>' . $interaction['score_min'] . "</td>\n<td></td>\n</tr>";
$counter++;
}
}

Loading…
Cancel
Save