Fix issues when creating/editing entries. Fix android icon.

1 files changed, 24 insertions, 28 deletions

diff --git a/logic/database.gd b/logic/database.gd
index 1abb984..db449ae 100644
--- a/logic/database.gd
+++ b/logic/database.gd
@@ -52,38 +52,34 @@ func _ready():
 	add_button.connect("pressed", self, "add_action")	
 	stage.connect("save", self, "save")
 	stage.connect("discard", self, "discard")
-	refresh_list()
+	for it in db:
+		self.add_item(get_entry_view(it))
 
 
 func get_entry_view(database_entry: Dictionary) -> String:
 	return "%6s | %6s | %s" % [database_entry.process_id, database_entry.surgery_id, get_entry_date(database_entry)]
 
 
-func refresh_list():
-	self.clear()
-	for it in db:
-		self.add_item(get_entry_view(it))
-
-
 func clear_selection():
 	unselect_all()
 
 
 func delete_action():
-	# @DAM Could do some performance improvements
 	var selected_entries_idx := self.get_selected_items()
-	var sorted_idx := Array(selected_entries_idx)
-	sorted_idx.sort()
-	sorted_idx.invert()
-	for idx in sorted_idx:
-		db.remove(idx)
-		self.remove_item(idx)
+	if selected_entries_idx.size() == 0:
+		return
+	assert(selected_entries_idx.size() == 1, "Multiple selected items not supported.")
+	var selected_idx = selected_entries_idx[0]
+	db.remove(selected_idx)
+	self.remove_item(selected_idx)
+	store_database()
 
 
 func edit_action():
 	var selected_entries_idx := self.get_selected_items()
-	if selected_entries_idx.size() != 1:
+	if selected_entries_idx.size() == 0:
 		return
+	assert(selected_entries_idx.size() == 1, "Multiple selected items not supported.")
 	staged_idx = selected_entries_idx[0]
 	self.visible = false
 	stage.visible = true
@@ -95,20 +91,17 @@ func add_action():
 	stage.visible = true
 	var staged := instance_entry()
 	stage.set_stage(staged)
-	# @DAM This signal is connected but, if we select "DISCARD" it stays connectd.
-	# Maybe I should always keep the connection and use two different buttons on sage screen.
-	stage.connect("save", self, "save_new", [], CONNECT_ONESHOT)
 
 
 func save(database_entry: Dictionary):
+	database_entry = instance_entry(database_entry) # @DAM Maybe we could not be creating endless dictionaries?
 	if staged_idx >= 0:
 		db[staged_idx] = database_entry
 		set_item_text(staged_idx, get_entry_view(database_entry))
-#		items[staged_idx] = get_entry_view(database_entry)
 	else:
 		db.append(database_entry)
 		add_item(get_entry_view(database_entry))
-	
+	store_database()
 	staged_idx = -1
 	self.visible = true
 
@@ -118,9 +111,9 @@ func discard():
 	self.visible = true
 
 
-func load_database():
+func load_database(file_path: String = DATABASE_FILE_PATH):
 	var file := File.new()
-	file.open(DATABASE_FILE_PATH, File.READ_WRITE)
+	file.open(file_path, File.READ_WRITE)
 	var headers: PoolStringArray
 	var is_first_line := true
 #	while database_file.eof_reached() == false:
@@ -177,9 +170,9 @@ func load_database():
 	]
 
 
-func store_database():
+func store_database(file_path: String = DATABASE_FILE_PATH):
 	var file := File.new()
-	file.open(DATABASE_FILE_PATH, File.WRITE)
+	file.open(file_path, File.WRITE)
 	var header := PoolStringArray(ENTRY_PROTOTYPE.keys())
 	file.store_csv_line(header)
 	var entry := PoolStringArray()
@@ -188,14 +181,17 @@ func store_database():
 	file.close()
 
 
-func instance_entry(params: Dictionary = {}) -> Dictionary:
+static func instance_entry(params: Dictionary = {}) -> Dictionary:
 	var new_entry := ENTRY_PROTOTYPE.duplicate(true)
 	new_entry.process_id		= params.get("process_id", "")
 	new_entry.surgery_id		= params.get("surgery_id", "")
 	new_entry.place				= params.get("place", "")
 	
 	var today = OS.get_date()
-	set_entry_date(new_entry, params.get("date", DATE_FORMAT % [today.year, today.month, today.day]))
+	new_entry.date_year			= params.get("date_year", today.year)
+	new_entry.date_month		= params.get("date_month", today.month)
+	new_entry.date_day			= params.get("date_day", today.day)
+	new_entry.date				= params.get("date", get_entry_date(new_entry))
 	
 	new_entry.anesthetic		= params.get("anesthetic", "")
 	new_entry.first_assistant	= params.get("first_assistant", "")
@@ -210,11 +206,11 @@ func instance_entry(params: Dictionary = {}) -> Dictionary:
 	return new_entry
 
 
-func get_entry_date(entry: Dictionary) -> String:
+static func get_entry_date(entry: Dictionary) -> String:
 	return DATE_FORMAT % [entry.date_year, entry.date_month, entry.date_day]
 
 
-func set_entry_date(entry: Dictionary, date: String):
+static func set_entry_date(entry: Dictionary, date: String):
 	date = date.strip_edges().replace(" ", DATE_SEPARATOR).replace("/", DATE_SEPARATOR).replace("\\", DATE_SEPARATOR)
 	var year_month_idx := date.find(DATE_SEPARATOR)
 	var month_day_idx := date.find(DATE_SEPARATOR, year_month_idx + 1)