Fixed bug in result overview
Changed display of points to "[total_aquired] of [next_at]",
This commit is contained in:
		
							parent
							
								
									c65983dc60
								
							
						
					
					
						commit
						2a5de0af0e
					
				
					 3 changed files with 7 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -60,7 +60,7 @@ class block_gradelevel extends block_base {
 | 
			
		|||
		
 | 
			
		||||
			if($level_info->levelup_total > 0)
 | 
			
		||||
			{
 | 
			
		||||
				$this->content->footer = "<div class='pointinfo'>".get_string('levelup_at','block_gradelevel')." <span class='currentpoints'>{$level_info->points_in_level}</span>/<span class='leveluppoints'>{$level_info->levelup_total}</span></div>";
 | 
			
		||||
				$this->content->footer = "<div class='pointinfo'>".get_string('levelup_at','block_gradelevel')." <span class='currentpoints'>{$pointstotal}</span>/<span class='leveluppoints'>{$level_info->next_at}</span></div>";
 | 
			
		||||
			}
 | 
			
		||||
			else 
 | 
			
		||||
			{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
<?php
 | 
			
		||||
$plugin->component = 'block_gradelevel';  // Recommended since 2.0.2 (MDL-26035). Required since 3.0 (MDL-48494)
 | 
			
		||||
$plugin->version = 2019082500;  // YYYYMMDDHH (year, month, day, iteration)
 | 
			
		||||
$plugin->version = 2019091300;  // YYYYMMDDHH (year, month, day, iteration)
 | 
			
		||||
$plugin->requires = 2018050800; // YYYYMMDDHH (This is the release version for Moodle 3.5)
 | 
			
		||||
| 
						 | 
				
			
			@ -60,11 +60,11 @@ if(count($course_groups > 0))
 | 
			
		|||
			
 | 
			
		||||
			if($level_info->levelup_total > 0)
 | 
			
		||||
			{
 | 
			
		||||
				$this->content->footer = "<div class='pointinfo'>".get_string('levelup_at','block_gradelevel')." <span class='currentpoints'>{$level_info->points_in_level}</span>/<span class='leveluppoints'>{$level_info->levelup_total}</span></div>";
 | 
			
		||||
				print "<div class='pointinfo'>".get_string('levelup_at','block_gradelevel')." <span class='currentpoints'>{$pointstotal}</span>/<span class='leveluppoints'>{$level_info->next_at}</span></div>";
 | 
			
		||||
			}
 | 
			
		||||
			else 
 | 
			
		||||
			{
 | 
			
		||||
				$this->content->footer = "<div class='pointinfo complete'>".get_string('levelup_done','block_gradelevel')."</div>";
 | 
			
		||||
				print  "<div class='pointinfo complete'>".get_string('levelup_done','block_gradelevel')."</div>";
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			print "</li>";
 | 
			
		||||
| 
						 | 
				
			
			@ -80,6 +80,7 @@ if(count($course_groups > 0))
 | 
			
		|||
usort( $remaining_users, function( $a, $b) {
 | 
			
		||||
	return ( $a->lastname < $b->lastname ) ? -1 : 1;
 | 
			
		||||
} );
 | 
			
		||||
 | 
			
		||||
print "<ul class='skill_results other'>";
 | 
			
		||||
foreach($remaining_users as $usr)
 | 
			
		||||
{
 | 
			
		||||
| 
						 | 
				
			
			@ -90,11 +91,11 @@ foreach($remaining_users as $usr)
 | 
			
		|||
	print "<figcaption><span class='namepart'>{$usr->firstname}</span> <span class='namepart'>{$usr->lastname}</span></figcaption>";
 | 
			
		||||
	if($level_info->levelup_total > 0)
 | 
			
		||||
	{
 | 
			
		||||
		$this->content->footer = "<div class='pointinfo'>".get_string('levelup_at','block_gradelevel')." <span class='currentpoints'>{$level_info->points_in_level}</span>/<span class='leveluppoints'>{$level_info->levelup_total}</span></div>";
 | 
			
		||||
		print "<div class='pointinfo'>".get_string('levelup_at','block_gradelevel')." <span class='currentpoints'>{$pointstotal}</span>/<span class='leveluppoints'>{$level_info->next_at}</span></div>";
 | 
			
		||||
	}
 | 
			
		||||
	else 
 | 
			
		||||
	{
 | 
			
		||||
		$this->content->footer = "<div class='pointinfo complete'>".get_string('levelup_done','block_gradelevel')."</div>";
 | 
			
		||||
		print "<div class='pointinfo complete'>".get_string('levelup_done','block_gradelevel')."</div>";
 | 
			
		||||
	}
 | 
			
		||||
	print "</li>";
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue