Commit 37887c105f72104a0bfefd04c836f320c0cd50f3
1 parent
3113efb7e5
Exists in
master
and in
2 other branches
Cambio en estilo de selector de fecha, botones.
Showing
2 changed files
with
54 additions
and
38 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -276,8 +276,8 @@ angular.module('focaAdminSeguimiento').controller('focaAdminSeguimientoControlle |
| 276 | 276 | } |
| 277 | 277 | focaModalService.modal(parametrosModal) |
| 278 | 278 | .then( |
| 279 | - function (vendedor) { | |
| 280 | - $scope.idUsuario = $scope.idUsuarioInput = vendedor.NOM; | |
| 279 | + function (data) { | |
| 280 | + $scope.idUsuario = $scope.idUsuarioInput = data.NUM; | |
| 281 | 281 | getSeguimiento(); |
| 282 | 282 | if ($scope.actividad === 'Entrega de producto' && $scope.idUsuario !== 0) { |
| 283 | 283 | focaAdminSeguimientoService.obtenerRemitosVehiculo($scope.idUsuario) |
src/views/foca-admin-seguimiento.html
| ... | ... | @@ -17,57 +17,73 @@ |
| 17 | 17 | /> |
| 18 | 18 | </div> |
| 19 | 19 | <div class="col-2 pl-0"> |
| 20 | - <input | |
| 21 | - type="text" | |
| 22 | - ng-model="now" | |
| 23 | - class="btn col-12 my-1" | |
| 24 | - ng-blur="fecha()" | |
| 25 | - uib-datepicker-popup="dd/MM/yyyy" | |
| 26 | - show-button-bar="false" | |
| 27 | - is-open="datepickerOpen" | |
| 28 | - on-open-focus="false" | |
| 29 | - ng-focus="datepickerOpen = true" | |
| 30 | - datepicker-options="dateOptions" | |
| 31 | - /> | |
| 32 | - <button | |
| 33 | - type="button" | |
| 34 | - ng-class="{'active': idUsuario == 0}" | |
| 35 | - class="btn col-12 my-1" | |
| 20 | + <div class="input-group mb-3"> | |
| 21 | + <div class="input-group-prepend my-2"> | |
| 22 | + <button | |
| 23 | + class="input-group-text" | |
| 24 | + ng-click="datepickerOpen = true" | |
| 25 | + > | |
| 26 | + <i class="fa fa-calendar" aria-hidden="true"></i> | |
| 27 | + </button> | |
| 28 | + </div> | |
| 29 | + <input | |
| 30 | + type="text" | |
| 31 | + ng-model="now" | |
| 32 | + class="form-control col-12 my-2" | |
| 33 | + ng-blur="fecha()" | |
| 34 | + uib-datepicker-popup="dd/MM/yyyy" | |
| 35 | + show-button-bar="false" | |
| 36 | + is-open="datepickerOpen" | |
| 37 | + on-open-focus="false" | |
| 38 | + ng-focus="datepickerOpen = true" | |
| 39 | + datepicker-options="dateOptions" | |
| 40 | + /> | |
| 41 | + </div> | |
| 42 | + <button | |
| 43 | + type="button" | |
| 44 | + ng-class="{'active': idUsuario == 0}" | |
| 45 | + class="btn btn-outline-debo col-12 my-1" | |
| 36 | 46 | ng-click="general()" |
| 37 | 47 | >General</button> |
| 38 | 48 | <button |
| 39 | - type="button" | |
| 40 | - ng-class="{'active': idUsuario != 0}" | |
| 41 | - class="btn col-12 my-1" | |
| 49 | + type="button" | |
| 50 | + ng-class="{'active': idUsuario != 0}" | |
| 51 | + class="btn btn-outline-debo col-12 my-1" | |
| 42 | 52 | ng-click="individual()" |
| 43 | 53 | >Individual</button> |
| 44 | 54 | <div class="form-group my-1" ng-show="idUsuario != 0"> |
| 45 | - <button | |
| 46 | - class="btn btn-primary" | |
| 55 | + <button | |
| 56 | + class="btn btn-default" | |
| 47 | 57 | foca-focus="idUsuario == -1" |
| 48 | 58 | ng-show="actividad == 'Nota de pedido'" |
| 49 | - ng-click="openModal()" | |
| 50 | - >Seleccionar vendedor</button> | |
| 51 | - <button | |
| 52 | - class="btn btn-primary" | |
| 53 | - foca-focus="idUsuario == -1" | |
| 59 | + ng-click="openModal()"> | |
| 60 | + <i class="fa fa-hand-pointer-o" aria-hidden="true"></i> | |
| 61 | + Vendedor | |
| 62 | + </button> | |
| 63 | + <button | |
| 64 | + class="btn btn-default" | |
| 65 | + foca-focus="idUsuario == -1" | |
| 54 | 66 | ng-show="actividad == 'Entrega de producto'" |
| 55 | - ng-click="openModal()" | |
| 56 | - >Seleccionar transportista</button> | |
| 57 | - <button | |
| 58 | - class="btn btn-primary" | |
| 59 | - foca-focus="idUsuario == -1" | |
| 67 | + ng-click="openModal()"> | |
| 68 | + <i class="fa fa-hand-pointer-o" aria-hidden="true"></i> | |
| 69 | + Transportista | |
| 70 | + </button> | |
| 71 | + <button | |
| 72 | + class="btn btn-default" | |
| 73 | + foca-focus="idUsuario == -1" | |
| 60 | 74 | ng-show="actividad == 'Cobranza'" |
| 61 | - ng-click="openModal()" | |
| 62 | - >Seleccionar cobrador</button> | |
| 75 | + ng-click="openModal()"> | |
| 76 | + <i class="fa fa-hand-pointer-o" aria-hidden="true"></i> | |
| 77 | + Cobrador | |
| 78 | + </button> | |
| 63 | 79 | </div> |
| 64 | 80 | <button |
| 65 | - type="button" | |
| 66 | - class="btn col-12 my-1" | |
| 81 | + type="button" | |
| 82 | + class="btn btn-danger col-12 my-1" | |
| 67 | 83 | ng-show="marcadores.length > 0 && idUsuario > 0" |
| 68 | 84 | ng-click="showMarcadores()" |
| 69 | 85 | >Listar marcadores</button> |
| 70 | - <div ng-show="actividad === 'Entrega de producto' && idUsuario != 0"> | |
| 86 | + <div ng-show="actividad === 'Entrega de producto' && idUsuario !== 0"> | |
| 71 | 87 | <div class="custom-control custom-radio"> |
| 72 | 88 | <input |
| 73 | 89 | type="radio" |