Merge pull request #131 from jeffreykirchner/dev

Dev
jeffreykirchner · Sep 19, 2023 · d6ea29c · d6ea29c
2 parents 0598f46 + 824e510
commit d6ea29c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/main/models/session.py b/main/models/session.py
@@ -535,9 +535,11 @@ def action_data_parse(self, type, data, session_players):
         elif type == "attack_avatar":
             return f'{session_players[str(data["source_player_id"])]["parameter_set_player__id_label"]} -> {session_players[str(data["target_player_id"])]["parameter_set_player__id_label"]}' 
         elif type == "move_fruit_to_avatar":
-             return f'{data["good_one_move"]} {data["goods"]["good_one"]}, {data["good_two_move"]} {data["goods"]["good_two"]}, {data["good_three_move"]} {data["goods"]["good_three"]}'
+             return f'{data["good_one_move"]} {data["goods"]["good_one"]}, {data["good_two_move"]} {data["goods"]["good_two"]}, {data["good_three_move"]} {data["goods"].get("good_three","None")}'
         elif type == "move_fruit_house":
-            return f'{data["direction"]}: {data["good_one_move"]} {data["goods"]["good_one"]}, {data["good_two_move"]} {data["goods"]["good_two"]}, {data["good_three_move"]} {data["goods"]["good_three"]}'
+            return f'{data["direction"]}: {data["good_one_move"]} {data["goods"]["good_one"]}, {data["good_two_move"]} {data["goods"]["good_two"]}, {data["good_three_move"]} {data["goods"].get("good_three","None")}'
+        elif type == "help_doc":
+            return data
 
         return ""
 

diff --git a/main/templates/subject/subject_home/the_stage/house_modal.html b/main/templates/subject/subject_home/the_stage/house_modal.html
@@ -11,9 +11,8 @@
     <div class="modal-dialog modal-dialog-centered modal-sm">
         <div class="modal-content">
             <div class="modal-header fw-bold" v-if="selected_house.house">
-                House: Owner [[selected_house.parameter_set_player.id_label]]
-
-                <span v-show="selected_house.house.session_player==session_player.id">(You)</span>
+               <span v-if="selected_house.house.session_player==session_player.id"> House: [[selected_house.parameter_set_player.id_label]] (You)</span>
+               <span v-else> House: [[selected_house.parameter_set_player.id_label]]</span>
 
                 <span class="float-end">
                     <button type="button" class="btn btn-link" title="Show Help" v-on:click="send_load_help_doc_subject('House')">