X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=60540c03b8246d84fcab3b5c9dc7507f500c10b4;hp=b03d697ef1cfd2561ffc1b223d4939e3b616fa4a;hb=123507982e9643a1cf2d747fbd556fc3856bfa49;hpb=ae931528b06e796b57147b974b669e980b18c51f

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index b03d697..60540c0 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -55,13 +55,13 @@ events.addEventListener("player-update", event => {
 events.addEventListener("game-state", event => {
   const state = JSON.parse(event.data);
 
-  for (let prompt of state.prompts) {
-    window.game.add_or_update_prompt(prompt);
-  }
+  window.game.set_prompts(state.prompts);
 
   window.game.set_active_prompt(state.active_prompt);
 
   window.game.set_scores(state.scores);
+
+  window.game.set_ambiguities(state.ambiguities);
 });
 
 events.addEventListener("prompt", event => {
@@ -82,6 +82,18 @@ events.addEventListener("answered", event => {
   window.game.set_players_answered(players_answered);
 });
 
+events.addEventListener("ambiguities", event => {
+  const ambiguities = JSON.parse(event.data);
+
+  window.game.set_ambiguities(ambiguities);
+});
+
+events.addEventListener("judged", event => {
+  const players_judged = JSON.parse(event.data);
+
+  window.game.set_players_judged(players_judged);
+});
+
 events.addEventListener("scores", event => {
   const scores = JSON.parse(event.data);
 
@@ -129,10 +141,12 @@ const PlayerInfo = React.memo(props => {
     <div className="player-info">
       <span className="players-header">Players: </span>
       {props.player.name}
+      {props.player.score > 0 ? ` (${props.player.score})` : ""}
       {props.other_players.map(other => (
         <span key={other.id}>
           {", "}
           {other.name}
+          {other.score > 0 ? ` (${other.score})` : ""}
         </span>
       ))}
     </div>
@@ -305,6 +319,136 @@ const LetsPlay = React.memo(props => {
   );
 });
 
+class Ambiguities extends React.PureComponent {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      word_groups: props.words.map(word => [word]),
+      submitted: false,
+      selected: null
+    };
+  }
+
+  async handle_submit() {
+    const response = await fetch_post_json(`judging/${this.props.prompt.id}`,
+                                           this.state.word_groups);
+
+    if (response.status === 200) {
+      const result = await response.json();
+      if (! result.valid) {
+        add_message("danger", result.message);
+        return;
+      }
+    } else {
+      add_message("danger", "An error occurred submitting your answers");
+      return;
+    }
+
+    this.setState({
+      submitted: true
+    });
+  }
+
+  handle_click(word) {
+    if (this.state.selected == word) {
+      /* Second click on same word removes the word from the group. */
+      const new_groups = this.state.word_groups.filter(
+        group => (! group.includes(this.state.selected)) || (group.length > 1)).map(
+          group => {
+            return group.filter(w => w !== this.state.selected);
+          }
+        );
+      this.setState({
+        selected: null,
+        word_groups: [...new_groups, [word]]
+      });
+    } else if (this.state.selected) {
+      /* Click of a second word groups the two together. */
+      const new_groups = this.state.word_groups.filter(
+        group => (! group.includes(word)) || (group.length > 1)).map(
+          group => {
+            if (group.includes(this.state.selected)) {
+              if (! group.includes(word))
+                return [...group, word];
+              else
+                return group;
+            } else {
+              return group.filter(w => w !== word);
+            }
+          }
+        );
+      this.setState({
+        selected: null,
+        word_groups: new_groups
+      });
+    } else {
+      /* First click of a word selects it. */
+      this.setState({
+        selected: word
+      });
+    }
+  }
+
+  render() {
+    if (this.state.submitted)
+      return (
+        <div className="please-wait">
+          <h2>{this.props.players_judged}/
+            {this.props.players_total} players have responded</h2>
+          <p>
+            Please wait for the rest of the players to complete judging.
+          </p>
+        </div>
+      );
+
+    const btn_class = "ambiguity-button";
+    const btn_selected_class = btn_class + " selected";
+
+    return (
+      <div className="ambiguities">
+        <h2>Judging Answers</h2>
+        <p>
+          Click on each pair of answers that should be scored as equivalent,
+          (and click any word twice to split it out from a group). Remember,
+          what goes around comes around, so it's best to be generous when
+          judging.
+        </p>
+        {this.state.word_groups.map(word_group => {
+          return (
+            <div
+              className="ambiguity-group"
+              key={word_group[0]}
+            >
+            {word_group.map(word => {
+              return (
+                <button
+                className={this.state.selected === word ?
+                           btn_selected_class : btn_class }
+                key={word}
+                onClick={() => this.handle_click(word)}
+                  >
+                {word}
+                </button>
+              );
+            })}
+            </div>
+          );
+        })}
+        <p>
+          Click here when done judging:<br/>
+          <button
+            onClick={() => this.handle_submit()}
+          >
+            Send
+          </button>
+        </p>
+      </div>
+    );
+  }
+}
+
 class ActivePrompt extends React.PureComponent {
 
   constructor(props) {
@@ -328,7 +472,7 @@ class ActivePrompt extends React.PureComponent {
     const response = await fetch_post_json(`answer/${this.props.prompt.id}`, {
       answers: this.answers.map(r => r.current.value)
     });
-    if (response.status == 200) {
+    if (response.status === 200) {
       const result = await response.json();
       if (! result.valid) {
         add_message("danger", result.message);
@@ -368,7 +512,7 @@ class ActivePrompt extends React.PureComponent {
         </p>
         <h2>{this.props.prompt.prompt}</h2>
         <form onSubmit={this.handle_submit}>
-          {Array(this.props.prompt.items).fill(null).map((whocares,i) => {
+          {[...Array(this.props.prompt.items)].map((whocares,i) => {
             return (
               <div
                 key={i}
@@ -407,7 +551,9 @@ class Game extends React.PureComponent {
       other_players: [],
       prompts: [],
       active_prompt: null,
-      players_answered: 0
+      players_answered: 0,
+      ambiguities: null,
+      players_judged: 0
     };
   }
 
@@ -436,6 +582,12 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_prompts(prompts) {
+    this.setState({
+      prompts: prompts
+    });
+  }
+
   add_or_update_prompt(prompt) {
     const prompts_copy = [...this.state.prompts];
     const idx = prompts_copy.findIndex(p => p.id === prompt.id);
@@ -461,6 +613,18 @@ class Game extends React.PureComponent {
     });
   }
 
+  set_ambiguities(ambiguities) {
+    this.setState({
+      ambiguities: ambiguities
+    });
+  }
+
+  set_players_judged(players_judged) {
+    this.setState({
+      players_judged: players_judged
+    });
+  }
+
   set_scores(scores) {
     this.setState({
       scores: scores
@@ -509,6 +673,15 @@ class Game extends React.PureComponent {
       );
     }
 
+    if (state.ambiguities){
+      return <Ambiguities
+               prompt={state.active_prompt}
+               words={state.ambiguities}
+               players_judged={state.players_judged}
+               players_total={players_total}
+             />;
+    }
+
     if (state.active_prompt) {
       return <ActivePrompt
                prompt={state.active_prompt}