Tree: 1bc39f0ed1

Commit Graph

3 Commits (1bc39f0ed1ffce0d11c89ed0122afbff4aa92422)

Author	SHA1	Message	Date
kosiakkatrina	156c4b5b56	CLDC-3081 Update date input component (#2891 An error occurred ) ... * Add moj-frontend * Use date picker component in log forms * Refactor date_picker into component, add date_picker to location startdate * Use date_picker for location deactivation periods * Use date_picker in scheme deactivations * Use date_picker for merge request date * Fix missed tests * lint * Refactor	2 months ago
kosiakkatrina	e69ed94513	CLDC-3382 Add support user functionality to merge organisations (#2566 An error occurred ) ... * CLDC-2093 Merge organisations page - view all merge requests (#2561 An error occurred ) * CLDC-3585 Update absorbing organisation question (#2564 An error occurred ) * Update user permissions and absorbing org question order * Update absorbing organisation question and routing * CLDC 2094: View a merge request (#2565 An error occurred ) * CLDC-3584 Update merging orgs question (#2567 An error occurred ) * Update merging organisations question * Update rebase tests * Update routing between CYA and questions * CLDC-3586 Update merge date merge request question (#2571 An error occurred ) * Remove unused paths and update merge date * lint * Create delete merge request functionality (#2568 An error occurred ) * CLDC-3588: Add helpdesk ticket question (#2572 An error occurred ) * Merge request fixes (#2578 An error occurred ) * Add cancel button to merging orgs and update merging orgs selection * Update submit button text * Update back buttons * CLDC-2101 Add begin merge (#2575 An error occurred ) * Calculate merge request status * Add start merge and merge request job * Update merge request when it gets processed * Refactor and display a banner for failed requests * update test * Update change links * Update copy for error message (#2583 An error occurred ) * Do not display cancel button if there's no submit (#2584 An error occurred ) * Update hint date (#2588 An error occurred ) * CLDC-2100++ Add success notification after delete (#2589 An error occurred ) * Update helpdesk_ticket.html.erb * CLDC-2094++ Merge details page adjustments (#2593 An error occurred ) * Change page name and hide buttons during processing status * Update test * Make merge request status dynamic (#2592 An error occurred ) * Make merge request status dynamic * Update tests * Keep check answers referrer when validation is hit (#2594 An error occurred ) * Keep check answers referrer when validation is hit * Remove absorbing org from merging organisations list * Update text to handle singular merge requests * Add merge start confirmation page (#2601 An error occurred ) * Set merge request as non processing if it fails (#2598 An error occurred ) * Set merge request to no longer processing if it fails * clear last_failed_attempt as soon as we start processing the merge * CLDC-3603 View merged users outcomes (#2602 An error occurred ) * Update user outcomes view link * Add user outcomes page * Set user outcomes before merge and on merge fail * Update hardcoded total user count * Account for singular user numbers * CLDC-3603 View scheme outcomes (#2604 An error occurred ) * Update scheme outcomes view link * Add scheme outcomes page * Update scheme outcome before merge and on merge fail * Update back links in merge outcomes pages (#2611 An error occurred ) * CLDC-3605 View relationships page (#2606 An error occurred ) * CLDC-3609 Add existing absorbing organisation merge request question (#2600 An error occurred ) * Add existing absorbing organisation page and field * Update status calculation and add new question to check answers * Call correct merge service flow * Update test * Update test * Return correct status when existing_absorbing_organisation is false (#2617 An error occurred ) * Change styling of relationship outcomes page (#2619 An error occurred ) * CLDC-3604 View logs outcomes (#2618 An error occurred ) * Update view logs outcomes link * Add logs outcomes page * Set logs outcome before merge and on merge fail * Update logs outcomes text * Update line break * Fix incorrect filtering of relationships and count * Fix test * Fix test * Fix test * Make example date depend on collection year (#2620 An error occurred ) --------- Co-authored-by: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>	7 months ago
Jack	751f8661db	CLDC-2057 Telephone number confirmation (#1595 An error occurred ) ... * CLDC-2057 Merge request: ask to confirm number * address comments	2 years ago