diff --git a/services/registration/edit_family_name.vis b/services/registration/edit_family_name.vis index 6751766..8b76f1d 100644 --- a/services/registration/edit_family_name.vis +++ b/services/registration/edit_family_name.vis @@ -1,18 +1,8 @@ -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH update_familyname flag_allow_update 1 LOAD get_current_profile_info 0 RELOAD get_current_profile_info MAP get_current_profile_info MOUT back 0 HALT +LOAD save_familyname 32 INCMP _ 0 -RELOAD set_back -CATCH _ flag_back_set 1 -LOAD save_familyname 64 -RELOAD save_familyname -CATCH pin_entry flag_familyname_set 1 -CATCH select_gender flag_gender_set 0 -CATCH edit_yob flag_yob_set 0 -CATCH edit_location flag_location_set 0 -CATCH edit_offerings flag_offerings_set 0 -CATCH pin_entry flag_familyname_set 0 +INCMP edit_family_name_next * diff --git a/services/registration/edit_family_name_next.vis b/services/registration/edit_family_name_next.vis new file mode 100644 index 0000000..2e81955 --- /dev/null +++ b/services/registration/edit_family_name_next.vis @@ -0,0 +1,10 @@ +RELOAD save_familyname +CATCH incorrect_pin flag_incorrect_pin 1 +CATCH update_familyname flag_allow_update 1 +RELOAD set_back +CATCH _ flag_back_set 1 +CATCH pin_entry flag_familyname_set 1 +CATCH select_gender flag_gender_set 0 +CATCH edit_yob flag_yob_set 0 +CATCH edit_location flag_location_set 0 +CATCH pin_entry flag_familyname_set 0 diff --git a/services/registration/edit_first_name.vis b/services/registration/edit_first_name.vis index 835f2bb..9adb546 100644 --- a/services/registration/edit_first_name.vis +++ b/services/registration/edit_first_name.vis @@ -1,19 +1,8 @@ -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH update_firstname flag_allow_update 1 LOAD get_current_profile_info 0 RELOAD get_current_profile_info MAP get_current_profile_info MOUT back 0 HALT +LOAD save_firstname 64 INCMP _ 0 -RELOAD set_back -CATCH _ flag_back_set 1 -LOAD save_firstname 128 -RELOAD save_firstname -CATCH pin_entry flag_firstname_set 1 -CATCH edit_family_name flag_familyname_set 0 -CATCH edit_gender flag_gender_set 0 -CATCH edit_yob flag_yob_set 0 -CATCH edit_location flag_location_set 0 -CATCH edit_offerings flag_offerings_set 0 -CATCH pin_entry flag_firstname_set 0 +INCMP edit_first_name_next * diff --git a/services/registration/edit_first_name_next.vis b/services/registration/edit_first_name_next.vis new file mode 100644 index 0000000..b557580 --- /dev/null +++ b/services/registration/edit_first_name_next.vis @@ -0,0 +1,11 @@ +RELOAD save_firstname +CATCH incorrect_pin flag_incorrect_pin 1 +CATCH update_firstname flag_allow_update 1 +RELOAD set_back +CATCH _ flag_back_set 1 +CATCH pin_entry flag_firstname_set 1 +CATCH edit_family_name flag_familyname_set 0 +CATCH select_gender flag_gender_set 0 +CATCH edit_yob flag_yob_set 0 +CATCH edit_location flag_location_set 0 +CATCH pin_entry flag_firstname_set 0 diff --git a/services/registration/edit_location.vis b/services/registration/edit_location.vis index 17076ca..d097a7d 100644 --- a/services/registration/edit_location.vis +++ b/services/registration/edit_location.vis @@ -1,14 +1,9 @@ -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH update_location flag_allow_update 1 LOAD get_current_profile_info 0 RELOAD get_current_profile_info LOAD save_location 16 MOUT back 0 HALT -INCMP _ 0 -RELOAD set_back -CATCH _ flag_back_set 1 RELOAD save_location -CATCH pin_entry flag_location_set 1 -CATCH edit_offerings flag_offerings_set 0 -CATCH pin_entry flag_location_set 0 +INCMP _ 0 +INCMP edit_location_next * + diff --git a/services/registration/edit_location_next.vis b/services/registration/edit_location_next.vis new file mode 100644 index 0000000..86074e7 --- /dev/null +++ b/services/registration/edit_location_next.vis @@ -0,0 +1,6 @@ +CATCH incorrect_pin flag_incorrect_pin 1 +CATCH update_location flag_allow_update 1 +RELOAD set_back +CATCH _ flag_back_set 1 +CATCH pin_entry flag_location_set 1 +CATCH edit_offerings flag_offerings_set 0 diff --git a/services/registration/edit_offerings.vis b/services/registration/edit_offerings.vis index 9ce1407..d8ae703 100644 --- a/services/registration/edit_offerings.vis +++ b/services/registration/edit_offerings.vis @@ -1,15 +1,9 @@ -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH update_offerings flag_allow_update 1 LOAD get_current_profile_info 0 RELOAD get_current_profile_info LOAD save_offerings 8 MOUT back 0 HALT -INCMP _ 0 -RELOAD set_back -CATCH _ flag_back_set 1 RELOAD save_offerings INCMP _ 0 -CATCH pin_entry flag_offerings_set 1 -CATCH pin_entry flag_offerings_set 0 -INCMP update_profile_items * +INCMP edit_offerings_next * + diff --git a/services/registration/edit_offerings_next.vis b/services/registration/edit_offerings_next.vis new file mode 100644 index 0000000..9477382 --- /dev/null +++ b/services/registration/edit_offerings_next.vis @@ -0,0 +1,6 @@ +CATCH incorrect_pin flag_incorrect_pin 1 +CATCH update_offerings flag_allow_update 1 +RELOAD set_back +CATCH _ flag_back_set 1 +CATCH pin_entry flag_offerings_set 1 +MOVE update_profile_items diff --git a/services/registration/edit_yob.vis b/services/registration/edit_yob.vis index e65f1c9..36923fd 100644 --- a/services/registration/edit_yob.vis +++ b/services/registration/edit_yob.vis @@ -1,20 +1,11 @@ -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH update_yob flag_allow_update 1 LOAD get_current_profile_info 0 +LOAD save_yob 16 RELOAD get_current_profile_info MAP get_current_profile_info MOUT back 0 HALT -INCMP _ 0 -RELOAD set_back -CATCH _ flag_back_set 1 -LOAD verify_yob 6 +LOAD verify_yob 0 RELOAD verify_yob -CATCH incorrect_date_format flag_incorrect_date_format 1 -LOAD save_yob 32 RELOAD save_yob -CATCH pin_entry flag_yob_set 1 -CATCH edit_location flag_location_set 0 -CATCH edit_offerings flag_offerings_set 0 -CATCH pin_entry flag_yob_set 0 -INCMP edit_location * +INCMP _ 0 +INCMP edit_yob_next * diff --git a/services/registration/edit_yob_next.vis b/services/registration/edit_yob_next.vis new file mode 100644 index 0000000..4ab2bf2 --- /dev/null +++ b/services/registration/edit_yob_next.vis @@ -0,0 +1,9 @@ +CATCH incorrect_date_format flag_incorrect_date_format 1 +CATCH incorrect_pin flag_incorrect_pin 1 +CATCH update_yob flag_allow_update 1 +RELOAD set_back +CATCH _ flag_back_set 1 +CATCH pin_entry flag_yob_set 1 +CATCH edit_location flag_location_set 0 +CATCH edit_offerings flag_offerings_set 0 +CATCH pin_entry flag_yob_set 0 diff --git a/services/registration/select_gender.vis b/services/registration/select_gender.vis index c1a00f5..555d238 100644 --- a/services/registration/select_gender.vis +++ b/services/registration/select_gender.vis @@ -1,5 +1,3 @@ -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH profile_update_success flag_allow_update 1 LOAD get_current_profile_info 0 RELOAD get_current_profile_info MOUT male 1 diff --git a/services/registration/set_female.vis b/services/registration/set_female.vis index da92520..30228e9 100644 --- a/services/registration/set_female.vis +++ b/services/registration/set_female.vis @@ -1,10 +1,3 @@ -LOAD save_gender 32 +LOAD save_gender 16 RELOAD save_gender -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH update_gender flag_allow_update 1 -CATCH pin_entry flag_gender_set 1 -CATCH edit_yob flag_yob_set 0 -CATCH edit_location flag_location_set 0 -CATCH edit_offerings flag_offerings_set 0 -CATCH pin_entry flag_gender_set 0 -MOVE edit_yob +MOVE set_gender_next diff --git a/services/registration/set_gender_next b/services/registration/set_gender_next new file mode 100644 index 0000000..723a3b5 --- /dev/null +++ b/services/registration/set_gender_next @@ -0,0 +1 @@ +Select gender \ No newline at end of file diff --git a/services/registration/set_gender_next.vis b/services/registration/set_gender_next.vis new file mode 100644 index 0000000..095455a --- /dev/null +++ b/services/registration/set_gender_next.vis @@ -0,0 +1,6 @@ +CATCH incorrect_pin flag_incorrect_pin 1 +CATCH update_gender flag_allow_update 1 +CATCH pin_entry flag_gender_set 1 +CATCH edit_yob flag_yob_set 0 +CATCH edit_location flag_location_set 0 +CATCH edit_offerings flag_offerings_set 0 diff --git a/services/registration/set_male.vis b/services/registration/set_male.vis index 9a95937..30228e9 100644 --- a/services/registration/set_male.vis +++ b/services/registration/set_male.vis @@ -1,10 +1,3 @@ LOAD save_gender 16 RELOAD save_gender -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH update_gender flag_allow_update 1 -CATCH pin_entry flag_gender_set 1 -CATCH edit_yob flag_yob_set 0 -CATCH edit_location flag_location_set 0 -CATCH edit_offerings flag_offerings_set 0 -CATCH pin_entry flag_gender_set 0 -MOVE edit_yob +MOVE set_gender_next diff --git a/services/registration/set_unspecified.vis b/services/registration/set_unspecified.vis index 824105c..30228e9 100644 --- a/services/registration/set_unspecified.vis +++ b/services/registration/set_unspecified.vis @@ -1,10 +1,3 @@ -LOAD save_gender 8 +LOAD save_gender 16 RELOAD save_gender -CATCH incorrect_pin flag_incorrect_pin 1 -CATCH update_gender flag_allow_update 1 -CATCH pin_entry flag_gender_set 1 -CATCH edit_yob flag_yob_set 0 -CATCH edit_location flag_location_set 0 -CATCH edit_offerings flag_offerings_set 0 -CATCH pin_entry flag_gender_set 0 -MOVE edit_yob +MOVE set_gender_next