william
c9d3069f47
A Jauge could only target a whole object, not a specific record — three gauges pointing at the same "value" field (e.g. Réputation/ Trésorerie/Confiance in one "jauge" object) all silently showed the most recent row's value, with no way to tell them apart. Add "Enregistrement (ligne) à suivre" (row_id) so a Jauge targets one specific row, and "Champ contenant le nom" (champ_nom) to show a label above the bar — both as dropdowns populated from the object's actual fields/rows (previously "Champ numérique à afficher" was free text the user had to type correctly by hand). No regression: without row_id the widget still falls back to the latest row, exactly as before. Extract data_definition_options() (rows+fields for a definition) out of routes/screens/screen_edit.py so controls_with_values.py can reuse it server-side for the initial render; a small client-side handler (bindJaugeDefinitionSelect) repopulates the same selects live when the tracked object is changed without leaving the panel. Verified live with Playwright: picking "jauge" then "Confiance" then "value"/"name" in the panel renders an 80%-filled, green-leaning bar labelled "Confiance" on /play — not the 20%/50% of the other rows.
77 lines
3.9 KiB
Python
77 lines
3.9 KiB
Python
import json
|
|
|
|
from flask import render_template, request, abort
|
|
|
|
import db
|
|
import screens
|
|
|
|
from core.flask_app import app
|
|
|
|
|
|
@app.route("/game/<slug>/screens/<int:screen_id>/edit")
|
|
def screen_edit(slug, screen_id):
|
|
game = db.game_meta(slug)
|
|
screen = screens.get_screen(slug, screen_id)
|
|
if not screen:
|
|
abort(404)
|
|
elements = screens.list_elements(slug, screen_id)
|
|
all_screens = screens.list_screens(slug)
|
|
element_types = screens.list_element_types(slug)
|
|
selected_id = request.args.get("selected", type=int)
|
|
selected_controls = None
|
|
if selected_id:
|
|
selected_el = next((e for e in elements if e["id"] == selected_id), None)
|
|
if selected_el:
|
|
selected_controls = screens.controls_with_values(slug, selected_el)
|
|
children_of = {}
|
|
for el in elements:
|
|
if el.get("parent_id"):
|
|
children_of.setdefault(el["parent_id"], []).append(el)
|
|
top_level_elements = [el for el in elements if not el.get("parent_id")]
|
|
elements_by_id = {el["id"]: el for el in elements}
|
|
|
|
definitions = db.list_definitions(slug)
|
|
definitions_data = {str(d["id"]): screens.data_definition_options(slug, d["id"]) for d in definitions}
|
|
|
|
flow_nodes = screens.list_flow_nodes(slug, screen_id)
|
|
flow_edges = screens.list_flow_edges(slug, screen_id)
|
|
elements_labels = {el["id"]: screens.element_label(el, screens.WIDGETS) for el in elements}
|
|
screens_map = {s["id"]: s["name"] for s in all_screens}
|
|
animation_clips = screens.list_animation_clips(slug, screen_id)
|
|
|
|
return render_template(
|
|
"screen_edit.html",
|
|
game=game, screen=screen, elements=elements, top_level_elements=top_level_elements,
|
|
children_of=children_of, container_widgets=screens.CONTAINER_WIDGETS,
|
|
elements_by_id=elements_by_id,
|
|
all_screens=all_screens,
|
|
element_types=element_types, widgets=screens.WIDGETS,
|
|
trigger_labels=screens.TRIGGER_LABELS, action_type_labels=screens.ACTION_TYPE_LABELS,
|
|
element_action_properties=screens.ELEMENT_ACTION_PROPERTIES,
|
|
element_action_property_labels=screens.ELEMENT_ACTION_PROPERTY_LABELS,
|
|
element_visibility_values=screens.ELEMENT_VISIBILITY_VALUES,
|
|
element_visibility_labels=screens.ELEMENT_VISIBILITY_LABELS,
|
|
element_surbrillance_values=screens.ELEMENT_SURBRILLANCE_VALUES,
|
|
element_desactive_values=screens.ELEMENT_DESACTIVE_VALUES,
|
|
data_operations=screens.DATA_OPERATIONS,
|
|
data_operation_labels=screens.DATA_OPERATION_LABELS,
|
|
definitions=definitions, definitions_json=json.dumps(definitions_data),
|
|
selected_id=selected_id, selected_controls=selected_controls,
|
|
google_fonts_link=screens.GOOGLE_FONTS_LINK,
|
|
flow_nodes=flow_nodes, flow_edges=flow_edges,
|
|
flow_nodes_json=json.dumps(flow_nodes), flow_edges_json=json.dumps(flow_edges),
|
|
trigger_events=screens.TRIGGER_EVENTS, condition_operators=screens.CONDITION_OPERATORS,
|
|
elements_labels_json=json.dumps(elements_labels), screens_map_json=json.dumps(screens_map),
|
|
action_type_labels_json=json.dumps(screens.ACTION_TYPE_LABELS),
|
|
element_action_property_labels_json=json.dumps(screens.ELEMENT_ACTION_PROPERTY_LABELS),
|
|
element_visibility_labels_json=json.dumps(screens.ELEMENT_VISIBILITY_LABELS),
|
|
element_surbrillance_labels_json=json.dumps(screens.ELEMENT_SURBRILLANCE_LABELS),
|
|
element_desactive_labels_json=json.dumps(screens.ELEMENT_DESACTIVE_LABELS),
|
|
data_operation_labels_json=json.dumps(screens.DATA_OPERATION_LABELS),
|
|
condition_operator_labels_json=json.dumps(screens.CONDITION_OPERATOR_LABELS),
|
|
trigger_labels_json=json.dumps(screens.TRIGGER_LABELS),
|
|
animation_clips=animation_clips, animation_clips_json=json.dumps(animation_clips),
|
|
animate_css_catalog=screens.ANIMATE_CSS_CATALOG,
|
|
animate_css_labels_json=json.dumps(screens.ANIMATE_CSS_LABELS),
|
|
)
|