added someme info stuff for the presentation. Didn't get stuff in for…

… every page.
tunganhgau · Apr 25, 2012 · 4eee63d · 4eee63d
1 parent fb44a70
commit 4eee63d
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 132 deletions.
diff --git a/public/javascripts/functions.js b/public/javascripts/functions.js
@@ -1,5 +1,4 @@
 //place functions for client side interactions and checks here
-get_data();
 var interval_id;
 
 //set interval to 3 seconds
@@ -13,12 +12,6 @@ var stop_polling = function () {
 	}
 };
 
-$(function () {
-	get_data();
-	start_polling();// will poll every 3 seconds
-});
-
-
 var get_data = function () {
 	var req = $.ajax({
 		type: 'GET',
@@ -29,7 +22,10 @@ var get_data = function () {
 		//console.log('received data: ' + data.msg);
 		$('#name').text(user.u_name);
 		$('#school').text(user.u_school);
-
-
 	});
-};
+};
+
+//$(function () {
+//	get_data();
+//	start_polling();// will poll every 3 seconds
+//});
diff --git a/routes/index.js b/routes/index.js
@@ -37,8 +37,8 @@ function addUser(userName, userEmail, userSchool, userPassword, cb){
 	});
 }
 function getUser(userID, cb){
-	var sql = 'select * from users where u_name = $1;';
-	client.query(sql, [username], function(err, result){
+	var sql = 'select * from users where u_uid = $1;';
+	client.query(sql, [userID], function(err, result){
 		if(err !== null || result.rows.length == 0){
 			cb(null);
 		}else{
@@ -180,6 +180,17 @@ function updateGrade(userID, cID, grade, credits, cb){
 		}
 	});
 }
+function getGrades(userID, cb){
+	console.log('getting grades for '+userID);
+	var sql = 'select * from takes where t_uid = $1;';
+	client.query(sql, [userID], function(err, result){
+		if(err !== null){
+			cb(null);
+		}else{
+			cb(result.rows);
+		}
+	});
+}
 
 // home page, and also login page
 exports.home = function(req, res) {
@@ -189,11 +200,46 @@ exports.home = function(req, res) {
 exports.profile = function(req, res) {
     var user  = req.session.user;
     if (!user) {
-		req.session.msg = 'Please login first';
+	req.session.msg = 'Please login first';
         res.redirect('/home');
         return;
     }
-	res.render('profile',{title:'Profile',user:user});
+	getGrades(user.u_uid, function(rows){
+		var gradeList = [];
+		var creditList = [];
+		console.log(JSON.stringify(rows));
+		for (var i=0; i<rows.length; i++){
+			gradeList.push(rows[i].t_grade);
+			creditList.push(rows[i].t_credits);
+		}
+		var gpaSum = 0;
+		var creditSum = 0;
+		for (var j=0; j<gradeList.length; j++){
+			var grade = gradeList[j];
+			var cred = creditList[j];
+			var cred = cred-0;
+			if(grade === "A ") gpaSum += 4*cred;
+			else if(grade === "A-") gpaSum += 3.75*cred;
+			else if(grade === "B+") gpaSum += 3.25*cred;
+			else if(grade === "B ") gpaSum += 3*cred;
+			else if(grade === "B-") gpaSum += 2.75*cred;
+			else if(grade === "C+") gpaSum += 2.25*cred;
+			else if(grade === "C ") gpaSum += 2*cred;			
+			else if(grade === "C-") gpaSum += 1.75*cred;
+			else if(grade === "D+") gpaSum += 1.25*cred;
+			else if(grade === "D ") gpaSum += 1*cred;
+			else if(grade === "D-") gpaSum += 0.75*cred;
+			creditSum += cred;	
+			//console.log('gpaSum='+gpaSum+' : creditSum='+creditSum);	
+		}
+		var gpa = gpaSum/creditSum;
+		res.render('profile',{	title:'Profile',
+		user:user.u_uid,
+		uName:user.u_name,
+		uSchool:user.u_school,
+		GPAReturn:gpa
+		});
+	});
 };
 exports.gpa = function(req, res) {
     // TODO: home
@@ -266,6 +312,7 @@ exports.login = function(req, res) {
 				return;
 			}
 			else{
+				user.u_password = "********";
 				req.session.user = user;
 				res.redirect('/profile');
 			}

diff --git a/views/est.ejs b/views/est.ejs
@@ -1,7 +1,9 @@
 <!-- Profile -->
 
-<body>
-
+<body onload="init()">
+	<script type="text/javascript"
+		src="/javascripts/dropCSV.js">
+	</script>
 <div id="head">
 	<div id="top-bar">
 	<div id="top-logo"><img id="logo"></img></div>
@@ -11,7 +13,7 @@
 
 <div id ="body">
 	<div id="content">
-		<div id="leftBox" class="body-left">
+		<div id="leftBox"  class="body-left">
 			<h1>Grade Estimator</h1>
 			<form id="calculate" action="/calculate" method="post">
 				<div class="est-left">
@@ -20,7 +22,7 @@
 						<li><label for="assign">Assignment</label></li>
 						<li><label for="weight">Weight</label></li>
 						<li><label for="grade">Grade</label></li>
-					<p><li><select id="dropdown" name="assign">
+					<p><li><select id="dropdown" name="assign1">
 						<option value="H">Homework</option>
 						<option value="M">Midterm</option>
 						<option value="P">Project</option>
@@ -31,7 +33,7 @@
 					<li><input type="number" id="spin" name="weight1" step="5" min="0" max="100" value="0"></li>
 					<li><input type="text" id="text" name="grade1"></li></p>
 
-					<p><li><select id="dropdown" name="assign">
+					<p><li><select id="dropdown" name="assign2">
 						<option value="H">Homework</option>
 						<option value="M">Midterm</option>
 						<option value="P">Project</option>
@@ -42,7 +44,7 @@
 					<li><input type="number" id="spin" name="weight2" step="5" min="0" max="100" value="0"></li>
 					<li><input type="text" id="text" name="grade2"></li></p>
 
-					<p><li><select id="dropdown" name="assign">
+					<p><li><select id="dropdown" name="assign3">
 						<option value="H">Homework</option>
 						<option value="M">Midterm</option>
 						<option value="P">Project</option>
@@ -52,7 +54,7 @@
 					</select></li>				
 					<li><input type="number" id="spin" name="weight3" step="5" min="0" max="100" value="0"></li>
 					<li><input type="text" id="text" name="grade3"></li></p>
-					<p><li><select id="dropdown" name="assign">
+					<p><li><select id="dropdown" name="assign4">
 						<option value="H">Homework</option>
 						<option value="M">Midterm</option>
 						<option value="P">Project</option>
@@ -63,7 +65,7 @@
 					<li><input type="number" id="spin" name="weight4" step="5" min="0" max="100" value="0"></li>
 					<li><input type="text" id="text" name="grade4"></li></p>
 
-					<p><li><select id="dropdown" name="assign">
+					<p><li><select id="dropdown" name="assign5">
 						<option value="H">Homework</option>
 						<option value="M">Midterm</option>
 						<option value="P">Project</option>
@@ -74,7 +76,7 @@
 					<li><input type="number" id="spin" name="weight5" step="5" min="0" max="100" value="0"></li>
 					<li><input type="text" id="text" name="grade5"></li></p>
 
-					<p><li><select id="dropdown" name="assign">
+					<p><li><select id="dropdown" name="assign6">
 						<option value="H">Homework</option>
 						<option value="M">Midterm</option>
 						<option value="P">Project</option>
@@ -113,16 +115,6 @@
 	</div>
 </div>
 <div id="foot"></div>
-<script>
-	
-	document.getElementById("leftBox").addEventListener("drop", onDrop, true)
-	
-	function onDrop(event) {
-	    var data = event.dataTransfer.getData('text/plain')
-	    event.preventDefault()
-	    alert('files: ' + event.dataTransfer.files + ' && data: ' + data + '.')
-	}
-</script>
 </body>
 
 
diff --git a/views/est.ejs~ b/views/est.ejs~
@@ -1,7 +1,9 @@
 <!-- Profile -->
 
-<body>
-
+<body onload="init()">
+	<script type="text/javascript"
+		src="/javascripts/dropCSV.js">
+	</script>
 <div id="head">
 	<div id="top-bar">
 	<div id="top-logo"><img id="logo"></img></div>
@@ -11,7 +13,7 @@
 
 <div id ="body">
 	<div id="content">
-		<div class="body-left">
+		<div id="leftBox"  class="body-left">
 			<h1>Grade Estimator</h1>
 			<form id="calculate" action="/calculate" method="post">
 				<div class="est-left">
@@ -28,8 +30,8 @@
 						<option value="Q">Quiz</option>
 						<option value="L">Lab</option>				
 					</select></li>				
-					<li><input type="number" id="spin" name="weight" step="5" min="0" max="100" value="0"></li>
-					<li><input type="text" id="text" name="grade"></li></p>
+					<li><input type="number" id="spin" name="weight1" step="5" min="0" max="100" value="0"></li>
+					<li><input type="text" id="text" name="grade1"></li></p>
 
 					<p><li><select id="dropdown" name="assign">
 						<option value="H">Homework</option>
@@ -39,8 +41,8 @@
 						<option value="Q">Quiz</option>
 						<option value="L">Lab</option>				
 					</select></li>				
-					<li><input type="number" id="spin" name="weight" step="5" min="0" max="100" value="0"></li>
-					<li><input type="text" id="text" name="grade"></li></p>
+					<li><input type="number" id="spin" name="weight2" step="5" min="0" max="100" value="0"></li>
+					<li><input type="text" id="text" name="grade2"></li></p>
 
 					<p><li><select id="dropdown" name="assign">
 						<option value="H">Homework</option>
@@ -50,8 +52,8 @@
 						<option value="Q">Quiz</option>
 						<option value="L">Lab</option>				
 					</select></li>				
-					<li><input type="number" id="spin" name="weight" step="5" min="0" max="100" value="0"></li>
-					<li><input type="text" id="text" name="grade"></li></p>
+					<li><input type="number" id="spin" name="weight3" step="5" min="0" max="100" value="0"></li>
+					<li><input type="text" id="text" name="grade3"></li></p>
 					<p><li><select id="dropdown" name="assign">
 						<option value="H">Homework</option>
 						<option value="M">Midterm</option>
@@ -60,8 +62,8 @@
 						<option value="Q">Quiz</option>
 						<option value="L">Lab</option>				
 					</select></li>				
-					<li><input type="number" id="spin" name="weight" step="5" min="0" max="100" value="0"></li>
-					<li><input type="text" id="text" name="grade"></li></p>
+					<li><input type="number" id="spin" name="weight4" step="5" min="0" max="100" value="0"></li>
+					<li><input type="text" id="text" name="grade4"></li></p>
 
 					<p><li><select id="dropdown" name="assign">
 						<option value="H">Homework</option>
@@ -71,8 +73,8 @@
 						<option value="Q">Quiz</option>
 						<option value="L">Lab</option>				
 					</select></li>				
-					<li><input type="number" id="spin" name="weight" step="5" min="0" max="100" value="0"></li>
-					<li><input type="text" id="text" name="grade"></li></p>
+					<li><input type="number" id="spin" name="weight5" step="5" min="0" max="100" value="0"></li>
+					<li><input type="text" id="text" name="grade5"></li></p>
 
 					<p><li><select id="dropdown" name="assign">
 						<option value="H">Homework</option>
@@ -82,8 +84,8 @@
 						<option value="Q">Quiz</option>
 						<option value="L">Lab</option>				
 					</select></li>				
-					<li><input type="number" id="spin" name="weight" step="5" min="0" max="100" value="0"></li>
-					<li><input type="text" id="text" name="grade"></li></p>
+					<li><input type="number" id="spin" name="weight6" step="5" min="0" max="100" value="0"></li>
+					<li><input type="text" id="text" name="grade6"></li></p>
 
 
 
@@ -113,16 +115,6 @@
 	</div>
 </div>
 <div id="foot"></div>
-<script>
-
-	document.getElementById("body").addEventListener("drop", onDrop, true)
-
-	function onDrop(event) {
-	    var data = event.dataTransfer.getData('text/plain')
-	    event.preventDefault()
-	    alert('files: ' + event.dataTransfer.files + ' && data: ' + data + '.')
-	}
-</script>
 </body>
 
 
diff --git a/views/gpa.ejs b/views/gpa.ejs
@@ -13,7 +13,7 @@
 	<div id="content">
 		<div class="body-left">
 			<h1>GPA Calculator</h1>
-			<form id="calculate" action method="post">
+			<form id="calculate" action="/addGrade" method="post">
 				<div class="split-left">
 
 					<p>Add a Grade and credits</p>
@@ -43,6 +43,7 @@
 					<p id="current-gpa"><li><label for="current-gpa">Current GPA:</label></li>
 					<li><label for="credits">N/A</label></li></p>
 					<ul id="grades-added">
+
 						<p>list of current grades added on the fly here</p>
 					</ul>
 
@@ -60,4 +61,4 @@
 </div>
 <div id="foot"></div>
 
-</body>
+</body>