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

Improve Gradebook Tool part 2 CT#968

Browse Source
skala
Carlos Vargas 16 years ago
parent 6e5c094920
commit a3c3ff57ab
22 changed files with 28 additions and 12 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. 1
      main/css/blue_lagoon/default.css
  2. 1
      main/css/chamilo/default.css
  3. 1
      main/css/chamilo_green/default.css
  4. 1
      main/css/chamilo_red/default.css
  5. 1
      main/css/cool_blue/default.css
  6. 1
      main/css/corporate/default.css
  7. 1
      main/css/delicious_bordeaux/default.css
  8. 1
      main/css/dokeos_blue/default.css
  9. 1
      main/css/dokeos_classic/default.css
  10. 1
      main/css/dokeos_classic_2D/default.css
  11. 1
      main/css/empire_green/default.css
  12. 1
      main/css/fruity_orange/default.css
  13. 1
      main/css/medical/default.css
  14. 1
      main/css/public_admin/default.css
  15. 1
      main/css/royal_purple/default.css
  16. 1
      main/css/silver_line/default.css
  17. 1
      main/css/sober_brown/default.css
  18. 1
      main/css/steel_grey/default.css
  19. 1
      main/css/tasty_olive/default.css
  20. 9
      main/gradebook/lib/fe/displaygradebook.php
  21. 12
      main/gradebook/lib/fe/evalform.class.php
  22. BIN
      main/img/nocertificate.png

1
main/css/blue_lagoon/default.css
Unescape View File

@ -2155,6 +2155,7 @@ span.radio {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/chamilo/default.css
Unescape View File

@ -2379,6 +2379,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/chamilo_green/default.css
Unescape View File

@ -2387,6 +2387,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/chamilo_red/default.css
Unescape View File

@ -2383,6 +2383,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/cool_blue/default.css
Unescape View File

@ -2043,6 +2043,7 @@ div.comments {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/corporate/default.css
Unescape View File

@ -1499,6 +1499,7 @@ span.radio {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/delicious_bordeaux/default.css
Unescape View File

@ -2036,6 +2036,7 @@ div.comments {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/dokeos_blue/default.css
Unescape View File

@ -2049,6 +2049,7 @@ div.comments {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/dokeos_classic/default.css
Unescape View File

@ -2118,6 +2118,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/dokeos_classic_2D/default.css
Unescape View File

@ -2152,6 +2152,7 @@ input.forms {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/empire_green/default.css
Unescape View File

@ -2060,6 +2060,7 @@ div.comments {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/fruity_orange/default.css
Unescape View File

@ -2060,6 +2060,7 @@ div.comments {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/medical/default.css
Unescape View File

@ -2077,6 +2077,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/public_admin/default.css
Unescape View File

@ -2097,6 +2097,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/royal_purple/default.css
Unescape View File

@ -2056,6 +2056,7 @@ div.comments {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/silver_line/default.css
Unescape View File

@ -1764,6 +1764,7 @@ div.system_announcement {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/sober_brown/default.css
Unescape View File

@ -2116,6 +2116,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;}
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/steel_grey/default.css
Unescape View File

@ -2061,6 +2061,7 @@ div.comments {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

1
main/css/tasty_olive/default.css
Unescape View File

@ -2041,6 +2041,7 @@ div.comments {
float: left;
width: 25%;
text-align: left;
padding-top:8px;
}
.formw_result {
width: 75%;

9
main/gradebook/lib/fe/displaygradebook.php
Unescape View File

@ -302,11 +302,9 @@ class DisplayGradebook
$header .= '<td><a href="gradebook_edit_all.php?id_session='.intval($_SESSION['id_session']).'&amp;'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('statistics.gif', get_lang('EditAllWeights')).' ' . get_lang('EditAllWeights') . '</a>';
$my_course_id=api_get_course_id();
$my_file= substr($_SESSION['gradebook_dest'],0,5);
if ($my_file!='index' || api_is_platform_admin()) {
$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
}
if (api_is_allowed_to_edit(null, true)) {
$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats_access.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . '</a>';
$header .= '<td style="vertical-align: top;"><a href="../document/document.php?curdirpath=/certificates&'.$my_api_cidreq.'&origin=gradebook&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('certificate.png', get_lang('AttachCertificate')).' ' . get_lang('AttachCertificate') . '</a>';
$header .= '<td style="vertical-align: top;"><a href="gradebook_display_certificate.php?'.$my_api_cidreq.'&amp;cat_id='.(int)$_GET['selectcat'].'">'.Display::return_icon('gradebook_eval_not_empty.gif', get_lang('GradebookSeeListOfStudentsCertificates')).' ' . get_lang('GradebookSeeListOfStudentsCertificates') . '</a>';
@ -344,8 +342,7 @@ class DisplayGradebook
if ($is_course_admin) {
$header .= '<a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats_access.gif', get_lang('FlatView')).' '. get_lang('FlatView') . '</a>';
if ( api_is_platform_admin() /*$is_platform_admin || $is_course_admin*/)
$header .= '<a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
$header .= '<a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
} elseif (!(isset ($_GET['studentoverview']))) {
$header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('view_list.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . '</a>';
} else {

12
main/gradebook/lib/fe/evalform.class.php
Unescape View File

@ -120,14 +120,14 @@ class EvalForm extends FormValidator
$this->addElement('hidden', 'minvalue', 0);
$this->addElement('header','h1','<b>'.get_lang('EditResult').'</b>');
$renderer = $this->defaultRenderer();
$elementTemplateTwoLabel = '<div class="row"><ul style="list-style-type:none;">
$elementTemplateTwoLabel = '<div><div class="row"><ul style="list-style-type:none;">
<li><div class="label_result" >
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}
</div>
<div class="formw_result">
<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error --> {element} / '.$this->evaluation_object->get_max().'
</div></li></ul>
</div>';
</div></div>';
$results_and_users = array();
foreach ($this->result_object as $result) {
@ -192,14 +192,14 @@ class EvalForm extends FormValidator
$this->addElement('header','h1','<b>'.get_lang('AddResult').'</b>');
$renderer = $this->defaultRenderer();
$elementTemplateTwoLabel = '<div class="row">
<div class="label_result">
$elementTemplateTwoLabel = '<div><div class="row" ><ul style="list-style-type:none;">
<li><div class="label_result">
<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}
</div>
<div class="formw_result">
<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error --> {element} / '.$this->evaluation_object->get_max().'
</div>
</div>';
</div></li></ul>
</div></div>';
foreach ($tblusers as $user) {
//user_id, user.username, lastname, firstname
$this->add_textfield('score[' . $user[0] . ']',

BIN
main/img/nocertificate.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 798 B

After

Width:  |  Height:  |  Size: 803 B

Write Preview
Loading…
Cancel
Save