Merge pull request #7 from blopa/hotfix/splice_arr

Hotfix/splice arr

Author: blopa

README.md

@@ -40,6 +40,7 @@ First of all you need to create a Google Spreadsheet following the same rules as
 	- **square-list**: A list with a square before it
 - **depends**: Put the identification (id) of the row that this row must belong
 - **mandatory**: Make the row mandatory, meaning it will not ask to be added to the contract
+- **disabled**: Disable row
 
 So whenever you want a part of the contract to be only available when certain other part is on the contract, you should use the ``depends`` field. One row can depend of another row that also depends on another and so on. Use your creativity.
 
@@ -54,6 +55,7 @@ You can create complex tree decisions using the field ``depends``. The following
   "type": "title",
   "depends": "",
   "mandatory": "TRUE",
+  "disabled": "",
   "used": false,
   "childs": []
  },
@@ -64,6 +66,7 @@ You can create complex tree decisions using the field ``depends``. The following
   "type": "paragraph",
   "depends": "",
   "mandatory": "FALSE",
+  "disabled": "",
   "used": false,
   "childs": []
  },
@@ -74,6 +77,7 @@ You can create complex tree decisions using the field ``depends``. The following
   "type": "numeric-list",
   "depends": "",
   "mandatory": "FALSE",
+  "disabled": "TRUE",
   "used": false,
   "childs": []
  },
@@ -84,6 +88,7 @@ You can create complex tree decisions using the field ``depends``. The following
   "type": "numeric-list",
   "depends": "",
   "mandatory": "FALSE",
+  "disabled": "",
   "used": false,
   "childs": [
    {
@@ -93,6 +98,7 @@ You can create complex tree decisions using the field ``depends``. The following
     "type": "circle-list",
     "depends": "sample_4",
     "mandatory": "FALSE",
+    "disabled": "",
     "used": false,
     "childs": []
    },
@@ -103,6 +109,7 @@ You can create complex tree decisions using the field ``depends``. The following
     "type": "numeric-list",
     "depends": "sample_4",
     "mandatory": "FALSE",
+    "disabled": "",
     "used": false,
     "childs": []
    },
@@ -113,6 +120,7 @@ You can create complex tree decisions using the field ``depends``. The following
     "type": "numeric-list",
     "depends": "sample_4",
     "mandatory": "FALSE",
+    "disabled": "",
     "used": false,
     "childs": [
      {
@@ -122,6 +130,7 @@ You can create complex tree decisions using the field ``depends``. The following
       "type": "numeric-list",
       "depends": "sample_8",
       "mandatory": "FALSE",
+      "disabled": "",
       "used": false,
       "childs": [
        {
@@ -131,6 +140,7 @@ You can create complex tree decisions using the field ``depends``. The following
         "type": "circle-list",
         "depends": "sample_9",
         "mandatory": "FALSE",
+        "disabled": "",
         "used": false,
         "childs": [
          {
@@ -140,6 +150,7 @@ You can create complex tree decisions using the field ``depends``. The following
           "type": "circle-list",
           "depends": "sample_11",
           "mandatory": "TRUE",
+          "disabled": "",
           "used": false,
           "childs": []
          },
@@ -150,6 +161,7 @@ You can create complex tree decisions using the field ``depends``. The following
           "type": "circle-list",
           "depends": "sample_11",
           "mandatory": "TRUE",
+          "disabled": "",
           "used": false,
           "childs": [
            {
@@ -159,6 +171,7 @@ You can create complex tree decisions using the field ``depends``. The following
             "type": "square-list",
             "depends": "sample_13",
             "mandatory": "FALSE",
+            "disabled": "",
             "used": false,
             "childs": [
              {
@@ -168,6 +181,7 @@ You can create complex tree decisions using the field ``depends``. The following
               "type": "square-list",
               "depends": "sample_17",
               "mandatory": "FALSE",
+              "disabled": "",
               "used": false,
               "childs": []
              }
@@ -182,6 +196,7 @@ You can create complex tree decisions using the field ``depends``. The following
           "type": "circle-list",
           "depends": "sample_11",
           "mandatory": "TRUE",
+          "disabled": "",
           "used": false,
           "childs": []
          },
@@ -192,6 +207,7 @@ You can create complex tree decisions using the field ``depends``. The following
           "type": "circle-list",
           "depends": "sample_11",
           "mandatory": "TRUE",
+          "disabled": "",
           "used": false,
           "childs": []
          }
@@ -210,6 +226,7 @@ You can create complex tree decisions using the field ``depends``. The following
   "type": "numeric-list",
   "depends": "",
   "mandatory": "TRUE",
+  "disabled": "",
   "used": false,
   "childs": []
  },
@@ -220,6 +237,7 @@ You can create complex tree decisions using the field ``depends``. The following
   "type": "paragraph",
   "depends": "",
   "mandatory": "TRUE",
+  "disabled": "",
   "used": false,
   "childs": []
  },
@@ -230,6 +248,7 @@ You can create complex tree decisions using the field ``depends``. The following
   "type": "square-list",
   "depends": "",
   "mandatory": "FALSE",
+  "disabled": "",
   "used": false,
   "childs": []
  },
@@ -250,6 +269,7 @@ You can create complex tree decisions using the field ``depends``. The following
   "type": "paragraph",
   "depends": "",
   "mandatory": "TRUE",
+  "disabled": "",
   "used": false,
   "childs": []
  }
@@ -268,8 +288,9 @@ You can create complex tree decisions using the field ``depends``. The following
 
 ## Release Notes
 - **v0.0.2:**
-	- Fix mandatory children glitch
-	- Fix sheetId always equals to 0
+	- [Feature] Add option to disable row in the Spreadsheet
+	- [Bugfix] Fix mandatory children glitch
+	- [Bugfix] Fix sheetId always equals to 0
 - **v0.0.1:**
 	- First working version
 

js/contract-generator.js

@@ -61,9 +61,13 @@ var sheetCallback = function (error, options, response) {
 		var typeIndex = response.rows[0].labels.indexOf('type');
 		var dependsIndex = response.rows[0].labels.indexOf('depends');
 		var mandatoryIndex = response.rows[0].labels.indexOf('mandatory');
+		var disabledIndex = response.rows[0].labels.indexOf('disabled');
+		//debugger;
 
-		//collection = response.rows.slice(1, response.rows.length); // remove labels
-		collection = response.rows; // remove labels
+		if (arraysEqual(response.rows[0].cellsArray, response.rows[0].labels))
+			collection = response.rows.slice(1, response.rows.length); // remove labels
+		else
+			collection = response.rows; // remove labels
 		collection.filter(function(item){ // get all objects that has no dependency
 			if (item.cellsArray[dependsIndex] === "")
 			{
@@ -74,15 +78,19 @@ var sheetCallback = function (error, options, response) {
 				tempObject.type = item.cellsArray[typeIndex];
 				tempObject.depends = item.cellsArray[dependsIndex];
 				tempObject.mandatory = item.cellsArray[mandatoryIndex];
+				tempObject.disabled = item.cellsArray[disabledIndex];
 				tempObject.used = false;
 				tempObject.childs = [];
+				if (tempObject.disabled.toLowerCase() === "false") // ignore disabled rows
+					return;
 
 				docObject.push(tempObject);
 			}
 		});
 		collDependency = collection.filter(function(item){ // get all objects that has dependency
-			return (item.cellsArray[dependsIndex] !== "");
+			return ((item.cellsArray[dependsIndex] !== "") && (item.cellsArray[disabledIndex].toLowerCase() !== "false"));
 		});
+		//debugger;
 		// TODO add while to deep decision tree
 		var tempColl = [];
 		var i = 0;
@@ -101,6 +109,7 @@ var sheetCallback = function (error, options, response) {
 					tempObject.type = this.cellsArray[typeIndex];
 					tempObject.depends = this.cellsArray[dependsIndex];
 					tempObject.mandatory = this.cellsArray[mandatoryIndex];
+					tempObject.disabled = this.cellsArray[disabledIndex];
 					tempObject.used = false;
 					tempObject.childs = [];
 
@@ -164,6 +173,16 @@ else{
 }
 
 // FUNCTIONS
+function arraysEqual(arr1, arr2) {
+	if(arr1.length !== arr2.length)
+		return false;
+	for(var i = arr1.length; i--;) {
+		if(arr1[i] !== arr2[i])
+			return false;
+	}
+	return true;
+}
+
 function parseSpreadsheet()
 {
 	//debugger;