Merged
Conversation
* Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com>
* Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com>
timh1975
added a commit
that referenced
this pull request
Apr 19, 2024
* feature-taylab-new-pages-April (#58) * Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * feature-taylab-new-pages-April (#58) * Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * Question16 (#68) * feature-taylab-new-pages-April (#58) * Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * feature-taylab-new-pages-April (#58) (#64) * Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * Page 16 added with required amendments --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * Question8 (#69) * feature-taylab-new-pages-April (#58) * Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * feature-taylab-new-pages-April (#58) (#64) * Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * Page 16 added with required amendments * Page 8 and 15 linked. However, they are blank apart from the crab image and name --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * Page 10 now displaying correctly (#71) * feature-taylab-new-pages-April (#58) * Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * feature-taylab-new-pages-April (#58) (#64) * Initial Commit * Implements top app bar * Layout for bottom navigation bar * Top app bar * General Page Layout * Had build error due to "const" constructor. error resolved * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * Added the JSON files to the repo which consists of all questions along with other information displayed in the app. * changed bottom navigation bar so the number of pages currently user is in gets displayed correctly. * question 10 page, uses string questions intead of directly fetching json. ongoing tasks. * fixed the images loading issue, where the image couldnt be fetched previously. * question 8 and 9 using json data. * fixed the issue with "question" being fetched from the wrong questionnaire in the json data. * fixed both json data loading as there was an error wher question 9 was loading question 8 data. fixed. * app navigation can be done now, since i have 2 pages i am working on, user can navigate back and forth between the pages now and the bottom bar will change accordingly. * first commit * first commit * basic screen working * Updated elements for sizing on screen 3 * Updated elements for sizing on screen 4 * Updated question7.dart * question8.dart pulling county list based on hard coded state * Pass state, crab name and image file to question8.dart * Pass crab name and image file to question3.dart * Pass crab name and image file to question4.dart * Data now passed to Q3, Q4, Q7, Q8 * Screens refactored to work with amended modifiedquestions JSON * Screens refactored to work with amended modified questions JSON. Bottom navigation restored to original format * Code base from Tayyab now in this feature branch. Runs with issues on first page * Code base from Tayyab now in this feature branch. Runs with issues on first page * Added all image assets from original Android app * Pass data back from page3. Returned data variables defined * Pass data back from page4. * Page 4 listbox size fixed for web * Refactored questions_utils.dart * Refactored questions_utils.dart * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * question6.dart page added and linked * Revert "question6.dart page added and linked" This reverts commit 6dc797d. * Page 6 added * question9.dart added * added question6.dart * added question6.dart * Selected state now passed to question12 to display correct counties --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * Page 16 added with required amendments * Page 8 and 15 linked. However, they are blank apart from the crab image and name * Pge 10 now displaying correctly. --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com> * Update question10.dart Fixed merge conflict errors * Update question15.dart Fixed merged issues * Update questions_utils.dart Fixed merged issues * Prevent forward nagivation (#75) * Fixed merged issues with remote dev branch * Global variable added and added to question3.dart * Press on proceed does not work if a year is not selected on questionpage3 * Reverted back to preventing press to proceed if year not selected in question3 * Now cannot select future month. However, is still selected as green * Question13.dart now showing protected areas for selected state from page 10 --------- Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> * Prevent forward nagivation (#76) * Fixed merged issues with remote dev branch * Global variable added and added to question3.dart * Press on proceed does not work if a year is not selected on questionpage3 * Reverted back to preventing press to proceed if year not selected in question3 * Now cannot select future month. However, is still selected as green * Question13.dart now showing protected areas for selected state from page 10 * Question page 14 re-added --------- Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> * Prevent forward nagivation (#78) * Fixed merged issues with remote dev branch * Global variable added and added to question3.dart * Press on proceed does not work if a year is not selected on questionpage3 * Reverted back to preventing press to proceed if year not selected in question3 * Now cannot select future month. However, is still selected as green * Question13.dart now showing protected areas for selected state from page 10 * Question page 14 re-added * Disable forward navigation on null input for questions 3, 4, 7, 9, 10, 11, 12, 13, 14 --------- Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> * Prevent forward nagivation (#79) * Fixed merged issues with remote dev branch * Global variable added and added to question3.dart * Press on proceed does not work if a year is not selected on questionpage3 * Reverted back to preventing press to proceed if year not selected in question3 * Now cannot select future month. However, is still selected as green * Question13.dart now showing protected areas for selected state from page 10 * Question page 14 re-added * Disable forward navigation on null input for questions 3, 4, 7, 9, 10, 11, 12, 13, 14 --------- Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> * Prevent forward nagivation (#80) * Fixed merged issues with remote dev branch * Global variable added and added to question3.dart * Press on proceed does not work if a year is not selected on questionpage3 * Reverted back to preventing press to proceed if year not selected in question3 * Now cannot select future month. However, is still selected as green * Question13.dart now showing protected areas for selected state from page 10 * Question page 14 re-added * Disable forward navigation on null input for questions 3, 4, 7, 9, 10, 11, 12, 13, 14 * Disable forward navigation on null input for questions 3, 4, 7, 9, 10, 11, 12, 13, 14 --------- Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> * FIx Merge Conflict Error * Prevent forward nagivation (#81) * Fixed merged issues with remote dev branch * Global variable added and added to question3.dart * Press on proceed does not work if a year is not selected on questionpage3 * Reverted back to preventing press to proceed if year not selected in question3 * Now cannot select future month. However, is still selected as green * Question13.dart now showing protected areas for selected state from page 10 * Question page 14 re-added * Disable forward navigation on null input for questions 3, 4, 7, 9, 10, 11, 12, 13, 14 * Disable forward navigation on null input for questions 3, 4, 7, 9, 10, 11, 12, 13, 14 --------- Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> * Prevent forward nagivation (#82) * Fixed merged issues with remote dev branch * Global variable added and added to question3.dart * Press on proceed does not work if a year is not selected on questionpage3 * Reverted back to preventing press to proceed if year not selected in question3 * Now cannot select future month. However, is still selected as green * Question13.dart now showing protected areas for selected state from page 10 * Question page 14 re-added * Disable forward navigation on null input for questions 3, 4, 7, 9, 10, 11, 12, 13, 14 * Disable forward navigation on null input for questions 3, 4, 7, 9, 10, 11, 12, 13, 14 --------- Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> * Delete lib/main..dart delete duplicated main --------- Co-authored-by: Redux GB <alex@reduxgb.com> Co-authored-by: Adarsha Aryal <109141779+findingaadi@users.noreply.github.com> Co-authored-by: findingaadi <adarshaaryal30@gmail.com> Co-authored-by: Alex <alex@alexis.scot> Co-authored-by: Tim Honisett <40595819@live.napier.ac.uk> Co-authored-by: tayyabcreator <123637905+tayyabcreator@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added question page 16. Image and crab name removed as not on original page. Text needs to appear on the button on page load, at present only shows on button click