Icons updated, test fixed, paging rows adjusted
This commit is contained in:
parent
2951a737a7
commit
240f080de3
|
@ -2,7 +2,7 @@
|
|||
vn-id="model"
|
||||
url="/item/api/Clients"
|
||||
filter="::$ctrl.filter"
|
||||
limit="4"
|
||||
limit="8"
|
||||
data="clients"
|
||||
auto-load="false">
|
||||
</vn-crud-model>
|
||||
|
|
|
@ -20,5 +20,5 @@
|
|||
.icon-ticket:before { content: '\e821'; } /* '' */
|
||||
.icon-tax:before { content: '\e822'; } /* '' */
|
||||
.icon-no036:before { content: '\e823'; } /* '' */
|
||||
.icon-mana:before { content: '\e824'; } /* '' */
|
||||
.icon-transaction:before { content: '\e826'; } /* '' */
|
||||
.icon-solunion:before { content: '\e827'; } /* '' */
|
Binary file not shown.
|
@ -2,4 +2,4 @@ import './mdl-override.scss';
|
|||
import './mdi-override.css';
|
||||
import './zoom-image.scss';
|
||||
import './fontello-head.css';
|
||||
import './fontello-icons.css';
|
||||
import './fontello-codes.css';
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
<vn-auto pad-medium>
|
||||
<h5>{{$ctrl.item.id}}</h5>
|
||||
<vn-label-value label="Name"
|
||||
value="{{$ctrl.item.name}}">
|
||||
</vn-label-value>
|
||||
value="{{$ctrl.item.name}}">
|
||||
</vn-label-value>
|
||||
<vn-label-value label="Buyer"
|
||||
value="{{$ctrl.item.itemType.worker.firstName}} {{$ctrl.item.itemType.worker.name}}">
|
||||
</vn-label-value>
|
||||
|
|
|
@ -14,6 +14,7 @@ describe('Item', () => {
|
|||
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$httpBackend_) => {
|
||||
$componentController = _$componentController_;
|
||||
$httpBackend = _$httpBackend_;
|
||||
$httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
|
||||
$scope = $rootScope.$new();
|
||||
controller = $componentController('vnItemDiary', {$scope: $scope});
|
||||
controller.item = {id: 3};
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
vn-id="model"
|
||||
url="/item/api/Items"
|
||||
filter="::$ctrl.filter"
|
||||
limit="4"
|
||||
limit="8"
|
||||
data="items"
|
||||
auto-load="false">
|
||||
</vn-crud-model>
|
||||
|
|
|
@ -16,14 +16,14 @@ class Controller {
|
|||
getTags() {
|
||||
let filter = {
|
||||
where: {itemFk: this.params.id},
|
||||
order: "priority ASC",
|
||||
include: {relation: "tag"}
|
||||
order: 'priority ASC',
|
||||
include: {relation: 'tag'}
|
||||
};
|
||||
this.$http.get(`/item/api/ItemTags?filter=${JSON.stringify(filter)}`).then(response => {
|
||||
this.removedTags = [];
|
||||
|
||||
this.itemTags = JSON.parse(JSON.stringify(this.tags));
|
||||
this.tags = response.data;
|
||||
this.itemTags = JSON.parse(JSON.stringify(this.tags));
|
||||
this.orgTags = {};
|
||||
this.tags.forEach(tag => {
|
||||
this.orgTags[tag.id] = Object.assign({}, tag);
|
||||
|
@ -63,7 +63,7 @@ class Controller {
|
|||
return null;
|
||||
|
||||
if (selection.sourceTable) {
|
||||
return "/api/" + selection.sourceTable.charAt(0).toUpperCase() +
|
||||
return '/api/' + selection.sourceTable.charAt(0).toUpperCase() +
|
||||
selection.sourceTable.substring(1) + 's';
|
||||
} else if (selection.sourceTable == null) {
|
||||
return `/api/ItemTags/filterItemTags/${selection.id}`;
|
||||
|
@ -107,7 +107,6 @@ ngModule.component('vnItemTags', {
|
|||
template: require('./index.html'),
|
||||
controller: Controller,
|
||||
bindings: {
|
||||
itemTags: '=',
|
||||
selection: '<?'
|
||||
itemTags: '='
|
||||
}
|
||||
});
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
vn-id="model"
|
||||
url="/ticket/api/Tickets"
|
||||
filter="::$ctrl.filter"
|
||||
limit="10"
|
||||
limit="20"
|
||||
data="tickets"
|
||||
auto-load="false">
|
||||
</vn-crud-model>
|
||||
|
|
Loading…
Reference in New Issue