Disaster check in page - issue #654 - in progress #671
Conversation
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
…; some minor refactoring
… some related changes/additions
…droid support library v4
* Fix a couple typos in the Contributing file. * Database Changes * Fixing the database. * Removal of the Cluster for registration and hopefully cleaned up the test cases. Fix migration * Test fixed. * #309 : plumbing for Cluster create/edit/delete * #309 : cluster List * Task 313 Initial ability to select a crust on assign a volunteer though not narrowed down to a disaster in the dropdown list * Added the cluster list to the Create Disaster screen. Doesn't save yet. * Add the service to get the clusters for a specific disaster. Still tweaking needed on the cluster drop down. * #309 Added plumbing for Update Cluster and added two Cluster Exceptions * Resolves #299 * Added a unit test: MessageService__DoesNotFail_With_Empty_VolunteerList * Adding the ability to send a message via SMS. Had to add property to the models to support it. * Finished adding the ClusterDisaster addition/Creation/Deleteion/Update stuff. Should all work now. Yay. * adding comment to twilio config * #313 drop down list successfully changing depending on the disaster on the volunteer sign up page. * task #309: edit/remove cluster * Added error checking and fixed disappearing names. * Trying to make sure the test cases are fixed. * <3 Fix it so it can save the actual cluster. * 313 the cluster coordinator now shows in the my commitment box for volunteers. * task #309 : Cluster fixing issues * Test fixed for the disaster controller. * Fix for the volunteer results page. Not finished. * #326 Hopefully fixed this issue. when this branch gets merged. Also implemented it to show only the cluster that is related to that disaster per James. * Adding mock SMS for debugging purpose. Also fixing a bug on the Message Coordinator. * #326 Minor fix to change it so it would only show the commitments within that date as well to prevent duplicates. * Fixed the one failing tests * #311 Added redirecting to the create cluster page if they were coming from the disaster edit page. Also added in the button to add cluster on the disaster edit page. * task #309 : fixing bugs around cluster tasks * task #309: adding Cluster List and Add New Cluster to Admin Home * This will take in new clusters that are added on the Create Disaster page. * task #310: fixing validation on cluster creation * Try to modify the LINQ query to avoid 2 datareaders This is affecting the Disaster list view. * Issue 71. Added Regex on ViewModel, using existing resx. Also needed boundary check on Url.Segments in the Create view to prevent IndexOutOfRange when disaster name is bad. * Fixing issue #335 * Fixing issue #334 * Fixing issue #350. Also the issue could also happen on Create, so the same code was applied to that as well. * Fixing issue #345 * Bold Admin Username/Password * Modified Models to solve issues 350 and 402 * Added instructions for mac developers to get set up or developers who do not have visual studio * Changed 'Volunteer for Disaster' Label * Fixed grammar error in issue #364 "a end date" -> "an end date" * Fixed issue number 350 Added error message for string length validation. * Clarified error message when volunteer overload commitment in same time range For volunteer user, an error message is thrown whenever the volunteer user tries to add a second commitment in the same time range. Original message: there is already a commitment for this date range new message: You already have a commitment for this date range. Two good points: 1. format (full sentence) fit with other error messages; 2. Make it easier for the volunteer user to realize what they did wrong * Fix validation error in issue #383 * Added separators to improve readability * Fixed issue number 402 Added a check for the foreign key constraint of clusterId. Need to check on a live DB (we had connectivity issues at our codathon). * Add a simple integration test * Test the 'Add disaster' functionality * Fix for #429 fixes the user setup for the testuser and bob. * Cluster validation and fix for #431 Marked cluster name as required. Changed cluster's Update action to match Create action. * Requirement clarification for #386 Put little red asterisks by required fields and changed message to include location. * Fix for #435 tab order goes from username to password and username gets auto focus. * Beautification First go at beautification for disaster create/edit from issue #432 * space between buttons Put a space between the buttons on the disaster page as per #352 * updated version numbers in web.config files to match mvc razor references * Use existing disaster clusters to determine whether a selected cluster needs to be added * changed user name to username per #377 * Basic login test * TestUser can volunteer for disaster * Validate that a user can checkin to a disaster. * Run the test relative to the current date. * Create mock cluster to fix failing tests. * Moved the Create Disaster button up under the name and default on controls. * Update stale tests to get all tests passing. This will ensure that our appveyor builds work correctly. * Documented TestUser login. * On the Create/Edit Disaster page, add a checkbox to allow the user to check or uncheck all cluster checkboxes. * Cleaned up a javascript workaround. * Added cache-control header to Cluster List page so it's correct every time. * Allow volunteers to change status to delayed or unavailable. * added a step in the HomeController to also remove a person as a Cluster Coordinator when they are removing themselves from a Disaster. #406 * modified the delete cluster action so that it redirects to the list action in order to prevent browser-back issues. #385 * modified the successful login behavior to specifically render the home/index view instead of the returnUrl from the querystring. Also modified the unit tests to verify this functionality. #416 * Add initial ClusterGroup database and views/controllers Resolution for #450 * Missing migration Also for #450 * Fixed send message to volunteers to filter based on cluster * Changed nav item so it's consistently labeled * added additional step to collect a new start and end date when a volunteer indicates they will be delayed. #284 * Fix bug with LINQ query * Fixing the migration rebase Referencing #450 * Update README.md * Adding Organiszation Table * Adding OrganizationResource and Contact to the database entities. * Implementing a Resources Entity to replace the OrganizationResource entity, targetted on physical resources rather than documents. * Resetting error found in migration file. (DO not rename Entity Model Classes...) * filter by date is optional by default * display commitment details * add location detail to commitment * better format multiple commitments for volunteers * add organization relationship to person * Organizations in Person Contact Info * register with organization * fix organization data handling and display * fix nav by role * Display all checkin data for disasters clean up redundancy and errors * test fixes * display org resources and UI for entry/deletion * add resource checkin functionality add, remove, list, etc * implement contacts functionality * remove db from project someone slipped in including the db in project when they shouldn't * The volunteer homepage will now show the Organization Name in the "Commitments for today" section, as requested in Issue 474 * Remove use of the safe navigation operator (?.) as this is not supported for Visual Studio 2013. * Changed text of action description so that the user does not have to combine it with the button text in order for it to make sense. * iOS: commitment controller swap works; text box border color change works; updated NuGet packages; migrated to Unified project; fixed Xamarin.Forms build error; Tab bar buttons and text are now correct colors * Starting work on Issue378 * Resources are now added by the user, and the user is saved as a field on resource. (#495) The name of whoever checked in a resource is shown on the resource check in list next to the organisation. New resource types added. * Renaming a couple of tables for Issue492 (#496) * Resource now record when they were added... (#497) * Resource now record when they were added... * Adding files that were missed off my last commit. * minor update to fix #491 * Issue467 (#537) * Committing various work on Issue467 - a "Organizations Add" page and associated functionality... * Renaming an action method parameter so that it matches the MVC routes. * Removing POC. * Fixing issue with Registration page falling over itself... * Fixing issue with Registration page falling over itself... * Fixing unit tests. * Clarify which NUnit Extension (#638) There are two NUnit Test Runners in the extensions list, only one works to load the tests. * Fixed Typo (#637) * iOS: Commitment status picker works; some cleanup * Updated Xamarin.Forms package and necessary related changes; Login page; Disaster List with fake data; Commitment details needs UI
* Fix a couple typos in the Contributing file. * Database Changes * Fixing the database. * Removal of the Cluster for registration and hopefully cleaned up the test cases. Fix migration * Test fixed. * #309 : plumbing for Cluster create/edit/delete * #309 : cluster List * Task 313 Initial ability to select a crust on assign a volunteer though not narrowed down to a disaster in the dropdown list * Added the cluster list to the Create Disaster screen. Doesn't save yet. * Add the service to get the clusters for a specific disaster. Still tweaking needed on the cluster drop down. * #309 Added plumbing for Update Cluster and added two Cluster Exceptions * Resolves #299 * Added a unit test: MessageService__DoesNotFail_With_Empty_VolunteerList * Adding the ability to send a message via SMS. Had to add property to the models to support it. * Finished adding the ClusterDisaster addition/Creation/Deleteion/Update stuff. Should all work now. Yay. * adding comment to twilio config * #313 drop down list successfully changing depending on the disaster on the volunteer sign up page. * task #309: edit/remove cluster * Added error checking and fixed disappearing names. * Trying to make sure the test cases are fixed. * <3 Fix it so it can save the actual cluster. * 313 the cluster coordinator now shows in the my commitment box for volunteers. * task #309 : Cluster fixing issues * Test fixed for the disaster controller. * Fix for the volunteer results page. Not finished. * #326 Hopefully fixed this issue. when this branch gets merged. Also implemented it to show only the cluster that is related to that disaster per James. * Adding mock SMS for debugging purpose. Also fixing a bug on the Message Coordinator. * #326 Minor fix to change it so it would only show the commitments within that date as well to prevent duplicates. * Fixed the one failing tests * #311 Added redirecting to the create cluster page if they were coming from the disaster edit page. Also added in the button to add cluster on the disaster edit page. * task #309 : fixing bugs around cluster tasks * task #309: adding Cluster List and Add New Cluster to Admin Home * This will take in new clusters that are added on the Create Disaster page. * task #310: fixing validation on cluster creation * Try to modify the LINQ query to avoid 2 datareaders This is affecting the Disaster list view. * Issue 71. Added Regex on ViewModel, using existing resx. Also needed boundary check on Url.Segments in the Create view to prevent IndexOutOfRange when disaster name is bad. * Fixing issue #335 * Fixing issue #334 * Fixing issue #350. Also the issue could also happen on Create, so the same code was applied to that as well. * Fixing issue #345 * Bold Admin Username/Password * Modified Models to solve issues 350 and 402 * Added instructions for mac developers to get set up or developers who do not have visual studio * Changed 'Volunteer for Disaster' Label * Fixed grammar error in issue #364 "a end date" -> "an end date" * Fixed issue number 350 Added error message for string length validation. * Clarified error message when volunteer overload commitment in same time range For volunteer user, an error message is thrown whenever the volunteer user tries to add a second commitment in the same time range. Original message: there is already a commitment for this date range new message: You already have a commitment for this date range. Two good points: 1. format (full sentence) fit with other error messages; 2. Make it easier for the volunteer user to realize what they did wrong * Fix validation error in issue #383 * Added separators to improve readability * Fixed issue number 402 Added a check for the foreign key constraint of clusterId. Need to check on a live DB (we had connectivity issues at our codathon). * Add a simple integration test * Test the 'Add disaster' functionality * Fix for #429 fixes the user setup for the testuser and bob. * Cluster validation and fix for #431 Marked cluster name as required. Changed cluster's Update action to match Create action. * Requirement clarification for #386 Put little red asterisks by required fields and changed message to include location. * Fix for #435 tab order goes from username to password and username gets auto focus. * Beautification First go at beautification for disaster create/edit from issue #432 * space between buttons Put a space between the buttons on the disaster page as per #352 * updated version numbers in web.config files to match mvc razor references * Use existing disaster clusters to determine whether a selected cluster needs to be added * changed user name to username per #377 * Basic login test * TestUser can volunteer for disaster * Validate that a user can checkin to a disaster. * Run the test relative to the current date. * Create mock cluster to fix failing tests. * Moved the Create Disaster button up under the name and default on controls. * Update stale tests to get all tests passing. This will ensure that our appveyor builds work correctly. * Documented TestUser login. * On the Create/Edit Disaster page, add a checkbox to allow the user to check or uncheck all cluster checkboxes. * Cleaned up a javascript workaround. * Added cache-control header to Cluster List page so it's correct every time. * Allow volunteers to change status to delayed or unavailable. * added a step in the HomeController to also remove a person as a Cluster Coordinator when they are removing themselves from a Disaster. #406 * modified the delete cluster action so that it redirects to the list action in order to prevent browser-back issues. #385 * modified the successful login behavior to specifically render the home/index view instead of the returnUrl from the querystring. Also modified the unit tests to verify this functionality. #416 * Add initial ClusterGroup database and views/controllers Resolution for #450 * Missing migration Also for #450 * Fixed send message to volunteers to filter based on cluster * Changed nav item so it's consistently labeled * added additional step to collect a new start and end date when a volunteer indicates they will be delayed. #284 * Fix bug with LINQ query * Fixing the migration rebase Referencing #450 * Update README.md * Adding Organiszation Table * Adding OrganizationResource and Contact to the database entities. * Implementing a Resources Entity to replace the OrganizationResource entity, targetted on physical resources rather than documents. * Resetting error found in migration file. (DO not rename Entity Model Classes...) * filter by date is optional by default * display commitment details * add location detail to commitment * better format multiple commitments for volunteers * add organization relationship to person * Organizations in Person Contact Info * register with organization * fix organization data handling and display * fix nav by role * Display all checkin data for disasters clean up redundancy and errors * test fixes * display org resources and UI for entry/deletion * add resource checkin functionality add, remove, list, etc * implement contacts functionality * remove db from project someone slipped in including the db in project when they shouldn't * The volunteer homepage will now show the Organization Name in the "Commitments for today" section, as requested in Issue 474 * Remove use of the safe navigation operator (?.) as this is not supported for Visual Studio 2013. * Changed text of action description so that the user does not have to combine it with the button text in order for it to make sense. * iOS: commitment controller swap works; text box border color change works; updated NuGet packages; migrated to Unified project; fixed Xamarin.Forms build error; Tab bar buttons and text are now correct colors * Starting work on Issue378 * Resources are now added by the user, and the user is saved as a field on resource. (#495) The name of whoever checked in a resource is shown on the resource check in list next to the organisation. New resource types added. * Renaming a couple of tables for Issue492 (#496) * Resource now record when they were added... (#497) * Resource now record when they were added... * Adding files that were missed off my last commit. * minor update to fix #491 * Issue467 (#537) * Committing various work on Issue467 - a "Organizations Add" page and associated functionality... * Renaming an action method parameter so that it matches the MVC routes. * Removing POC. * Fixing issue with Registration page falling over itself... * Fixing issue with Registration page falling over itself... * Fixing unit tests. * Clarify which NUnit Extension (#638) There are two NUnit Test Runners in the extensions list, only one works to load the tests. * Fixed Typo (#637) * iOS: Commitment status picker works; some cleanup * Updated Xamarin.Forms package and necessary related changes; Login page; Disaster List with fake data; Commitment details needs UI * API refactor * Remove unused API code
* Fix a couple typos in the Contributing file. * Database Changes * Fixing the database. * Removal of the Cluster for registration and hopefully cleaned up the test cases. Fix migration * Test fixed. * #309 : plumbing for Cluster create/edit/delete * #309 : cluster List * Task 313 Initial ability to select a crust on assign a volunteer though not narrowed down to a disaster in the dropdown list * Added the cluster list to the Create Disaster screen. Doesn't save yet. * Add the service to get the clusters for a specific disaster. Still tweaking needed on the cluster drop down. * #309 Added plumbing for Update Cluster and added two Cluster Exceptions * Resolves #299 * Added a unit test: MessageService__DoesNotFail_With_Empty_VolunteerList * Adding the ability to send a message via SMS. Had to add property to the models to support it. * Finished adding the ClusterDisaster addition/Creation/Deleteion/Update stuff. Should all work now. Yay. * adding comment to twilio config * #313 drop down list successfully changing depending on the disaster on the volunteer sign up page. * task #309: edit/remove cluster * Added error checking and fixed disappearing names. * Trying to make sure the test cases are fixed. * <3 Fix it so it can save the actual cluster. * 313 the cluster coordinator now shows in the my commitment box for volunteers. * task #309 : Cluster fixing issues * Test fixed for the disaster controller. * Fix for the volunteer results page. Not finished. * #326 Hopefully fixed this issue. when this branch gets merged. Also implemented it to show only the cluster that is related to that disaster per James. * Adding mock SMS for debugging purpose. Also fixing a bug on the Message Coordinator. * #326 Minor fix to change it so it would only show the commitments within that date as well to prevent duplicates. * Fixed the one failing tests * #311 Added redirecting to the create cluster page if they were coming from the disaster edit page. Also added in the button to add cluster on the disaster edit page. * task #309 : fixing bugs around cluster tasks * task #309: adding Cluster List and Add New Cluster to Admin Home * This will take in new clusters that are added on the Create Disaster page. * task #310: fixing validation on cluster creation * Try to modify the LINQ query to avoid 2 datareaders This is affecting the Disaster list view. * Issue 71. Added Regex on ViewModel, using existing resx. Also needed boundary check on Url.Segments in the Create view to prevent IndexOutOfRange when disaster name is bad. * Fixing issue #335 * Fixing issue #334 * Fixing issue #350. Also the issue could also happen on Create, so the same code was applied to that as well. * Fixing issue #345 * Bold Admin Username/Password * Modified Models to solve issues 350 and 402 * Added instructions for mac developers to get set up or developers who do not have visual studio * Changed 'Volunteer for Disaster' Label * Fixed grammar error in issue #364 "a end date" -> "an end date" * Fixed issue number 350 Added error message for string length validation. * Clarified error message when volunteer overload commitment in same time range For volunteer user, an error message is thrown whenever the volunteer user tries to add a second commitment in the same time range. Original message: there is already a commitment for this date range new message: You already have a commitment for this date range. Two good points: 1. format (full sentence) fit with other error messages; 2. Make it easier for the volunteer user to realize what they did wrong * Fix validation error in issue #383 * Added separators to improve readability * Fixed issue number 402 Added a check for the foreign key constraint of clusterId. Need to check on a live DB (we had connectivity issues at our codathon). * Add a simple integration test * Test the 'Add disaster' functionality * Fix for #429 fixes the user setup for the testuser and bob. * Cluster validation and fix for #431 Marked cluster name as required. Changed cluster's Update action to match Create action. * Requirement clarification for #386 Put little red asterisks by required fields and changed message to include location. * Fix for #435 tab order goes from username to password and username gets auto focus. * Beautification First go at beautification for disaster create/edit from issue #432 * space between buttons Put a space between the buttons on the disaster page as per #352 * updated version numbers in web.config files to match mvc razor references * Use existing disaster clusters to determine whether a selected cluster needs to be added * changed user name to username per #377 * Basic login test * TestUser can volunteer for disaster * Validate that a user can checkin to a disaster. * Run the test relative to the current date. * Create mock cluster to fix failing tests. * Moved the Create Disaster button up under the name and default on controls. * Update stale tests to get all tests passing. This will ensure that our appveyor builds work correctly. * Documented TestUser login. * On the Create/Edit Disaster page, add a checkbox to allow the user to check or uncheck all cluster checkboxes. * Cleaned up a javascript workaround. * Added cache-control header to Cluster List page so it's correct every time. * Allow volunteers to change status to delayed or unavailable. * added a step in the HomeController to also remove a person as a Cluster Coordinator when they are removing themselves from a Disaster. #406 * modified the delete cluster action so that it redirects to the list action in order to prevent browser-back issues. #385 * modified the successful login behavior to specifically render the home/index view instead of the returnUrl from the querystring. Also modified the unit tests to verify this functionality. #416 * Add initial ClusterGroup database and views/controllers Resolution for #450 * Missing migration Also for #450 * Fixed send message to volunteers to filter based on cluster * Changed nav item so it's consistently labeled * added additional step to collect a new start and end date when a volunteer indicates they will be delayed. #284 * Fix bug with LINQ query * Fixing the migration rebase Referencing #450 * Update README.md * Adding Organiszation Table * Adding OrganizationResource and Contact to the database entities. * Implementing a Resources Entity to replace the OrganizationResource entity, targetted on physical resources rather than documents. * Resetting error found in migration file. (DO not rename Entity Model Classes...) * filter by date is optional by default * display commitment details * add location detail to commitment * better format multiple commitments for volunteers * add organization relationship to person * Organizations in Person Contact Info * register with organization * fix organization data handling and display * fix nav by role * Display all checkin data for disasters clean up redundancy and errors * test fixes * display org resources and UI for entry/deletion * add resource checkin functionality add, remove, list, etc * implement contacts functionality * remove db from project someone slipped in including the db in project when they shouldn't * The volunteer homepage will now show the Organization Name in the "Commitments for today" section, as requested in Issue 474 * Remove use of the safe navigation operator (?.) as this is not supported for Visual Studio 2013. * Changed text of action description so that the user does not have to combine it with the button text in order for it to make sense. * iOS: commitment controller swap works; text box border color change works; updated NuGet packages; migrated to Unified project; fixed Xamarin.Forms build error; Tab bar buttons and text are now correct colors * Starting work on Issue378 * Resources are now added by the user, and the user is saved as a field on resource. (#495) The name of whoever checked in a resource is shown on the resource check in list next to the organisation. New resource types added. * Renaming a couple of tables for Issue492 (#496) * Resource now record when they were added... (#497) * Resource now record when they were added... * Adding files that were missed off my last commit. * minor update to fix #491 * Issue467 (#537) * Committing various work on Issue467 - a "Organizations Add" page and associated functionality... * Renaming an action method parameter so that it matches the MVC routes. * Removing POC. * Fixing issue with Registration page falling over itself... * Fixing issue with Registration page falling over itself... * Fixing unit tests. * Clarify which NUnit Extension (#638) There are two NUnit Test Runners in the extensions list, only one works to load the tests. * Fixed Typo (#637) * Issue #502 - Create separate page for Field reported data (#639) * Issue #502 - Create separate page for Field reported data * Added 'View Data' links to administrator pages. Not showing top links before login * Removed an unused view model create during this change. * Fixed new partial name * _VolunteerLayout partial returned to displaying tabs before login * Added new layout page for login (#640) * iOS: Commitment status picker works; some cleanup * fixed build issue by including new shared view (#642) * Updated Xamarin.Forms package and necessary related changes; Login page; Disaster List with fake data; Commitment details needs UI * #501 - Task/Request table Details (#643) #501 - Task/Request table Details * Added a simple phone number validation (#636) also fixed false positives with other validations. * API refactor * Remove unused API code * Add the current milestone for mobile apps (#649) * Add files via upload
# Conflicts: # .gitignore # crisischeckin/crisicheckinweb/Api/EntitiesController.cs # crisischeckin/crisicheckinweb/crisicheckinweb.csproj
# Conflicts: # crisischeckin/CrisisCheckinMobile/CrisisCheckinMobile/CrisisCheckinMobile.csproj
# Conflicts: # crisischeckin/CrisisCheckinMobile/CrisisCheckinMobile/CrisisCheckinMobile.csproj # crisischeckin/CrisisCheckinMobile/CrisisCheckinMobile/LoginPage.cs
|
@brunck I see the "In progress" note in the title. Is this ready to merge, or not yet? If so, can you address the merge conflicts, and then I'll merge. |
|
Boo. Will do. |
added 2 commits
June 18, 2016 23:03
# Conflicts: # crisischeckin/CrisisCheckinMobile/CrisisCheckinMobile/CrisisCheckinMobile.csproj
# Conflicts: # crisischeckin/CrisisCheckinMobile/CrisisCheckinMobile/CrisisCheckinMobile.csproj
|
My repo is borked. Deleting this and will re-create once I straighten things out. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
UI work for the Disaster check in page - issue #654
@jsturtevant