🔧Some updates in Advisor Approval pages

AthulyaWeerakoon · Jul 10, 2024 · ae1e237 · ae1e237
1 parent 2fceead
commit ae1e237
Showing 1 changed file with 26 additions and 12 deletions.
diff --git a/ExamRegistrationUoJ/Components/Pages/Advisor/AdvisorApproval.razor b/ExamRegistrationUoJ/Components/Pages/Advisor/AdvisorApproval.razor
@@ -69,20 +69,16 @@
                 foreach (DataRow row in re_attempt_details.Rows)
                 {
                     <tr>
-                        <td  data-label="Course Code">@row["courseCode"]</td>
-                        <td  data-label="Course">@row["courseName"]</td>
-                        <td  data-label="Attempt">@row["Attempt"]?.ToString()</td>
+                        <td data-label="Course Code">@row["courseCode"]</td>
+                        <td data-label="Course">@row["courseName"]</td>
+                        <td data-label="Attempt">@row["isProper"]?.ToString()</td>
                         <td style="font-weight: bold;" data-label="Coordinator-approved status">
-                            @{ String approv_st = "";}
-                            @if (approval_status == 0)
-                            {
-                                approv_st = "Rejected";
+                            @{ 
+                                string approv_st = (row["approvalStatus"] != DBNull.Value && Convert.ToInt32(row["approvalStatus"]) == 1) ? "Accepted" : "Rejected"; 
                             }
-                            else
-                                approv_st = "Accepted";
-                            <text>@approv_st</text>
+                            @approv_st
                         </td>
-                        <td data-label="Subject Coordinator">@row["coName"]?</td>
+                        <td data-label="Subject Coordinator">@row["coordinatorName"]</td>
                     </tr>
                 }
             }
@@ -130,6 +126,7 @@
     private string? examName;
     private string? semesterId;
     private string? batch;
+
 
     /*protected override void OnInitialized()
     {
@@ -165,7 +162,24 @@
                 {
                     regNo = regNoInt;
                     re_attempt_details = await db.GetReAttemptDetails(accountID.Value,examID.Value);
-
+                    if (re_attempt_details.Rows.Count > 0)
+                    {
+                        DataRow row = re_attempt_details.Rows[0];
+                        courseCode = row["courseCode"].ToString();
+                        courseName = row["courseName"].ToString();
+                        attempt = row["isProper"] != DBNull.Value ? Convert.ToInt32(row["isProper"]) : (int?)null;
+                        approval_status = row["approvalStatus"] != DBNull.Value ? Convert.ToInt32(row["approvalStatus"]) : (int?)null;
+                        coName = row["coordinatorName"].ToString();
+                    }
+                    else
+                    {
+                        courseCode = null;
+                        courseName = null;
+                        attempt = null;
+                        approval_status = null;
+                        coName = null;
+                    }
+
                 }
                 else
                 {