From 018fd30b20fcd45c19dd41580a6af287ab880cac Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Sat, 9 Jan 2016 00:41:35 +0100
Subject: [PATCH] =?UTF-8?q?[x]=20Affichage=20des=20semestres=20non=20capit?=
 =?UTF-8?q?alis=C3=A9s=20sur=20le=20svg=20(violet)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page/career.php | 2 +-
 src/svg_v2.php  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/page/career.php b/page/career.php
index 82b44e5..271472b 100755
--- a/page/career.php
+++ b/page/career.php
@@ -1142,7 +1142,7 @@ if( (permission('master') || permission('admin')) && $etudiantOpt != null ){
 			$parcoursChart[$index]['UEs'] = array();
 			foreach($semestre['UEs'] as $UE){
 				array_push( $parcoursChart[$index]['UEs'],
-					array( 'id' => $UE['id'], 'moyenne' => $UE['moyenne'] )
+					array( 'id' => $UE['id'], 'moyenne' => $UE['moyenne'], 'capitalisation' => !in_array($UE['id'], $semestre['inactive']) )
 				);
 			}
 		}
diff --git a/src/svg_v2.php b/src/svg_v2.php
index ab87925..83ac62c 100755
--- a/src/svg_v2.php
+++ b/src/svg_v2.php
@@ -116,6 +116,10 @@ function displayParcours($parcours, $selected){
 				}else // si pas de note, on met la couleur par défaut
 					$themeColor = $normColor;
 
+				// si le semestre n'est pas pris en compte dans la capitalisation, on l'affiche en violet
+				if( !$UE['capitalisation'] )
+					$themeColor = '#b18cff';
+
 				echo "<circle style='cursor:pointer;' onclick=\"document.location='#".$UE['id']."';\" class='semestre_circle' data-stre='".$parcours[$i]['id']."' cx='".($xx)."' cy='".$dot['y']."' r='".(.8*$dot['r'])."' fill='".$themeColor."'/>";
 			}
 		}