misc. cleanup/refactor

This commit is contained in:
Collin M. Barrett 2017-02-08 06:55:14 -06:00
parent 641962885c
commit e1eb3fe560
3 changed files with 24 additions and 39 deletions

View file

@ -46,7 +46,7 @@ function refreshHttpResponses(triggerNum) {
var rangeData = sheetData.getRange(colHeaderData + "2:" + colHeaderData + (1 + listDataMax));
var rangeStatuses = sheetStatuses.getRange(colHeaderStatuses + "2:" + colHeaderStatuses);
rangeStatuses.clearContent();
for (i = 2; i <= rangeData.getNumRows() + 1; i++) {
for (var i = 2; i <= rangeData.getNumRows() + 1; i++) {
var rangeStatus = sheetStatuses.getRange(colHeaderStatuses + i);
var url = rangeData.getCell(i - 1, 1).getValue();
if (url) {

View file

@ -1,6 +1,6 @@
function createHtmlViewLinkArray(url, listName) {
if (url instanceof Array) {
for (i in url) {
for (var i in url) {
url[i] = createHtmlViewLinkArray(url[i], listName[i]);
}
return url;
@ -15,7 +15,7 @@ function createHtmlViewLinkArray(url, listName) {
function createHtmlAddLinkArray(url, listName) {
if (url instanceof Array) {
for (i in url) {
for (var i in url) {
url[i] = createHtmlAddLinkArray(url[i], listName[i]);
}
return url;
@ -30,7 +30,7 @@ function createHtmlAddLinkArray(url, listName) {
function createHtmlHomeLinkArray(url, listName) {
if (url instanceof Array) {
for (i in url) {
for (var i in url) {
url[i] = createHtmlHomeLinkArray(url[i], listName[i]);
}
return url;
@ -45,7 +45,7 @@ function createHtmlHomeLinkArray(url, listName) {
function createHtmlForumLinkArray(url, listName) {
if (url instanceof Array) {
for (i in url) {
for (var i in url) {
url[i] = createHtmlForumLinkArray(url[i], listName[i]);
}
return url;
@ -60,7 +60,7 @@ function createHtmlForumLinkArray(url, listName) {
function createHtmlIssuesLinkArray(url, listName) {
if (url instanceof Array) {
for (i in url) {
for (var i in url) {
url[i] = createHtmlIssuesLinkArray(url[i], listName[i]);
}
return url;
@ -75,7 +75,7 @@ function createHtmlIssuesLinkArray(url, listName) {
function createHtmlEmailLinkArray(url, listName) {
if (url instanceof Array) {
for (i in url) {
for (var i in url) {
url[i] = createHtmlEmailLinkArray(url[i], listName[i]);
}
return url;
@ -90,7 +90,7 @@ function createHtmlEmailLinkArray(url, listName) {
function createHtmlDonateLinkArray(url, listName) {
if (url instanceof Array) {
for (i in url) {
for (var i in url) {
url[i] = createHtmlDonateLinkArray(url[i], listName[i]);
}
return url;
@ -105,7 +105,7 @@ function createHtmlDonateLinkArray(url, listName) {
function createHtmlRelatedLinkArray(related) {
if (related instanceof Array) {
for (i in related) {
for (var i in related) {
related[i] = createHtmlRelatedLinkArray(related[i]);
}
return related;
@ -126,7 +126,7 @@ function createHtmlRelatedLinkArray(related) {
function createHtmlListNameArray(listName) {
if (listName instanceof Array) {
for (i in listName) {
for (var i in listName) {
listName[i] = createHtmlListNameArray(listName[i]);
}
return listName;

View file

@ -1,6 +1,6 @@
function fill2dJsonArrayWithNulls(array2d) {
for (i = 0; i < array2d.length; i++) {
for (j = 0; j < array2d[0].length; j++) {
for (var i = 0, array2dLength = array2d.length; i < array2dLength; i++) {
for (var j = 0, array2dLength2 = array2d[0].length; j < array2dLength2; j++) {
if (array2d[i][j] == null) {
array2d[i][j] = "";
}
@ -10,9 +10,8 @@ function fill2dJsonArrayWithNulls(array2d) {
}
function getColIndex(sheet, columnHeader) {
var headerRange = sheet.getRange("A1:1");
var headerData = headerRange.getValues();
for (i = 0; i < headerData[0].length; i++) {
var headerData = sheet.getRange("A1:1").getValues();
for (var i = 0, headerDataLength = headerData[0].length; i < headerDataLength; i++) {
if (headerData[0][i] == columnHeader) {
return String.fromCharCode(65 + i);
}
@ -21,9 +20,8 @@ function getColIndex(sheet, columnHeader) {
}
function getColIndexNum(sheet, columnHeader) {
var headerRange = sheet.getRange("A1:1");
var headerData = headerRange.getValues();
for (i = 0; i < headerData[0].length; i++) {
var headerData = sheet.getRange("A1:1").getValues();
for (var i = 0, headerDataLength = headerData[0].length; i < headerDataLength; i++) {
if (headerData[0][i] == columnHeader) {
return i + 1;
}
@ -31,21 +29,9 @@ function getColIndexNum(sheet, columnHeader) {
return null;
}
function getColIndicesWithHeaderSubstring(sheet, columnHeaderSubstring) {
var headerRange = sheet.getRange("A1:1");
var headerData = headerRange.getValues();
var columnIndices = new Array();
for (i = 0; i < headerData[0].length; i++) {
if (headerData[0][i].indexOf(columnHeaderSubstring) != -1) {
columnIndices.push(headerData[0][i]);
}
}
return columnIndices;
}
function encodeUrlArray(urlArray) {
if (urlArray instanceof Array) {
for (i in urlArray) {
for (var i in urlArray) {
urlArray[i] = encodeUrlArray(urlArray[i]);
}
return urlArray;
@ -60,14 +46,14 @@ function encodeUrlArray(urlArray) {
function trimUrlSlugArray(slugArray) {
if (slugArray instanceof Array) {
for (i in slugArray) {
for (var i in slugArray) {
slugArray[i] = trimUrlSlugArray(slugArray[i]);
}
return slugArray;
} else {
if (slugArray) {
var trimCharacters = [" ", "\"", ":", "'", "+", "(", ")", "."];
for (i = 0; i < trimCharacters.length; i++) {
for (var i = 0, trimCharactersLength = trimCharacters.length; i < trimCharactersLength; i++) {
slugArray = slugArray.split(trimCharacters[i]).join("");
}
return slugArray;
@ -78,20 +64,19 @@ function trimUrlSlugArray(slugArray) {
}
function getNumLists(sheetData) {
var listHeaderData = getColIndex(sData, "viewUrl");
var listData = sheetData.getRange(listHeaderData + "2:" + listHeaderData);
for (i = 1; i <= listData.getNumRows(); i++) {
if (!(listData.getCell(i, 1).getValue())) {
var colIndexDataViewUrl = getColIndex(sData, "viewUrl");
var colRangeDataViewUrl = sheetData.getRange(colIndexDataViewUrl + "2:" + colIndexDataViewUrl);
for (var i = 1, colRangeDataViewUrlLength = colRangeDataViewUrl.getNumRows(); i <= colRangeDataViewUrlLength; i++) {
if (!(colRangeDataViewUrl.getCell(i, 1).getValue())) {
return i - 1;
}
}
}
function copyRange(sheetSource, rangeSource, sheetTarget, rangeTarget) {
var sourceRangeListNames = sheetSource.getRange(rangeSource);
var targetRangeListNames = sheetTarget.getRange(rangeTarget);
targetRangeListNames.clearContent();
sourceRangeListNames.copyTo(targetRangeListNames);
sheetSource.getRange(rangeSource).copyTo(targetRangeListNames);
}
// https://stackoverflow.com/questions/21145080/moving-a-column-in-google-spreadsheet/21152273#21152273
function moveColumn(sheet, iniCol, finCol) {