Clone
 

nikodem graczewski <ngraczewski@soldevelo.com> in openlmis-requisition-refUI

OLMIS-2105: Modified loadingModalService to require less management when testing

The previous implementation required some minimal maintenance to be used

in unit tests, I've modified the service to be easier to use in tests.

OLMIS-2105: Added User Form Modal

- Added user form modal

- Added openlmisModalService for handling and displaying modals

- migrated alerts and loading modal to use the new service

- added directive for displaying validation errors on forms

- added directive for displaying errors returned for the server

- merged user related factories/services

    • -0
    • +30
    /src/admin-user-form-modal/user-form.scss
  1. … 19 more files in changeset.
    • -0
    • +30
    /src/auth-user/auth-user.module.js
    • -0
    • +70
    /src/auth-user/auth-user.service.js
    • -0
    • +58
    /src/auth/auth-url.factory.js
    • -0
    • +30
    /src/auth/auth.module.js
    • -0
    • +30
    /src/admin-user-form-modal/user-form.scss
  1. … 19 more files in changeset.
OLMIS-2105: Removed leftover test

Revert "OLMIS-2105: Added User Form Modal"

This reverts commit 27e22c3e161fceeca63da5bdd2a35754a4b9bba4.

Conflicts:

src/admin-user-list/user-list.controller.js

src/admin-user-list/user-list.routes.js

    • -30
    • +0
    /src/admin-user-form-modal/user-form.scss
  1. … 18 more files in changeset.
Revert "OLMIS-2105: Added missing service"

This reverts commit 94926b74cb168db39f7f2f40908c8f51d64a7ef6.

Revert "OLMIS-2105: Removed extra dependency"

This reverts commit 09c43413f1f2772eae58eb93ac1eb25abe572406.

OLMIS-2105: Removed extra dependency

OLMIS-2105: Added missing service

    • -0
    • +140
    /src/openlmis-modal/openlmis-modal.service.js
OLMIS-2105: Added User Form Modal

- Added user form modal

- Added openlmisModalService for handling and displaying modals

- migrated alerts and loading modal to use the new service

- added directive for displaying validation errors on forms

- added directive for displaying errors returned for the server

- merged user related factories/services

    • -0
    • +77
    /src/admin-user-form-modal/user-form-modal.js
    • -0
    • +30
    /src/admin-user-form-modal/user-form.scss
    • -2
    • +2
    /src/admin-user-list/user-list.routes.js
    • -0
    • +86
    /src/openlmis-form/form-server-validation.directive.js
  1. … 19 more files in changeset.
    • -0
    • +30
    /src/admin-user-form-modal/user-form.scss
    • -0
    • +80
    /src/openlmis-form/form-server-validation.directive.js
  1. … 17 more files in changeset.
    • -0
    • +30
    /src/admin-user-form-modal/user-form.scss
  1. … 12 more files in changeset.
WIP

    • -0
    • +62
    /src/admin-user-form-modal/user-form-modal.js
    • -0
    • +30
    /src/admin-user-form-modal/user-form.scss
    • -0
    • +1
    /src/openlmis-modal/loading-modal.html
    • -29
    • +8
    /src/openlmis-modal/loading-modal.scss
  1. … 7 more files in changeset.
OLMIS-2081: Modified Total Stockout Days validation to longer require it to be displayed if Adjusted Consumption is hidden

OLMIS-2081: Fixed typo in a test name

OLMIS-2081: Added validation toe Total Stockout Days on the admin template page

OLMIS-2081: Refactored validation on the Requisition Template Administration screen

Merged methods for displaying errors and validating template into one to

make the code more DRY.

    • -186
    • +0
    /src/admin-template/requisition-template-admin.controller.spec.js
    • -0
    • +324
    /src/admin-template/template-validator.factory.spec.js
    • -56
    • +0
    /src/admin-template/template.factory.js
OLMIS-2033: Added default form width

OLMIS-2056: Added test to the templateFactory spec

OLMIS-2056: Option for invisible column is no longer needed when saving the template

    • -1
    • +1
    /src/admin-template/template.factory.js
OLMIS-2054: Notification will now be shown after loading modal is closed when converting requisitions

OLMIS-2054: UI will now be blocked immediately after confirming requisition conversion

    • -19
    • +5
    /src/requisition/requisitions.service.js
OLMIS-2046: Pagination will now match table width

OLMIS-2062: Fixed shadow under navbar

    • -1
    • +1
    /src/openlmis-navigation/navigation.scss
OLMIS-2051: Cleared alert markup

OLMIS-2047: Syncing requisition with server will now send a copy of the requisition

This was done to fix flashing of the calculated valued due to being nulled before sending to the server.

OLMIS-2051: Modified alertService to allow only single alert to be displayed

- refactored alertService class to make variables more meaningful

    • -36
    • +52
    /src/openlmis-modal/alert.service.js
OLMIS-2053: Fixed select to now properly show/hide placeholder and clear link

OLMIS-2051: Added default error alert when changing UI state fails

    • -13
    • +25
    /src/openlmis-modal/alert.service.js