Admin.php: remove dash before TA name (if any). If no TA is available, show 'None' instead of leaving it empty.

Bug430-Eden2
Lan Hui 2023-08-19 21:11:48 +08:00
parent 6309a32a07
commit 48cff9c8d9
1 changed files with 15 additions and 13 deletions

View File

@ -377,28 +377,30 @@ course_ta ON course_ta.Course_ID=courses_table.Course_ID where course_ta.TA=$use
if(mysqli_num_rows($result) != 0) if(mysqli_num_rows($result) != 0)
{ {
while($row = mysqli_fetch_assoc($result)) { while($row = mysqli_fetch_assoc($result)) {
$id=$row['Course_ID']; $id = $row['Course_ID'];
$name=$row['Course_Name']; $name = $row['Course_Name'];
$code=$row['Course_Code']; $code = $row['Course_Code'];
$faculty=$row['Faculty']; $faculty = $row['Faculty'];
$lecturer=$row['Full_Name']; $lecturer = $row['Full_Name'];
$academic=$row['Academic_Year']; $academic = $row['Academic_Year'];
$url=$row['URL']; $url = $row['URL'];
$resultTA = mysqli_query($con,"SELECT `Course_ID`, `TA`,users_table.Full_Name as TA_NAME FROM `course_ta` $resultTA = mysqli_query($con,"SELECT `Course_ID`, `TA`,users_table.Full_Name as TA_NAME FROM `course_ta` INNER JOIN users_table on users_table.User_ID=course_ta.TA where course_ta.Course_ID=$id");
INNER JOIN users_table on users_table.User_ID=course_ta.TA
where course_ta.Course_ID=$id");
$ta=""; $ta = "";
while($rowTA = mysqli_fetch_assoc($resultTA)) { while($rowTA = mysqli_fetch_assoc($resultTA)) {
$ta=$ta." - ".$rowTA['TA_NAME']; $ta = $ta." ".$rowTA['TA_NAME'];
}
if ($ta == "") {
$ta = " None";
} }
echo" <a href='~\..\Courses.php?course=$url'> echo" <a href='~\..\Courses.php?course=$url'>
<div class='btn btn-default'> <div class='btn btn-default'>
($code) - $name ($code) - $name
<p class='text-muted'><small> Faculty: $faculty &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Year: $academic &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Lecturer:$lecturer &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; TA:$ta </small></p> <p class='text-muted'><small> Faculty: $faculty &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Year: $academic &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Lecturer: $lecturer &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; TA:$ta </small></p>
</div> </div>
</a>"; </a>";