From dbbee6f90e7d47af8dab165278cc7637ca99ce51 Mon Sep 17 00:00:00 2001 From: Lloyd Dakin Date: Wed, 15 Nov 2023 10:05:50 -0800 Subject: [PATCH 1/2] removed observing side replace with ascending, descending removed the state variable observing_side from project_params, instead to support the selection of both ascending and descending the field was replaced with two checkboxes and the state was replaced with two new states 'ascending' and 'descending' that will be sent to site code instead --- src/components/projects/CreateProjectForm.vue | 26 ++++++------------- src/store/modules/project_params.js | 9 ++++--- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/components/projects/CreateProjectForm.vue b/src/components/projects/CreateProjectForm.vue index 7f5f4735..4ca727d0 100644 --- a/src/components/projects/CreateProjectForm.vue +++ b/src/components/projects/CreateProjectForm.vue @@ -433,23 +433,12 @@
- - - Ascending - - - - - Descending - + + Ascending + + + Descending +
@@ -1169,7 +1158,8 @@ export default { 'targets', 'project_is_active', 'generic_instrument', - 'observing_side', + 'ascending', + 'descending', 'ra_offset', 'ra_offset_units', 'dec_offset', diff --git a/src/store/modules/project_params.js b/src/store/modules/project_params.js index 0113b1f8..8658f433 100644 --- a/src/store/modules/project_params.js +++ b/src/store/modules/project_params.js @@ -39,7 +39,8 @@ const state = { // Project constraints below project_is_active: true, generic_instrument: 'Main Camera', // removed from ui with options Auxiliary, Echelle, UXEX, Planet, IR at waynes request - observing_side: 'flip_ok', // can be ['flip_ok', 'no_flip', 'east_only', 'west_only'] + ascending: false, + descending: false, ra_offset: 0.0, ra_offset_units: 'deg', dec_offset: 0.0, @@ -71,7 +72,8 @@ const getters = { return { project_is_active: state.project_is_active, generic_instrument: state.generic_instrument, - observing_side: state.observing_side, + ascending: state.ascending, + descending: state.descending, ra_offset: state.ra_offset, ra_offset_units: state.ra_offset_units, dec_offset: state.dec_offset, @@ -145,7 +147,8 @@ const mutations = { project_is_active (state, val) { state.project_is_active = val }, generic_instrument (state, val) { state.generic_instrument = val }, - observing_side (state, val) { state.observing_side = val }, + ascending (state, val) { state.ascending = val }, + descending (state, val) { state.descending = val }, ra_offset (state, val) { state.ra_offset = val }, ra_offset_units (state, val) { state.ra_offset_units = val }, dec_offset (state, val) { state.dec_offset = val }, From 199e4ba6245db96f31ab57999656d25a8549a84e Mon Sep 17 00:00:00 2001 From: Lloyd Dakin Date: Wed, 15 Nov 2023 11:35:07 -0800 Subject: [PATCH 2/2] Setting Default behavior for ascending, descending After consulting with Wayne default behavior for these values should be true for both of them. Changing the state default to reflect this --- src/store/modules/project_params.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/store/modules/project_params.js b/src/store/modules/project_params.js index 8658f433..23c4628b 100644 --- a/src/store/modules/project_params.js +++ b/src/store/modules/project_params.js @@ -39,8 +39,8 @@ const state = { // Project constraints below project_is_active: true, generic_instrument: 'Main Camera', // removed from ui with options Auxiliary, Echelle, UXEX, Planet, IR at waynes request - ascending: false, - descending: false, + ascending: true, + descending: true, ra_offset: 0.0, ra_offset_units: 'deg', dec_offset: 0.0,