MASTER-hotFix(travel_extraCommunity): fix css #1078
|
@ -86,7 +86,7 @@ export default class Controller extends Section {
|
|||
const params = JSON.stringify(data);
|
||||
this.$http.post('ClientConsumptionQueues', {params})
|
||||
.then(() => this.$.filters.hide())
|
||||
.then(() => this.vnApp.showSuccess(this.$t('Notifications sent!')));
|
||||
.then(() => this.vnApp.showSuccess(this.$t('Notification sent!')));
|
||||
}
|
||||
|
||||
exprBuilder(param, value) {
|
||||
|
|
|
@ -69,15 +69,16 @@ describe('Client notification', () => {
|
|||
data[0].$checked = true;
|
||||
data[1].$checked = true;
|
||||
|
||||
const params = Object.assign({
|
||||
const args = Object.assign({
|
||||
clients: [1101, 1102]
|
||||
}, controller.campaign);
|
||||
const params = JSON.stringify(args);
|
||||
|
||||
$httpBackend.expect('POST', `ClientConsumptionQueues`, {params}).respond(200, params);
|
||||
controller.onSendClientConsumption();
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notifications sent!');
|
||||
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notification sent!');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@ module.exports = Self => {
|
|||
|
||||
Self.closeAll = async() => {
|
||||
const toDate = new Date();
|
||||
toDate.setHours(0, 0, 0, 0);
|
||||
toDate.setDate(toDate.getDate() - 1);
|
||||
|
||||
const todayMinDate = new Date();
|
||||
|
|
|
@ -42,10 +42,10 @@
|
|||
<th field="id" shrink>
|
||||
<span translate>Id</span>
|
||||
</th>
|
||||
<th field="cargoSupplierFk" expand>
|
||||
<th field="cargoSupplierFk">
|
||||
<span translate>Supplier</span>
|
||||
</th>
|
||||
<th field="agencyModeFk" expand>
|
||||
<th field="agencyModeFk">
|
||||
<span translate>Agency</span>
|
||||
</th>
|
||||
<th field="ref">
|
||||
|
@ -100,7 +100,7 @@
|
|||
{{::travel.id}}
|
||||
</span>
|
||||
</td>
|
||||
<td expand vn-click-stop>
|
||||
<td vn-click-stop>
|
||||
<span
|
||||
class="link"
|
||||
ng-click="supplierDescriptor.show($event, travel.cargoSupplierFk)">
|
||||
|
@ -110,22 +110,23 @@
|
|||
<td expand>{{::travel.agencyModeName}}</td>
|
||||
<td
|
||||
name="reference"
|
||||
expand
|
||||
class="td-editable"
|
||||
vn-click-stop>
|
||||
<vn-textfield
|
||||
class="dense td-editable"
|
||||
ng-model="travel.ref"
|
||||
on-change="$ctrl.save(travel.id, {ref: value})">
|
||||
</vn-textfield>
|
||||
</vn-icon>
|
||||
</td>
|
||||
<td number>{{::travel.stickers}}</td>
|
||||
<td
|
||||
name="lockedKg"
|
||||
expand
|
||||
class="number"
|
||||
shrink
|
||||
vn-click-stop>
|
||||
<vn-input-number
|
||||
number
|
||||
shrink
|
||||
class="td-editable number"
|
||||
ng-model="travel.kg"
|
||||
on-change="$ctrl.save(travel.id, {kg: value})"
|
||||
|
@ -158,7 +159,7 @@
|
|||
</span>
|
||||
</td>
|
||||
<td></td>
|
||||
<td expand>{{::entry.ref}}</td>
|
||||
<td class="td-editable">{{::entry.ref}}</td>
|
||||
<td number>{{::entry.stickers}}</td>
|
||||
<td number></td>
|
||||
<td number>{{::entry.loadedkg}}</td>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
vn-travel-extra-community {
|
||||
.header {
|
||||
margin-bottom: 16px;
|
||||
font-size: 1.25rem;
|
||||
font-size: 1.1rem;
|
||||
line-height: 1;
|
||||
padding: 7px;
|
||||
padding-bottom: 7px;
|
||||
|
@ -29,10 +29,10 @@ vn-travel-extra-community {
|
|||
outline: 0;
|
||||
height: 65px;
|
||||
pointer-events: fill;
|
||||
user-select:all;
|
||||
user-select: all;
|
||||
}
|
||||
|
||||
tr[draggable] *::selection{
|
||||
tr[draggable] *::selection {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
|
@ -43,16 +43,19 @@ vn-travel-extra-community {
|
|||
tr[draggable].dragging {
|
||||
background-color: $color-primary-light;
|
||||
color: $color-font-light;
|
||||
font-weight:bold;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.td-editable{
|
||||
input{
|
||||
font-size: 1.25rem!important;
|
||||
}
|
||||
.td-editable {
|
||||
max-width: 200px;
|
||||
}
|
||||
|
||||
.number *{
|
||||
text-align: right;
|
||||
vn-input-number.number {
|
||||
min-width: 100px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.number * {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue