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

Merge pull request '5691-route.index_optimizar' (!1610) from 5691-route.index_optimizar into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Vicent Llopis 2023-06-14 11:01:43 +00:00
parent aa2d3be451 9e89167d27
commit 9b692e00d4
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
modules/route/front/index/index.html
View File

@ -1,11 +1,26 @@
<vn-auto-search <vn-auto-search
model="model"> model="model">
</vn-auto-search> </vn-auto-search>
<vn-crud-model
auto-load="true"
url="AgencyModes"
data="agencyModes">
</vn-crud-model>
<vn-crud-model
auto-load="true"
url="Vehicles"
data="vehicles">
</vn-crud-model>
<vn-crud-model
auto-load="true"
url="Workers/activeWithInheritedRole"
data="activeWithInheritedRole">
</vn-crud-model>
<div class="vn-w-xl"> <div class="vn-w-xl">
<vn-card> <vn-card>
<smart-table <smart-table
model="model" model="model"
options="$ctrl.smartTableOptions" options="$ctrl.smartTableOptions"
expr-builder="$ctrl.exprBuilder(param, value)"> expr-builder="$ctrl.exprBuilder(param, value)">
<slot-actions> <slot-actions>
<section class="header"> <section class="header">
@ -35,7 +50,7 @@
<thead> <thead>
<tr> <tr>
<th shrink> <th shrink>
<vn-multi-check <vn-multi-check
model="model"> model="model">
</vn-multi-check> </vn-multi-check>
</th> </th>
@ -52,19 +67,19 @@
<span translate>Vehicle</span> <span translate>Vehicle</span>
</th> </th>
<th field="created" shrink-date> <th field="created" shrink-date>
<span translate>Date</span> <span translate>Date</span>
</th> </th>
<th field="m3" number> <th field="m3" number>
<span translate>m³</span> <span translate>m³</span>
</th> </th>
<th field="description"> <th field="description">
<span translate>Description</span> <span translate>Description</span>
</th> </th>
<th field="started"> <th field="started">
<span translate>Hour started</span> <span translate>Hour started</span>
</th> </th>
<th field="finished"> <th field="finished">
<span translate>Hour finished</span> <span translate>Hour finished</span>
</th> </th>
<th shrink></th> <th shrink></th>
</tr> </tr>
@ -74,7 +89,7 @@
class="clickable vn-tr search-result" class="clickable vn-tr search-result"
ng-attr-id="{{::route.id}}" vn-droppable="$ctrl.onDrop($event)"> ng-attr-id="{{::route.id}}" vn-droppable="$ctrl.onDrop($event)">
<td shrink> <td shrink>
<vn-check <vn-check
ng-model="route.checked" ng-model="route.checked"
vn-click-stop> vn-click-stop>
</vn-check> </vn-check>
@ -83,7 +98,7 @@
<td> <td>
<vn-autocomplete <vn-autocomplete
ng-model="route.workerFk" ng-model="route.workerFk"
url="Workers/activeWithInheritedRole" data="activeWithInheritedRole"
show-field="nickname" show-field="nickname"
search-function="{firstName: $search}" search-function="{firstName: $search}"
value-field="id" value-field="id"
@ -98,25 +113,25 @@
<td expand> <td expand>
<vn-autocomplete <vn-autocomplete
ng-model="route.agencyModeFk" ng-model="route.agencyModeFk"
url="AgencyModes" data="agencyModes"
show-field="name" show-field="name"
value-field="id" value-field="id"
on-change="$ctrl.updateAttributes(route)" on-change="$ctrl.updateAttributes(route)"
vn-click-stop> vn-click-stop>
</vn-autocomplete> </vn-autocomplete>
</td> </td>
<td expand> <td expand>
<vn-autocomplete <vn-autocomplete
ng-model="route.vehicleFk" ng-model="route.vehicleFk"
url="Vehicles" data="vehicles"
show-field="numberPlate" show-field="numberPlate"
value-field="id" value-field="id"
on-change="$ctrl.updateAttributes(route)" on-change="$ctrl.updateAttributes(route)"
vn-click-stop> vn-click-stop>
</vn-autocomplete> </vn-autocomplete>
</td > </td >
<td> <td>
<vn-date-picker <vn-date-picker
ng-model="route.created" ng-model="route.created"
on-change="$ctrl.updateAttributes(route)"> on-change="$ctrl.updateAttributes(route)">
</vn-horizontal> </vn-horizontal>
@ -156,7 +171,7 @@
</tbody> </tbody>
</table> </table>
</slot-table> </slot-table>
</smart-table> </smart-table>
</vn-card> </vn-card>
</div> </div>
@ -171,7 +186,7 @@
route="$ctrl.routeSelected"> route="$ctrl.routeSelected">
</vn-route-ticket-popup> </vn-route-ticket-popup>
<vn-worker-descriptor-popover <vn-worker-descriptor-popover
vn-id="workerDescriptor"> vn-id="workerDescriptor">
</vn-worker-descriptor-popover> </vn-worker-descriptor-popover>
<vn-ticket-descriptor-popover <vn-ticket-descriptor-popover
@ -194,7 +209,7 @@
</div> </div>
<!-- Clonation dialog --> <!-- Clonation dialog -->
<vn-dialog class="edit" <vn-dialog class="edit"
vn-id="clonationDialog" vn-id="clonationDialog"
on-accept="$ctrl.cloneSelectedRoutes()" on-accept="$ctrl.cloneSelectedRoutes()"
message="Select the starting date"> message="Select the starting date">
@ -210,4 +225,4 @@
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/> <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
<button response="accept" translate>Clone</button> <button response="accept" translate>Clone</button>
</tpl-buttons> </tpl-buttons>
</vn-dialog> </vn-dialog>