diff --git a/godot/global_ints.gd b/godot/global_ints.gd index e9bb87c..492eea2 100644 --- a/godot/global_ints.gd +++ b/godot/global_ints.gd @@ -1,7 +1,7 @@ extends Node -var date -var ddmmyyyy +var date = {} +var ddmmyyyy : String var update_text : String @@ -30,26 +30,26 @@ var locked_observation_intervals : int var locked_observations_intervals_remaining : int var locked_observations_completed : int -var one_acronym = "OnT" -var two_acronym = "Loo" -var three_acronym = "Dis" -var four_acronym = "Wal" -var five_acronym = "Oth" -var six_acronym = "Emp" +var one_acronym : String = "OnT" +var two_acronym : String = "Loo" +var three_acronym : String = "Dis" +var four_acronym : String = "Wal" +var five_acronym : String = "Oth" +var six_acronym : String = "Emp" -var one_behaviour = "On Task" -var two_behaviour = "Looking" -var three_behaviour = "Distracting" -var four_behaviour = "Walking" -var five_behaviour = "Other" -var six_behaviour = "Empty" +var one_behaviour : String = "On Task" +var two_behaviour : String = "Looking" +var three_behaviour : String = "Distracting" +var four_behaviour : String = "Walking" +var five_behaviour : String = "Other" +var six_behaviour : String = "Empty" -var one_explanation = "The pupil is on task" -var two_explanation = "The pupil is looking around in a distracted manner or is staring into the distance" -var three_explanation = "The pupil is distracting other pupils or talking to them" -var four_explanation = "The pupil is walking through the class" -var five_explanation = "The pupil is otherwise distracted and not on task" -var six_explanation = "No answer was selected for this round" +var one_explanation : String = "The pupil is on task" +var two_explanation : String = "The pupil is looking around in a distracted manner or is staring into the distance" +var three_explanation : String = "The pupil is distracting other pupils or talking to them" +var four_explanation : String = "The pupil is walking through the class" +var five_explanation : String = "The pupil is otherwise distracted and not on task" +var six_explanation : String = "No answer was selected for this round" var total_behaviours : int var one_behaviour_score : int diff --git a/godot/main_screen.gd b/godot/main_screen.gd index 83d3c93..3621a8c 100644 --- a/godot/main_screen.gd +++ b/godot/main_screen.gd @@ -2,11 +2,8 @@ extends CanvasLayer const RATIO = 720.0 / 1280.0 -var date_time var check_time_var : int -var ddmmyyyy : String -var date -var csv_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/version_info.csv" +var csv_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/updater/version_info.csv" var update_text_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/updater/update_text.md" var update_text : String var text_buffer : String @@ -126,11 +123,10 @@ func _process(_delta): if check_time_var == 10: check_time_var = 0 - date_time = Time.get_datetime_dict_from_system() - if date_time.minute < 10: - date_time_display.text = str(date_time.hour, ":0", date_time.minute) - if date_time.minute >= 10: - date_time_display.text = str(date_time.hour, ":", date_time.minute) + if global_ints.date.minute < 10: + date_time_display.text = str(global_ints.date.hour, ":0", global_ints.date.minute) + if global_ints.date.minute >= 10: + date_time_display.text = str(global_ints.date.hour, ":", global_ints.date.minute) func _on_MinuteMinus_pressed(): diff --git a/version_info.csv b/updater/version_info.csv similarity index 100% rename from version_info.csv rename to updater/version_info.csv