Merge remote-tracking branch 'origin/master'

UMM-CSci-3601-S14 · May 1, 2014 · 0b42a30 · 0b42a30
2 parents 363ed03 + 8ec9fcb
commit 0b42a30
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 48 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,25 +1,25 @@
 The MIT License (MIT)
 
 Copyright (c) 2014, Students of UMM Csci 3601, Spring 2014 course offering
-Callery,Emma, 
-Chapman,Josh, 
-Donatucci,David, 
-Eberhardt,Jeremy,
-Gensch,Brennan,
-Harren,Thomas,
-Linder,Matthew
-Megarry,Henry Thomas,
-Mitchell,Brian, 
-Pagels,David Andrew,
-Peterson,Andrew Lawrence,
-Rachor,Kristin Marie,
-Schuweiler,Michael,
-Smolund,Isaac,
-Stenberg,Dillon,
-Stock,Brandon,
-Vink,Zachary,
-Walcome,Xavier Sarek,
-Yadeau,Justin.
+Emma Callery, 
+Josh Chapman, 
+David Donatucci, 
+Jeremy Eberhardt, 
+Brennan Gensch, 
+Thomas Harren, 
+Matthew Linder, 
+Henry Thomas Megarry, 
+Brian Mitchell, 
+David Andrew Pagels, 
+Andrew Lawrence Peterson, 
+Kristin Marie Rachor, 
+Michael Schuweiler, 
+Isaac Smolund, 
+Dillon Stenberg, 
+Brandon Stock, 
+Zachary Vink, 
+Xavier Sarek Walcome, 
+Justin Yadeau.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/public/js/views/dashView.coffee b/public/js/views/dashView.coffee
@@ -71,7 +71,7 @@ class window.dashView extends Backbone.View
                 shortTitle += '...'
                 buttonString += buttonString1 + p + buttonString2 + shortTitle + buttonString3
 
-      #append the buttons to the div 'customModels'
+#     append the buttons to the div 'customModels'
       $('#customModels').append(buttonString)
 
     this
@@ -80,7 +80,7 @@ class window.dashView extends Backbone.View
     window.location.href = '/model-maker'
 
   loadYourPrompts: ->
-    #when you
+    #when you click any of your made prompts
     $('.yourPrompts').click ->
       prompt = this.id
       thePrompt = new request
@@ -123,7 +123,7 @@ class window.dashView extends Backbone.View
     $('#essayArea').hide()
 
   submitEssay: ->
-    # alerts user if no text has been entered
+#   alerts user if no text has been entered
     if $('#essayContents').val() is ""
       alert "Please enter text to for LightSide to Grade."
 
@@ -137,18 +137,18 @@ class window.dashView extends Backbone.View
         text:  $('#essayContents').val()
       }).save().done ->
 
-        # Post a prediction task to calculate the grade of the essay.
+#       Post a prediction task to calculate the grade of the essay.
         thePredictionTask = new predictionTask({
           answer_set: theAnswerSet.responseJSON.url
           trained_model: thePrompt.responseJSON.default_models[0]
         }).save().done ->
 
-          # Adds the prediction task to the process queue
+#         Adds the prediction task to the process queue
           theProcess = new request()
           theProcess.urlRoot = thePredictionTask.responseJSON.process
           theProcess.save().done ->
 
-            # Request for checking status of essay grade calculation every second
+#           Request for checking status of essay grade calculation every second
             thePredictionStatus = new request()
             looping = setInterval (->
 
@@ -157,7 +157,7 @@ class window.dashView extends Backbone.View
 
                 if thePredictionStatus.attributes.status == 'S'
 
-                  # Gets the grade
+#                 Gets the grade
                   thePredictionResult = new predictionResult().fetch().done ->
                     $('#grade').html("Your grade for the submitted essay is " +
                     thePredictionResult.responseJSON.results[0].label + " out of 5.")

diff --git a/public/unzip/unzip.js b/public/unzip/unzip.js
@@ -9,30 +9,30 @@
 //Ideally we'd use the API, but as a stop-gap, we tried to use the ZipJs library. It was way beyond my understanding,
 // so i'll leave this here
 
-
-function processEssay(aString) {
-//returns one complete line for a csv, given an essay.
-  var regex = /{#.*}/
-  //This regex finds our grade segment - which has the form {#grade1#grade2}.
-  //It assumes that it is among the first elements of a Essay.
-  //So similar forms *CAN* be in an essay, but ours *HAS* to be first.
-  var grades = getGrades(aString.match(regex))
-  var csvLine = "";
-  for (var i = 0; i <= grades.length; i++){
-      csvLine = csvLine + grades[i] + ", ";
-  }
-    //here we add the essay to the line, removing our grade construct.
-  return (csvLine + aString.replace(regex, "") + "\r\n")
-}
-
 function getGrades(aString){
-    var regex = /#([^#{}\s]*)/gm
-    //Matches hash tags, globally, with any non hash character in them.
+    var regex = /#([^#{}\s]*)/gm;
+    //Matches hashtags, globally, with any non hash character in them.
     //So the hash ## is *NOT* ok, but all other hashes work.
     //Even Unicode characters - #漢字 should work!
     return aString.match(regex);
 }
 
+function processEssay(aString) {
+//returns one complete line for a csv, given an essay.
+    var regex = /{#.*}/;
+    //This regex finds our grade segment - which has the form {#grade1#grade2}.
+    //It assumes that it is among the first elements of a Essay.
+    //So similar forms *CAN* be in an essay, but ours *HAS* to be first.
+    var tags = aString.match(regex);
+    var grades = getGrades(tags[0]);
+    var csvLine = "";
+    for (var i = 0; i < grades.length; i++){
+        csvLine = csvLine + grades[i] + ", ";
+    }
+    //here we add the essay to the line, removing our grade construct.
+    return (csvLine + aString.replace(regex, "") + "\r\n");
+}
+
 function dezip(zip){
    //get the contents of a zip file
    //return the compressed contents of a zip.

diff --git a/routes/user.coffee b/routes/user.coffee
@@ -40,6 +40,7 @@ populateDB = ->
       email: '[email protected]'
       firstName: 'Justin'
       surname: 'YaDeau'
+      promptArray: ["https://try-api.lightsidelabs.com/api/prompts/449"]
     },
     {
       password: '9hnMILd23145'

diff --git a/routes/user.js b/routes/user.js
diff --git a/routes/user.map b/routes/user.map
@@ -6,5 +6,5 @@
     "user.coffee"
   ],
   "names": [],
-  "mappings": "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"
+  "mappings": "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"
 }
diff --git a/views/partials/dashboard.html b/views/partials/dashboard.html
@@ -3,7 +3,7 @@
     <div class="left col-sm-7 col-sm-push-1">
         <h1 class="title center" >Welcome {{user.firstName}}, <small>Select a Model to Use or Edit</small></h1>
 
-        <!--hidden div that is the general template for showing practice models and made models on page-->
+        <!--Hidden div that is the general template for showing practice models and made models on page-->
         <div id="essayArea" class="center hiding">
             <h2 id="yourModel" class="title center">Here Is Your Model</h2>
             <h3 id="promptTitle" class="title center"></h3>
@@ -20,6 +20,7 @@ <h4 class="title">Here is what our Model Reports:</h4>
             </div>
         </div>
 
+        <!--Start of Model buttons-->
         <div id="dash" class="center">
             <h3 class="title">Explore Our Ready To Use Models!</h3>
             <button type='button' name='pickEssay1' class='pickEssay1 box' id="pickEssay1">
@@ -43,7 +44,9 @@ <h3 class="title">Custom Models</h3>
             </div>
         </div>
     </div>
+    <!--End of the left side of the page-->
 
+    <!--Start of right side of the page-->
     <div class="right col-sm-3 col-sm-push-1">
         <div class="content">
             <a href="account" class="btn btn-primary btn-lg btn-block">Account</a>
@@ -56,4 +59,5 @@ <h3 class="title"><small>Welcome to the </small> Dashboard<small>, a place where
             <p><strong>Custom Models</strong> will be built to your specifications and displayed for you to use here on the Dashboard.</p>
         </div>
     </div>
+    <!--End of the right side of the page-->
 </script>
diff --git a/views/partials/model.html b/views/partials/model.html
@@ -41,7 +41,7 @@
 
         <div class="center hiding" id="waitingForModel">
             <h4>Please Wait For LightSide To Build Your Model</h4>
-            <p id="waitMessage" style="text-align: center">This may take about half an hour, please do not close your browser window if you have not chosen to receive an email notification about your model.</p>
+            <p id="waitMessage" style="text-align: center">This may take about half an hour, please do not close your browser window.</p>
             <img src="http://lightsidelabs.com/wp-content/uploads/2013/09/lightside-how-it-works-icon.png"></p>
             <br />
             <button id="hideWait" class="btn btn-success">Hide</button>

diff --git a/views/partials/welcome.html b/views/partials/welcome.html
@@ -49,6 +49,7 @@ <h3 class="title center">Sign in <small>to create and use your own models!</smal
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                     <h1 class="text-center">Welcome!!</h1>
                 </div>
+                <!--Entries-->
                 <div class="modal-body">
                     <form method="post" action="/" class="form col-md-12 center-block">
                         <div class="form-group">
@@ -63,6 +64,7 @@ <h1 class="text-center">Welcome!!</h1>
                         </div>
                     </form>
                 </div>
+                <!--Cancel button-->
                 <div class="modal-footer">
                     <div class="col-md-12">
                         <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>