Generalizing rendering of UI

.zenodo.json

@@ -11,7 +11,7 @@
     },
     {
       "affiliation": "Boston University",
-      "name": "Kinan Bab"
+      "name": "Kinan Dak Albab"
     },
     {
       "affiliation": "Boston University",

README.md

@@ -84,7 +84,7 @@ Instructions on how to operate the web-mpc application. All steps below are perf
 
 #### Generate session key
 
-* Navigate to `localhost:8080/session`.
+* Navigate to `localhost:8080/create`.
 * Click on **Generate Session** and copy and share the session key with all participants.
 
 #### Fill out data
@@ -93,7 +93,7 @@ Instructions on how to operate the web-mpc application. All steps below are perf
 
 #### Manage session
 
-* Navigate to `localhost:8080/track`.
+* Navigate to `localhost:8080/manage`.
 * Input your session key and password.
 * Generate participation links.
 * Start the session.
@@ -105,3 +105,6 @@ Instructions on how to operate the web-mpc application. All steps below are perf
 * Paste the session key and password in its designated fields.
 * Click **Browse** and upload the private key file that was downloaded when generating the session key.
 * Click **Unmask Data** and view the result.
+
+## License
+Web-mpc is freely distributable under the terms of the [MIT license](https://github.com/multiparty/web-mpc/blob/master/LICENSE). This release supports Handsontable's "[Nested headers](https://docs.handsontable.com/pro/1.17.0/demo-nested-headers.html)", a Pro feature. A [valid license](https://handsontable.com/pricing) must be obtained when using this feature.

client/app/common.js

@@ -14,7 +14,7 @@ require.config({
     DropSheet: 'helper/drop_sheet',
     mpc: 'helper/mpc',
     ResizeSensor: 'vendor/ResizeSensor',
-    table_template: 'data/tables'
+    table_template: 'data/pacesetters'
 
   },
   shim: {

client/app/controllers/analystController.js

@@ -43,7 +43,6 @@ define(['filesaver'], function (filesaver) {
     } else {
       // TODO add better error reporting
       alert('Error Not a valid Session Status');
-      //console.log('Error Not a valid Session Status');
     }
   }
 
@@ -249,13 +248,13 @@ define(['filesaver'], function (filesaver) {
 
 
   return {
-    checkStatus: checkStatus,
-    changeStatus: changeStatus,
-    generateUrls: generateUrls,
-    getExistingParticipants: getExistingParticipants,
-    generateTable: generateTable,
-    generateSession: generateSession,
-    getParameterByName: getParameterByName,
+    checkStatus,
+    changeStatus,
+    generateUrls,
+    getExistingParticipants,
+    generateTable,
+    generateSession,
+    getParameterByName,
     START: 'START',
     PAUSE: 'PAUSE',
     STOP: 'STOP'

client/app/controllers/clientController.js

@@ -104,63 +104,6 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
 
     var errors = [];
 
-    /*
-    Called when the instructions card is expanded.
-    */
-    var tableWidthsOld = [];
-
-    function updateWidth(tables, reset) {
-
-      if (reset) {
-        tableController.resetTableWidth();
-
-        tableWidthsOld = [];
-        return;
-      }
-
-      var tableWidths = [];
-      for (var i = 0; i < tables.length - 1; i++) {
-        var table = tables[i];
-        var header_width = getWidth(table);
-        tableWidths.push(parseFloat(header_width));
-      }
-
-      // No need to resize if width hasn't changed
-      // Quick and dirty equality check of arrays
-      if (JSON.stringify(tableWidths) === JSON.stringify(tableWidthsOld)) {
-        return;
-      }
-
-      for (var j = 0; j < tables.length - 1; j++) {
-        table = tables[j];
-        table.updateSettings({
-          // TODO check why reported table width is off
-          // This value is incorrect when expanding table by inputting more data
-          width: tableWidths[j] - 40
-        });
-      }
-
-      var maxWidth = Math.max.apply(null, tableWidths);
-
-      tableController.updateTableWidth(maxWidth);
-      tableWidthsOld = tableWidths.concat();
-    }
-
-    function getWidth(table) {
-      var colWidths = [];
-
-      for (var i = 0; i < table.countRenderedCols(); i++) {
-        colWidths.push(parseFloat(table.getColWidth(i)));
-      }
-
-      // Need to account for column header.
-      var narrowestCol = Math.min.apply(null, colWidths);
-      var colSum = colWidths.reduce(function (a, b) {
-        return a + b
-      }, 0);
-      return narrowestCol * 5 + colSum;
-    }
-
     /**
      * Called when the submit button is pressed.
      */
@@ -210,14 +153,10 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
             $(questions[q]).removeClass('has-error');
           }
         }
-        // NOTE: no error check available
         // if (!questionsValid) {
         //   errors = errors.concat(ADD_QUESTIONS_ERR);
         // }
 
-        // Register semantic discrepancies validator.
-        // console.log("VALIDATE?", registerValidator)
-        // NOTE: semantic discrepancies for sal equity?!
         // tableController.registerValidator('discrepancies', function (table, cell, value, callback) {
         //   checkSemanticDiscrepancies(tables, table, cell, value, callback);
         // });
@@ -279,7 +218,7 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
     /**
      * All inputs are valid. Construct JSON objects and send them to the server.
      */
-    function construct_and_send(tables, la) {
+    function constructAndSend(tables, la) {
       // Begin constructing the data
       var questions = $('#questions form');
       var data_submission = questions.length ? {questions: {}} : {};
@@ -360,8 +299,6 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
           session: session
         };
 
-        //console.log(submission);
-
         return $.ajax({
           type: 'POST',
           url: '/',
@@ -433,8 +370,6 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
         }
       }
 
-      //console.log('bonus',bonus_table);
-
       // bonus can only be non-zero if the other tables are non-zero.
       if (name === bonus_table._sail_meta.name) {
         // bonus can only be non-zero if the other tables are non-zero.
@@ -472,12 +407,11 @@ define(['jquery', 'controllers/tableController', 'helper/mpc', 'alertify', 'aler
     }
 
     return {
-      errors: errors,
-      submitEntries: submitEntries,
-      validate: validate,
-      constructAndSend: construct_and_send,
-      validateSessionInput: validateSessionInput,
-      updateWidth: updateWidth
+      errors,
+      submitEntries,
+      validate,
+      constructAndSend,
+      validateSessionInput,
     };
   })();