[#39] Updating web client for teacher (0.7.4)

routes/index.js

@@ -118,9 +118,7 @@ exports.handleDeleteIQSet = function(req, res) {
 exports.handlePostNewIQSet = function(req, res) {
 
     console.log("\n\n[BODY of json request]");
-    console.log("\t>> %j\n", req.body);
-    console.log("[HEADERS of json request]");
-    console.log("\t>> %j\n\n", req.headers);
+    console.log("%j\n", req.body);
 
     var headers = req.headers;
     var iqset;
@@ -136,21 +134,9 @@ exports.handlePostNewIQSet = function(req, res) {
             iqset = req.body;
         }
 
-        if (!iqset.title) {
-            // iqset.title = iqdoc.date + "-IQSet";
-        }
-
-        if (!iqset.teachername) {
-            // iqset.teachername = "Teacher";
-        }
-
-        if (!iqset.groupname) {
-            // iqset.groupname = "General";
-        }
-
-        if (!iqset.iqdata) {
-            isValid = false;
-        }
+        // Adding values of the current session before saving the IQSet
+        iqset.teachername = game.teacherName;
+        iqset.groupname = game.groupName;
 
         if (isValid === true) {
             //
@@ -165,7 +151,6 @@ exports.handlePostNewIQSet = function(req, res) {
                     // 1. Get the original index of the image
                     // 2. Change the PICURL to match the new index 
                     //
-
                     if (iqset.iqdata[i].PICURL) {
                         // /smile/questionview/1.jpg
                         var tmpidx = parseInt(iqset.iqdata[i].PICURL.split('/')[3].split('.')[0], 10);
@@ -279,6 +264,7 @@ exports.handleSmileRootGet = function(req, res) {
 };
 
 exports.handleStartMakeQuestionPut = function(req, res) {
+
     game.setCurrentMessage(MESSAGE_START_MAKE_QUESTION);
 
     //
@@ -384,9 +370,9 @@ exports.handleStudentResultsGet = function(req, res) {
 
 exports.handleStartSolveQuestionPut = function(req, res) {
     var timeLimit = 10; // The same time limit of old implementation.
-    if (req.body.TIME_LIMIT) {
-        timeLimit = req.body.TIME_LIMIT;
-    }
+    //if (req.body.TIME_LIMIT !== undefined && req.body.TIME_LIMIT) {
+    //    timeLimit = req.body.TIME_LIMIT;
+    //}
     var numberOfQuestions = game.questions.getNumberOfQuestions();
     var rightAnswers = game.questions.getRightAnswers();
     var message = {};
@@ -502,11 +488,15 @@ exports.handleAllMessagesGet = function(req, res) {
 reset = function() {
     oldGame = game;
     game = new Game(); // XXX Point to ponder, do we need to save before we destroy the server?
-    game.setCurrentMessage({ TYPE: 'RESET' , TIMESTAMP: (new Date()).toUTCString(), EXPIRY: 1500});
+    //game.setCurrentMessage({});
+    //game.setCurrentMessage({ TYPE: 'RESET' , TIMESTAMP: (new Date()).toUTCString(), EXPIRY: 1500});
+
+    /*
     setTimeout(function() {
         // Remove RESET
         game.setCurrentMessage({});
     }, 2000);
+    */
 };
 
 exports.handleResetGet = function(req, res) {
@@ -624,6 +614,9 @@ exports.createSessionFromTeacherApp = function(req, res) {
         if (req.body.groupName) {
             game.groupName = req.body.groupName;
         }
+
+        game.setCurrentMessage({"TYPE":"SESSION_VALUES","teacherName":game.teacherName,"groupName":game.groupName,"sessionName":game.sessionName});
+
     } catch (e) {
         res.handleError("Can't parse Incoming JSON in createSessionFromTeacherApp method");
     }
@@ -829,6 +822,7 @@ exports.handleQuestionJSONDelete = function(req, res) {
 };
 
 exports.handleQuestionImageGet = function(req, res) {
+
     var questionNumber = parseInt(req.id, 10);
     var question = game.questions.getList()[questionNumber];
     if (!question) {
@@ -837,9 +831,10 @@ exports.handleQuestionImageGet = function(req, res) {
     if (question.TYPE != "QUESTION_PIC") {
         return res.handleError(js.JumboError.notFound('Question does not have picture: ' + questionNumber));
     }
+    console.log('CRASH AT THIS MOMENT>>'+game.questions.getQuestionPicture(questionNumber));
     var dataBuffer = new Buffer(game.questions.getQuestionPicture(questionNumber), 'base64');
     res.writeHead(200, {
-        'Content-Type' : 'image/jpeg',
+        'Content-Type' : 'image/jpeg'
     });
     res.write(dataBuffer);
     res.end();

smileplug.js

@@ -57,14 +57,16 @@ js.get('/smile/currentmessage', routes.handleCurrentMessageGet);
 js.put('/smile/startmakequestion', routes.handleStartMakeQuestionPut);
 js.post('/smile/startmakequestion', routes.handleStartMakeQuestionPut);
 
+js.get('/smile/startsolvequestion', routes.handleStartSolveQuestionPut);
 js.put('/smile/startsolvequestion', routes.handleStartSolveQuestionPut);
-js.post('/smile/startsolvequestion', routes.handleStartSolveQuestionPut);
+//js.post('/smile/startsolvequestion', routes.handleStartSolveQuestionPut);
 
 js.put('/smile/sendinitmessage', routes.handleSendInitMessagePut);
 js.post('/smile/sendinitmessage', routes.handleSendInitMessagePut);
 
+js.get('/smile/sendshowresults', routes.handleSendShowResultsPut);
 js.put('/smile/sendshowresults', routes.handleSendShowResultsPut);
-js.post('/smile/sendshowresults', routes.handleSendShowResultsPut);
+//js.post('/smile/sendshowresults', routes.handleSendShowResultsPut);
 
 js.put('/smile/metadata/rating', routes.handleRatingMetadataPut);
 js.post('/smile/metadata/rating', routes.handleRatingMetadataPut);

static/index.html

@@ -71,6 +71,8 @@ <h3>Plugmin Apps</h3>
                         <h3>SMILE Web Apps</h3>
 
                         <p><a class="success button" href="/smile-student.html">SMILE Student Web App 1.0.5 - Click to Join!</a></p>
+
+                        <p><a class="success button" href="/smile-teacher.html">SMILE Teacher Web App</a></p>
                     </div>
                 </div>
             </div>

static/js/smilestudent.js

@@ -189,7 +189,7 @@ GlobalViewModel.doLogin = function() {
     }
     if (!self.hasSubmitted()) {
         console.log('doLogin');
-        smileAlert('#globalstatus', 'Logging in ' + self.username(), 'green', 5000);
+        //smileAlert('#globalstatus', 'Logging as ' + self.username(), 'green', 5000);
         doSmileLogin(self.clientip(), self.username(), self.realname());
     }
     self.hasSubmitted(true);
@@ -238,7 +238,7 @@ GlobalViewModel.doInquiryReset = function() {
 
 GlobalViewModel.doSubmitQ = function() {
     var self = this;
-    console.log(">>>> >>> >> > doSubmitQ");
+    //console.log(">>>> >>> >> > doSubmitQ");
     if (self.validateInquirySubmission()) {
 
 	$('#submit-inquiry-area').hide();
@@ -292,14 +292,14 @@ GlobalViewModel.doSubmitQandDone = function() {
 
 GlobalViewModel.doSaveAnswerState = function() {
     var self = this;
-    console.log(">>>>>>>>>>doSaveAnswerState");
+    //console.log(">>>>>>>>>>doSaveAnswerState");
     self.answersarray()[self.qidx()] = self.answer()[1]; // Drop the leading 'a' from the answer label
     self.ratingsarray()[self.qidx()] = self.rating();
 }
 
 GlobalViewModel.doAnswerPrevQ = function() {
     var self = this;
-    console.log(">>>>>>>>>>doAnswerPrevQ");
+    //console.log(">>>>>>>>>>doAnswerPrevQ");
     self.doSaveAnswerState();
 
     // Check if there are more questions
@@ -322,7 +322,7 @@ GlobalViewModel.doAnswerPrevQ = function() {
 
 GlobalViewModel.doAnswerNextQ = function() {
     var self = this;
-    console.log(">>>>>>>>>>doAnswerNextQ");
+    //console.log(">>>>>>>>>>doAnswerNextQ");
 
     self.doSaveAnswerState();