From 89e264f637cbf57ef4eed3e6b91d635849b2fa1a Mon Sep 17 00:00:00 2001
From: HumairAK <humair88@hotmail.com>
Date: Fri, 22 Jul 2016 20:20:47 -0400
Subject: made fixes to server callbacks

---
 node_simple.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'node_simple.js')

diff --git a/node_simple.js b/node_simple.js
index f735b82..cd6d06f 100644
--- a/node_simple.js
+++ b/node_simple.js
@@ -112,11 +112,11 @@ exports.add_user = function (fields, callbackUser) {
     };
 
     // find out if this user already exists by checking their email
-    exports.find_user( fields[0] ,callbackUser,  function (result, callbackUser) {
+    exports.find_user( fields[0], function (result) {
         if  (result == false) {
 
             // find out if the user_name is taken
-            exports.find_user_name( fields[1], callbackUser,  function (docs) {
+            exports.find_user_name( fields[1], function (docs) {
                 if (docs == false) {        // if not ...
                     // continue
                     console.log("user name is valid");
@@ -599,7 +599,7 @@ exports.find_exam = function (fields, serverCallback, callback) {
  * Params: course_code - an string of format "CSC309"
  *         title - the course description
  * */
-exports.add_course = function (course_code, title) {
+exports.add_course = function (course_code, title, serverCallback) {
 
     var courseData = {
         course_code: course_code,
@@ -609,6 +609,7 @@ exports.add_course = function (course_code, title) {
     exports.find_course(course_code, function (result) {
 
         if (result == true){
+            serverCallback(false, "Course already exists");
             console.log("course already exists");
         }
         else if (result == false) {    // add it
@@ -621,7 +622,8 @@ exports.add_course = function (course_code, title) {
                     courses.insert(courseData, function(err) {
                         if (err) throw err;
                         else {
-                            console.log("couse added");
+                            console.log("course added");
+                            serverCallback(true, "Course added successfully.");
                             db.close(function (err) {   // close the connection when done
                                 if (err) throw err;
                             });
@@ -656,8 +658,8 @@ exports.find_course = function (course_code, callback) {
                 { course_code: course_code }
             ).toArray(function (err, docs) {
                 if (err) throw err;
-
-                if (docs.length == 0) { // if this course doesnt exist.... add it
+                // if this course doesnt exist.... add it (via add_course call)
+                if (docs.length == 0) {
                     callback(false);
                 }
                 else {  // course was found
-- 
cgit v1.2.3


From 0ccf1dc1b80fe2dff8f98538ffac673c6b326a57 Mon Sep 17 00:00:00 2001
From: HumairAK <humair88@hotmail.com>
Date: Sat, 23 Jul 2016 00:12:11 -0400
Subject: Added admin cpanel functionality, added serverCallback in parameters
 for some database queries.

---
 node_simple.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'node_simple.js')

diff --git a/node_simple.js b/node_simple.js
index cd6d06f..cf06e61 100644
--- a/node_simple.js
+++ b/node_simple.js
@@ -112,11 +112,11 @@ exports.add_user = function (fields, callbackUser) {
     };
 
     // find out if this user already exists by checking their email
-    exports.find_user( fields[0], function (result) {
+    exports.find_user( fields[0] ,callbackUser, function (result, callbackUser) {
         if  (result == false) {
 
             // find out if the user_name is taken
-            exports.find_user_name( fields[1], function (docs) {
+            exports.find_user_name( fields[1], callbackUser,  function (docs) {
                 if (docs == false) {        // if not ...
                     // continue
                     console.log("user name is valid");
@@ -682,7 +682,7 @@ exports.find_course = function (course_code, callback) {
  * Params: fields - an array of format ["course_code", year, "term", "type"]
  *
  * */
-exports.remove_exam = function (fields) {
+exports.remove_exam = function (fields, serverCallback) {
 
     var course_code = fields[0];
     var year = fields[1];
@@ -707,10 +707,14 @@ exports.remove_exam = function (fields) {
                     if (err) throw err;
                     else {
                         if (docs.deletedCount == 1) {
-                            console.log("exam was removed");
+                            serverCallback(true, "Exam was removed successfully");
+                            db.close();
+                            //console.log("exam was removed");
                         }
                         else if (docs.deletedCount == 0) {
-                            console.log("No such exam was found");
+                            serverCallback(false, "No such exam was found");
+                            db.close();
+                            //console.log("No such exam was found");
                         }
                     }
                 }
-- 
cgit v1.2.3