fixed typescript warning, implemented md (#173)

cemersoz · DerekTBrown · commit 4d16e8759900 · 2016-07-25T16:25:32.000-04:00
* issue 32 fixed * removed swp * fixed nconf issues * issue 82, 84 fixes * fixed #82 * isse #77 * fixed tests * fixed files * fixed tests master * fixed comment * moved validator * removed duplicate file * fixed tests, removed duplicate underscore, publish * changes * fixed methods.ts import * fixed issues w methods * fixes * minor fixes * A * api changes * fixed api * comments * minor changes * minor fixes * api changes (#126) * issue 32 fixed * removed swp * fixed nconf issues * issue 82, 84 fixes * fixed #82 * isse #77 * fixed tests * fixed files * fixed tests master * fixed comment * moved validator * removed duplicate file * fixed tests, removed duplicate underscore, publish * changes * fixed methods.ts import * fixed issues w methods * fixes * minor fixes * A * api changes * fixed api * comments * minor changes * minor fixes * method implementations * before merge * removed testing change * fixed typo * fixed prepareLab * removed test methods * fix prepareLab * methods changes * removed swap file * fixed merge * fixes * prepareLab WORKS * further fixes * merge * all works * deleted debug line * fixed minor excess code * minor indentation fix * reference fixes * fixes to nextTask * merged with master * minor changes * fixed merge problems * fixed md view and swithces * fixed error messages * removed debug code * removed swp * fixes * fixed typescript warning * added student object * changed function calls * deleted unnecessary files * updated api, added md feedback * fixed ts warn
diff --git a/client/imports/ui/pages/lab/taskview.ts b/client/imports/ui/pages/lab/taskview.ts
@@ -60,11 +60,14 @@ export default class TaskView extends MeteorComponent {
   currentCompleted: boolean;
   courseId: string;
   nextButton : boolean;
+  taskUpdates : Array<string>
   @ViewChild(Terminal) term : Terminal;
 
 
   constructor() {
     super();
+    this.taskUpdates = [];
+    this.nextButton = false;
     this.tasks = [
       { id: 1, name: "Task 1", completed: true, md: "# Task 1" },
       { id: 2, name: "Task 2", completed: true, md: "# Task 2" },
@@ -88,7 +91,8 @@ export default class TaskView extends MeteorComponent {
         password: res.sshInfo.pass,
         domain: "10.100.1.11"
       };
-      console.log("here");
+      slf.taskUpdates = res.taskUpdates;
+
       slf.term.openTerminal(slf.auth);
       console.log("fired",err,res);
     });
@@ -97,16 +101,18 @@ export default class TaskView extends MeteorComponent {
   //called by the check button, I'm already calling this
   verify(){
     Meteor.call('verifyTask',"1",function(err,res){
+      var slf = this;
       if(err){
         console.log("something went horribly wrong");
       }
       else{
-        if(res){
-	  nextButton = true;
+        if(res.verified){
+	  slf.nextButton = true;
 	}
 	else{
-	  nextButton = false;
+	  slf.nextButton = false;
 	}
+        slf.taskUpdates = res.taskUpdates;
       }
     });
   }
@@ -117,15 +123,16 @@ export default class TaskView extends MeteorComponent {
     var slf = this;
      Meteor.call('nextTask',"1",function(err,res){
        if(err){
+	 slf.nextButton = false;
          console.log("try again");
        }
        else{
          console.log(res);
          slf.tasks = res.taskList
          slf.toTask(slf.tasks[res.taskNo-1]);
 	 slf.labProgress = res.taskNo+" / "+slf.tasks.length
+	 slf.taskUpdates = res.taskUpdates
        }
-       console.log("yay");
      });
   }
   toTask(task) {
diff --git a/server/imports/api/lab.session.js b/server/imports/api/lab.session.js
@@ -6,6 +6,8 @@ var session = function(){};
 session.prototype.env = null;
 session.prototype.lab = null;
 session.prototype.student = null;
+session.prototype.taskUpdates = [];
+
 /* init: pulls labFile and initializes session object from it
  */
 session.prototype.init = function(user,userId,labId,callback){
@@ -18,7 +20,7 @@ session.prototype.init = function(user,userId,labId,callback){
   var courseId = lab_data.course_id;
 
   //initialize student object
-  this.student = new student(userId,labId,courseId);
+  this.student = new student(this, userId,labId,courseId);
 
   if(!lab_data || lab_data.length < 0){
     TuxLog.log("warn",new Error("Lab not found"));
@@ -143,9 +145,10 @@ session.prototype.start = function(callback){
 
 
 session.prototype.verify = function(callback){
-  
+  var slf = this;
   slf.lab.currentTask.verifyFn(slf.env,slf.student)
-    .then(callback(true),callback(false));
+    .then(callback({verified: true, taskUpdates: slf.taskUpdates}),callback({verified: false,taskUpdates: slf.taskUpdates}));
+  
 }
 /* next: verifies that task is completed
  * moves on to next task and runs callback(null,parseTasks) if completed
@@ -168,7 +171,7 @@ session.prototype.next = function(callback){
          slf.lab.currentTask.setupFn(slf.env,slf.student)
            .then(function(){
               slf.lab.taskNo += 1;
-	      callback(null,slf.lab.taskNo);
+	      callback(null,{taskNo: slf.lab.taskNo,taskUpdates: slf.taskUpdates});
               },
               function(err){
                 TuxLog.log("warn",err);
diff --git a/server/imports/api/lab.student.js b/server/imports/api/lab.student.js
@@ -1,5 +1,6 @@
 
-var student = function(userId, labId, courseId){
+var student = function(session, userId, labId, courseId){
+  this.session = session;
   this.userId = userId;
   this.labId = labId;
   this.courseId = courseId;
@@ -8,6 +9,12 @@ var student = function(userId, labId, courseId){
 student.prototype.userId = null;
 student.prototype.labId = null;
 student.prototype.courseId = null;
+student.prototype.session = null;
+
+
+student.prototype.feedback = function(taskNo,md){
+  this.session.taskUpdates[taskNo] = md;
+}
 
 student.prototype.setGrade = function(taskNo, grade){
 
diff --git a/server/imports/lab/labMethods.ts b/server/imports/lab/labMethods.ts
@@ -33,7 +33,7 @@ function getSession(user : string, userId, labId : string, callback : any) : voi
         }
         else{
           console.log(result);
-          callback(null,{taskNo:res.lab.taskNo,sshPass:result});
+          callback(null,{taskNo:res.lab.taskNo,sshPass:result,taskUpdates: res.taskUpdates});
         }
       })
     }
@@ -83,14 +83,16 @@ export function prepLab(user : string,userId: string, labId : string, callback :
 
       //parse sshInfo from nconf and results
       var sshInfo = {host : nconf.get("domain_root"), pass: res.sshPass};
+      var taskUpdates = res.taskUpdates;
+      
       //map taskList into frontend schema
       mapTasks(labId,res.taskNo,function(err,res){
         if(err){
           //cannot have an error
           callback(err,null);
         }
         else{
-          callback(null,{sshInfo: sshInfo, taskList: res});
+          callback(null,{sshInfo: sshInfo, taskList: res, taskUpdates: taskUpdates});
         }
       });
     }
@@ -108,14 +110,7 @@ export function verify(uId : string, labId : string, callback : any) : void{
       callback(new Meteor.Error("Session.get returned no result for session in use"),null);
     }
     else{
-      result.verify(function(succ){
-        if(!succ){
-          callback(null,false);
-	}
-	else{
-          callback(null,true);    
-	}
-      })
+      result.verify(callback);
     }
   });
 
@@ -146,7 +141,7 @@ export function next(uId : string,labId : string, callback : any) : void{
               callback(err,null);
             }
             else{ 
-              callback(null,{taskList: ress, taskNo:res});
+              callback(null,{taskList: ress, taskNo:res, taskUpdates:result.taskUpdates});
             }
           });
         }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ function getSession(user : string, userId, labId : string, callback : any) : voi`
`33`	`33`	`}`
`34`	`34`	`else{`
`35`	`35`	`console.log(result);`
`36`		`- callback(null,{taskNo:res.lab.taskNo,sshPass:result});`
	`36`	`+ callback(null,{taskNo:res.lab.taskNo,sshPass:result,taskUpdates: res.taskUpdates});`
`37`	`37`	`}`
`38`	`38`	`})`
`39`	`39`	`}`
`@@ -83,14 +83,16 @@ export function prepLab(user : string,userId: string, labId : string, callback :`
`83`	`83`
`84`	`84`	`//parse sshInfo from nconf and results`
`85`	`85`	`var sshInfo = {host : nconf.get("domain_root"), pass: res.sshPass};`
	`86`	`+ var taskUpdates = res.taskUpdates;`
	`87`	`+`
`86`	`88`	`//map taskList into frontend schema`
`87`	`89`	`mapTasks(labId,res.taskNo,function(err,res){`
`88`	`90`	`if(err){`
`89`	`91`	`//cannot have an error`
`90`	`92`	`callback(err,null);`
`91`	`93`	`}`
`92`	`94`	`else{`
`93`		`- callback(null,{sshInfo: sshInfo, taskList: res});`
	`95`	`+ callback(null,{sshInfo: sshInfo, taskList: res, taskUpdates: taskUpdates});`
`94`	`96`	`}`
`95`	`97`	`});`
`96`	`98`	`}`
`@@ -108,14 +110,7 @@ export function verify(uId : string, labId : string, callback : any) : void{`
`108`	`110`	`callback(new Meteor.Error("Session.get returned no result for session in use"),null);`
`109`	`111`	`}`
`110`	`112`	`else{`
`111`		`- result.verify(function(succ){`
`112`		`- if(!succ){`
`113`		`- callback(null,false);`
`114`		`- }`
`115`		`- else{`
`116`		`- callback(null,true);`
`117`		`- }`
`118`		`- })`
	`113`	`+ result.verify(callback);`
`119`	`114`	`}`
`120`	`115`	`});`
`121`	`116`
`@@ -146,7 +141,7 @@ export function next(uId : string,labId : string, callback : any) : void{`
`146`	`141`	`callback(err,null);`
`147`	`142`	`}`
`148`	`143`	`else{`
`149`		`- callback(null,{taskList: ress, taskNo:res});`
	`144`	`+ callback(null,{taskList: ress, taskNo:res, taskUpdates:result.taskUpdates});`
`150`	`145`	`}`
`151`	`146`	`});`
`152`	`147`	`}`