diff --git a/client/client/src/index/index.html b/client/client/src/index/index.html index 4c234d25b..bf278862e 100644 --- a/client/client/src/index/index.html +++ b/client/client/src/index/index.html @@ -2,7 +2,7 @@ vn-id="model" url="/item/api/Clients" filter="::$ctrl.filter" - limit="4" + limit="8" data="clients" auto-load="false"> diff --git a/client/core/src/styles/fontello-icons.css b/client/core/src/styles/fontello-codes.css similarity index 90% rename from client/core/src/styles/fontello-icons.css rename to client/core/src/styles/fontello-codes.css index 6f448acf0..d90a5615a 100644 --- a/client/core/src/styles/fontello-icons.css +++ b/client/core/src/styles/fontello-codes.css @@ -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'; } /* '' */ \ No newline at end of file diff --git a/client/core/src/styles/fontello.woff2 b/client/core/src/styles/fontello.woff2 index 8424baf8a..50b83f934 100644 Binary files a/client/core/src/styles/fontello.woff2 and b/client/core/src/styles/fontello.woff2 differ diff --git a/client/core/src/styles/index.js b/client/core/src/styles/index.js index fea272aed..f5ed1e400 100644 --- a/client/core/src/styles/index.js +++ b/client/core/src/styles/index.js @@ -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'; diff --git a/client/item/src/descriptor/index.html b/client/item/src/descriptor/index.html index 67a8bca44..140798989 100644 --- a/client/item/src/descriptor/index.html +++ b/client/item/src/descriptor/index.html @@ -25,8 +25,8 @@
{{$ctrl.item.id}}
- + value="{{$ctrl.item.name}}"> + diff --git a/client/item/src/diary/index.spec.js b/client/item/src/diary/index.spec.js index 39c5ce6d0..6cad8fc81 100644 --- a/client/item/src/diary/index.spec.js +++ b/client/item/src/diary/index.spec.js @@ -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}; diff --git a/client/item/src/index/index.html b/client/item/src/index/index.html index e206015e7..a0b0f5101 100644 --- a/client/item/src/index/index.html +++ b/client/item/src/index/index.html @@ -2,7 +2,7 @@ vn-id="model" url="/item/api/Items" filter="::$ctrl.filter" - limit="4" + limit="8" data="items" auto-load="false"> diff --git a/client/item/src/tags/index.js b/client/item/src/tags/index.js index e63393898..20430516e 100644 --- a/client/item/src/tags/index.js +++ b/client/item/src/tags/index.js @@ -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: '