Merge pull request ushahidi#3 from Shadrock/master

Shadrock Roberts · web-flow · commit 0471e469aae8 · 2017-06-02T15:44:06.000-06:00
Updating index, Javascript, and ReadME
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 Ushahidi Programs Plotr
 ===========
-This is a visualization tool for looking at key deliverables and milestones milestones for Ushahidi programs. You can see the [Plotr visualization here](http://?????) or [add dates and milesontes here](https://docs.google.com/spreadsheets/d/1NXG2znwFFdbyK83wHmN00AEp_t_OMAoRkShicl_y7Wk/edit#gid=0). See below for more information about how to interpret the visualization or enter data.
+This is a visualization tool for looking at key deliverables and milestones milestones for Ushahidi programs. You can see the [Plotr visualization here](http://?????) or [add dates and milestones here](https://docs.google.com/spreadsheets/d/1NXG2znwFFdbyK83wHmN00AEp_t_OMAoRkShicl_y7Wk/edit#gid=0). See below for more information about how to interpret the visualization or enter data.
 
 ### About
 This is simple sortable chart for viewing and tracking programmatic deliverables and milestones on a timeline. It is primarily for coordination among Ushahidi programs: especially around shared goals such as trainings, volunteer engagement, and product releases. It is useful for a quick global view of what's going on when and how the milestones/expectations/resourcing need to be managed. This was originally developed by Aurelia Moser ([original repo here](https://github.com/auremoser/pirateplotr)) and I've adopted it for programmatic use.  
@@ -28,14 +28,14 @@ project2 | value2 	| date1 		| date2 	| [DREAMS/Uchaguzi/...] | core
 * **deliverable** is _brief_ description of the deliverable.
 * **priority** is an arbitrary weight. This is a placeholder that was originally intended to be replaced by some numerical value that we might want to priotize by, such as cost, price, or resources. We can figure out how to use this... or leave it blank!
 * **dates** are the start and end date of a project.
-* **team** is the name of the team responsible for the deliverable. I've populated the spreadsheet with a drop-down menu for: Uchaguzi, DREAMS, COMRADES, and Platform.
-* **type** is one of 4 categories for filtering purposes. I don't honestly remember what these different categories meant at the time they were created so I'd be happy to change them. Right now, I'm using
+* **team** is the name of the team responsible for the deliverable. I've populated the spreadsheet with a drop-down menu for: Platform, RollCall, Uchaguzi, COMRADES, DREAMS, MAVC, Sup. & Engage., and Engineering. I suppose we could put _all_ circles on this but the goal is really to use this for better programmatic coordination. Because that means implementing our tools and some engagement, I've included the relevant tech circles as well.
+* **type** is one of 4 categories for filtering purposes. I don't honestly remember what these different categories meant at the time they were created so I'd be happy to change them. Right now, I'm using:
   * "core" as an internal deadline;
   * "external" is a public facing deadline;
   * "ops" - I'm not using this right now. 
   * "milestone" creates a vertical plum lines on the chart as opposed to a bar that shows something happening over time. You create these by entering a `deliverable` name, a `start_date`, and then listing the `type` as "milestone". Check the csv for examples of this.
 
-Give me a shout if you have any further questions!
+Give me a shout if you have any further questions and feel free to edit the Plotr: we all own it!
 
 
 
diff --git a/index.html b/index.html
@@ -230,14 +230,14 @@ <h6>COLOR BY</h6>
 		<div class="legend-title">Teams 2014</div>
 			<div class="legend-scale">
 				<ul class="legend-labels">
-					<li><span style="background:#d53e4f;"></span>BRCK</li>
-					<li><span style="background:#f46d43;"></span>Crisis Net</li>
-					<li><span style="background:#fdae61;"></span>Crowd Map</li>
-					<li><span style="background:#fee08b;"></span>Ex. Projects</li>
+					<li><span style="background:#d53e4f;"></span>Platform</li>
+					<li><span style="background:#f46d43;"></span>RollCall</li>
+					<li><span style="background:#fdae61;"></span>Engineering</li>
+					<li><span style="background:#fee08b;"></span>COMRADES</li>
 					<li><span style="background:#ffffbf;"></span>MAVC</li>
-					<li><span style="background:#abdda4;"></span>Ops</li>
-					<li><span style="background:#66c2a5;"></span>RRI</li>
-					<li><span style="background:#3288bd;"></span>V3</li>
+					<li><span style="background:#abdda4;"></span>DREAMS</li>
+					<li><span style="background:#66c2a5;"></span>UCHAGUZI</li>
+					<li><span style="background:#3288bd;"></span>Sup. & Engage.</li>
 				</ul>
 			</div>
 		</div>
@@ -258,4 +258,4 @@ <h6>COLOR BY</h6>
 	</body>
 </html>
 <!--special thx to mhkeller (homg dates in d3), and to aubergene (D3.edu)-->
-<!--auremoser-->
+<!--auremoser-->
diff --git a/plotr.js b/plotr.js
@@ -7,7 +7,7 @@
 	var canvas_width = d3.select('#chart-canvas').node().offsetWidth;
 
 	var teamColorScale = d3.scale.ordinal()
-		.domain(['BRCK', 'CrisisNet', 'Crowdmap', 'External Projects', 'MAVC', 'Operations', 'RRI', 'V3'])
+		.domain(['Platform', 'RollCall', 'Engineering', 'COMRADES', 'MAVC', 'DREAMS', 'UCHAGUZI', 'Sup. & Engage.'])
 		//.range(['#e45f56',' #d75c37','#fff568','#a3d39c','#4aaaa5','#4aaaa5','#334455','#260126'])
 		.range(['#d53e4f', '#f46d43', '#fdae61', '#fee08b', '#ffffbf', '#abdda4', '#66c2a5', '#3288bd']);
 
@@ -40,7 +40,7 @@
 	 * LOAD AND TIDY DATA
 	 */
 	 // Data comes in as a simple updateable csv, so names entities, values can update
-	 // Gspreadsheet for CSV is here: https://docs.google.com/a/ushahidi.com/spreadsheet/ccc?key=0AlR1bR7sxqL-dFhnYWRNUm81WWNUai0ybjZRcWwyNXc&usp=sharing
+	 // Gspreadsheet for CSV is here: https://docs.google.com/spreadsheets/d/1NXG2znwFFdbyK83wHmN00AEp_t_OMAoRkShicl_y7Wk/edit#gid=0
 	 
 
 	 // Switch to lowercase Y in the d3.time.format if using an excel csv, it's uppercase because google spreadsheets formats it's dates differently
@@ -290,7 +290,7 @@
 	 * var proxy = 'http://www.enjoy-mondays.com/assets/services/proxy.php?url=';
 	 */
 
-	var csvURL = 'https://docs.google.com/spreadsheet/pub?key=0AlR1bR7sxqL-dFhnYWRNUm81WWNUai0ybjZRcWwyNXc&single=true&gid=0&output=csv';
+	var csvURL = 'https://docs.google.com/a/ushahidi.com/spreadsheets/d/1NXG2znwFFdbyK83wHmN00AEp_t_OMAoRkShicl_y7Wk/pub?output=csv';
 	
 	d3.csv(csvURL, function(csv) {
 		tidyData(csv);
