From e9316a8bac42451547b8e7efb4f34ea7056d901c Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Tue, 3 Apr 2012 16:50:36 +0200
Subject: [PATCH] Fixing work bug when deleting a student assignment the score
 was still there see BT#4131

---
 main/gradebook/lib/be/linkfactory.class.php            | 4 ++++
 main/gradebook/lib/be/studentpublicationlink.class.php | 9 +++++----
 main/gradebook/lib/flatview_data_generator.class.php   | 4 +---
 main/work/work.lib.php                                 | 9 ++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 main/gradebook/lib/be/linkfactory.class.php

diff --git a/main/gradebook/lib/be/linkfactory.class.php b/main/gradebook/lib/be/linkfactory.class.php
old mode 100755
new mode 100644
index fe89a5def2..f8e47d129c
--- a/main/gradebook/lib/be/linkfactory.class.php
+++ b/main/gradebook/lib/be/linkfactory.class.php
@@ -115,5 +115,9 @@ class LinkFactory
                       LINK_SURVEY
 					  );
 	}
+    
+    public function delete() {
+        
+    }
 
 }
diff --git a/main/gradebook/lib/be/studentpublicationlink.class.php b/main/gradebook/lib/be/studentpublicationlink.class.php
index ccfe991658..b4625d0af6 100644
--- a/main/gradebook/lib/be/studentpublicationlink.class.php
+++ b/main/gradebook/lib/be/studentpublicationlink.class.php
@@ -147,19 +147,20 @@ class StudentPublicationLink extends AbstractLink
     		 $v_assigment_id = $assignment['id'];
     	}
     	$sql = 'SELECT * FROM '.$tbl_stats.' 
-    			WHERE c_id = '.$this->course_id.' AND parent_id ="'.$v_assigment_id.'" AND session_id='.api_get_session_id().'';
+    			WHERE c_id = '.$this->course_id.' AND active = 1 AND parent_id ="'.$v_assigment_id.'" AND session_id='.api_get_session_id().'';
     	
     	if (!empty($stud_id)) {
     		$sql .= " AND user_id = $stud_id ";
     	}
     	// order by id, that way the student's first attempt is accessed first
-		$sql .= ' ORDER BY id';		
+		$sql .= ' ORDER BY id';
+        
     	$scores = Database::query($sql);
 
 		// for 1 student
     	if (!empty($stud_id)) {
-    		if ($data=Database::fetch_array($scores)) {
-     			return array ($data['qualification'], $assignment['qualification']);
+    		if ($data = Database::fetch_array($scores)) {
+     			return array($data['qualification'], $assignment['qualification']);
     		} else {
      			return '';
     		}
diff --git a/main/gradebook/lib/flatview_data_generator.class.php b/main/gradebook/lib/flatview_data_generator.class.php
index cd0df13c84..1a298a3a09 100644
--- a/main/gradebook/lib/flatview_data_generator.class.php
+++ b/main/gradebook/lib/flatview_data_generator.class.php
@@ -215,7 +215,7 @@ class FlatViewDataGenerator
 
 			for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
 				$item  			= $this->evals_links[$count + $items_start];       
-                         
+                                         
 				$score 			= $item->calc_score($user_id);
 				$divide			= ( ($score[1])==0 ) ? 1 : $score[1];                
                 $sub_cat_percentage = $sum_categories_weight_array[$item->get_category_id()];
@@ -262,8 +262,6 @@ class FlatViewDataGenerator
             }
             $item_total = round($item_total);
 			$total_score = array($item_value_total, $item_total);
-            
-            
 			
 			if (!$show_all) {				
 				$row[] = $scoredisplay->display_score($total_score);
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index 381f6c440f..ecb799af11 100644
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -506,8 +506,8 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 					list($d_year, $d_month, $d_day) = explode('-', $parts[0]);
 					list($d_hour, $d_minute) = explode(':', $parts[1]);
 						
-					$qualification_input[] = FormValidator :: createElement('text','qualification');
-					$form_folder -> addGroup($qualification_input, 'qualification', get_lang('QualificationNumeric'), 'size="10"');
+					$qualification_input[] = FormValidator :: createElement('text', 'qualification');
+					$form_folder -> addGroup($qualification_input, 'qualification', get_lang('QualificationNumeric'));
 						
 					if ((int)$row['weight'] == 0) { 
 						$form_folder -> addElement('checkbox', 'make_calification', null, get_lang('MakeQualifiable'), 'onclick="javascript: if(this.checked){document.getElementById(\'option3\').style.display = \'block\';}else{document.getElementById(\'option3\').style.display = \'none\';}"');
@@ -765,7 +765,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
 					$count = $gradebook_data['weight'];
 				}
 				if ($count > 0) {
-					$add_to_name = ' / <span style="color:blue">'.get_lang('IncludedInEvaluation').'</span>';
+					$add_to_name = Display::label(get_lang('IncludedInEvaluation'), 'info');
 				} else {
 					$add_to_name = '';
 				}
@@ -779,8 +779,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor
                     }
 				//}         
 				$url = $zip.'<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&id='.$work_data['id'].'"'.$class.'>'.
-						$work_title.'</a>'.					
-						$add_to_name.'<br />'.$cant_files.' '.$text_file.$dirtext;							
+						$work_title.'</a> '.$add_to_name.'<br />'.$cant_files.' '.$text_file.$dirtext;							
 				$row[] = $url;				
 			}
 			if ($count_files != 0) {