Voucher Registry Module #561
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -244,17 +244,32 @@ function PrototypeApiService($http, util) { | |
|
|
||
| // append the id to the base url | ||
| var target = this.url.concat('reports/', param); | ||
| return reportBuilder(this, param, filetype); | ||
|
There was a problem hiding this comment. This |
||
| } | ||
|
|
||
| /** | ||
| * Receipt | ||
| */ | ||
| function receipt(param, filetype) { | ||
|
|
||
| // append the id to the base url | ||
| var target = this.url.concat('receipts/', param); | ||
|
There was a problem hiding this comment. Putting this function in var voucherService = new Api('vouchers/');
voucherService.receipt(uuid); // sends GET vouchers/receipts/uuid
var accountService = new Api('accounts/');
accountService.receipt(uuid); // sends GET accounts/receipts/uuid
var inventoryService = new Api('inventory/');
inventoryService.receipt(uuid); // sends GET inventory/receipts/uuidThat's a pretty cool API standard. I like it. @sfount, what do you think of this standard for APIs? Should receipts be part of each API, or a separate API altogether? You could also imagine... Which do you prefer? |
||
| return reportBuilder(param, filetype); | ||
| } | ||
|
|
||
| /** report builder */ | ||
| function reportBuilder(param, filetype) { | ||
|
|
||
| // filetype setup | ||
| var responseType = filetype === 'pdf' ? 'arraybuffer' : null; | ||
| var params = { renderer: filetype }; | ||
|
|
||
| // send the GET request | ||
| return $http.get(target, { | ||
| params: params, | ||
| responseType: responseType | ||
| }) | ||
| .then(util.unwrapHttpResponse); | ||
| } | ||
|
|
||
| return Api; | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <div style="padding: 5px;"> | ||
|
|
||
| <a href="" | ||
| ng-if="row.entity.uuid" | ||
| ng-click="grid.appScope.showReceipt(row.entity.uuid)" | ||
| data-link-receipt="{{ row.entity.uuid }}"> | ||
| <i class="fa fa-file-pdf-o"></i> {{ "TABLE.COLUMNS.RECEIPT" | translate }} | ||
| </a> | ||
| </div> | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <div style="padding: 5px;"> | ||
|
There was a problem hiding this comment. I think @sfount created a class |
||
| <span ng-class="{'label label-success': grid.appScope.getType(row.entity.type_id).incomeExpense == 'income', 'label label-warning': grid.appScope.getType(row.entity.type_id).incomeExpense == 'expense'}" href=""> | ||
| {{ grid.appScope.getType(row.entity.type_id).text | translate }} | ||
| <span ng-if="row.groupHeader">{{ COL_FIELD }}</span> | ||
| </span> | ||
| <a ng-if="grid.appScope.isDefined(row.entity)" class="label label-default">{{ "FORM.LABELS.UNDEFINED" | translate }}</a> | ||
| </div> | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this
padding-topnecessary? It seems very ... custom.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe the
flex-utilneed some fixation, thepadding-top: 7pxis necessary to avoid to have something like this :The content of the util bar is so closed to the top of the
flex-utilbar, thepadding-top: 7px;is not so good, maybe i can useline-height: 35pxor other things to center the content in the util bar.All proposals are welcome