Adding prefix, count_elements in components model

main/inc/lib/grade_model.lib.php

@@ -8,10 +8,12 @@
 /**
  * Code
  */
-
 /**
  * @package chamilo.library
  */
+
+require_once 'fckeditor/fckeditor.php';
+
 class GradeModel extends Model {
     
     var $table;
@@ -103,10 +105,16 @@ class GradeModel extends Model {
             $counter = $i;
             $form->addElement('text', 'components['.$i.'][percentage]', null, array('class' => 'span1'));                                        
             $form->addElement('text', 'components['.$i.'][acronym]',    null, array('class' => 'span1'));
-            $form->addElement('text', 'components['.$i.'][title]',      null, array('class' => 'span3'));        
-            $form->addElement('hidden', 'components['.$i.'][id]',       null, array('class' => 'span3'));
             
-             $template_percentage =
+            $form->addElement('text', 'components['.$i.'][prefix]',      null, array('class' => 'span2'));
+            $form->addElement('text', 'components['.$i.'][exclusions]',      null, array('class' => 'span2'));
+            $form->addElement('text', 'components['.$i.'][count_elements]',      null, array('class' => 'span2'));
+            
+            $form->addElement('text', 'components['.$i.'][title]',      null, array('class' => 'span2'));
+            
+            $form->addElement('hidden', 'components['.$i.'][id]');
+            
+            $template_percentage =
             '<div id=' . $i . ' style="display: '.(($i<=$nr_items)?'inline':'none').';" class="control-group">                
                 <p>
                 <label class="control-label">{label}</label>
@@ -132,6 +140,10 @@ class GradeModel extends Model {
             $renderer->setElementTemplate($template_percentage ,  'components['.$i.'][percentage]');
             $renderer->setElementTemplate($template_acronym , 'components['.$i.'][acronym]');
             
+            $renderer->setElementTemplate($template_acronym , 'components['.$i.'][prefix]');
+            $renderer->setElementTemplate($template_acronym , 'components['.$i.'][exclusions]');
+            $renderer->setElementTemplate($template_acronym , 'components['.$i.'][count_elements]');
+            
             if ($i == 0) {
                 $form->addRule('components['.$i.'][percentage]', get_lang('ThisFieldIsRequired'), 'required');
                 $form->addRule('components['.$i.'][title]', get_lang('ThisFieldIsRequired'), 'required');
@@ -253,12 +265,11 @@ class GradeModel extends Model {
 
 class GradeModelComponents extends Model {
     var $table;
-    var $columns = array('id', 'title', 'percentage', 'acronym', 'grade_model_id');
+    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);  
         return $id;

main/install/db_main.sql

@@ -3001,9 +3001,13 @@ DROP TABLE IF EXISTS grade_components;
 CREATE TABLE grade_components (
     id INTEGER NOT NULL AUTO_INCREMENT,
     percentage VARCHAR(255)  NOT NULL,
-    title VARCHAR(255)  NOT NULL,
-    acronym VARCHAR(255)  NOT NULL,
+    title VARCHAR(255) NOT NULL,
+    acronym VARCHAR(255) NOT NULL,
     grade_model_id INTEGER NOT NULL,
+    exclusions VARCHAR(255) DEFAULT NULL,
+    prefix VARCHAR(255) DEFAULT NULL,
+    count_elements INT DEFAULT 0,
+    grade_model_id INT NOT NULL,
     PRIMARY KEY (id)
 );
 

main/install/migrate-db-1.9.0-1.10.0-pre.sql

@@ -34,7 +34,6 @@ ALTER TABLE session_rel_user ADD COLUMN moved_to INT NOT NULL DEFAULT 0;
 ALTER TABLE session_rel_user ADD COLUMN moved_status INT NOT NULL DEFAULT 0;
 ALTER TABLE session_rel_user ADD COLUMN moved_at datetime NOT NULL default '0000-00-00 00:00:00';
 
-
 ALTER TABLE session ADD COLUMN display_start_date datetime NOT NULL default '0000-00-00 00:00:00';
 ALTER TABLE session ADD COLUMN display_end_date datetime NOT NULL default '0000-00-00 00:00:00';
 ALTER TABLE session ADD COLUMN access_start_date datetime NOT NULL default '0000-00-00 00:00:00';
@@ -42,6 +41,10 @@ ALTER TABLE session ADD COLUMN access_end_date datetime NOT NULL default '0000-0
 ALTER TABLE session ADD COLUMN coach_access_start_date datetime NOT NULL default '0000-00-00 00:00:00';
 ALTER TABLE session ADD COLUMN coach_access_end_date datetime NOT NULL default '0000-00-00 00:00:00';
 
+ALTER TABLE grade_components ADD COLUMN prefix VARCHAR(255) DEFAULT NULL;
+ALTER TABLE grade_components ADD COLUMN exclusions VARCHAR(255) DEFAULT NULL;
+ALTER TABLE grade_components ADD COLUMN count_elements INT DEFAULT 0,;
+
 -- ALTER TABLE session DROP COLUMN date_start;
 -- ALTER TABLE session DROP COLUMN date_end;