X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=empathy%2Fempathy.jsx;h=683f92d9318a6afa6628fd238edacccf9f90f183;hb=1896a4e7c03026eb1ef2aa084b55e1434265fd9d;hp=566ad105c5e3cdb3727ffe504d74ca52e9c0efc4;hpb=04b3139e734606e5281f7a784c3a04ce1b02cc4d;p=lmno.games

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 566ad10..683f92d 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -67,6 +67,8 @@ events.addEventListener("game-state", event => {
 
   window.game.set_players_answering(state.players_answering);
 
+  window.game.set_answering_idle(state.answering_idle);
+
   window.game.set_end_answers(state.end_answers);
 
   window.game.set_ambiguities(state.ambiguities);
@@ -104,6 +106,12 @@ events.addEventListener("player-answering", event => {
   window.game.set_player_answering(player);
 });
 
+events.addEventListener("answering-idle", event => {
+  const value = JSON.parse(event.data);
+
+  window.game.set_answering_idle(value);
+});
+
 events.addEventListener("vote-end-answers", event => {
   const player = JSON.parse(event.data);
 
@@ -402,14 +410,19 @@ class Ambiguities extends React.PureComponent {
 
     this.state = {
       word_sets: word_sets,
-      submitted: false,
       selected: null
     };
 
+    this.submitted = false;
     this.judging_sent_recently = false;
   }
 
   async handle_submit() {
+
+    /* Don't submit a second time. */
+    if (this.submitted)
+      return;
+
     const response = await fetch_post_json(
       `judged/${this.props.prompt.id}`,{
         word_groups: this.state.word_sets.map(set => Array.from(set))
@@ -427,9 +440,7 @@ class Ambiguities extends React.PureComponent {
       return;
     }
 
-    this.setState({
-      submitted: true
-    });
+    this.submitted = true;
   }
 
   handle_click(word) {
@@ -498,7 +509,7 @@ class Ambiguities extends React.PureComponent {
   }
 
   render() {
-    if (this.state.submitted)
+    if (this.props.players_judged.has(this.props.player.name)) {
       return (
         <div className="please-wait">
           <h2>Submission received</h2>
@@ -543,6 +554,7 @@ class Ambiguities extends React.PureComponent {
 
         </div>
       );
+    }
 
     const btn_class = "ambiguity-button";
     const btn_selected_class = btn_class + " selected";
@@ -596,9 +608,7 @@ class ActivePrompt extends React.PureComponent {
     super(props);
     const items = props.prompt.items;
 
-    this.state = {
-      submitted: false
-    };
+    this.submitted = false;
 
     this.answers = [...Array(items)].map(() => React.createRef());
     this.answering_sent_recently = false;
@@ -630,6 +640,10 @@ class ActivePrompt extends React.PureComponent {
     /* Prevent the default page-changing form-submission behavior. */
     event.preventDefault();
 
+    /* And don't submit a second time. */
+    if (this.submitted)
+      return;
+
     const response = await fetch_post_json(`answer/${this.props.prompt.id}`, {
       answers: this.answers.map(r => r.current.value)
     });
@@ -646,13 +660,35 @@ class ActivePrompt extends React.PureComponent {
 
     /* Everything worked. Server is happy with our answers. */
     form.reset();
-    this.setState({
-        submitted: true
-    });
+    this.submitted = true;
   }
 
   render() {
-    if (this.state.submitted)
+    let move_on_button = null;
+    if (this.props.idle) {
+      move_on_button =(
+        <button
+          className="vote-button"
+          onClick={() => fetch_post_json(`end-answers/${this.props.prompt.id}`) }
+        >
+          Move On
+          <div className="vote-choices">
+            {[...this.props.votes].map(v => {
+              return (
+                <div
+                  key={v}
+                  className="vote-choice"
+                >
+                  {v}
+                </div>
+              );
+            })}
+          </div>
+        </button>
+      );
+    }
+
+    if (this.props.players_answered.has(this.props.player.name)) {
       return (
         <div className="please-wait">
           <h2>Submission received</h2>
@@ -676,27 +712,11 @@ class ActivePrompt extends React.PureComponent {
               );
             })}
           </ul>
-          <button
-            className="vote-button"
-            onClick={() => fetch_post_json(`end-answers/${this.props.prompt.id}`) }
-          >
-            Move On
-            <div className="vote-choices">
-              {[...this.props.votes].map(v => {
-                return (
-                  <div
-                    key={v}
-                    className="vote-choice"
-                  >
-                    {v}
-                  </div>
-                );
-              })}
-            </div>
-          </button>
+          {move_on_button}
 
         </div>
       );
+    }
 
     return (
       <div className="active-prompt">
@@ -750,6 +770,7 @@ class Game extends React.PureComponent {
       active_prompt: null,
       players_answered: new Set(),
       players_answering: {},
+      answering_idle: false,
       end_answers_votes: new Set(),
       ambiguities: null,
       players_judged: new Set(),
@@ -790,6 +811,7 @@ class Game extends React.PureComponent {
       active_prompt: null,
       players_answered: new Set(),
       players_answering: {},
+      answering_idle: false,
       end_answers_votes: new Set(),
       ambiguities: null,
       players_judged: new Set(),
@@ -859,6 +881,12 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_answering_idle(value) {
+    this.setState({
+      answering_idle: value
+    });
+  }
+
   set_end_answers(players) {
     this.setState({
       end_answers_votes: new Set(players)
@@ -983,6 +1011,7 @@ class Game extends React.PureComponent {
       return <Ambiguities
                prompt={state.active_prompt}
                words={state.ambiguities}
+               player={state.player_info}
                players_judged={state.players_judged}
                players_judging={state.players_judging}
                votes={state.end_judging_votes}
@@ -992,8 +1021,10 @@ class Game extends React.PureComponent {
     if (state.active_prompt) {
       return <ActivePrompt
                prompt={state.active_prompt}
+               player={state.player_info}
                players_answered={state.players_answered}
                players_answering={state.players_answering}
+               idle={state.answering_idle}
                votes={state.end_answers_votes}
              />;
     }