From 369645ae4aad05229972afdd4a9e61d65bc9a5ef Mon Sep 17 00:00:00 2001 From: Diana Mukhanova Date: Mon, 29 Jun 2020 16:54:44 +0200 Subject: [PATCH 1/3] Update walkthrough.js - added click events for deleteAction and editAction - cleaned up a little bit drawSubgoal function (the else statement wasn't even necessary) - tried to create a separate saveSubgoalChanges function, but it didn't work. - #addAction id (button when you click on save and continue) should be changed into #saveSubgoal. It's confusing --- scripts/walkthrough.js | 140 +++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 91 deletions(-) diff --git a/scripts/walkthrough.js b/scripts/walkthrough.js index f63a690d..ed19b870 100644 --- a/scripts/walkthrough.js +++ b/scripts/walkthrough.js @@ -66,19 +66,59 @@ function drawSubgoal(subgoalId){ var isSetSubgoalQuestions = (statusIsTrue("gotSubgoalQuestions")); + var personaName = getVarFromLocal("personaName"); + var pronoun = getVarFromLocal("personaPronoun"); + var possessive = getVarFromLocal("personaPossessive"); + var subName = localStorage.getItem("currSubgoalName"); + + //empty contents of question container in the slider and put in subgoal questions + var el = $(id).contents().find('#containeryo'); + el.empty(); + appendTemplateToElement(el,file); + + + sidebarBody().find('#subgoalHeading').html("Subgoal: " + subName); + sidebarBody().find('#goalQuestion').html("Will " + personaName + " have formed this subgoal as a step to " + possessive +" overall goal?"); + sidebarBody().find('#goalFacets').html("Which (if any) of " + personaName + "'s facets did you use to answer the previous question?"); + + //add click events + + sidebarBody().find('body').off('click', '#editSubName').on('click', '#editSubName', function(){editSubgoal(subgoalId);}); + //DIANA: + sidebarBody().find('body').on('click', '#deleteActionButton', function(){deleteAction();}); + sidebarBody().find('body').on('click', '#editActionButton', function(){editAction();}); + //END + sidebarBody().find('body').off('click', '#addAction').on('click', '#addAction', function(){ //helper function saveSubgoalAnswers? + var yesNoMaybe = {"yes": sidebarBody().find("#yes").is(":checked"), + "no": sidebarBody().find("#no").is(":checked"), + "maybe": sidebarBody().find("#maybe").is(":checked")}; + var whyText = sidebarBody().find('#A0Q0whyYes').val(); + if (whyText === "") { + whyText = sidebarBody().find('#A0Q0Response').html(); + } + var facets = {"motiv": sidebarBody().find("#A0Q0motiv").is(":checked"), + "info": sidebarBody().find("#A0Q0info").is(":checked"), + "selfE": sidebarBody().find("#A0Q0selfE").is(":checked"), + "risk": sidebarBody().find("#A0Q0risk").is(":checked"), + "tinker": sidebarBody().find("#A0Q0tinker").is(":checked"), + "none": sidebarBody().find("#A0Q0none").is(":checked")}; + saveSubgoal(subgoalId, subName, yesNoMaybe, whyText, facets); + setStatusToTrue("gotSubgoalQuestions"); + var numActions = localStorage.getItem("numActions"); + if(numActions > 0){ + drawAction(numActions, subgoalId); + } + else{ + localStorage.setItem("numActions", 1); + drawAction(1, subgoalId); + } + }); + // if already got answers for subgoal questions, if (isSetSubgoalQuestions) { var subgoals = getSubgoalArrayFromLocal(); var numActions = localStorage.getItem("numActions"); - //get current subgoal name and pronoun/possessive - var subName = localStorage.getItem("currSubgoalName"); - - //empty contents of question container in the slider and put in subgoal questions - var el = $(id).contents().find('#containeryo'); - el.empty(); - appendTemplateToElement(el,file); - //check if subgoal number param corresponds to the current subgoal if not then set param subgoal as //local subgoal var subgoal; @@ -89,15 +129,7 @@ function drawSubgoal(subgoalId){ } else{ subgoal = subgoals[subgoals.length-1]; } - - //set up header and edit subgoal buttons - var personaName = getVarFromLocal("personaName"); - var pronoun = getVarFromLocal("personaPronoun"); - var possessive = getVarFromLocal("personaPossessive"); - sidebarBody().find('body').off('click', '#editSubName').on('click', '#editSubName', function(){editSubgoal(subgoalId);}); - sidebarBody().find('#subgoalHeading').html("Subgoal: " + subName); - sidebarBody().find('#goalQuestion').html("Will " + personaName + " have formed this subgoal as a step to " + possessive +" overall goal?"); - sidebarBody().find('#goalFacets').html("Which (if any) of " + personaName + "'s facets did you use to answer the previous question?"); + sidebarBody().find('#editSubgoal').hide(); if(subgoals){ //populate existing information @@ -125,82 +157,8 @@ function drawSubgoal(subgoalId){ sidebarBody().find("#A0Q0whyYes").html(subgoal.why); sidebarBody().find("#A0Q0Response").hide(); }); - - //save and continue is clicked save subgoal and call draw action function - sidebarBody().find('body').off('click', '#addAction').on('click', '#addAction', function(){ - var yesNoMaybe = {"yes": sidebarBody().find("#yes").is(":checked"), - "no": sidebarBody().find("#no").is(":checked"), - "maybe": sidebarBody().find("#maybe").is(":checked")}; - var whyText = sidebarBody().find('#A0Q0whyYes').val(); - if (whyText === "") { - whyText = sidebarBody().find('#A0Q0Response').html(); - } - var facets = {"motiv": sidebarBody().find("#A0Q0motiv").is(":checked"), - "info": sidebarBody().find("#A0Q0info").is(":checked"), - "selfE": sidebarBody().find("#A0Q0selfE").is(":checked"), - "risk": sidebarBody().find("#A0Q0risk").is(":checked"), - "tinker": sidebarBody().find("#A0Q0tinker").is(":checked"), - "none": sidebarBody().find("#A0Q0none").is(":checked")}; - saveSubgoal(subgoalId, subName, yesNoMaybe, whyText, facets); - //change key for subgoal questions - setStatusToTrue("gotSubgoalQuestions"); - //increase number of actions and draw action - var numActions = localStorage.getItem("numActions"); - if(numActions > 0){ - drawAction(numActions, subgoalId); - } - else{ - localStorage.setItem("numActions", 1); - drawAction(1, subgoalId); - } - }); } } - //if subgoal questions haven't been gotten yet - else { - //get current subgoal, empty question container and add in subgoal questions - var personaName = getVarFromLocal("personaName"); - var pronoun = getVarFromLocal("personaPronoun"); - var possessive = getVarFromLocal("personaPossessive"); - var subName = localStorage.getItem("currSubgoalName"); - var el = $(id).contents().find('#containeryo'); - el.empty(); - appendTemplateToElement(el,file); - sidebarBody().find('#subgoalHeading').html("Subgoal: " + subName); - sidebarBody().find('#goalQuestion').html("Will " + personaName + " have formed this subgoal as a step to " + possessive +" overall goal?"); - sidebarBody().find('#goalFacets').html("Which (if any) of " + personaName + "'s facets did you use to answer the previous question?"); - //edit subgoal button calls edit subgoal - sidebarBody().find('body').off('click', '#editSubName').on('click', '#editSubName', function(){ - editSubgoal(subgoalId); - }); - - //on save and continue, save subgoal question answers and call draw action - sidebarBody().find('body').off('click', '#addAction').on('click', '#addAction', function(){ - var yesNoMaybe = {"yes": sidebarBody().find("#yes").is(":checked"), - "no": sidebarBody().find("#no").is(":checked"), - "maybe": sidebarBody().find("#maybe").is(":checked")}; - var whyText = sidebarBody().find('#A0Q0whyYes').val(); - if (whyText === "") { - whyText = sidebarBody().find('#A0Q0Response').html(); - } - var facets = {"motiv": sidebarBody().find("#A0Q0motiv").is(":checked"), - "info": sidebarBody().find("#A0Q0info").is(":checked"), - "selfE": sidebarBody().find("#A0Q0selfE").is(":checked"), - "risk": sidebarBody().find("#A0Q0risk").is(":checked"), - "tinker": sidebarBody().find("#A0Q0tinker").is(":checked"), - "none": sidebarBody().find("#A0Q0none").is(":checked")}; - saveSubgoal(subgoalId, subName, yesNoMaybe, whyText, facets); - setStatusToTrue("gotSubgoalQuestions"); - var numActions = localStorage.getItem("numActions"); - if(numActions > 0){ - drawAction(numActions, subgoalId); - } - else{ - localStorage.setItem("numActions", 1); - drawAction(1, subgoalId); - } - }); - } } /* From 9de2105f85a02190ed4e2bdea25c6d339d104cbe Mon Sep 17 00:00:00 2001 From: Diana Mukhanova Date: Mon, 29 Jun 2020 16:58:19 +0200 Subject: [PATCH 2/3] Update actionAnswers.html --- templates/actionAnswers.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/actionAnswers.html b/templates/actionAnswers.html index 054b2b54..aa747cd3 100644 --- a/templates/actionAnswers.html +++ b/templates/actionAnswers.html @@ -1,6 +1,10 @@
Action :   + + + +
@@ -21,4 +25,4 @@
  • Facets used:
    • - \ No newline at end of file + From e8b4dc3677f155c9175aa6d3d9827d1e7374f059 Mon Sep 17 00:00:00 2001 From: Diana Mukhanova Date: Thu, 2 Jul 2020 18:51:53 +0200 Subject: [PATCH 3/3] Update walkthrough.js --- scripts/walkthrough.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/walkthrough.js b/scripts/walkthrough.js index ed19b870..e3179208 100644 --- a/scripts/walkthrough.js +++ b/scripts/walkthrough.js @@ -10,6 +10,15 @@ * creating the current subgoal and should not be called on any subgoal that is not the current subgoal. * Params: subgoalNum - number of the subgoal to edit (should be the current subgoal) */ + + +function deleteAction(subgoalId, actionId) { + alert("delete action!"); +} + +function editAction() { + alert("edit action!"); //much more complicated than delete +} function editSubgoal(subgoalNum){ //Show subgoal name field, hide subgoal questions //sidebarBody function is from file utilities.js @@ -85,7 +94,7 @@ function drawSubgoal(subgoalId){ sidebarBody().find('body').off('click', '#editSubName').on('click', '#editSubName', function(){editSubgoal(subgoalId);}); //DIANA: - sidebarBody().find('body').on('click', '#deleteActionButton', function(){deleteAction();}); + sidebarBody().find('body').on('click', '#deleteActionButton', function(){deleteAction(subgoalId, actionId);}); //DOESN'T WORK sidebarBody().find('body').on('click', '#editActionButton', function(){editAction();}); //END sidebarBody().find('body').off('click', '#addAction').on('click', '#addAction', function(){ //helper function saveSubgoalAnswers?