verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

item diary visual refesh

This commit is contained in:
Gerard 2018-10-23 14:29:34 +02:00
parent 82bdea09ae
commit 410c38c420
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/item/src/diary/index.html
View File

@ -33,9 +33,11 @@
</vn-tr>
</vn-thead>
<vn-tbody>
<vn-tr ng-class="::{'warning': $ctrl.isToday(sale.date), 'isIn': sale.in, 'balanceNegative': sale.balance < 0}"
<vn-tr ng-class="::{'isToday': $ctrl.isToday(sale.date), 'isIn': sale.in, 'balanceNegative': sale.balance < 0}"
ng-repeat="sale in sales" vn-repeat-last on-last="$ctrl.scrollToLine()">
<vn-td>{{::sale.date | date:'dd/MM/yyyy' }}</vn-td>
<vn-td class="date">
{{::sale.date | date:'dd/MM/yyyy' }}
</vn-td>
<vn-td number>
<span ng-class="::{'link pointer': sale.isTicket}"
ng-click="$ctrl.showDescriptor($event, sale)">

10
client/item/src/diary/index.spec.js
View File

@ -7,18 +7,13 @@ describe('Item', () => {
let $stateParams;
let $scope;
let controller;
let $httpBackend;
beforeEach(() => {
angular.mock.module('item');
});
beforeEach(ngModule('item'));
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$stateParams_, _$httpBackend_) => {
beforeEach(angular.mock.inject((_$componentController_, $rootScope, _$stateParams_) => {
$componentController = _$componentController_;
$stateParams = _$stateParams_;
$stateParams.id = 1;
$httpBackend = _$httpBackend_;
$httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
$scope = $rootScope.$new();
controller = $componentController('vnItemDiary', {$scope: $scope, $stateParams});
controller.$scope.model = crudModel;
@ -99,7 +94,6 @@ describe('Item', () => {
});
});
describe('givenTicketIndex() setter', () => {
it(`should return the index position of the line of a given ticket fk`, () => {
controller.$scope.model = {data: [

11
client/item/src/diary/style.scss
View File

@ -14,15 +14,20 @@ vn-item-diary {
& vn-autocomplete > div{
width: 400px;
}
.balanceNegative .balance {
background-color: $main-01;
color: white;
font-weight: bold;
}
.isIn .in {
background-color: $main-02;
color: white;
font-weight: bold;
}
.isToday .date{
background-color: rgba(247, 147, 30, 0.5);
font-weight: bold;
}
.truncate {
max-width: 250px;
white-space: nowrap;