Fix filters

lellex · lellex · commit fcc866a556da · 2017-01-28T18:17:58.000+01:00
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.5cc73768.css",
   "main.css.map": "static/css/main.5cc73768.css.map",
-  "main.js": "static/js/main.a0333ea0.js",
-  "main.js.map": "static/js/main.a0333ea0.js.map"
+  "main.js": "static/js/main.5a17071d.js",
+  "main.js.map": "static/js/main.5a17071d.js.map"
 }
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/talks/favicon.ico"><link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"><title>Propositions de sujets pour Sud Web</title><script type="text/javascript">function triggerGoogleLoaded(){window.dispatchEvent(new Event("google-loaded"))}</script><script type="text/javascript" src="https://apis.google.com/js/client.js?onload=triggerGoogleLoaded"></script><link href="/talks/static/css/main.5cc73768.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/talks/static/js/main.a0333ea0.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/talks/favicon.ico"><link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"><title>Propositions de sujets pour Sud Web</title><script type="text/javascript">function triggerGoogleLoaded(){window.dispatchEvent(new Event("google-loaded"))}</script><script type="text/javascript" src="https://apis.google.com/js/client.js?onload=triggerGoogleLoaded"></script><link href="/talks/static/css/main.5cc73768.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/talks/static/js/main.5a17071d.js"></script></body></html>
diff --git a/src/actions/Notes.js b/src/actions/Notes.js
@@ -37,18 +37,11 @@ export const loadNotes = () => dispatch => {
   });
 }
 
-export const selectTalk = talk => ({
-  type: 'SELECT_TALK',
-  talk: talk
-});
-
-
 export const vote = (name, note) => (dispatch, getState) => {
   const state = getState();
-  const talkIndex = state.selectedTalk;
-  const nameArray = Object.keys(state.notes[talkIndex]);
+  const nameArray = Object.keys(state.notes[state.selectedTalk]);
   const column = findColumnLetter(name, nameArray);
-  const row = talkIndex + 2; // sheet values start at 2
+  const row = state.selectedTalk + 1; // sheet values start at 2;
   console.log(`${name} give a ${note} to ${state.selectedTalk}`);
 
   dispatch({
diff --git a/src/actions/Talks.js b/src/actions/Talks.js
@@ -34,7 +34,7 @@ export const loadTalks = () => dispatch => {
   });
 }
 
-export const selectTalk = talk => ({
+export const selectTalk = id => ({
   type: 'SELECT_TALK',
-  talk: talk
+  talk: id
 });
diff --git a/src/components/App.js b/src/components/App.js
@@ -107,7 +107,7 @@ class AppView extends Component {
             selectedTalk={selectedTalk}
             count={count}
             talks={filteredTalks}
-            selectTalk={talk => this.props.selectTalk(talk)}
+            selectTalk={id => this.props.selectTalk(id)}
             setFilter={format => this.props.filterTalks(format)}
             />
         </Drawer>
@@ -119,6 +119,8 @@ class AppView extends Component {
   toggleDrawer = () => this.setState({drawerIsOpen: !this.state.drawerIsOpen});
 
   render() {
+    console.log(this.props.filteredTalks)
+
     return (
       <MuiThemeProvider>
         <div className="container">
@@ -149,7 +151,7 @@ const mapDispatchToProps = (dispatch) => {
   return {
     requestAuth: immediate => dispatch(requestAuth(immediate)),
     filterTalks: format => dispatch(filterTalks(format)),
-    selectTalk: talk => dispatch(selectTalk(talk)),
+    selectTalk: id => dispatch(selectTalk(id)),
     signout: () => dispatch(signout())
   };
 }
diff --git a/src/components/TalkList.js b/src/components/TalkList.js
@@ -3,6 +3,7 @@ import {List, ListItem, makeSelectable} from 'material-ui/List';
 import Avatar from 'material-ui/Avatar';
 import {teal500, red400, orange500} from 'material-ui/styles/colors';
 import {Tabs, Tab} from 'material-ui/Tabs';
+import {isPK, isLT} from '../selectors/Talks';
 
 let SelectableList = makeSelectable(List);
 
@@ -45,10 +46,10 @@ SelectableList = wrapState(SelectableList);
 
 class TalkList extends Component {
   getFormat(format) {
-    if (format === 'Pecha Kucha : 20 images x 20 secondes') {
+    if (isPK(format)) {
       return <Avatar backgroundColor={teal500}>PK</Avatar>
     }
-    if (format === 'Lightning Talk : 5 minutes') {
+    if (isLT(format)) {
       return <Avatar backgroundColor={orange500}>LT</Avatar>
     }
 
@@ -60,7 +61,7 @@ class TalkList extends Component {
         <ListItem
             key={i}
             value={i}
-            onTouchTap={() => this.props.selectTalk(i)}
+            onTouchTap={() => this.props.selectTalk(talk.id)}
             primaryText={talk.titre_de_ta_presentation}
             secondaryText={talk.prenom_et_nom}
             leftAvatar={this.getFormat(talk.formats)}
@@ -70,7 +71,6 @@ class TalkList extends Component {
 
   render() {
     const {talks, count} = this.props;
-
     return (
       <div className="TalkList">
         <Tabs 
diff --git a/src/selectors/Talks.js b/src/selectors/Talks.js
@@ -16,6 +16,7 @@ export const parseTalks = talks => {
       talks[0].map((field, j) => {
           return talk[getPrettyColumnNames(field)] = row[j];
       });
+      talk.id = i;
       talksArray.push(talk);
     }    
   }
@@ -32,7 +33,7 @@ export const isLT = format => {
 
 export const getFilteredList = (talks, filter) => {
   if (filter === 'PK') {
-    return talks.filter(talk => {
+    return talks.filter((talk, id) => {
       return isPK(talk.formats);
     });
   }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"main.css": "static/css/main.5cc73768.css",`
`3`	`3`	`"main.css.map": "static/css/main.5cc73768.css.map",`
`4`		`- "main.js": "static/js/main.a0333ea0.js",`
`5`		`- "main.js.map": "static/js/main.a0333ea0.js.map"`
	`4`	`+ "main.js": "static/js/main.5a17071d.js",`
	`5`	`+ "main.js.map": "static/js/main.5a17071d.js.map"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/talks/favicon.ico"><link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"><title>Propositions de sujets pour Sud Web</title><script type="text/javascript">function triggerGoogleLoaded(){window.dispatchEvent(new Event("google-loaded"))}</script><script type="text/javascript" src="https://apis.google.com/js/client.js?onload=triggerGoogleLoaded"></script><link href="/talks/static/css/main.5cc73768.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/talks/static/js/main.a0333ea0.js"></script></body></html>
	`1`	+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/talks/favicon.ico"><link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"><title>Propositions de sujets pour Sud Web</title><script type="text/javascript">function triggerGoogleLoaded(){window.dispatchEvent(new Event("google-loaded"))}</script><script type="text/javascript" src="https://apis.google.com/js/client.js?onload=triggerGoogleLoaded"></script><link href="/talks/static/css/main.5cc73768.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/talks/static/js/main.5a17071d.js"></script></body></html>
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export const loadTalks = () => dispatch => {`
`34`	`34`	`});`
`35`	`35`	`}`
`36`	`36`
`37`		`-export const selectTalk = talk => ({`
	`37`	`+export const selectTalk = id => ({`
`38`	`38`	`type: 'SELECT_TALK',`
`39`		`- talk: talk`
	`39`	`+ talk: id`
`40`	`40`	`});`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ export const parseTalks = talks => {`
`16`	`16`	`talks[0].map((field, j) => {`
`17`	`17`	`return talk[getPrettyColumnNames(field)] = row[j];`
`18`	`18`	`});`
	`19`	`+ talk.id = i;`
`19`	`20`	`talksArray.push(talk);`
`20`	`21`	`}`
`21`	`22`	`}`
`@@ -32,7 +33,7 @@ export const isLT = format => {`
`32`	`33`
`33`	`34`	`export const getFilteredList = (talks, filter) => {`
`34`	`35`	`if (filter === 'PK') {`
`35`		`- return talks.filter(talk => {`
	`36`	`+ return talks.filter((talk, id) => {`
`36`	`37`	`return isPK(talk.formats);`
`37`	`38`	`});`
`38`	`39`	`}`