Merge pull request 'MASTER-hotFix(travel_extraCommunity): fix css' (#1078) from hotFix_travel_extraCommunity-css into master
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #1078
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2022-10-10 05:51:15 +00:00
commit bdf156638d
5 changed files with 26 additions and 20 deletions

View File

@ -86,7 +86,7 @@ export default class Controller extends Section {
const params = JSON.stringify(data); const params = JSON.stringify(data);
this.$http.post('ClientConsumptionQueues', {params}) this.$http.post('ClientConsumptionQueues', {params})
.then(() => this.$.filters.hide()) .then(() => this.$.filters.hide())
.then(() => this.vnApp.showSuccess(this.$t('Notifications sent!'))); .then(() => this.vnApp.showSuccess(this.$t('Notification sent!')));
} }
exprBuilder(param, value) { exprBuilder(param, value) {

View File

@ -69,15 +69,16 @@ describe('Client notification', () => {
data[0].$checked = true; data[0].$checked = true;
data[1].$checked = true; data[1].$checked = true;
const params = Object.assign({ const args = Object.assign({
clients: [1101, 1102] clients: [1101, 1102]
}, controller.campaign); }, controller.campaign);
const params = JSON.stringify(args);
$httpBackend.expect('POST', `ClientConsumptionQueues`, {params}).respond(200, params); $httpBackend.expect('POST', `ClientConsumptionQueues`, {params}).respond(200, params);
controller.onSendClientConsumption(); controller.onSendClientConsumption();
$httpBackend.flush(); $httpBackend.flush();
expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notifications sent!'); expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Notification sent!');
}); });
}); });

View File

@ -18,6 +18,7 @@ module.exports = Self => {
Self.closeAll = async() => { Self.closeAll = async() => {
const toDate = new Date(); const toDate = new Date();
toDate.setHours(0, 0, 0, 0);
toDate.setDate(toDate.getDate() - 1); toDate.setDate(toDate.getDate() - 1);
const todayMinDate = new Date(); const todayMinDate = new Date();

View File

@ -42,10 +42,10 @@
<th field="id" shrink> <th field="id" shrink>
<span translate>Id</span> <span translate>Id</span>
</th> </th>
<th field="cargoSupplierFk" expand> <th field="cargoSupplierFk">
<span translate>Supplier</span> <span translate>Supplier</span>
</th> </th>
<th field="agencyModeFk" expand> <th field="agencyModeFk">
<span translate>Agency</span> <span translate>Agency</span>
</th> </th>
<th field="ref"> <th field="ref">
@ -100,7 +100,7 @@
{{::travel.id}} {{::travel.id}}
</span> </span>
</td> </td>
<td expand vn-click-stop> <td vn-click-stop>
<span <span
class="link" class="link"
ng-click="supplierDescriptor.show($event, travel.cargoSupplierFk)"> ng-click="supplierDescriptor.show($event, travel.cargoSupplierFk)">
@ -110,22 +110,23 @@
<td expand>{{::travel.agencyModeName}}</td> <td expand>{{::travel.agencyModeName}}</td>
<td <td
name="reference" name="reference"
expand class="td-editable"
vn-click-stop> vn-click-stop>
<vn-textfield <vn-textfield
class="dense td-editable" class="dense td-editable"
ng-model="travel.ref" ng-model="travel.ref"
on-change="$ctrl.save(travel.id, {ref: value})"> on-change="$ctrl.save(travel.id, {ref: value})">
</vn-textfield> </vn-textfield>
</vn-icon>
</td> </td>
<td number>{{::travel.stickers}}</td> <td number>{{::travel.stickers}}</td>
<td <td
name="lockedKg" name="lockedKg"
expand class="number"
shrink
vn-click-stop> vn-click-stop>
<vn-input-number <vn-input-number
number number
shrink
class="td-editable number" class="td-editable number"
ng-model="travel.kg" ng-model="travel.kg"
on-change="$ctrl.save(travel.id, {kg: value})" on-change="$ctrl.save(travel.id, {kg: value})"
@ -158,7 +159,7 @@
</span> </span>
</td> </td>
<td></td> <td></td>
<td expand>{{::entry.ref}}</td> <td class="td-editable">{{::entry.ref}}</td>
<td number>{{::entry.stickers}}</td> <td number>{{::entry.stickers}}</td>
<td number></td> <td number></td>
<td number>{{::entry.loadedkg}}</td> <td number>{{::entry.loadedkg}}</td>

View File

@ -3,7 +3,7 @@
vn-travel-extra-community { vn-travel-extra-community {
.header { .header {
margin-bottom: 16px; margin-bottom: 16px;
font-size: 1.25rem; font-size: 1.1rem;
line-height: 1; line-height: 1;
padding: 7px; padding: 7px;
padding-bottom: 7px; padding-bottom: 7px;
@ -29,10 +29,10 @@ vn-travel-extra-community {
outline: 0; outline: 0;
height: 65px; height: 65px;
pointer-events: fill; pointer-events: fill;
user-select:all; user-select: all;
} }
tr[draggable] *::selection{ tr[draggable] *::selection {
background-color: transparent; background-color: transparent;
} }
@ -43,16 +43,19 @@ vn-travel-extra-community {
tr[draggable].dragging { tr[draggable].dragging {
background-color: $color-primary-light; background-color: $color-primary-light;
color: $color-font-light; color: $color-font-light;
font-weight:bold; font-weight: bold;
} }
.td-editable{ .td-editable {
input{ max-width: 200px;
font-size: 1.25rem!important;
}
} }
.number *{ vn-input-number.number {
text-align: right; min-width: 100px;
padding-right: 10px;
}
.number * {
text-align: center;
} }
} }