Resolve conflict?

Author: emlabor

Progress.md

@@ -1,38 +1,57 @@
 # Progress Documentation
+
+## WEEK 3: July 13 - July 17
+### Issues
+
+* issue [#49](../../issues/49) : screenshot image not being saved even after clicking save and exit from screenshot overlay
+    * point of contact: Annie
+    - [x] investigate reason behind image not saving
+    - [x] implement a solution to save the image
+
+* issue [#12](../..issues/21) : improve styling
+    * point of contact: Annie
+    - [x] separate CSS from HTML files
+    - [ ] improve styling of checkboxes
+
 ## WEEK 2: July 6 - July 10
 ### Issues
+#### Completed: [#22](../../issues/22), [#41](../../issues/41), [#43](../../issues/43)
 
 * issue [#13](https://github.com/GenderMagProject/GenderMagRecordersAssistant/issues/13) : CSV formatting
     * point of contact: Imani
-
-* issue [#15](../../issues/15) : implement delete action button
-    * point of contact: Diana
-    - [x] frontend setup: HTML button, js click event listener
-    - [x] design doc (how should deleteAction() be implemented? flowchart?)
-    - [ ] backend: implement deleteAction()
-    - [ ] test
-    
-* issue [#21](../../issues/21) : add a toggle option to hide or display the GenderMag pop up by clicking on the extension icon
-    * point of contact: Annie
-    - [ ] figure out how to hide and display pop up
-    - [ ] test
 
 * issue [#22](../../issues/22) : save and exit from screenshot
-    * point of contact: Fatima
+    * point of contact: Fatima and Annie
+    - [x] design doc: https://docs.google.com/document/d/1-matsEHtxUJAcR5-2F_RBA9UD7O9Ej_qajQkFFxC_8o/edit?usp=sharing
+    - [x] investigate why program freezes
+    - [x] implement a solution so the program just exits
+    - [x] implement a solution so the program saves and exits after completing the screenshot and inputting information
 
 * issue [#41](../../issues/41) : delete the exit button and the save and exit button from the exit screen
     * point of contact: Annie
-    - [ ] hide buttons on exit screen
-    - [ ] test
+    - [x] hide buttons on exit screen
+    - [x] test
 
 * issue [#43](../../issues/43) : fix subgoals saving in the wrong place
     * point of contact: Elizabeth
-    - [ ] investigate what happens when clicking on previous subgoals
-    - [ ] implement a solution so the subgoalID is correct when saving
+    - [x] investigate what happens when clicking on previous subgoals
+    - [x] implement a solution so the subgoalID is correct when saving
+ 
+* multiple issues : improvements to documentation & instructions
+    * point of contact: Elizabeth
+    - [x] choose issues on the main repo and comment
+    - [x] fix as many as possible (6)
+    - [ ] update download instructions for Mac
+    
+* issue [#94](https://github.com/GenderMagProject/GenderMagRecordersAssistant/issues/94): Convert distributed setting guide to MD file
+   * point of contact: Diana
+   - [x] issue closed (on the main repo)
 
 ### Tasks
 - [ ] add mentors as contributors
 - [ ] set up a code review system
+- [ ] read the style guide: https://google.github.io/styleguide/jsguide.html 
+- [ ] add comments to the original repository on issues we worked on 
 
 ## WEEK 1: June 29 - July 3
 ### Issues
@@ -51,6 +70,13 @@
     - [x] test
     - [x] fix last action added to every subgoal
     - [x] test
+  
+* issue [#15](../../issues/15) : implement delete action button
+    * point of contact: Diana
+    - [x] frontend setup: HTML button, js click event listener
+    - [x] design doc (how should deleteAction() be implemented? flowchart?)
+    - [ ] backend: implement deleteAction()
+    - [ ] test
 
 * issue [#19](../../issues/19) : add exit without saving button
     * point of contact: Annie

distributed_setting_guide.md

@@ -0,0 +1,81 @@
+# Using the Tool in a distributed GenderMag Session
+
+1. [What is GenderMag?](#introduction)
+2. [Roles, Rules and Common Errors](#paragraph1)
+    1. [Roles](#subparagraph1)
+    2. [Rules](#subparagraph2)
+    3. [Common Errors](#subparagraph3)
+    4. [Best Practices](subparagraph4)
+3. [How to run GenderMag with the Tool  (if not distributed):](#paragraph2)
+4. [The tool in a distributed setting (testing of it)](#paragraph3)
+    1. [Here’s What You Need to Set Up (if you do it on join.me):](#subparagraph21)
+    2. [Here’s What You Need to Set Up (if you do it on zoom):](#subparagraph22)
+
+## What is GenderMag? <a name="introduction"></a>
+- GenderMag (short for Gender Inclusiveness Magnifier) is a method for finding gender-inclusiveness issues in software features. Software developers and/or user experience professionals can use it to evaluate their software products from a gender-inclusiveness lens. GenderMag does not advocate for "pink" and "blue" software, but instead gender-inclusive software. 
+
+- GenderMag uses 4 personas, each based on 5 key facets of problem-solving. Research spanning approximately 10 years found that these facets contain gender differences and have informed the GenderMag personas.
+
+- GenderMag then takes these personas and incorporates them into a cognitive walkthrough. Allowing software developers and UX professionals to look at and evaluate their software through the eyes of a persona.
+
+## Roles, Rules and Common Errors <a name="paragraph1"></a>
+### Roles: <a name="subparagraph1"></a>
+- **The facilitator** : Leads the team through the walkthrough and keeps it on track. Can also help to enforce rules and prevent counterproductive work. <br/>
+- **The record-driver** : Records the team's comments, results in the GenderMag forms and drives the prototype for the team. <br/>
+- **Everyone** : does the evaluation work. <br/><br/>
+
+- For a distributed session, only **Record-driver** will have write access on the computer (Everyone can see the screen)
+
+### Rules: <a name="subparagraph2"></a>
+- **Stay true to the persona**: The team is looking to fix issues the persona might find, so really channel the persona. <br/>
+- **Follow the "ideal" sequence**: The persona might do something that is not part of the pre-made sequence but stick to the chosen sequence. <br/>
+- **Answer every question**: The team wants to gather as much information as they can, so don't leave anything out. <br/>
+- **The team doesn't have to agree** : But make sure the recorder writes down everyone’s comments. <br/>
+- **Just find the issues** : During the session is not the time to fix the issues, save that for after. <br/>
+
+### Common Errors: <a name="subparagraph3"></a>
+- **"I" Methodology** : Evaluators often drift from the persona and answer questions from their perspective. Be sure to use the persona’s name to stay true to the persona. <br/>
+- **"Look ahead" problems** : Taking the action before the persona would, giving more information than the persona actually has. <br/>
+- **Confusing actions with subgoals** : Subgoals are ideas in the head while actions are done with the hands. <br/>
+
+### Best practices:  <a name="subparagraph4"></a>
+
+- Sometimes people don’t actively stay involved.  To solve this, call on everyone for every question to get their response.
+- There are too many windows, so keeping the persona in mind is very hard. So solve this, encourage everyone to PRINT the persona IN ADVANCE so that it’s lying in front of them and they can use their windows for all the other info they need to keep in mind.
+-  (Mariam might add more things.)
+
+## How to run GenderMag with the Tool  (if not distributed): <a name="paragraph2"></a>
+- http://gendermag.org/genderMag.html
+
+## The tool in a distributed setting (testing of it) <a name="paragraph3"></a>
+All participants were in a distributed location.
+- Brijesh Bhuva
+- Rupika Dikkala 
+- Mariam Guizani
+
+* +ve :
+    * We were able to finish the entire GM session in D.systerm
+    * Join.me easy to connect all are able to hear properly 
+    * 2 person need to access computer 
+        * The facilitator will start the session 
+        * Record-driver will Record and drive the project 
+
+* \-ve:
+    * not able to identify the cursor on the screen 
+		* Solution:
+            * Slowly circle the area which we are pointing
+           * Change the size of the cursor
+	* facets name on tool is different then persona
+        * willing to tinker
+	* save and continue option was hidden on some of the screens (Bug)
+
+**It’s difficult because we are not able to see the faces.** 
+<br/>
+![image](images/image1.png?raw=true)
+### Here’s What You Need to Set Up (if you do it on join.me): <a name="subparagraph21"></a>
+![image2](images/image2.jpg?raw=true)
+
+
+### Here’s What You Need to Set Up (if you do it on zoom): <a name="subparagraph22"></a>
+- We think you can accomplish the same thing on zoom, possibly even better than on join.me, since it also has things like break-out rooms and so on, but we’ve tested it only a little.
+- (This is a stub.  Feel free to expand this.)

images/image1.png

@@ -0,0 +1,41 @@
+body{
+    font-family: "Trebuchet MS", sans-serif;
+    margin: 50px;
+}
+.demoHeaders {
+    margin-top: 2em;
+}
+#dialog-link {
+    padding: .4em 1em .4em 20px;
+    text-decoration: none;
+    position: relative;
+}
+#dialog-link span.ui-icon {
+    margin: 0 5px 0 0;
+    position: absolute;
+    left: .2em;
+    top: 50%;
+    margin-top: -8px;
+}
+#icons {
+    margin: 0;
+    padding: 0;
+}
+#icons li {
+    margin: 2px;
+    position: relative;
+    padding: 4px 0;
+    cursor: pointer;
+    float: left;
+    list-style: none;
+}
+#icons span.ui-icon {
+    float: left;
+    margin: 0 4px;
+}
+.fakewindowcontain .ui-widget-overlay {
+    position: absolute;
+}
+select {
+    width: 200px;
+}

images/image2.jpg

@@ -4,49 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Example Page</title>
 	<link href="jquery-ui.css" rel="stylesheet">
-	<style>
-	body{
-		font-family: "Trebuchet MS", sans-serif;
-		margin: 50px;
-	}
-	.demoHeaders {
-		margin-top: 2em;
-	}
-	#dialog-link {
-		padding: .4em 1em .4em 20px;
-		text-decoration: none;
-		position: relative;
-	}
-	#dialog-link span.ui-icon {
-		margin: 0 5px 0 0;
-		position: absolute;
-		left: .2em;
-		top: 50%;
-		margin-top: -8px;
-	}
-	#icons {
-		margin: 0;
-		padding: 0;
-	}
-	#icons li {
-		margin: 2px;
-		position: relative;
-		padding: 4px 0;
-		cursor: pointer;
-		float: left;
-		list-style: none;
-	}
-	#icons span.ui-icon {
-		float: left;
-		margin: 0 4px;
-	}
-	.fakewindowcontain .ui-widget-overlay {
-		position: absolute;
-	}
-	select {
-		width: 200px;
-	}
-	</style>
+	<link href="/styles/index.css" rel="stylesheet">
 </head>
 <body>
 

jquery-ui-1.12.1/index.css

@@ -14,10 +14,6 @@
 		"default_icon": "icon.png",
 		"default_title": "GenderMag Tool"
 	},
-	 
-	 "web_accessible_resources": [
-      "images/*.jpg", "images/*.png", "/styles/*.css",  "/Stuk-jszip-4cbaf0e/*"
-    ],
 	"content_scripts": [
 		{
 			"matches": ["<all_urls>"],
@@ -26,6 +22,6 @@
 			"css": ["jquery-ui-1.12.1/jquery-ui.css"]
 		}
 	],
-	"permissions": ["storage", "tabs", "<all_urls>", "unlimitedStorage"],
+	"permissions": ["storage", "tabs", "<all_urls>", "unlimitedStorage", "activeTab"],
 	"web_accessible_resources": ["/templates/*", "/images/*.jpg", "/images/*.png", "/styles/*.css", "styles/styles.css", "/jquery-ui-1.12.1/jquery-ui.css", "/font-awesome-4.6.1/*", "/Stuk-jszip-4cbaf0e/*" ]
 }

jquery-ui-1.12.1/index.html

@@ -325,19 +325,13 @@ function actionLoop(el){
 		}
 	});
 
-	//TODO(roseg31) : Investigate this...
-	//on save and exit button click, save all info, close session
-	$("#saveAndExit").unbind( "click" ).click(function(){
+	//exits the gendermag session
+	function exit() {
 		//setStatusToFalse("inMiddleOfAction");
 		localStorage.setItem("inMiddleOfAction", "false");
 		$(el).find("#actionLoopTemplate").hide();
 		$(el).find("#theFinalCountDown").show();
 
-		//create and download sheet with session data
-        setStatusToTrue("finishedGM");
-		var scurvy = createCSV();
-		downloadCSV(scurvy);
-
 		//on click of redownload zip button, download sheet again
 		$("#finalDownload").unbind("click").click(function () {
 			setStatusToFalse("inMiddleOfAction");
@@ -374,54 +368,23 @@ function actionLoop(el){
 			setStatusToFalse('finishedGM');
 			$('#actionLoopTemplate').show();
 		});
-	});
-
-	$("#justExit").unbind( "click" ).click(function(){
-		//setStatusToFalse("inMiddleOfAction");
-		localStorage.setItem("inMiddleOfAction", "false");
-		$(el).find("#actionLoopTemplate").hide();
-		$(el).find("#theFinalCountDown").show();
+	}
 
+	//TODO(roseg31) : Investigate this...
+	//on save and exit button click, save all info, close session
+	$("#saveAndExit").unbind( "click" ).click(function(){
 		//create and download sheet with session data
         setStatusToTrue("finishedGM");
 		var scurvy = createCSV();
+		downloadCSV(scurvy);
 
-		//on click of redownload zip button, download sheet again
-		$("#finalDownload").unbind("click").click(function () {
-			setStatusToFalse("inMiddleOfAction");
-			var scurvy = createCSV();
-			downloadCSV(scurvy, false);
-		});
-
-		$("#oldFormat").unbind("click").click(function () {
-			var scurvy = createOldCSV();
-			downloadCSV(scurvy, true);
-		});
-
-		//make sure user has downloaded their file before quitting
-		$("#finalYesCheckbox").unbind("click").click(function () {
-			if ($('#finalYesCheckbox').is(":checked")) {
-				$('#finalYes').prop('disabled', false);
-				$("#finalYes").attr("style","background-color:#7D1935;color:white;");
-			}
-			else {
-				$('#finalYes').prop('disabled', true);
-				$("#finalYes").attr("style","background-color:#7D1935;color:white;opacity:0.5");
-			}
-		});	
-
-		//final quit button clears local storage and reloads
-		$("#finalYes").unbind("click").click(function () {
-			localStorage.clear(); 
-			location.reload();
-		});
+		exit();
+	});
 
-		//'I'm not done, take me back' button returns to action loop
-		$("#finalNo").unbind("click").click(function () {
-			$('#theFinalCountDown').hide();
-			setStatusToFalse('finishedGM');
-			$('#actionLoopTemplate').show();
-		});
+	$("#justExit").unbind( "click" ).click(function(){
+		setStatusToTrue("finishedGM");
+		var scurvy = createCSV();
+		exit();
 	});
 
 	//back button returns to post action questions, resets got post action key

manifest.json

@@ -22,7 +22,25 @@ var screenShotURL;
 
 	/*Send request to current tab when page action is clicked*/
 	chrome.pageAction.onClicked.addListener(function(tab) {
+		// toggle the visibility of slideout
+		chrome.tabs.executeScript({ code: `(${ inContent })()` });
+		function inContent() {
+			const slideout = document.getElementById('slideout');
+			const gmFrame = document.getElementById('GenderMagFrame');
+  			if (slideout.style.display == 'none'){
+				  slideout.style.display = '';
+				  gmFrame.style.display = '';
+  			}
+  			// if the slider is not already open, hide the slideout
+  			else if (!statusIsTrue("sliderIsOpen")){
+				  slideout.style.display = 'none';
+				  gmFrame.style.display = 'none';
+  			}
+		}
+		/* Alternate option: link to the GitHub
 		window.open("https://github.com/mendezc1/GenderMagRecordersAssistant");
+		*/
+		
 		//TODO: Think about creating open/close function and call it here?
 		/*OLD CODE HERE DON'T DELETE UNTIL TO DO IS RESOLVED*/
 		//chrome.tabs.executeScript(null, { file: "./jquery-ui-1.12.1/jquery.js" }, function() {