diff options
| -rw-r--r-- | logic/database.gd | 2 | ||||
| -rw-r--r-- | logic/database_entry.gd | 4 | ||||
| -rw-r--r-- | logic/stage.gd | 42 | ||||
| -rw-r--r-- | main.tscn | 4 | ||||
| -rw-r--r-- | project.godot | 2 |
5 files changed, 27 insertions, 27 deletions
diff --git a/logic/database.gd b/logic/database.gd index 26f88b9..ad42ae0 100644 --- a/logic/database.gd +++ b/logic/database.gd @@ -252,7 +252,7 @@ static func import_csv(file_path: String) -> Array: DatabaseEntry.set_entry_date(entry, field_value) "date_year", "date_month", "date_day": entry[field_name] = int(field_value) - "is_urgent": + "emergency_surgery": entry[field_name] = true if field_value.strip_edges().to_lower() == "true" else false _: if DatabaseEntry.ENTRY_PROTOTYPE.has(field_name): diff --git a/logic/database_entry.gd b/logic/database_entry.gd index 3a78505..b7a88a2 100644 --- a/logic/database_entry.gd +++ b/logic/database_entry.gd @@ -17,7 +17,7 @@ const ENTRY_PROTOTYPE: Dictionary = { "sub_sub_type": "", "pathology": "", "intervention": "", - "is_urgent": false, + "emergency_surgery":false, "notes": "", } @@ -40,7 +40,7 @@ static func instance_entry(params: Dictionary = {}) -> Dictionary: new_entry.sub_sub_type = params.get("sub_sub_type", "") new_entry.pathology = params.get("pathology", "") new_entry.intervention = params.get("intervention", "") - new_entry.is_urgent = params.get("is_urgent", false) + new_entry.emergency_surgery = params.get("emergency_surgery", false) new_entry.notes = params.get("notes", "") return new_entry diff --git a/logic/stage.gd b/logic/stage.gd index e1eafba..cc0cb97 100644 --- a/logic/stage.gd +++ b/logic/stage.gd @@ -23,25 +23,25 @@ const OPTION_SETS_TREE_STRUCTURE := { var staged_entry_hash: int var option_sets: Dictionary -onready var title := get_node("controls/title") as Label -onready var process_id := get_node("controls/process_id") as LineEdit -onready var surgery_id := get_node("controls/surgery_id") as LineEdit -onready var date := get_node("controls/date_picker") as DatePicker -onready var place := get_node("controls/place") as OptionSet -onready var anesthesia := get_node("controls/anesthesia") as OptionSet -onready var first_assistant := get_node("controls/first_assistant") as OptionSet -onready var type := get_node("controls/type") as OptionSet -onready var sub_type := get_node("controls/sub_type") as OptionSet -onready var sub_sub_type := get_node("controls/sub_sub_type") as OptionSet -onready var pathology := get_node("controls/pathology") as OptionSet -onready var intervention := get_node("controls/intervention") as OptionSet -onready var is_urgent := get_node("controls/is_urgent") as Button -onready var notes := get_node("controls/notes") as LineEdit -onready var save_button := get_node("controls/buttons/save") as Button -onready var discard_button := get_node("controls/buttons/discard") as Button -onready var scrollbar := get_v_scrollbar() -onready var popup := get_node("/root/main/popup") as ModalPopup -onready var dialog := get_node("/root/main/dialog") as Dialog +onready var title := get_node("controls/title") as Label +onready var process_id := get_node("controls/process_id") as LineEdit +onready var surgery_id := get_node("controls/surgery_id") as LineEdit +onready var date := get_node("controls/date_picker") as DatePicker +onready var place := get_node("controls/place") as OptionSet +onready var anesthesia := get_node("controls/anesthesia") as OptionSet +onready var first_assistant := get_node("controls/first_assistant") as OptionSet +onready var type := get_node("controls/type") as OptionSet +onready var sub_type := get_node("controls/sub_type") as OptionSet +onready var sub_sub_type := get_node("controls/sub_sub_type") as OptionSet +onready var pathology := get_node("controls/pathology") as OptionSet +onready var intervention := get_node("controls/intervention") as OptionSet +onready var emergency_surgery := get_node("controls/emergency_surgery") as Button +onready var notes := get_node("controls/notes") as LineEdit +onready var save_button := get_node("controls/buttons/save") as Button +onready var discard_button := get_node("controls/buttons/discard") as Button +onready var scrollbar := get_v_scrollbar() +onready var popup := get_node("/root/main/popup") as ModalPopup +onready var dialog := get_node("/root/main/dialog") as Dialog func _init(): @@ -138,7 +138,7 @@ func set_stage(entry: Dictionary, title: String): sub_sub_type.text = entry.sub_sub_type pathology.text = entry.pathology intervention.text = entry.intervention - is_urgent.pressed = entry.is_urgent + emergency_surgery.pressed = entry.emergency_surgery notes.text = entry.notes self.scroll_vertical = 0 @@ -158,7 +158,7 @@ func get_stage() -> Dictionary: "sub_sub_type": sub_sub_type.text, "pathology": pathology.text, "intervention": intervention.text, - "is_urgent": is_urgent.pressed, + "emergency_surgery": emergency_surgery.pressed, "notes": notes.text, } return entry @@ -203,13 +203,13 @@ margin_bottom = 992.0 rect_min_size = Vector2( 0, 62 ) placeholder = "Intervention" -[node name="is_urgent" type="Button" parent="stage/controls" index="12"] +[node name="emergency_surgery" type="Button" parent="stage/controls" index="12"] margin_top = 1002.0 margin_right = 1080.0 margin_bottom = 1064.0 rect_min_size = Vector2( 0, 62 ) toggle_mode = true -text = "Is urgent" +text = "Emergency surgery" align = 0 [node name="notes" type="LineEdit" parent="stage/controls" index="13"] diff --git a/project.godot b/project.godot index bb9d71e..ad972fc 100644 --- a/project.godot +++ b/project.godot @@ -112,7 +112,7 @@ window/handheld/orientation="portrait" [global] -version="1.4" +version="1.5" [input_devices] |