Merge pull request #148 from SOEN341-W16/dimitir-merger_attemp_bryce

Academic Record pull request sub-branch

Author: dtopaloglou

protected/models/CompletedCourses.php

@@ -7,6 +7,8 @@
  * @property integer $ID
  * @property integer $userID
  * @property integer $courseID
+ * @property string $Grade
+ * @property double $GPA
  */
 class CompletedCourses extends CActiveRecord
 {
@@ -26,11 +28,13 @@ public function rules()
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-			array('userID, courseID', 'required'),
+			array('userID, courseID, Grade', 'required'),
 			array('userID, courseID', 'numerical', 'integerOnly'=>true),
+			array('GPA', 'numerical'),
+			array('Grade', 'length', 'max'=>3),
 			// The following rule is used by search().
 			// @todo Please remove those attributes that should not be searched.
-			array('ID, userID, courseID', 'safe', 'on'=>'search'),
+			array('ID, userID,courseID, Grade, GPA', 'safe', 'on'=>'search'),
 		);
 	}
 
@@ -43,7 +47,7 @@ public function relations()
 		// class name for the relations automatically generated below.
 		return array(
 
-			'course' => array(self::BELONGS_TO, 'Course','ID'),
+			'course' => array(self::BELONGS_TO, 'Course','courseID'),
 		);
 	}
 
@@ -56,6 +60,8 @@ public function attributeLabels()
 			'ID' => 'ID',
 			'userID' => 'User',
 			'courseID' => 'Course',
+			'Grade' => 'Grade',
+			'GPA' => 'Gpa',
 		);
 	}
 
@@ -82,9 +88,12 @@ public function search()
 		//$criteria->compare('ID',$this->ID);
 		$criteria->compare('userID', Yii::app()->user->userID);
 		$criteria->order = 'course.course_code';
-
 		$criteria->with = array('course');
 
+		//$criteria->compare('Grade',$this->Grade,true);
+		//$criteria->compare('GPA',$this->GPA);
+
+
 		return new CActiveDataProvider($this, array(
 			'criteria'=>$criteria,
 		));

protected/runtime/application.log

@@ -11716,3 +11716,14 @@ Stack trace:
 REQUEST_URI=/index.php?r=course/view&id=71
 HTTP_REFERER=http://www.conuscheduler.localhost/index.php?r=course/create
 ---
+2016/04/02 21:06:25 [error] [exception.CHttpException.404] exception 'CHttpException' with message 'The system is unable to find the requested action "admin".' in C:\xampp\htdocs\ConUScheduler\framework\web\CController.php:483
+Stack trace:
+#0 C:\xampp\htdocs\ConUScheduler\framework\web\CController.php(270): CController->missingAction('admin')
+#1 C:\xampp\htdocs\ConUScheduler\framework\web\CWebApplication.php(282): CController->run('admin')
+#2 C:\xampp\htdocs\ConUScheduler\framework\web\CWebApplication.php(141): CWebApplication->runController('profile/admin')
+#3 C:\xampp\htdocs\ConUScheduler\framework\base\CApplication.php(185): CWebApplication->processRequest()
+#4 C:\xampp\htdocs\ConUScheduler\index.php(13): CApplication->run()
+#5 {main}
+REQUEST_URI=/index.php?r=profile/admin
+HTTP_REFERER=http://www.conuscheduler.localhost/index.php?r=profile/record
+---

protected/views/profile/index.php

@@ -3,7 +3,6 @@
 
 $this->menu=array(
     array('label'=>'Academic Record', 'url'=>array('record')),
-    array('label'=>'Contact Information', 'url'=>array('admin')),
 );
 ?>
 <h1>Profile</h1>

protected/views/profile/record.php

@@ -1,17 +1,44 @@
 <?php
 $this->menu=array(
     array('label'=>'Profile', 'url'=>array('index')),
-    array('label'=>'Contact Information', 'url'=>array('admin')),
 );
 ?>
 
-<h1>Academic Record</h1>
+    <h1>Academic Record</h1>
 <?php $this->widget('zii.widgets.grid.CGridView', array(
     'id'=>'courses_completed-grid',
     'dataProvider'=>$model->search(),
     'filter'=>$model,
     'columns'=>array(
-        'ID',
-        'course.course_code'
+        'course.course_code',
+        'course.credits',
+        'Grade',
+        'GPA'
     ),
 )); ?>
+
+<?php
+
+$sql="SELECT * FROM completed_courses LEFT JOIN course ON completed_courses.courseID=course.ID";
+
+$test=Yii::app()->db->createCommand($sql);
+$data=$test->queryAll();
+$creditTotal=0;
+$sum=0;
+
+foreach ($data as $value)
+{
+    if ($value['userID']== Yii::app()->user->userID) {
+        $sum+=$value['GPA']*$value['credits'];
+        $creditTotal+=$value['credits'];
+
+    }
+
+}
+$finalGPA=$sum/$creditTotal;
+$finalGPA=round($finalGPA,2);
+echo "<h2>";
+
+echo "Total GPA: $finalGPA";
+echo "</h2>";
+?>