From ec23fee0c3b1c43f4e2f5ef94ed8f847486f3508 Mon Sep 17 00:00:00 2001 From: anjanasilva99 Date: Wed, 10 May 2023 20:29:47 +0530 Subject: [PATCH 1/2] Displayed the course name and course code on the page --- controllers/AnnouncementController.php | 3 +++ views/course/course_announcement.php | 2 ++ 2 files changed, 5 insertions(+) diff --git a/controllers/AnnouncementController.php b/controllers/AnnouncementController.php index e38f97e..c68b445 100644 --- a/controllers/AnnouncementController.php +++ b/controllers/AnnouncementController.php @@ -4,6 +4,7 @@ use app\core\Controller; use app\core\Request; +use app\model\Course; use app\model\SiteAnnouncement; use app\model\CourseAnnouncement; @@ -23,11 +24,13 @@ public function displayCourseAnnouncements(Request $request) { $body = $request->getBody(); $params['course_code'] = $body['course_code']; + $params['course'] = Course::getCourse($body['course_code']); $params['announcements'] = CourseAnnouncement::getCourseAnnouncements($params['course_code']); return $this->render( view: 'course/course_announcement', params: $params ); + } public function createSiteAnnouncements(Request $request) diff --git a/views/course/course_announcement.php b/views/course/course_announcement.php index fe4195c..6f6cdea 100644 --- a/views/course/course_announcement.php +++ b/views/course/course_announcement.php @@ -1,7 +1,9 @@
+

getCourseName()?>

+
From 89bdaeb7b53ea1a9c49cd0c61e6ae1b1942b68ee Mon Sep 17 00:00:00 2001 From: anjanasilva99 Date: Wed, 10 May 2023 20:34:39 +0530 Subject: [PATCH 2/2] The remaining allocating points were displayed to the lecturer --- controllers/CourseController.php | 5 ++++- model/Submission.php | 26 +++++++++++++++++++++++--- views/submissions.php | 4 +++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/controllers/CourseController.php b/controllers/CourseController.php index 35013c7..044345d 100644 --- a/controllers/CourseController.php +++ b/controllers/CourseController.php @@ -97,7 +97,9 @@ public function displayAllSubmissions(Request $request) { $body = $request->getBody(); $params['course_code'] = $body['course_code']; + $params['submission'] = Course::getCourse($body['course_code']); $params['submissions'] = Submission::getSubmission($params['course_code']); + $params['remaining_points'] = count($params['submissions']) > 0 ? $params['submissions'][0]->remainingPoints : 100; return $this->render( view: '/submissions', allowedRoles: ['Lecturer'], @@ -116,9 +118,10 @@ public function CreateSubmission(Request $request) topic: $body['heading'], description: $body['content'], dueDate: $dueDate->format('Y-m-d H:i:s'), + remainingPoints: (int)$body['remainingPoint'] ?? 0, allocatedMark: (int)$body['mark'] ?? 0, allocatedPoint: (int)$body['point'] ?? 0, - visibility: $body['visibility'] ?? false, + visibility: $body['visibility'] ?? false ); $submission_id = $course_submissions->getLastSubmissionId()+1; diff --git a/model/Submission.php b/model/Submission.php index 0c593b6..f3e314c 100644 --- a/model/Submission.php +++ b/model/Submission.php @@ -15,11 +15,12 @@ class Submission private string $dueDate; private bool $visibility; private string $location; + public int $remainingPoints; private function __construct() {} - public static function createNewSubmission($courseCode, $topic, $description, $dueDate, $allocatedMark=0, $allocatedPoint=0, $visibility=false, $location="",$submissionId="") { + public static function createNewSubmission($courseCode, $topic, $description, $dueDate, $remainingPoints, $allocatedMark=0, $allocatedPoint=0, $visibility=false, $location="",$submissionId="") { $submission = new Submission(); if ($submissionId != ""){ $submission->submissionId = $submissionId; @@ -32,6 +33,7 @@ public static function createNewSubmission($courseCode, $topic, $description, $d $submission->dueDate = $dueDate; $submission->visibility = $visibility; $submission->location = $location; + $submission->remainingPoints = $remainingPoints; return $submission; } @@ -43,17 +45,29 @@ public static function getSubmission($course_code): array where: ['course_code' => $course_code], order: 'submission_id DESC' ); + + $total_allocated_marks = Application::$db->select( + table: 'coursesubmission', + columns: ['SUM(allocated_point)'], + where: ['course_code' => $course_code], + limit: 1 + ); + $marks_row = mysqli_fetch_assoc($total_allocated_marks); + $total_allocated_points = $marks_row['SUM(allocated_point)'] * 100 / 100; + $remaining_points = 100 - $total_allocated_points; + while ($sub = Application::$db->fetch($results)){ $assignmentSubmissions[] = self::createNewSubmission( courseCode: $sub['course_code'], topic: $sub['topic'], description: $sub['description'], dueDate: $sub['due_date'], + remainingPoints: $remaining_points, allocatedMark: $sub['allocated_mark'], allocatedPoint: $sub['allocated_point'], visibility: $sub['visibility'], location: $sub['attachments']?? '', - submissionId: $sub['submission_id'] + submissionId: $sub['submission_id'] // Pass the remaining points to each submission ); } return $assignmentSubmissions; @@ -206,5 +220,11 @@ public function setLocation(string $location): void $this->location = $location; } - + /** + * @return int + */ + public function getRemainingPoints(): int + { + return $this->remainingPoints; + } } \ No newline at end of file diff --git a/views/submissions.php b/views/submissions.php index aafba99..2e40312 100644 --- a/views/submissions.php +++ b/views/submissions.php @@ -1,6 +1,7 @@
+

getCourseName()?>

@@ -16,7 +17,8 @@ class="add-headline text-bold v-center text-justify" id="" wrap="hard">
Marks Allocated:-
-
Points Allocated:-
+
Points Allocated:-
+