submit-social-housing-lettings-and-sales-data

2146 Commits

231 Branches

285 Tags

80 MiB

Branch: more-bulk-upload-year

Commit Graph

Author	SHA1	Message	Date
natdeanlewissoftwire	879cdea47f	Cldc 1672 scheme reactivation (#1023 ) * feat: add scheme reactivation behaviour * test: add tests * refactor: linting * fix: find deactivation periods by scheme/location ids rather than just the first * feat: add activating_soon status to location (not to schemes as they have no startdate field) * feat: fix logic and add tests fo activating soon * fix: check for startdate presence	3 years ago
kosiakkatrina	11bb9c887c	Cldc 1670 reactivate locations (#1007 ) * route deactivated scheme to reactivation page * Render correct reactivate question content * refactor into a helper * display successful reactivation banner for default date * Save reactivation date * Add reactivation errors * lint and fix url in tests * make toggle translations generic * Add reactivation status * Reuse date validation messages * Show deactivate this location when location is reactivating soon * Display correct confirmation banner * Add validation for reactivation date before deactivation date * Improve availability label * Use current collection start date if created at is later than that * Update paths * Fix controller and don't display the previous day if location availability start afterwards * refactor availability label * Filter out active periods * lint * Refactor active_period method into the model * Allow deactivations and reactivations from available from date instead of start of the collection date * Prevent deactivations during deactivated periods * lint * typo * Remove active periods that last 1 day (because they get deactivated on the same day) * Move the active_periods into helper * extract remove_overlapping_and_empty_periods into a separate method * Remove nested deactivation periods * Make deactivate/reactvate location form use location_deactivation_period model * refactor toggle date methods * extract shared condition * update validations * refactor validations * Update schemes deactivation form to use dectivation model * Refactor * lint * remove redundant location_id and update scheme controller * update active_periods	3 years ago
natdeanlewissoftwire	87793f24bd	Cldc 1671 deactivate scheme (#980 ) * feat: wip update scheme summary page * feat: wip deactivate scheme schemes page * feat: wip toggle active page * feat: wip set deactivation_date to a datetime (to be more specific times later_ * Change conditional question controller to accommodate all models * feat: add specific datetimes for deactivation * feat: correct date and add notice * feat: wip error behaviour * feat: wip errors * feat: wip errors refactoring * feat: wip errors more refactoring * refactor: linting * feat: add second error in correct position and wip date range error * feat: remove unneccessary db field * feat: change type values to strings * refactor: tidy up controller logic * refactor: use same structure as locations deactivation * feat: add general partially missing date input error * feat: add tests ("updates existing scheme with valid deactivation date and renders scheme page" still wip) and add new partially nil date behaviour to locations controller * feat: fix tests, add status tag behaviour and remove unnecessary nils * refactor: linting * refactor: erblinting * refactor: remove redundant line * refactor: respond to PR comments 1 * refactor: respond to PR comments 2 * refactor: respond to PR comments 3 * refactor: respond to PR comments 3 (locations side) * fix: remove @locations in location model * fix: remove @locations in location model * fix: update status names * feat: wip validation update * feat: add validation to model layer * feat: further separate scheme deactivation behaviour * test: update tests to new flow * feat: respond to pr comments and add dynamic success text * feat: duplicate behaviour schemes -> locations (+ tests) * refactor: linting * refactor: typo and remove unnecessary line for this PR * refactor: feature toggle simplification * Refactor locations and schemes controller actions - Rename confirmation partials to `deactivate_confirm.html.erb` so that they match the actions in which they belong to - Make all deactivation date comparision UTC time * feat: update deactivation_date validation and add tests * refactor: linting Co-authored-by: Kat <katrina@kosiak.co.uk> Co-authored-by: James Rose <james@jbpr.net>	3 years ago

Author

SHA1

Message

Date

natdeanlewissoftwire

879cdea47f

Cldc 1672 scheme reactivation (#1023 )

* feat: add scheme reactivation behaviour

* test: add tests

* refactor: linting

* fix: find deactivation periods by scheme/location ids rather than just the first

* feat: add activating_soon status to location (not to schemes as they have no startdate field)

* feat: fix logic and add tests fo activating soon

* fix: check for startdate presence

3 years ago

kosiakkatrina

11bb9c887c

Cldc 1670 reactivate locations (#1007 )

* route deactivated scheme to reactivation page

* Render correct reactivate question content

* refactor into a helper

* display successful reactivation banner for default date

* Save reactivation date

* Add reactivation errors

* lint and fix url in tests

* make toggle translations generic

* Add reactivation status

* Reuse date validation messages

* Show deactivate this location when location is reactivating soon

* Display correct confirmation banner

* Add validation for reactivation date before deactivation date

* Improve availability label

* Use current collection start date if created at is later than that

* Update paths

* Fix controller and don't display the previous day if location availability start afterwards

* refactor availability label

* Filter out active periods

* lint

* Refactor active_period method into the model

* Allow deactivations and reactivations from available from date instead of start of the collection date

* Prevent deactivations during deactivated periods

* lint

* typo

* Remove active periods that last 1 day (because they get deactivated on the same day)

* Move the active_periods into helper

* extract remove_overlapping_and_empty_periods into a separate method

* Remove nested deactivation periods

* Make deactivate/reactvate location form use location_deactivation_period model

* refactor toggle date methods

* extract shared condition

* update validations

* refactor validations

* Update schemes deactivation form to use dectivation model

* Refactor

* lint

* remove redundant location_id and update scheme controller

* update active_periods

3 years ago

natdeanlewissoftwire

87793f24bd

Cldc 1671 deactivate scheme (#980 )

* feat: wip update scheme summary page

* feat: wip deactivate scheme schemes page

* feat: wip toggle active page

* feat: wip set deactivation_date to a datetime (to be more specific times later_

* Change conditional question controller to accommodate all models

* feat: add specific datetimes for deactivation

* feat: correct date and add notice

* feat: wip error behaviour

* feat: wip errors

* feat: wip errors refactoring

* feat: wip errors more refactoring

* refactor: linting

* feat: add second error in correct position and wip date range error

* feat: remove unneccessary db field

* feat: change type values to strings

* refactor: tidy up controller logic

* refactor: use same structure as locations deactivation

* feat: add general partially missing date input error

* feat: add tests ("updates existing scheme with valid deactivation date and renders scheme page" still wip) and add new partially nil date behaviour to locations controller

* feat: fix tests, add status tag behaviour and remove unnecessary nils

* refactor: linting

* refactor: erblinting

* refactor: remove redundant line

* refactor: respond to PR comments 1

* refactor: respond to PR comments 2

* refactor: respond to PR comments 3

* refactor: respond to PR comments 3 (locations side)

* fix: remove @locations in location model

* fix: remove @locations in location model

* fix: update status names

* feat: wip validation update

* feat: add validation to model layer

* feat: further separate scheme deactivation behaviour

* test: update tests to new flow

* feat: respond to pr comments and add dynamic success text

* feat: duplicate behaviour schemes -> locations (+ tests)

* refactor: linting

* refactor: typo and remove unnecessary line for this PR

* refactor: feature toggle simplification

* Refactor locations and schemes controller actions

- Rename confirmation partials to `deactivate_confirm.html.erb` so that they match the actions in which they belong to
- Make all deactivation date comparision UTC time

* feat: update deactivation_date validation and add tests

* refactor: linting

Co-authored-by: Kat <katrina@kosiak.co.uk>
Co-authored-by: James Rose <james@jbpr.net>

3 years ago

3 Commits (more-bulk-upload-year)