From 37887c105f72104a0bfefd04c836f320c0cd50f3 Mon Sep 17 00:00:00 2001
From: mpuebla <mpuebla@focasoftware.com>
Date: Tue, 7 May 2019 17:35:47 -0300
Subject: [PATCH] Cambio en estilo de selector de fecha, botones.

---
 src/js/controller.js                  |  4 +-
 src/views/foca-admin-seguimiento.html | 88 +++++++++++++++++++++--------------
 2 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 00fee13..d0eb055 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -276,8 +276,8 @@ angular.module('focaAdminSeguimiento').controller('focaAdminSeguimientoControlle
             }
             focaModalService.modal(parametrosModal)
                 .then(
-                    function (vendedor) {
-                        $scope.idUsuario = $scope.idUsuarioInput = vendedor.NOM;
+                    function (data) {
+                        $scope.idUsuario = $scope.idUsuarioInput = data.NUM;
                         getSeguimiento();
                         if ($scope.actividad === 'Entrega de producto' && $scope.idUsuario !== 0) {
                             focaAdminSeguimientoService.obtenerRemitosVehiculo($scope.idUsuario)
diff --git a/src/views/foca-admin-seguimiento.html b/src/views/foca-admin-seguimiento.html
index 1d6a680..a4bf434 100644
--- a/src/views/foca-admin-seguimiento.html
+++ b/src/views/foca-admin-seguimiento.html
@@ -17,57 +17,73 @@
             />
         </div>
         <div class="col-2 pl-0">
-            <input
-                type="text"
-                ng-model="now"
-                class="btn col-12 my-1"
-                ng-blur="fecha()"
-                uib-datepicker-popup="dd/MM/yyyy"
-                show-button-bar="false"
-                is-open="datepickerOpen"
-                on-open-focus="false"
-                ng-focus="datepickerOpen = true"
-                datepicker-options="dateOptions"
-            />
-            <button 
-                type="button" 
-                ng-class="{'active': idUsuario == 0}" 
-                class="btn col-12 my-1" 
+            <div class="input-group mb-3">
+                <div class="input-group-prepend my-2">
+                    <button
+                        class="input-group-text"
+                        ng-click="datepickerOpen = true"
+                    >
+                        <i class="fa fa-calendar" aria-hidden="true"></i>
+                    </button>
+                </div>
+                <input
+                    type="text"
+                    ng-model="now"
+                    class="form-control col-12 my-2"
+                    ng-blur="fecha()"
+                    uib-datepicker-popup="dd/MM/yyyy"
+                    show-button-bar="false"
+                    is-open="datepickerOpen"
+                    on-open-focus="false"
+                    ng-focus="datepickerOpen = true"
+                    datepicker-options="dateOptions"
+                />
+            </div>
+            <button
+                type="button"
+                ng-class="{'active': idUsuario == 0}"
+                class="btn btn-outline-debo col-12 my-1"
                 ng-click="general()"
             >General</button>
             <button
-                type="button" 
-                ng-class="{'active': idUsuario != 0}" 
-                class="btn col-12 my-1" 
+                type="button"
+                ng-class="{'active': idUsuario != 0}"
+                class="btn btn-outline-debo col-12 my-1"
                 ng-click="individual()"
             >Individual</button>
             <div class="form-group my-1" ng-show="idUsuario != 0">
-                <button 
-                    class="btn btn-primary"
+                <button
+                    class="btn btn-default"
                     foca-focus="idUsuario == -1"
                     ng-show="actividad == 'Nota de pedido'"
-                    ng-click="openModal()"
-                >Seleccionar vendedor</button>
-                <button 
-                    class="btn btn-primary"
-                    foca-focus="idUsuario == -1"                
+                    ng-click="openModal()">
+                    <i class="fa fa-hand-pointer-o" aria-hidden="true"></i>
+                    Vendedor
+                </button>
+                <button
+                    class="btn btn-default"
+                    foca-focus="idUsuario == -1"
                     ng-show="actividad == 'Entrega de producto'"
-                    ng-click="openModal()"
-                >Seleccionar transportista</button>
-                <button 
-                    class="btn btn-primary"
-                    foca-focus="idUsuario == -1"                                    
+                    ng-click="openModal()">
+                    <i class="fa fa-hand-pointer-o" aria-hidden="true"></i>
+                    Transportista
+                </button>
+                <button
+                    class="btn btn-default"
+                    foca-focus="idUsuario == -1"
                     ng-show="actividad == 'Cobranza'"
-                    ng-click="openModal()"
-                >Seleccionar cobrador</button>
+                    ng-click="openModal()">
+                    <i class="fa fa-hand-pointer-o" aria-hidden="true"></i>
+                    Cobrador
+                </button>
             </div>
             <button
-                type="button" 
-                class="btn col-12 my-1"
+                type="button"
+                class="btn btn-danger col-12 my-1"
                 ng-show="marcadores.length > 0 && idUsuario > 0"
                 ng-click="showMarcadores()"
             >Listar marcadores</button>
-            <div ng-show="actividad === 'Entrega de producto' && idUsuario != 0">
+            <div ng-show="actividad === 'Entrega de producto' && idUsuario !== 0">
                 <div class="custom-control custom-radio">
                     <input
                     type="radio"
-- 
1.9.1