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

Reformat code

Browse Source
skala
Julio Montoya 12 years ago
parent 0fbbcc38f6
commit 27252e419e
2 changed files with 134 additions and 76 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. 2
      .htaccess
  2. 208
      main/inc/lib/grade_model.lib.php

2
.htaccess
Unescape View File

@ -3,7 +3,7 @@
Options +FollowSymLinks Options +FollowSymLinks
RewriteEngine On RewriteEngine On
RewriteBase / RewriteBase /chamilogits
# Courses home # Courses home
RewriteCond %{QUERY_STRING} ^id_session=0 RewriteCond %{QUERY_STRING} ^id_session=0

208
main/inc/lib/grade_model.lib.php
Unescape View File

@ -1,10 +1,10 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
/** /**
* This class provides methods for the notebook management. * This class provides methods for the notebook management.
* Include/require it in your code to use its features. * Include/require it in your code to use its features.
* @package chamilo.library * @package chamilo.library
*/ */
/** /**
* Code * Code
*/ */
@ -12,35 +12,46 @@
* @package chamilo.library * @package chamilo.library
*/ */
class GradeModel extends Model { class GradeModel extends Model
{
var $table; public $table;
var $columns = array('id', 'name', 'description'); public $columns = array('id', 'name', 'description');
public function __construct() { public function __construct()
$this->table = Database::get_main_table(TABLE_GRADE_MODEL); {
} $this->table = Database::get_main_table(TABLE_GRADE_MODEL);
}
public function get_all($where_conditions = array()) { public function get_all($where_conditions = array())
return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'name ASC')); {
return Database::select('*', $this->table, array('where' => $where_conditions, 'order' => 'name ASC'));
} }
public function get_count() { public function get_count()
$row = Database::select('count(*) as count', $this->table, array(),'first'); {
$row = Database::select('count(*) as count', $this->table, array(), 'first');
return $row['count']; return $row['count'];
} }
/** /**
* Displays the title + grid * Displays the title + grid
*/ */
public function display() { public function display()
// action links {
echo '<div class="actions" style="margin-bottom:20px">'; // action links
echo '<a href="grade_models.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>'; echo '<div class="actions" style="margin-bottom:20px">';
echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png',get_lang('Add'),'','32').'</a>'; echo '<a href="grade_models.php">'.Display::return_icon('back.png', get_lang('Back'), '', '32').'</a>';
echo '</div>'; echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon(
'add.png',
get_lang('Add'),
'',
'32'
).'</a>';
echo '</div>';
echo Display::grid_html('grade_model'); echo Display::grid_html('grade_model');
} }
/** /**
* Returns a Form validator Obj * Returns a Form validator Obj
@ -49,14 +60,15 @@ class GradeModel extends Model {
* @param string action add, edit * @param string action add, edit
* @return obj form validator obj * @return obj form validator obj
*/ */
public function return_form($url, $action) { public function return_form($url, $action)
{
$oFCKeditor = new FCKeditor('description') ; $oFCKeditor = new FCKeditor('description');
$oFCKeditor->ToolbarSet = 'grade_model'; $oFCKeditor->ToolbarSet = 'grade_model';
$oFCKeditor->Width = '100%'; $oFCKeditor->Width = '100%';
$oFCKeditor->Height = '200'; $oFCKeditor->Height = '200';
$oFCKeditor->Value = ''; $oFCKeditor->Value = '';
$oFCKeditor->CreateHtml(); $oFCKeditor->CreateHtml();
$form = new FormValidator('grades', 'post', $url); $form = new FormValidator('grades', 'post', $url);
@ -72,7 +84,13 @@ class GradeModel extends Model {
$form->addElement('hidden', 'id', $id); $form->addElement('hidden', 'id', $id);
$form->addElement('text', 'name', get_lang('Name'), array('size' => '70')); $form->addElement('text', 'name', get_lang('Name'), array('size' => '70'));
$form->add_html_editor('description', get_lang('Description'), false, false, array('ToolbarSet' => 'careers','Width' => '100%', 'Height' => '250')); $form->add_html_editor(
'description',
get_lang('Description'),
false,
false,
array('ToolbarSet' => 'careers', 'Width' => '100%', 'Height' => '250')
);
$form->addElement('label', get_lang('Components')); $form->addElement('label', get_lang('Components'));
@ -88,36 +106,50 @@ class GradeModel extends Model {
if ($action == 'edit') { if ($action == 'edit') {
if (!empty($components)) { if (!empty($components)) {
$nr_items = count($components) -1; $nr_items = count($components) - 1;
} }
} }
$form->addElement('hidden', 'maxvalue', '100'); $form->addElement('hidden', 'maxvalue', '100');
$form->addElement('hidden', 'minvalue', '0'); $form->addElement('hidden', 'minvalue', '0');
$renderer = & $form->defaultRenderer(); $renderer = & $form->defaultRenderer();
$component_array = array(); $component_array = array();
for ($i = 0; $i <= $max; $i++) { for ($i = 0; $i <= $max; $i++) {
$counter = $i; $counter = $i;
$form->addElement('text', 'components['.$i.'][percentage]', null, array('class' => 'span1')); $form->addElement('text', 'components['.$i.'][percentage]', null, array('class' => 'span1'));
$form->addElement('text', 'components['.$i.'][acronym]', null, array('class' => 'span1', 'placeholder' => get_lang('Acronym'))); $form->addElement(
$form->addElement('text', 'components['.$i.'][title]', null, array('class' => 'span2', 'placeholder' => get_lang('Title'))); 'text',
$form->addElement('text', 'components['.$i.'][prefix]', null, array('class'=> 'span1', 'placeholder' => get_lang('Prefix'))); 'components['.$i.'][acronym]',
null,
$options = array(0=>0, 1 => 1, 2 => 2, 3=>3, 4=> 4, 5=> 5); array('class' => 'span1', 'placeholder' => get_lang('Acronym'))
);
$form->addElement(
'text',
'components['.$i.'][title]',
null,
array('class' => 'span2', 'placeholder' => get_lang('Title'))
);
$form->addElement(
'text',
'components['.$i.'][prefix]',
null,
array('class' => 'span1', 'placeholder' => get_lang('Prefix'))
);
$options = array(0 => 0, 1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5);
$form->addElement('select', 'components['.$i.'][count_elements]', null, $options); $form->addElement('select', 'components['.$i.'][count_elements]', null, $options);
$options = array(0=>0, 1 => 1, 2 => 2, 3=>3, 4=> 4, 5=> 5); $options = array(0 => 0, 1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5);
$form->addElement('select', 'components['.$i.'][exclusions]', null, $options); $form->addElement('select', 'components['.$i.'][exclusions]', null, $options);
$form->addElement('hidden', 'components['.$i.'][id]'); $form->addElement('hidden', 'components['.$i.'][id]');
$template_percentage = $template_percentage =
'<div id=' . $i . ' style="display: '.(($i<=$nr_items)?'inline':'none').';" class="control-group"> '<div id='.$i.' style="display: '.(($i <= $nr_items) ? 'inline' : 'none').';" class="control-group">
<p> <p>
<label class="control-label">{label}</label> <label class="control-label">{label}</label>
<div class="controls"> <div class="controls">
@ -128,22 +160,26 @@ class GradeModel extends Model {
{element} {label} <!-- BEGIN error --><span class="form_error">{error}</span> <!-- END error -->'; {element} {label} <!-- BEGIN error --><span class="form_error">{error}</span> <!-- END error -->';
$template_title = $template_title =
'&nbsp{element} <!-- BEGIN error --> <span class="form_error">{error}</span><!-- END error --> '&nbsp{element} <!-- BEGIN error --> <span class="form_error">{error}</span><!-- END error -->
<a href="javascript:plusItem(' . ($counter+1) . ')"> <a href="javascript:plusItem('.($counter + 1).')">
<img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="../img/icons/22/add.png" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></img> <img style="display: '.(($counter >= $nr_items) ? 'inline' : 'none').';" id="plus-'.($counter + 1).'" src="../img/icons/22/add.png" alt="'.get_lang(
'Add'
).'" title="'.get_lang('Add').'"></img>
</a> </a>
<a href="javascript:minItem(' . ($counter) . ')"> <a href="javascript:minItem('.($counter).')">
<img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="min-' . $counter . '" src="../img/delete.png" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></img> <img style="display: '.(($counter >= $nr_items) ? 'inline' : 'none').';" id="min-'.$counter.'" src="../img/delete.png" alt="'.get_lang(
'Delete'
).'" title="'.get_lang('Delete').'"></img>
</a> </a>
</div></p></div>'; </div></p></div>';
$renderer->setElementTemplate($template_acronym, 'components['.$i.'][title]'); $renderer->setElementTemplate($template_acronym, 'components['.$i.'][title]');
$renderer->setElementTemplate($template_percentage , 'components['.$i.'][percentage]'); $renderer->setElementTemplate($template_percentage, 'components['.$i.'][percentage]');
$renderer->setElementTemplate($template_acronym , 'components['.$i.'][acronym]'); $renderer->setElementTemplate($template_acronym, 'components['.$i.'][acronym]');
$renderer->setElementTemplate($template_acronym , 'components['.$i.'][prefix]'); $renderer->setElementTemplate($template_acronym, 'components['.$i.'][prefix]');
$renderer->setElementTemplate($template_title , 'components['.$i.'][exclusions]'); $renderer->setElementTemplate($template_title, 'components['.$i.'][exclusions]');
$renderer->setElementTemplate($template_acronym , 'components['.$i.'][count_elements]'); $renderer->setElementTemplate($template_acronym, 'components['.$i.'][count_elements]');
if ($i == 0) { if ($i == 0) {
$form->addRule('components['.$i.'][percentage]', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('components['.$i.'][percentage]', get_lang('ThisFieldIsRequired'), 'required');
@ -164,9 +200,9 @@ class GradeModel extends Model {
$form->addElement('advanced_settings', get_lang('AllMustWeight100')); $form->addElement('advanced_settings', get_lang('AllMustWeight100'));
if ($action == 'edit') { if ($action == 'edit') {
$form->addElement('style_submit_button', 'submit', get_lang('Modify'), 'class="save"'); $form->addElement('style_submit_button', 'submit', get_lang('Modify'), 'class="save"');
} else { } else {
$form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"'); $form->addElement('style_submit_button', 'submit', get_lang('Add'), 'class="save"');
} }
if (!empty($components)) { if (!empty($components)) {
@ -183,38 +219,44 @@ class GradeModel extends Model {
// Setting the rules // Setting the rules
$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
return $form;
return $form;
} }
public function get_components($id) { public function get_components($id)
{
$obj = new GradeModelComponents(); $obj = new GradeModelComponents();
if (!empty($id)) { if (!empty($id)) {
return $obj->get_all(array('where'=> array('grade_model_id = ?' => $id))); return $obj->get_all(array('where' => array('grade_model_id = ?' => $id)));
} }
return null; return null;
} }
public function save($params, $show_query = false) { public function save($params, $show_query = false)
$id = parent::save($params, $show_query); {
if (!empty($id)) { $id = parent::save($params, $show_query);
if (!empty($id)) {
foreach ($params['components'] as $component) { foreach ($params['components'] as $component) {
if (!empty($component['title']) && !empty($component['percentage']) && !empty($component['acronym'])) { if (!empty($component['title']) && !empty($component['percentage']) && !empty($component['acronym'])) {
$obj = new GradeModelComponents(); $obj = new GradeModelComponents();
$component['grade_model_id'] = $id; $component['grade_model_id'] = $id;
$obj->save($component); $obj->save($component);
} }
} }
} }
//event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id()); //event_system(LOG_CAREER_CREATE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
return $id; return $id;
} }
public function update($params) { public function update($params)
{
parent::update($params); parent::update($params);
if (!empty($params['id'])) { if (!empty($params['id'])) {
foreach ($params['components'] as $component) { foreach ($params['components'] as $component) {
$obj = new GradeModelComponents(); $obj = new GradeModelComponents();
$component['grade_model_id'] = $params['id']; $component['grade_model_id'] = $params['id'];
if (empty($component['title']) && empty($component['percentage']) && empty($component['acronym'])) { if (empty($component['title']) && empty($component['percentage']) && empty($component['acronym'])) {
$obj->delete($component['id']); $obj->delete($component['id']);
@ -226,18 +268,20 @@ class GradeModel extends Model {
//$params['components'] //$params['components']
} }
public function delete($id) { public function delete($id)
parent::delete($id); {
//event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id()); parent::delete($id);
//event_system(LOG_CAREER_DELETE, LOG_CAREER_ID, $id, api_get_utc_datetime(), api_get_user_id());
} }
public function fill_grade_model_select_in_form(&$form, $name = 'gradebook_model_id', $default_value = null) { public function fill_grade_model_select_in_form(&$form, $name = 'gradebook_model_id', $default_value = null)
{
if (api_get_setting('gradebook_enable_grade_model') == 'false') { if (api_get_setting('gradebook_enable_grade_model') == 'false') {
return false; return false;
} }
if (api_get_setting('teachers_can_change_grade_model_settings') == 'true' || api_is_platform_admin()) { if (api_get_setting('teachers_can_change_grade_model_settings') == 'true' || api_is_platform_admin()) {
$grade_models = $this->get_all(); $grade_models = $this->get_all();
$grade_model_options = array('-1' => get_lang('None')); $grade_model_options = array('-1' => get_lang('None'));
if (!empty($grade_models)) { if (!empty($grade_models)) {
foreach ($grade_models as $item) { foreach ($grade_models as $item) {
@ -264,15 +308,29 @@ class GradeModel extends Model {
} }
} }
class GradeModelComponents extends Model { class GradeModelComponents extends Model
{
var $table; var $table;
var $columns = array('id', 'title', 'percentage', 'acronym', 'grade_model_id', 'prefix', 'exclusions', 'count_elements'); var $columns = array(
'id',
'title',
'percentage',
'acronym',
'grade_model_id',
'prefix',
'exclusions',
'count_elements'
);
public function __construct()
{
$this->table = Database::get_main_table(TABLE_GRADE_MODEL_COMPONENTS);
}
public function save($params, $show_query = false)
{
$id = parent::save($params, $show_query);
public function __construct() {
$this->table = Database::get_main_table(TABLE_GRADE_MODEL_COMPONENTS);
}
public function save($params, $show_query = false) {
$id = parent::save($params, $show_query);
return $id; return $id;
} }
} }
Write Preview
Loading…
Cancel
Save