From da198e3ba28c2c752f0affe3a8bd4e4f0906679f Mon Sep 17 00:00:00 2001
From: SlowestLoris <zhangraymond05@gmail.com>
Date: Wed, 9 Oct 2019 11:50:12 -0400
Subject: [PATCH] Fixed bugs.

---
 execForm.gs    | 282 +++++++++--------------------------------------
 senatorForm.gs | 294 +++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 289 insertions(+), 287 deletions(-)

diff --git a/execForm.gs b/execForm.gs
index 31a4000..ea58afc 100644
--- a/execForm.gs
+++ b/execForm.gs
@@ -23,16 +23,26 @@ function generate() {
   var range = sheet.getDataRange();
   var values = range.getValues();
   var parentFolder = DriveApp.getFolderById('1_J5QVewVApOJKh5FGNszah0wt9dlkzW7');
-  var newFolder = parentFolder.createFolder(year + ' Exec Election');
+  
+  var ui = SpreadsheetApp.getUi();
+  var grade = "";
+  
+  do {
+    var response = ui.prompt('Grade Selection', 'Enter a grade', ui.ButtonSet.OK_CANCEL);
+    grade = response.getResponseText().trim();
+  } while(response.getSelectedButton() == ui.Button.CANCEL || response.getSelectedButton() == ui.Button.CLOSE);
+  
+  
+  var newFolder = parentFolder.createFolder(year + ' Grade ' + grade + ' Election');
   
   //stores old sheet data and resets to base
   var sheets = ss.getSheets();
   if(sheets.length>2) {
-    Logger.log('Archived ' + year + ' Exec Election');
-    var archive = SpreadsheetApp.create(year + ' Archive');
+    Logger.log('Archived previous election');
+    var archive = SpreadsheetApp.create('[rename this] Previous senator election archive');
     sheets[1].copyTo(archive);
     sheets[2].copyTo(archive);
-    moveForm(year + 'Archive', newFolder.getId());
+    moveForm('[rename this] Previous senator election archive', newFolder.getId());
     
     var formURL = sheets[0].getFormUrl();
     FormApp.openByUrl(formURL).removeDestination();
@@ -44,50 +54,23 @@ function generate() {
   if(h>0) endpoint.deleteRows(2, h);
   
   //add new names
-  var p = [];
-  var vp = [];
-  var t = [];
-  var pd = [];
-  var prd = [];
-  var socd = [];
-  var spird = [];
-  var cc = [];
-  
+  var names = [];
   for(i=1;i<values.length;i++) {
-    var line = [];
-    var cnt = 0;
-    for(j=0;j<values[i].length;j++) {
-      var a = values[i][j];
-      if(a!=="") {
-        if(j==0) p.push(a);
-        if(j==1) vp.push(a);
-        if(j==2) t.push(a);
-        if(j==3) pd.push(a);
-        if(j==4) prd.push(a);
-        if(j==5) socd.push(a);
-        if(j==6) spird.push(a);
-        if(j==7) cc.push(a);
-      } else cnt++;
-      line.push(a);
-      if(a!=="") line.push(0);
-      else line.push("");
-    }
-    if(cnt == values[i].length) break;
-    endpoint.appendRow(line);
+    if(values[i][0]==="") break;
+    names.push(values[i][0]);
+    endpoint.appendRow([values[i][0],0]);
   }
-  p.push('No Vote'); vp.push('No Vote'); t.push('No Vote'); 
-  pd.push('No Vote'); prd.push('No Vote'); socd.push('No Vote');
-  spird.push('No Vote'); cc.push('No Vote');
+    
   //make the form
-  makeOurForm(p,vp,t,pd,prd,socd,spird,cc, newFolder.getId());
+  makeOurForm(names, grade, newFolder.getId());
 }
 
 //function which creates the form
-function makeOurForm(p,vp,t,pd,prd,socd,spird,cc, fileId) {
+function makeOurForm(names, grade, fileId) {
   var ss = SpreadsheetApp.getActive();
   Logger.log('Starting to create form');
   
-  var name = 'BOSS Exec Position Ballot';
+  var name = 'Grade ' + grade + ' Student Senator Ballot';
   var form = FormApp.create(name);
   
   //make sure only one response per user is allowed
@@ -95,38 +78,17 @@ function makeOurForm(p,vp,t,pd,prd,socd,spird,cc, fileId) {
   form.setLimitOneResponsePerUser(true);
   form.setRequireLogin(true);
   
-  //put in all positions and candidates
-  var item = form.addMultipleChoiceItem();
-  item.setTitle('President');
-  item.setChoiceValues(p);
-  
-  var item2 = form.addMultipleChoiceItem();
-  item2.setTitle('Vice President');
-  item2.setChoiceValues(vp);
-  
-  var item3 = form.addMultipleChoiceItem();
-  item3.setTitle('Treasurer');
-  item3.setChoiceValues(t);
+  var item = form.addCheckboxItem();
+  item.setTitle('Vote for at most two candidates');
+  item.setChoiceValues(names);
+  item.setRequired(true);
   
-  var item4 = form.addMultipleChoiceItem();
-  item4.setTitle('Publicity Director');
-  item4.setChoiceValues(pd);
-  
-  var item5 = form.addMultipleChoiceItem();
-  item5.setTitle('Public Relation Director');
-  item5.setChoiceValues(prd);
-  
-  var item6 = form.addMultipleChoiceItem();
-  item6.setTitle('Social Director');
-  item6.setChoiceValues(socd);
-  
-  var item7 = form.addMultipleChoiceItem();
-  item7.setTitle('Spirit Director');
-  item7.setChoiceValues(spird);
-  
-  var item8 = form.addMultipleChoiceItem();
-  item8.setTitle('Clubs Coordinator');
-  item8.setChoiceValues(cc);
+  //ensures that max two is allowed
+  var checkBoxValidation = FormApp.createCheckboxValidation()
+  .setHelpText('Select at most two candidates.')
+  .requireSelectAtMost(2)
+  .build();
+  item.setValidation(checkBoxValidation);
   
   //make the results go to the master sheet
   form.setDestination(FormApp.DestinationType.SPREADSHEET, ss.getId());
@@ -165,24 +127,6 @@ function onFormSubmit(e) {
   if(sheets[0].getName()!=='Responses') {
     ss.getSheets()[0].setName('Responses');
   }
-  var sheet = ss.getSheetByName('Candidates');
-  var range = sheet.getDataRange();
-  var values = range.getValues();
-  
-  //retrieve student numbers of applicants
-  var invalid = [];
-  for(i=1;i<values.length;i++) {
-    invalid.push(values[i][8]);
-  }
-  
-  //retrieve response data
-  var email = e.namedValues['Email Address'][0];
-  
-  //check if response is invalid (email is one of the applicants)
-  if(invalid.indexOf(email)>-1) {
-    Logger.log(email + '\'s vote was removed');
-    e.range.deleteCells(SpreadsheetApp.Dimension.COLUMNS);
-  }
 }
 
 //count up all the votes
@@ -190,162 +134,46 @@ function tallyVotes() {
   //variables for manipulating spreadsheet
   var ss = SpreadsheetApp.getActive();
   var output = ss.getSheetByName('Results');
-  var input = ss.getSheetByName('Responses');
   var r = output.getDataRange();
   var v = r.getValues();
+  var input = ss.getSheetByName('Responses');
   var r2 = input.getDataRange();
   var v2 = r2.getValues();
+  var sheet = ss.getSheetByName('Candidates');
+  var range = sheet.getDataRange();
+  var values = range.getValues();
+  
+  //retrieve student numbers of valid participants
+  var valid = {};
+  for(i=1;i<values.length;i++) {
+    valid[values[i][1]] = 1;
+  }
   
   //clear spreadsheet
   output.clear();
-  output.appendRow(['President', 'Votes','Vice President','Votes',
-                    'Treasurer','Votes','Publicity Director','Votes',
-                    'Public Relation Director','Votes','Social Director','Votes',
-                    'Spirit Director','Votes','Clubs Coordinator','Votes']);
+  output.appendRow(['Name', 'Votes']);
   
-  //count votes for every candidate
+  //count votes for every person
   for(i=1;i<v.length;i++) {
-    var rowOutput = [];
-    
-    //pres
     var name = v[i][0];
     var num = v[i][1];
-    if(name !== "") {
-      for(j=1;j<v2.length;j++) {
-        var name1 = v2[j][2];
-        if(name1===name) {
-          num++;
-        }
-      }
-    } else num = "";
-    rowOutput.push(name);
-    rowOutput.push(num);
-    
-    //vice pres
-    var name = v[i][2];
-    var num = v[i][3];
-    if(name !== "") {
-      for(j=1;j<v2.length;j++) {
-        var name1 = v2[j][3];
-        if(name1===name) {
-          num++;
-        }
-      }
-    } else num = "";
-    rowOutput.push(name);
-    rowOutput.push(num);
-    
-    //treasurer
-    var name = v[i][4];
-    var num = v[i][5];
-    if(name !== "") {
-      for(j=1;j<v2.length;j++) {
-        var name1 = v2[j][4];
-        if(name1===name) {
-          num++;
-        }
-      }
-    } else num = "";
-    rowOutput.push(name);
-    rowOutput.push(num);
-    
-    //public direc
-    var name = v[i][6];
-    var num = v[i][7];
-    if(name !== "") {
-      for(j=1;j<v2.length;j++) {
-        var name1 = v2[j][5];
-        if(name1===name) {
-          num++;
-        }
-      }
-    } else num = "";
-    rowOutput.push(name);
-    rowOutput.push(num);
-    
-    //public relation direc
-    var name = v[i][8];
-    var num = v[i][9];
-    if(name !== "") {
-      for(j=1;j<v2.length;j++) {
-        var name1 = v2[j][6];
-        if(name1===name) {
-          num++;
-        }
-      }
-    } else num = "";
-    rowOutput.push(name);
-    rowOutput.push(num);
-    
-    //social direc
-    var name = v[i][10];
-    var num = v[i][11];
-    if(name !== "") {
-      for(j=1;j<v2.length;j++) {
-        var name1 = v2[j][7];
-        if(name1===name) {
+    for(j=1;j<v2.length;j++) {
+      //check validity
+      var email = v2[j][1];
+      if(valid[email]===undefined) continue;
+      var names = v2[j][2].split(", ");
+      for(k=0;k<names.length;k++) {
+        if(names[k]===name) {
           num++;
+          break;
         }
       }
-    } else num = "";
-    rowOutput.push(name);
-    rowOutput.push(num);
-    
-    //spirit direc
-    var name = v[i][12];
-    var num = v[i][13];
-    if(name !== "") {
-      for(j=1;j<v2.length;j++) {
-        var name1 = v2[j][8];
-        if(name1===name) {
-          num++;
-        }
-      }
-    } else num = "";
-    rowOutput.push(name);
-    rowOutput.push(num);
-    
-    //clubs direc
-    var name = v[i][14];
-    var num = v[i][15];
-    if(name !== "") {
-      for(j=1;j<v2.length;j++) {
-        var name1 = v2[j][9];
-        if(name1===name) {
-          num++;
-        }
-      }
-    } else num = "";
-    rowOutput.push(name);
-    rowOutput.push(num);
-    
-    output.appendRow(rowOutput);
+    }
+    output.appendRow([name,num]);
   }
   
   //output results
-  var range = output.getRange('A1:B100');
-  range.sort({column: 2, ascending: false});
-  
-  var range = output.getRange('C1:D100');
-  range.sort({column: 4, ascending: false});
-  
-  var range = output.getRange('E1:F100');
-  range.sort({column: 6, ascending: false});
-  
-  var range = output.getRange('G1:H100');
-  range.sort({column: 8, ascending: false});
-  
-  var range = output.getRange('I1:J100');
-  range.sort({column: 10, ascending: false});
-  
-  var range = output.getRange('K1:L100');
-  range.sort({column: 12, ascending: false});
-  
-  var range = output.getRange('M1:N100');
-  range.sort({column: 14, ascending: false});
-  
-  var range = output.getRange('O1:P100');
-  range.sort({column: 16, ascending: false});
+  output.sort(2, false);
 }
 
 //get rid of previous triggers (a new one is created everytime this code is run)
diff --git a/senatorForm.gs b/senatorForm.gs
index 259675b..c0d4af0 100644
--- a/senatorForm.gs
+++ b/senatorForm.gs
@@ -23,26 +23,16 @@ function generate() {
   var range = sheet.getDataRange();
   var values = range.getValues();
   var parentFolder = DriveApp.getFolderById('1_J5QVewVApOJKh5FGNszah0wt9dlkzW7');
-  
-  var ui = SpreadsheetApp.getUi();
-  var grade = "";
-  
-  do {
-    var response = ui.prompt('Grade Selection', 'Enter a grade', ui.ButtonSet.OK_CANCEL);
-    grade = response.getResponseText().trim();
-  } while(response.getSelectedButton() == ui.Button.CANCEL || response.getSelectedButton() == ui.Button.CLOSE);
-  
-  
-  var newFolder = parentFolder.createFolder(year + ' Grade ' + grade + ' Election');
+  var newFolder = parentFolder.createFolder(year + ' Exec Election');
   
   //stores old sheet data and resets to base
   var sheets = ss.getSheets();
   if(sheets.length>2) {
-    Logger.log('Archived ' + (year-1) + ' Grade ' + grade + ' Election');
-    var archive = SpreadsheetApp.create((year-1) + ' Archive');
+    Logger.log('Archived previous election');
+    var archive = SpreadsheetApp.create('[rename this] Previous exec election archive');
     sheets[1].copyTo(archive);
     sheets[2].copyTo(archive);
-    moveForm((year-1) + ' Archive', newFolder.getId());
+    moveForm('[rename this] Previous exec election archive', newFolder.getId());
     
     var formURL = sheets[0].getFormUrl();
     FormApp.openByUrl(formURL).removeDestination();
@@ -54,22 +44,50 @@ function generate() {
   if(h>0) endpoint.deleteRows(2, h);
   
   //add new names
-  var names = [];
+  var p = [];
+  var vp = [];
+  var t = [];
+  var pd = [];
+  var prd = [];
+  var socd = [];
+  var spird = [];
+  var cc = [];
+  
   for(i=1;i<values.length;i++) {
-    names.push(values[i][0]);
-    endpoint.appendRow([values[i][0],0]);
+    var line = [];
+    var cnt = 0;
+    for(j=0;j<values[i].length;j++) {
+      var a = values[i][j];
+      if(a!=="") {
+        if(j==0) p.push(a);
+        if(j==1) vp.push(a);
+        if(j==2) t.push(a);
+        if(j==3) pd.push(a);
+        if(j==4) prd.push(a);
+        if(j==5) socd.push(a);
+        if(j==6) spird.push(a);
+        if(j==7) cc.push(a);
+      } else cnt++;
+      line.push(a);
+      if(a!=="") line.push(0);
+      else line.push("");
+    }
+    if(cnt == values[i].length) break;
+    endpoint.appendRow(line);
   }
-    
+  p.push('No Vote'); vp.push('No Vote'); t.push('No Vote'); 
+  pd.push('No Vote'); prd.push('No Vote'); socd.push('No Vote');
+  spird.push('No Vote'); cc.push('No Vote');
   //make the form
-  makeOurForm(names, grade, newFolder.getId());
+  makeOurForm(p,vp,t,pd,prd,socd,spird,cc, newFolder.getId());
 }
 
 //function which creates the form
-function makeOurForm(names, grade, fileId) {
+function makeOurForm(p,vp,t,pd,prd,socd,spird,cc, fileId) {
   var ss = SpreadsheetApp.getActive();
   Logger.log('Starting to create form');
   
-  var name = 'Grade ' + grade + ' Student Senator Ballot';
+  var name = 'BOSS Exec Position Ballot';
   var form = FormApp.create(name);
   
   //make sure only one response per user is allowed
@@ -77,17 +95,38 @@ function makeOurForm(names, grade, fileId) {
   form.setLimitOneResponsePerUser(true);
   form.setRequireLogin(true);
   
-  var item = form.addCheckboxItem();
-  item.setTitle('Vote for at most two candidates');
-  item.setChoiceValues(names);
-  item.setRequired(true);
+  //put in all positions and candidates
+  var item = form.addMultipleChoiceItem();
+  item.setTitle('President');
+  item.setChoiceValues(p);
+  
+  var item2 = form.addMultipleChoiceItem();
+  item2.setTitle('Vice President');
+  item2.setChoiceValues(vp);
+  
+  var item3 = form.addMultipleChoiceItem();
+  item3.setTitle('Treasurer');
+  item3.setChoiceValues(t);
   
-  //ensures that max two is allowed
-  var checkBoxValidation = FormApp.createCheckboxValidation()
-  .setHelpText('Select at most two candidates.')
-  .requireSelectAtMost(2)
-  .build();
-  item.setValidation(checkBoxValidation);
+  var item4 = form.addMultipleChoiceItem();
+  item4.setTitle('Publicity Director');
+  item4.setChoiceValues(pd);
+  
+  var item5 = form.addMultipleChoiceItem();
+  item5.setTitle('Public Relation Director');
+  item5.setChoiceValues(prd);
+  
+  var item6 = form.addMultipleChoiceItem();
+  item6.setTitle('Social Director');
+  item6.setChoiceValues(socd);
+  
+  var item7 = form.addMultipleChoiceItem();
+  item7.setTitle('Spirit Director');
+  item7.setChoiceValues(spird);
+  
+  var item8 = form.addMultipleChoiceItem();
+  item8.setTitle('Clubs Coordinator');
+  item8.setChoiceValues(cc);
   
   //make the results go to the master sheet
   form.setDestination(FormApp.DestinationType.SPREADSHEET, ss.getId());
@@ -126,24 +165,6 @@ function onFormSubmit(e) {
   if(sheets[0].getName()!=='Responses') {
     ss.getSheets()[0].setName('Responses');
   }
-  var sheet = ss.getSheetByName('Candidates');
-  var range = sheet.getDataRange();
-  var values = range.getValues();
-  
-  //retrieve student numbers of applicants
-  var invalid = [];
-  for(i=1;i<values.length;i++) {
-    invalid.push(values[i][1]);
-  }
-  
-  //retrieve response data
-  var email = e.namedValues['Email Address'][0];
-  
-  //check if response is invalid (email is one of the applicants)
-  if(invalid.indexOf(email)>-1) {
-    Logger.log(email + '\'s vote was removed');
-    e.range.deleteCells(SpreadsheetApp.Dimension.COLUMNS);
-  }
 }
 
 //count up all the votes
@@ -151,34 +172,187 @@ function tallyVotes() {
   //variables for manipulating spreadsheet
   var ss = SpreadsheetApp.getActive();
   var output = ss.getSheetByName('Results');
+  var input = ss.getSheetByName('Responses');
   var r = output.getDataRange();
   var v = r.getValues();
-  var input = ss.getSheetByName('Responses');
   var r2 = input.getDataRange();
   var v2 = r2.getValues();
+  var sheet = ss.getSheetByName('Candidates');
+  var range = sheet.getDataRange();
+  var values = range.getValues();
+  
+  //retrieve student numbers of valid participants
+  var valid = {};
+  for(i=1;i<values.length;i++) {
+    valid[values[i][1]] = 1;
+  }
   
   //clear spreadsheet
   output.clear();
-  output.appendRow(['Name', 'Votes']);
+  output.appendRow(['President', 'Votes','Vice President','Votes',
+                    'Treasurer','Votes','Publicity Director','Votes',
+                    'Public Relation Director','Votes','Social Director','Votes',
+                    'Spirit Director','Votes','Clubs Coordinator','Votes']);
   
-  //count votes for every person
+  //count votes for every candidate
   for(i=1;i<v.length;i++) {
+    var rowOutput = [];
+    
+    //pres
     var name = v[i][0];
     var num = v[i][1];
-    for(j=1;j<v2.length;j++) {
-      var names = v2[j][2].split(", ");
-      for(k=0;k<names.length;k++) {
-        if(names[k]===name) {
+    if(name !== "") {
+      for(j=1;j<v2.length;j++) {
+        var email = v2[j][1];
+        if(valid[email]===undefined) continue;
+        var name1 = v2[j][2];
+        if(name1===name) {
           num++;
-          break;
         }
       }
-    }
-    output.appendRow([name,num]);
+    } else num = "";
+    rowOutput.push(name);
+    rowOutput.push(num);
+    
+    //vice pres
+    var name = v[i][2];
+    var num = v[i][3];
+    if(name !== "") {
+      for(j=1;j<v2.length;j++) {
+        var email = v2[j][1];
+        if(valid[email]===undefined) continue;
+        var name1 = v2[j][3];
+        if(name1===name) {
+          num++;
+        }
+      }
+    } else num = "";
+    rowOutput.push(name);
+    rowOutput.push(num);
+    
+    //treasurer
+    var name = v[i][4];
+    var num = v[i][5];
+    if(name !== "") {
+      for(j=1;j<v2.length;j++) {
+        var email = v2[j][1];
+        if(valid[email]===undefined) continue;
+        var name1 = v2[j][4];
+        if(name1===name) {
+          num++;
+        }
+      }
+    } else num = "";
+    rowOutput.push(name);
+    rowOutput.push(num);
+    
+    //public direc
+    var name = v[i][6];
+    var num = v[i][7];
+    if(name !== "") {
+      for(j=1;j<v2.length;j++) {
+        var email = v2[j][1];
+        if(valid[email]===undefined) continue;
+        var name1 = v2[j][5];
+        if(name1===name) {
+          num++;
+        }
+      }
+    } else num = "";
+    rowOutput.push(name);
+    rowOutput.push(num);
+    
+    //public relation direc
+    var name = v[i][8];
+    var num = v[i][9];
+    if(name !== "") {
+      for(j=1;j<v2.length;j++) {
+        var email = v2[j][1];
+        if(valid[email]===undefined) continue;
+        var name1 = v2[j][6];
+        if(name1===name) {
+          num++;
+        }
+      }
+    } else num = "";
+    rowOutput.push(name);
+    rowOutput.push(num);
+    
+    //social direc
+    var name = v[i][10];
+    var num = v[i][11];
+    if(name !== "") {
+      for(j=1;j<v2.length;j++) {
+        var email = v2[j][1];
+        if(valid[email]===undefined) continue;
+        var name1 = v2[j][7];
+        if(name1===name) {
+          num++;
+        }
+      }
+    } else num = "";
+    rowOutput.push(name);
+    rowOutput.push(num);
+    
+    //spirit direc
+    var name = v[i][12];
+    var num = v[i][13];
+    if(name !== "") {
+      for(j=1;j<v2.length;j++) {
+        var email = v2[j][1];
+        if(valid[email]===undefined) continue;
+        var name1 = v2[j][8];
+        if(name1===name) {
+          num++;
+        }
+      }
+    } else num = "";
+    rowOutput.push(name);
+    rowOutput.push(num);
+    
+    //clubs direc
+    var name = v[i][14];
+    var num = v[i][15];
+    if(name !== "") {
+      for(j=1;j<v2.length;j++) {
+        var email = v2[j][1];
+        if(valid[email]===undefined) continue;
+        var name1 = v2[j][9];
+        if(name1===name) {
+          num++;
+        }
+      }
+    } else num = "";
+    rowOutput.push(name);
+    rowOutput.push(num);
+    
+    output.appendRow(rowOutput);
   }
   
   //output results
-  output.sort(2, false);
+  var range = output.getRange('A1:B100');
+  range.sort({column: 2, ascending: false});
+  
+  var range = output.getRange('C1:D100');
+  range.sort({column: 4, ascending: false});
+  
+  var range = output.getRange('E1:F100');
+  range.sort({column: 6, ascending: false});
+  
+  var range = output.getRange('G1:H100');
+  range.sort({column: 8, ascending: false});
+  
+  var range = output.getRange('I1:J100');
+  range.sort({column: 10, ascending: false});
+  
+  var range = output.getRange('K1:L100');
+  range.sort({column: 12, ascending: false});
+  
+  var range = output.getRange('M1:N100');
+  range.sort({column: 14, ascending: false});
+  
+  var range = output.getRange('O1:P100');
+  range.sort({column: 16, ascending: false});
 }
 
 //get rid of previous triggers (a new one is created everytime this code is run)