auto reload content instead of refreshing the page and restrict expense sheet modification #333
Conversation
This file contains 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
…ugh the user interface
Gumbee
added a commit
that referenced
this pull request
Jan 17, 2020
* disallow deletion of services withe expense sheets and some other minor updates (#323) * Merge master into develop so that both branches are finally up to date (#316) * Extended holiday view total amount payments (#296) * Extended holiday view (#271) * expaneded store for additional timefilters #270 * Holidays with Tabs now. Could maybe be refactored into another Template and change store-behavour #270 * removed some empty lines to test if username shows in github now * Checck in yarn packages maybe? #270 * Fixed some lint-errors. Only filelength open... * exported Tabs into own file #270 * Linelength != filelength... Learn reading #270 * Added total amount to the Payments (#275) * Update develop with master via RELEASE (#289) * Update dev branch with releases from master (#288) * Total with cond render (#294) * added conditional rendering for total in tables * Fixed linter error * updated sum function to lodash (#297) * rewrote to lodash function * fixed linting errors once again * rewrote sum function (#298) * rewrote function * missed semicolon * Update to expenses_overview (#306) * Extended holiday view (#271) * expaneded store for additional timefilters #270 * Holidays with Tabs now. Could maybe be refactored into another Template and change store-behavour #270 * removed some empty lines to test if username shows in github now * Checck in yarn packages maybe? #270 * Fixed some lint-errors. Only filelength open... * exported Tabs into own file #270 * Linelength != filelength... Learn reading #270 * Added total amount to the Payments (#275) * Update develop with master via RELEASE (#289) * Update dev branch with releases from master (#288) * Total with cond render (#294) * added conditional rendering for total in tables * Fixed linter error * updated sum function to lodash (#297) * rewrote to lodash function * fixed linting errors once again * rewrote sum function (#298) * rewrote function * missed semicolon * Bump loofah from 2.2.3 to 2.3.1 in /api (#299) Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](flavorjones/loofah@v2.2.3...v2.3.1) Signed-off-by: dependabot[bot] <[email protected]> * Expense sheet zdpplz (#300) * Added PLZ and city to address. Switched ZIP to correct ZDP. * rubocoped. Should close #282 * Changed test to user ZDP * try with separated user in test * ZDP as string and full lenght comparison in test * switched to two years in future (#301) * Printable payments layout (#302) * Added print media query for margin in print media * missing trailing comma... * Expense statistics (#278) * Added route for expenses_overview * Added expenses_overview controller & service * Changed headers in PDF * Added table header for expenses_overview * import basic fileds in expenses_overview * some improvements * Added total * new approach with pushing into the array * Added all values and Names. Total still missing. Name / ID duplicates need to be removed. * Centered headers * Added subheader * #272 Added sum. Formatting open. Also the header should only be once on top. * Fixed headers. But the bottom lines are not well formated. * Removed linelength from linter. Can be fixed later * All values are correct now. Layout and refactoring pendent. * Better Layout * Fixed some rubocop-offenses * Fixed some robocop offenses * add missing translations * normalized translations * Some refactorings * some refactorings * Added annotation to satisfy rubocop * Splited header into two methods * first exported method * Exported in different methods * exported sum-method * fixed errors * refactor and start testing * added helper-class * rubocop * changed order to last_name * added Total, but format seemsbad * wrong day addition * some table improvements * compacted table * added some missing tests and fixed linting errors * added addditions testclass * changed test * removed tests * expanded test * changed tests * reduced min. coverage and changed test * changed tests * reduced coverage after defining in a meeting * expanded tests * fixed reek errors * fixed linter errors * expanding tests * fixed tests * removed test This closes #272 Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]> * remove the authorization token if it is expired (#318) * auto generate expense sheets, live update service days and sort sheets by date (#319) * fix auto-calculation of service ending and service days * order expenses by beginning and end date * order by oldest first * auto generate the expense sheets when we accept the civil service * remove default value which is always overriden by DB content * disallow deletion of services with associated expense sheets (#321) * fix auto-calculation of service ending and service days * order expenses by beginning and end date * order by oldest first * auto generate the expense sheets when we accept the civil service * remove default value which is always overriden by DB content * don't allow deletion of service periods with expense sheets * improve layout * prevent deletion of services with expense sheets in the backend * fix rubocop offenses * fix reek issue and improve layout Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]> Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]> * auto reload the content when we submit a service or confirm a service (#327) * auto reload the content when we submit a service or confirm a service * forgot a console log * fixed semicolon issue * auto reload content instead of refreshing the page and restrict expense sheet modification (#333) * auto reload the content when we submit a service or confirm a service * forgot a console log * fixed semicolon issue * fix safari tooltip and add deletable to expense sheets * Restrict modification of expense sheets to open ones only * non paid expense sheet should be modifiable in general, just not through the user interface * don't allow deletion of expense sheet in backend if it is not open * remove superfluous test * update tests Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]>
Gumbee
added a commit
that referenced
this pull request
Jan 17, 2020
#335) * disallow deletion of services withe expense sheets and some other minor updates (#323) * Merge master into develop so that both branches are finally up to date (#316) * Extended holiday view total amount payments (#296) * Extended holiday view (#271) * expaneded store for additional timefilters #270 * Holidays with Tabs now. Could maybe be refactored into another Template and change store-behavour #270 * removed some empty lines to test if username shows in github now * Checck in yarn packages maybe? #270 * Fixed some lint-errors. Only filelength open... * exported Tabs into own file #270 * Linelength != filelength... Learn reading #270 * Added total amount to the Payments (#275) * Update develop with master via RELEASE (#289) * Update dev branch with releases from master (#288) * Total with cond render (#294) * added conditional rendering for total in tables * Fixed linter error * updated sum function to lodash (#297) * rewrote to lodash function * fixed linting errors once again * rewrote sum function (#298) * rewrote function * missed semicolon * Update to expenses_overview (#306) * Extended holiday view (#271) * expaneded store for additional timefilters #270 * Holidays with Tabs now. Could maybe be refactored into another Template and change store-behavour #270 * removed some empty lines to test if username shows in github now * Checck in yarn packages maybe? #270 * Fixed some lint-errors. Only filelength open... * exported Tabs into own file #270 * Linelength != filelength... Learn reading #270 * Added total amount to the Payments (#275) * Update develop with master via RELEASE (#289) * Update dev branch with releases from master (#288) * Total with cond render (#294) * added conditional rendering for total in tables * Fixed linter error * updated sum function to lodash (#297) * rewrote to lodash function * fixed linting errors once again * rewrote sum function (#298) * rewrote function * missed semicolon * Bump loofah from 2.2.3 to 2.3.1 in /api (#299) Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md) - [Commits](flavorjones/loofah@v2.2.3...v2.3.1) Signed-off-by: dependabot[bot] <[email protected]> * Expense sheet zdpplz (#300) * Added PLZ and city to address. Switched ZIP to correct ZDP. * rubocoped. Should close #282 * Changed test to user ZDP * try with separated user in test * ZDP as string and full lenght comparison in test * switched to two years in future (#301) * Printable payments layout (#302) * Added print media query for margin in print media * missing trailing comma... * Expense statistics (#278) * Added route for expenses_overview * Added expenses_overview controller & service * Changed headers in PDF * Added table header for expenses_overview * import basic fileds in expenses_overview * some improvements * Added total * new approach with pushing into the array * Added all values and Names. Total still missing. Name / ID duplicates need to be removed. * Centered headers * Added subheader * #272 Added sum. Formatting open. Also the header should only be once on top. * Fixed headers. But the bottom lines are not well formated. * Removed linelength from linter. Can be fixed later * All values are correct now. Layout and refactoring pendent. * Better Layout * Fixed some rubocop-offenses * Fixed some robocop offenses * add missing translations * normalized translations * Some refactorings * some refactorings * Added annotation to satisfy rubocop * Splited header into two methods * first exported method * Exported in different methods * exported sum-method * fixed errors * refactor and start testing * added helper-class * rubocop * changed order to last_name * added Total, but format seemsbad * wrong day addition * some table improvements * compacted table * added some missing tests and fixed linting errors * added addditions testclass * changed test * removed tests * expanded test * changed tests * reduced min. coverage and changed test * changed tests * reduced coverage after defining in a meeting * expanded tests * fixed reek errors * fixed linter errors * expanding tests * fixed tests * removed test This closes #272 Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]> * remove the authorization token if it is expired (#318) * auto generate expense sheets, live update service days and sort sheets by date (#319) * fix auto-calculation of service ending and service days * order expenses by beginning and end date * order by oldest first * auto generate the expense sheets when we accept the civil service * remove default value which is always overriden by DB content * disallow deletion of services with associated expense sheets (#321) * fix auto-calculation of service ending and service days * order expenses by beginning and end date * order by oldest first * auto generate the expense sheets when we accept the civil service * remove default value which is always overriden by DB content * don't allow deletion of service periods with expense sheets * improve layout * prevent deletion of services with expense sheets in the backend * fix rubocop offenses * fix reek issue and improve layout Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]> Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]> * auto reload the content when we submit a service or confirm a service (#327) * auto reload the content when we submit a service or confirm a service * forgot a console log * fixed semicolon issue * auto reload content instead of refreshing the page and restrict expense sheet modification (#333) * auto reload the content when we submit a service or confirm a service * forgot a console log * fixed semicolon issue * fix safari tooltip and add deletable to expense sheets * Restrict modification of expense sheets to open ones only * non paid expense sheet should be modifiable in general, just not through the user interface * don't allow deletion of expense sheet in backend if it is not open * remove superfluous test * update tests Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]> Co-authored-by: Lukas Bischof <[email protected]> Co-authored-by: Sebi <[email protected]>
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.
this closes #255