Eric Fernandez / wrapper-mobile

Download as
Browse Code ยป

Commit be2c36711fcab96c6df37d02bde566a845ba790d

Authored by Eric Fernandez
2 parents 8ceb495a27 9181cef41f
Exists in master

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request !6
Showing 12 changed files   Show diff stats
... ... @@ -42,37 +42,30 @@
42 42 <script src="./node_modules/foca-hoja-ruta/dist/foca-hoja-ruta.min.js"></script>
43 43 <script src="./node_modules/foca-login/dist/foca-login.min.js"></script>
44 44 <script src="./node_modules/foca-modal/dist/foca-modal.min.js"></script>
45   - <script src="./node_modules/foca-modal-banco/dist/foca-modal-banco.min.js"></script>
  45 +
46 46 <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
47 47 <script src="./node_modules/foca-modal-cheque/dist/foca-modal-cheque.min.js"></script>
48   - <script src="./node_modules/foca-modal-chofer/dist/foca-modal-chofer.min.js"></script>
49   - <script src="./node_modules/foca-modal-cobrador/dist/foca-modal-cobradores.min.js"></script>
50 48 <script src="./node_modules/foca-modal-cobranza/dist/foca-modal-cobranza.min.js"></script>
51 49 <script src="./node_modules/foca-modal-cotizacion/dist/foca-modal-cotizacion.min.js"></script>
52 50 <script src="./node_modules/foca-modal-detalle-hoja-ruta/dist/foca-modal-detalle-hoja-ruta.min.js"></script>
  51 + <script src="./node_modules/foca-modal-detalles/dist/foca-modal-detalles.min.js"></script>
53 52 <script src="./node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script>
54 53 <script src="./node_modules/foca-modal-efectivo/dist/foca-modal-efectivo.min.js"></script>
55 54 <script src="./node_modules/foca-modal-factura/dist/foca-modal-factura.min.js"></script>
56 55 <script src="./node_modules/foca-modal-factura-detalle/dist/foca-modal-factura-detalle.min.js"></script>
57 56 <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
58 57 <script src="./node_modules/foca-modal-lista-precio/dist/foca-modal-lista-precio.min.js"></script>
59   - <script src="./node_modules/foca-modal-localidad/dist/foca-modal-localidad.min.js"></script>
60 58 <script src="./node_modules/foca-modal-login/dist/foca-modal-login.min.js"></script>
61   - <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script>
62 59 <script src="./node_modules/foca-modal-nota-pedido/dist/foca-modal-nota-pedido.min.js"></script>
63 60 <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
64   - <script src="./node_modules/foca-modal-proveedor/dist/foca-modal-proveedor.min.js"></script>
65   - <script src="./node_modules/foca-modal-provincia/dist/foca-modal-provincia.min.js"></script>
66 61 <script src="./node_modules/foca-modal-punto-descarga/dist/foca-modal-punto-descarga.min.js"></script>
67 62 <script src="./node_modules/foca-modal-tarifa-flete/dist/foca-modal-tarifa-flete.min.js"></script>
68   - <script src="./node_modules/foca-modal-transportista/dist/foca-modal-transportista.min.js"></script>
69   - <script src="./node_modules/foca-modal-unidad-medida/dist/foca-modal-unidad-medida.min.js"></script>
70   - <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script>
71 63 <script src="./node_modules/foca-nombre-empresa/dist/foca-nombre-empresa.min.js"></script>
72 64 <script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script>
73 65 <script src="./node_modules/foca-sqlite/dist/foca-sqlite.min.js"></script>
74 66 <script src="./src/js/app.js"></script>
75 67 <script src="./src/js/controller.js"></script>
  68 + <script src="./src/js/service.js"></script>
76 69 <script src="./src/etc/develop.js"></script>
77 70 </head>
78 71 <body>
... ... @@ -20,15 +20,15 @@
20 20 "author": "Foca Software",
21 21 "license": "ISC",
22 22 "dependencies": {
23   - "angular": "^1.7.5",
  23 + "angular": "^1.7.7",
24 24 "angular-chart.js": "1.1.1",
25   - "angular-cookies": "^1.7.5",
26   - "angular-i18n": "^1.7.5",
  25 + "angular-cookies": "^1.7.7",
  26 + "angular-i18n": "^1.7.7",
27 27 "angular-ladda": "^0.4.3",
28   - "angular-route": "^1.7.5",
29   - "angular-sanitize": "^1.7.5",
  28 + "angular-route": "^1.7.7",
  29 + "angular-sanitize": "^1.7.7",
30 30 "angular-ui-swiper": "^2.3.8",
31   - "bootstrap": "^4.1.3",
  31 + "bootstrap": "^4.3.1",
32 32 "chart.js": "2.7.3",
33 33 "foca-abm-chofer": "git+http://git.focasoftware.com/npm/foca-abm-chofer.git",
34 34 "foca-abm-plazo-pago": "git+http://git.focasoftware.com/npm/foca-abm-plazo-pago.git",
... ... @@ -64,6 +64,7 @@
64 64 "foca-modal-cobranza": "git+http://git.focasoftware.com/npm/foca-modal-cobranza.git",
65 65 "foca-modal-cotizacion": "git+http://git.focasoftware.com/npm/foca-modal-cotizacion.git",
66 66 "foca-modal-detalle-hoja-ruta": "git+http://git.focasoftware.com/npm/foca-modal-detalle-hoja-ruta.git",
  67 + "foca-modal-detalles": "git+http://git.focasoftware.com/npm/foca-modal-detalles.git",
67 68 "foca-modal-domicilio": "git+http://git.focasoftware.com/npm/foca-modal-domicilio.git",
68 69 "foca-modal-efectivo": "git+http://git.focasoftware.com/npm/foca-modal-efectivo.git",
69 70 "foca-modal-factura": "git+http://git.focasoftware.com/npm/foca-modal-factura.git",
... ... @@ -100,7 +101,7 @@
100 101 "ngstorage": "^0.3.11",
101 102 "node-sass": "^4.10.0",
102 103 "uglify": "^0.1.5",
103   - "ui-bootstrap4": "^3.0.5"
  104 + "ui-bootstrap4": "^3.0.6"
104 105 },
105 106 "devDependencies": {
106 107 "gulp": "3.9.1",
... ... @@ -114,7 +115,7 @@
114 115 "gulp-uglify": "^1.0.4",
115 116 "gulp-watch": "^5.0.1",
116 117 "jasmine-core": "^3.2.1",
117   - "jshint": "^2.9.6",
  118 + "jshint": "^2.10.1",
118 119 "pre-commit": "^1.2.2",
119 120 "pump": "^3.0.0"
120 121 }
src/etc/develop.ejemplo.js
Diff comments   View file @ be2c367
1 1 angular.module('appWrapperDemo')
2   - .constant('API_ENDPOINT', {
3   - 'URL': '//127.0.0.1:9000'
4   - })
5   - .constant("APP", ''); // Posibles valores '', 'distribuidor', 'transportista'
  2 +.constant('APP', '')
  3 +.constant('ENDPOINT_BASE', 'http://10.231.45.127:3000');
... ... @@ -23,31 +23,22 @@ angular.module(&#39;appWrapperDemo&#39;, [
23 23 'focaHojaRuta',
24 24 'focaLogin',
25 25 'focaModal',
26   - 'focaModalBanco',
27 26 'focaModalCheque',
28   - 'focaModalChofer',
29   - 'focaModalCobradores',
30 27 'focaModalCobranza',
31 28 'focaModalCotizacion',
32 29 'focaModalDetalleHojaRuta',
  30 + 'focaModalDetalles',
33 31 'focaModalDomicilio',
34 32 'focaModalEfectivo',
35 33 'focaModalFactura',
36 34 'focaModalFacturaDetalle',
37 35 'focaModalFlete',
38 36 'focaModalListaPrecio',
39   - 'focaModalLocalidad',
40 37 'focaModalLogin',
41   - 'focaModalMoneda',
42 38 'focaModalNotaPedido',
43 39 'focaModalPrecioCondicion',
44   - 'focaModalProveedor',
45   - 'focaModalProvincia',
46 40 'focaModalPuntoDescarga',
47 41 'focaModalTarifaFlete',
48   - 'focaModalTransportista',
49   - 'focaModalUnidadMedida',
50   - 'focaModalVendedores',
51 42 'focaNombreEmpresa',
52 43 'focaSeguimiento',
53 44 'focaSqlite'
src/js/controller.js
Diff comments   View file @ be2c367
... ... @@ -4,10 +4,24 @@ angular.module(&#39;appWrapperDemo&#39;)
4 4 '$rootScope',
5 5 '$timeout',
6 6 'focaSqliteService',
7   - function($scope, $rootScope, $timeout, focaSqliteService) {
  7 + 'API_ENDPOINT',
  8 + 'focaModalService',
  9 + function($scope, $rootScope, $timeout, focaSqliteService, API_ENDPOINT, focaModalService) {
8 10 document.addEventListener('deviceready', function() {
9 11 focaSqliteService.openDataBase();
10 12 });
  13 +
  14 + if (!API_ENDPOINT.URL) {
  15 + API_ENDPOINT.getUrl().then(success, error);
  16 + }
  17 +
  18 + function success(res) {
  19 + API_ENDPOINT.setUrl(res.data);
  20 + }
  21 + function error() {
  22 + focaModalService.alert('La terminal no esta configurada correctamente');
  23 + }
  24 +
11 25 $scope.usarTeclado = false;
12 26 $rootScope.$broadcast('usarTeclado', false);
13 27 $scope.mostrarTeclado = false;
... ... @@ -23,7 +37,7 @@ angular.module(&#39;appWrapperDemo&#39;)
23 37 $rootScope.$broadcast('usarTeclado', true);
24 38 };
25 39  
26   - $rootScope.$on('focus', function(event) {
  40 + $rootScope.$on('focus', function() {
27 41 if(!$scope.usarTeclado) {
28 42 return;
29 43 }
... ... @@ -33,7 +47,7 @@ angular.module(&#39;appWrapperDemo&#39;)
33 47 $scope.$apply();
34 48 }
35 49 });
36   - $rootScope.$on('blur', function(event) {
  50 + $rootScope.$on('blur', function() {
37 51 $scope.timeout = $timeout(function() {
38 52 $scope.mostrarTeclado = false;
39 53 if(!$scope.$$phase) {
... ... @@ -0,0 +1,20 @@
  1 +angular.module('appWrapperDemo')
  2 +.factory('API_ENDPOINT', [
  3 + '$http',
  4 + '$localStorage',
  5 + 'ENDPOINT_BASE',
  6 + function($http, $localStorage, ENDPOINT_BASE) {
  7 +
  8 + var direccion = ENDPOINT_BASE;
  9 +
  10 + return {
  11 + URL: $localStorage.urlEndPoint,
  12 + setUrl: function(url) {
  13 + this.URL = url;
  14 + $localStorage.urlEndPoint = url;
  15 + },
  16 + getUrl: function() {
  17 + return $http.get(direccion + '/terminal/consultar');
  18 + }
  19 + };
  20 +}]);
src/sass/_botonera-lateral.scss
Diff comments   View file @ be2c367
... ... @@ -28,6 +28,9 @@
28 28 background-color: #17d236 !important;
29 29 color: #FFF !important;
30 30 }
  31 + div[ladda]{
  32 + background-color: #DDD;
  33 + }
31 34  
32 35 button, .btn-group-toggle{
33 36 background-color: #DDD;
... ... @@ -63,4 +66,25 @@
63 66 display: none;
64 67 }
65 68 }
  69 +
  70 + .guardado{
  71 + animation:guardado 4s 1;
  72 + -webkit-animation:guardado 4s 1; /* Safari and Chrome */
  73 + }
  74 +
  75 + @keyframes guardado
  76 + {
  77 + 0% {background:#DDD; color: #000;}
  78 + 25% {background:#28a745; color: #FFF;}
  79 + 75% {background:#28a745; color: #FFF;}
  80 + 100% {background:#DDD; color: #000;}
  81 + }
  82 +
  83 + @-webkit-keyframes guardado /* Safari and Chrome */
  84 + {
  85 + 0% {background:#DDD; color: #000;}
  86 + 25% {background:#28a745; color: #FFF;}
  87 + 75% {background:#28a745; color: #FFF;}
  88 + 100% {background:#DDD; color: #000;}
  89 + }
66 90 }
src/sass/_botonera-secundaria.scss
Diff comments   View file @ be2c367
... ... @@ -3,7 +3,7 @@
3 3 border-radius: 5px;
4 4 overflow: hidden;
5 5 }
6   - .btn {
  6 + .btn-xs {
7 7 display: grid;
8 8 border-width: 3px !important;
9 9 border-radius: .7rem !important;
... ... @@ -29,13 +29,13 @@
29 29 }
30 30 }
31 31 @media(max-width: 992px){
32   - .btn{
  32 + .btn-xs{
33 33 font-weight: 700;
34 34 }
35 35 }
36 36 @media(min-width: 1200px){
37   - .btn{
38   - min-height: 85px;
  37 + .btn-xs{
  38 + height: 85px !important;
39 39 }
40 40 .foca-facturador-px{
41 41 padding-left: 3rem;
... ... @@ -44,14 +44,26 @@
44 44 }
45 45  
46 46 @media(min-width: 992px) and (max-width: 1200px){
47   - .btn{
48   - min-height: 73px;
  47 + .btn-xs{
  48 + height: 73px !important;
49 49 }
50 50 }
51 51  
52 52 @media(min-width: 768px) and (max-width: 992px){
53   - .btn{
54   - min-height: 62px;
  53 + .btn-xs{
  54 + height: 62px !important;
  55 + }
  56 + }
  57 +
  58 + @media(min-width: 576px) and (max-width: 768px){
  59 + .btn-xs{
  60 + max-height: 51px;
  61 + }
  62 + }
  63 +
  64 + @media(max-width: 576px) {
  65 + .btn-xs{
  66 + max-height: 13vw;
55 67 }
56 68 }
57 69  
... ... @@ -0,0 +1,32 @@
  1 +.gridInforme {
  2 + width: 100%;
  3 + height: 350px;
  4 +}
  5 +.ui-grid-header-cell-wrapper{
  6 + height: 40px !important;
  7 +}
  8 +
  9 +
  10 +.yellow {
  11 + max-width: unset !important;
  12 + >div {
  13 + background: yellow !important;
  14 + font-weight: bold;
  15 + }
  16 +}
  17 +
  18 +.red {
  19 + max-width: unset !important;
  20 + >div {
  21 + color: red;
  22 + font-weight: bold;
  23 + }
  24 +}
  25 +
  26 +.green {
  27 + max-width: unset !important;
  28 + >div {
  29 + color: green;
  30 + font-weight: bold;
  31 + }
  32 +}
src/sass/_logistica-pedido-ruta.scss
Diff comments   View file @ be2c367
... ... @@ -74,7 +74,7 @@
74 74 background: #44484b;
75 75 font-size: 24px;
76 76 color: #fff;
77   - line-height: 135px;
  77 + line-height: 20px;
78 78 text-align: center;
79 79 position: absolute;
80 80 top: 5%;
src/sass/_paginador-abm.scss
Diff comments   View file @ be2c367
... ... @@ -0,0 +1,18 @@
  1 +.paginador-abm {
  2 + margin-top: 1rem;
  3 + li {
  4 + &.active{
  5 + > a {
  6 + background: $primary-color !important;
  7 + color: #FFF !important;
  8 + }
  9 + }
  10 +
  11 + > a {
  12 + background-color: transparent !important;
  13 + border-color: #67615e !important;
  14 + color: #000 !important;
  15 +
  16 + }
  17 + }
  18 +}
src/sass/general.scss
Diff comments   View file @ be2c367
... ... @@ -17,6 +17,8 @@ $primary-color: #e09125;
17 17 @import 'foca-crear';
18 18 @import 'logistica-pedido-ruta';
19 19 @import 'tabs';
  20 +@import 'grid';
  21 +@import 'paginador-abm';
20 22  
21 23  
22 24 //OCULTA FLECHAS INPUT NUMBER
... ... @@ -49,6 +51,26 @@ input::-webkit-inner-spin-button {
49 51 z-index: 9999;
50 52 }
51 53  
52   -.foca-overflow-hidden{
53   - overflow: hidden;
  54 +.uib-daypicker{
  55 + outline: 0
  56 +}
  57 +
  58 +.right-0{
  59 + right: 0;
  60 +}
  61 +
  62 +.tabla-factura{
  63 + word-wrap: break-word;
  64 + table-layout: fixed;
  65 +}
  66 +
  67 +.ladda-w-100 .ladda-label{
  68 + width: 100%
  69 +}
  70 +
  71 +.btn-delete-image{
  72 + height: 25px;
  73 + width: 25px;
  74 + top: -10px;
  75 + right: 0;
54 76 }