Fixed export settings to include all required scripts. Renamed is_urgency to is_urgent.v1.4

6 files changed, 15 insertions, 18 deletions

diff --git a/export_presets.cfg b/export_presets.cfg
index 19202dd..27ae693 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -4,10 +4,9 @@ name="android"
 platform="Android"
 runnable=true
 custom_features=""
-export_filter="scenes"
-export_files=PoolStringArray( "res://main.tscn" )
+export_filter="all_resources"
 include_filter=""
-exclude_filter=""
+exclude_filter="*.png"
 export_path="build/surgery_log.apk"
 script_export_mode=1
 script_encryption_key=""
@@ -211,10 +210,9 @@ name="linux"
 platform="Linux/X11"
 runnable=true
 custom_features=""
-export_filter="scenes"
-export_files=PoolStringArray( "res://main.tscn" )
+export_filter="all_resources"
 include_filter=""
-exclude_filter=""
+exclude_filter="*.png"
 export_path="build/surgery_log.x64"
 script_export_mode=1
 script_encryption_key=""
@@ -237,10 +235,9 @@ name="windows"
 platform="Windows Desktop"
 runnable=true
 custom_features=""
-export_filter="scenes"
-export_files=PoolStringArray( "res://main.tscn" )
+export_filter="all_resources"
 include_filter=""
-exclude_filter=""
+exclude_filter="*.png"
 export_path="build/surgery_log.exe"
 script_export_mode=1
 script_encryption_key=""
diff --git a/logic/database.gd b/logic/database.gd
index 5d8792f..26f88b9 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_urgency":
+				"is_urgent":
 					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 8b0c51f..3a78505 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_urgency":		false,
+	"is_urgent":		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_urgency		= params.get("is_urgency", false)
+	new_entry.is_urgent			= params.get("is_urgent", false)
 	new_entry.notes				= params.get("notes", "")
 	
 	return new_entry
diff --git a/logic/stage.gd b/logic/stage.gd
index e6d9474..e1eafba 100644
--- a/logic/stage.gd
+++ b/logic/stage.gd
@@ -35,7 +35,7 @@ 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_urgency		:= get_node("controls/is_urgency") as Button
+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
@@ -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_urgency.pressed		= entry.is_urgency
+	is_urgent.pressed		= entry.is_urgent
 	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_urgency":		is_urgency.pressed,
+		"is_urgent":		is_urgent.pressed,
 		"notes":			notes.text,
 	}
 	return entry
diff --git a/main.tscn b/main.tscn
index 694f41a..32b1785 100644
--- a/main.tscn
+++ b/main.tscn
@@ -203,13 +203,13 @@ margin_bottom = 992.0
 rect_min_size = Vector2( 0, 62 )
 placeholder = "Intervention"
 
-[node name="is_urgency" type="Button" parent="stage/controls" index="12"]
+[node name="is_urgent" 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 urgency"
+text = "Is urgent"
 align = 0
 
 [node name="notes" type="LineEdit" parent="stage/controls" index="13"]
diff --git a/project.godot b/project.godot
index e1be231..bb9d71e 100644
--- a/project.godot
+++ b/project.godot
@@ -112,7 +112,7 @@ window/handheld/orientation="portrait"
 
 [global]
 
-version="1.3"
+version="1.4"
 
 [input_devices]