Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

budgets: add component budget and accounts #107

Merged
merged 1 commit into from
Jan 27, 2020
Merged

budgets: add component budget and accounts #107

merged 1 commit into from
Jan 27, 2020

Conversation

Garfield-fr
Copy link
Contributor

@Garfield-fr Garfield-fr commented Jan 10, 2020 •
edited
Loading

  • Adds brief and detail views for budget.
  • Adds list of acquisition accounts for current library on budget detail view.
  • Adds detail view for organisation.
  • Adds default budget option on organisation detail view.

Co-Authored-by: Bertrand Zuchuat bertrand.zuchuat@rero.ch

Why are you opening this PR?

  • Implement budget and acq_account.
  • Implement default budget on organisation.

How to test?

Code review check list

  • Commit message template compliance.
  • Commit message without typos.
  • File names.
  • Functions names.
  • Functions docstrings.
  • Unnecessary commited files?
  • Extracted translations?

AoNoOokami
AoNoOokami suggested changes Jan 10, 2020
View reviewed changes
Copy link
Contributor

@AoNoOokami AoNoOokami left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would move the 'add' button to the right in the budget detail view in order to have a similar layout to the brief views and avoid having this button sometimes on the right and sometimes on the left. I think it's more user-friendly.

...s/admin/src/app/record/detail-view/budget-detail-view/acq-accounts/acq-accounts.component.ts Outdated Show resolved Hide resolved
...cord/detail-view/organisation-detail-view/budget-select-line/budget-select-line.component.ts Show resolved Hide resolved
projects/admin/src/app/service/record-routing.service.ts Show resolved Hide resolved
@Garfield-fr Garfield-fr force-pushed the zub-budget-library branch 3 times, most recently from 5a17c81 to e482d36 Compare January 14, 2020 09:16
@Garfield-fr Garfield-fr force-pushed the zub-budget-library branch 7 times, most recently from e9f201d to 04514c7 Compare January 17, 2020 06:57
@Garfield-fr Garfield-fr requested a review from jma January 17, 2020 07:05
@Garfield-fr Garfield-fr force-pushed the zub-budget-library branch 5 times, most recently from 69073b8 to 3376410 Compare January 17, 2020 13:10
zannkukai
zannkukai approved these changes Jan 20, 2020
View reviewed changes
projects/admin/src/app/record/brief-view/budgets-brief-view.component.ts Show resolved Hide resolved
projects/admin/src/app/record/brief-view/budgets-brief-view.component.ts Show resolved Hide resolved
projects/admin/src/app/record/detail-view/budget-detail-view/budget-detail-view.component.html Outdated Show resolved Hide resolved
.../src/app/record/detail-view/organisation-detail-view/organisation-detail-view.component.html Outdated Show resolved Hide resolved
.../src/app/record/detail-view/organisation-detail-view/organisation-detail-view.component.html Outdated Show resolved Hide resolved
.../src/app/record/detail-view/organisation-detail-view/organisation-detail-view.component.html Outdated Show resolved Hide resolved
jma
jma reviewed Jan 22, 2020
View reviewed changes
...cts/admin/src/app/record/detail-view/budget-detail-view/acq-account/acq-account.component.ts Outdated Show resolved Hide resolved
...cts/admin/src/app/record/detail-view/budget-detail-view/acq-account/acq-account.component.ts Outdated Show resolved Hide resolved
projects/admin/src/app/record/detail-view/budget-detail-view/budget-detail-view.component.ts Show resolved Hide resolved
...cord/detail-view/organisation-detail-view/budget-select-line/budget-select-line.component.ts Outdated Show resolved Hide resolved
...cord/detail-view/organisation-detail-view/budget-select-line/budget-select-line.component.ts Outdated Show resolved Hide resolved
...c/app/record/detail-view/organisation-detail-view/budget-select/budget-select.component.html Outdated Show resolved Hide resolved
...src/app/record/detail-view/organisation-detail-view/budget-select/budget-select.component.ts Outdated Show resolved Hide resolved
...in/src/app/record/detail-view/organisation-detail-view/organisation-detail-view.component.ts Show resolved Hide resolved
projects/admin/src/app/service/budget-total.service.ts Show resolved Hide resolved
projects/admin/src/app/service/budget-total.service.ts Show resolved Hide resolved
@Garfield-fr Garfield-fr requested a review from jma January 23, 2020 13:34
@Garfield-fr Garfield-fr force-pushed the zub-budget-library branch 4 times, most recently from c915a67 to 97798f1 Compare January 24, 2020 09:16
@Garfield-fr Garfield-fr requested a review from jma January 27, 2020 10:06
@Garfield-fr
budgets: add component budget and accounts
236347d 
* Adds brief and detail views for budget.
* Adds list of acquisition accounts for current library on budget detail view.
* Adds detail view for organisation.
* Adds default budget option on organisation detail view.

Co-Authored-by: Bertrand Zuchuat <bertrand.zuchuat@rero.ch>
@Garfield-fr Garfield-fr merged commit e340721 into rero:dev Jan 27, 2020
@Garfield-fr Garfield-fr deleted the zub-budget-library branch January 27, 2020 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lauren-d lauren-d lauren-d approved these changes

@AoNoOokami AoNoOokami AoNoOokami approved these changes

@zannkukai zannkukai zannkukai approved these changes

@sebdeleze sebdeleze sebdeleze approved these changes

@benerken benerken Awaiting requested review from benerken

@jma jma Awaiting requested review from jma

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Garfield-fr @jma @sebdeleze @zannkukai @AoNoOokami @lauren-d