From 14429e90074cbd54b30456674270965237f82403 Mon Sep 17 00:00:00 2001 From: efernandez Date: Thu, 21 Feb 2019 15:57:09 -0300 Subject: [PATCH] files from wrapper-demo --- index.html | 12 ++---------- package.json | 17 +++++++++-------- src/js/app.js | 34 ++++++++++++++++++++++++---------- src/js/controller.js | 10 +++------- src/sass/_botonera-lateral.scss | 24 ++++++++++++++++++++++++ src/sass/_botonera-secundaria.scss | 28 ++++++++++++++++++++-------- src/sass/_grid.scss | 32 ++++++++++++++++++++++++++++++++ src/sass/_logistica-pedido-ruta.scss | 2 +- src/sass/_paginador-abm.scss | 18 ++++++++++++++++++ src/sass/general.scss | 26 ++++++++++++++++++++++++-- 10 files changed, 157 insertions(+), 46 deletions(-) create mode 100644 src/sass/_grid.scss create mode 100644 src/sass/_paginador-abm.scss diff --git a/index.html b/index.html index bf4bc89..8cbba29 100644 --- a/index.html +++ b/index.html @@ -42,32 +42,24 @@ - + - - + - - - - - - - diff --git a/package.json b/package.json index 456d2a6..a220092 100644 --- a/package.json +++ b/package.json @@ -20,15 +20,15 @@ "author": "Foca Software", "license": "ISC", "dependencies": { - "angular": "^1.7.5", + "angular": "^1.7.7", "angular-chart.js": "1.1.1", - "angular-cookies": "^1.7.5", - "angular-i18n": "^1.7.5", + "angular-cookies": "^1.7.7", + "angular-i18n": "^1.7.7", "angular-ladda": "^0.4.3", - "angular-route": "^1.7.5", - "angular-sanitize": "^1.7.5", + "angular-route": "^1.7.7", + "angular-sanitize": "^1.7.7", "angular-ui-swiper": "^2.3.8", - "bootstrap": "^4.1.3", + "bootstrap": "^4.3.1", "chart.js": "2.7.3", "foca-abm-chofer": "git+http://git.focasoftware.com/npm/foca-abm-chofer.git", "foca-abm-plazo-pago": "git+http://git.focasoftware.com/npm/foca-abm-plazo-pago.git", @@ -64,6 +64,7 @@ "foca-modal-cobranza": "git+http://git.focasoftware.com/npm/foca-modal-cobranza.git", "foca-modal-cotizacion": "git+http://git.focasoftware.com/npm/foca-modal-cotizacion.git", "foca-modal-detalle-hoja-ruta": "git+http://git.focasoftware.com/npm/foca-modal-detalle-hoja-ruta.git", + "foca-modal-detalles": "git+http://git.focasoftware.com/npm/foca-modal-detalles.git", "foca-modal-domicilio": "git+http://git.focasoftware.com/npm/foca-modal-domicilio.git", "foca-modal-efectivo": "git+http://git.focasoftware.com/npm/foca-modal-efectivo.git", "foca-modal-factura": "git+http://git.focasoftware.com/npm/foca-modal-factura.git", @@ -100,7 +101,7 @@ "ngstorage": "^0.3.11", "node-sass": "^4.10.0", "uglify": "^0.1.5", - "ui-bootstrap4": "^3.0.5" + "ui-bootstrap4": "^3.0.6" }, "devDependencies": { "gulp": "3.9.1", @@ -114,7 +115,7 @@ "gulp-uglify": "^1.0.4", "gulp-watch": "^5.0.1", "jasmine-core": "^3.2.1", - "jshint": "^2.9.6", + "jshint": "^2.10.1", "pre-commit": "^1.2.2", "pump": "^3.0.0" } diff --git a/src/js/app.js b/src/js/app.js index 7079a71..9b06706 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -4,11 +4,21 @@ angular.module('appWrapperDemo', [ 'cordovaGeolocationModule', 'ngCookies', 'ngRoute', + 'ngSanitize', 'ngStorage', + 'onScreenKeyboard', 'ui.bootstrap', 'ui.swiper', + 'ui.grid', + 'ui.grid.exporter', // MODULOS FOCA + 'focaAbmPreciosCondiciones', + 'focaAbmVehiculo', + 'focaAbmChofer', + 'focaAbmVendedorCobrador', + 'focaActivarHojaRuta', + 'focaAdminSeguimiento', 'focaBotoneraFacturador', 'focaBotoneraLateral', 'focaBotoneraPrincipal', @@ -16,39 +26,43 @@ angular.module('appWrapperDemo', [ 'focaBusquedaProductos', 'focaCabeceraFacturador', 'focaConfiguracion', + 'focaConfigurarTerminal', 'focaCrearCobranza', + 'focaCrearHojaRuta', + 'focaCrearLogin', 'focaCrearNotaPedido', + 'focaCrearRemito', 'focaDirectivas', + 'focaEstadoCisternas', 'focaFiltros', 'focaHojaRuta', + 'focaInformes', 'focaLogin', 'focaModal', - 'focaModalBanco', 'focaModalCheque', - 'focaModalChofer', - 'focaModalCobradores', 'focaModalCobranza', 'focaModalCotizacion', + 'focaModalDetalleCisternas', 'focaModalDetalleHojaRuta', + 'focaModalDetalles', 'focaModalDomicilio', 'focaModalEfectivo', 'focaModalFactura', 'focaModalFacturaDetalle', 'focaModalFlete', + 'focaModalGraficoCisternas', + 'focaModalInforme', 'focaModalListaPrecio', - 'focaModalLocalidad', + 'focaModalLocalizar', 'focaModalLogin', - 'focaModalMoneda', 'focaModalNotaPedido', 'focaModalPrecioCondicion', - 'focaModalProveedor', - 'focaModalProvincia', 'focaModalPuntoDescarga', + 'focaModalRemito', 'focaModalTarifaFlete', - 'focaModalTransportista', 'focaModalUnidadMedida', - 'focaModalVendedores', 'focaNombreEmpresa', 'focaSeguimiento', - 'focaSqlite' + 'focaTeclado', + 'focaLogisticaPedidoRuta' ]); diff --git a/src/js/controller.js b/src/js/controller.js index a8d56e7..0c72727 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -3,11 +3,7 @@ angular.module('appWrapperDemo') '$scope', '$rootScope', '$timeout', - 'focaSqliteService', - function($scope, $rootScope, $timeout, focaSqliteService) { - document.addEventListener('deviceready', function() { - focaSqliteService.openDataBase(); - }); + function($scope, $rootScope, $timeout) { $scope.usarTeclado = false; $rootScope.$broadcast('usarTeclado', false); $scope.mostrarTeclado = false; @@ -23,7 +19,7 @@ angular.module('appWrapperDemo') $rootScope.$broadcast('usarTeclado', true); }; - $rootScope.$on('focus', function(event) { + $rootScope.$on('focus', function() { if(!$scope.usarTeclado) { return; } @@ -33,7 +29,7 @@ angular.module('appWrapperDemo') $scope.$apply(); } }); - $rootScope.$on('blur', function(event) { + $rootScope.$on('blur', function() { $scope.timeout = $timeout(function() { $scope.mostrarTeclado = false; if(!$scope.$$phase) { diff --git a/src/sass/_botonera-lateral.scss b/src/sass/_botonera-lateral.scss index b486613..329e8fd 100644 --- a/src/sass/_botonera-lateral.scss +++ b/src/sass/_botonera-lateral.scss @@ -28,6 +28,9 @@ background-color: #17d236 !important; color: #FFF !important; } + div[ladda]{ + background-color: #DDD; + } button, .btn-group-toggle{ background-color: #DDD; @@ -63,4 +66,25 @@ display: none; } } + + .guardado{ + animation:guardado 4s 1; + -webkit-animation:guardado 4s 1; /* Safari and Chrome */ + } + + @keyframes guardado + { + 0% {background:#DDD; color: #000;} + 25% {background:#28a745; color: #FFF;} + 75% {background:#28a745; color: #FFF;} + 100% {background:#DDD; color: #000;} + } + + @-webkit-keyframes guardado /* Safari and Chrome */ + { + 0% {background:#DDD; color: #000;} + 25% {background:#28a745; color: #FFF;} + 75% {background:#28a745; color: #FFF;} + 100% {background:#DDD; color: #000;} + } } diff --git a/src/sass/_botonera-secundaria.scss b/src/sass/_botonera-secundaria.scss index ab783b2..718c5dc 100644 --- a/src/sass/_botonera-secundaria.scss +++ b/src/sass/_botonera-secundaria.scss @@ -3,7 +3,7 @@ border-radius: 5px; overflow: hidden; } - .btn { + .btn-xs { display: grid; border-width: 3px !important; border-radius: .7rem !important; @@ -29,13 +29,13 @@ } } @media(max-width: 992px){ - .btn{ + .btn-xs{ font-weight: 700; } } @media(min-width: 1200px){ - .btn{ - min-height: 85px; + .btn-xs{ + height: 85px !important; } .foca-facturador-px{ padding-left: 3rem; @@ -44,14 +44,26 @@ } @media(min-width: 992px) and (max-width: 1200px){ - .btn{ - min-height: 73px; + .btn-xs{ + height: 73px !important; } } @media(min-width: 768px) and (max-width: 992px){ - .btn{ - min-height: 62px; + .btn-xs{ + height: 62px !important; + } + } + + @media(min-width: 576px) and (max-width: 768px){ + .btn-xs{ + max-height: 51px; + } + } + + @media(max-width: 576px) { + .btn-xs{ + max-height: 13vw; } } diff --git a/src/sass/_grid.scss b/src/sass/_grid.scss new file mode 100644 index 0000000..955f72d --- /dev/null +++ b/src/sass/_grid.scss @@ -0,0 +1,32 @@ +.gridInforme { + width: 100%; + height: 350px; +} +.ui-grid-header-cell-wrapper{ + height: 40px !important; +} + + +.yellow { + max-width: unset !important; + >div { + background: yellow !important; + font-weight: bold; + } +} + +.red { + max-width: unset !important; + >div { + color: red; + font-weight: bold; + } +} + +.green { + max-width: unset !important; + >div { + color: green; + font-weight: bold; + } +} diff --git a/src/sass/_logistica-pedido-ruta.scss b/src/sass/_logistica-pedido-ruta.scss index 40a3800..278cbe2 100644 --- a/src/sass/_logistica-pedido-ruta.scss +++ b/src/sass/_logistica-pedido-ruta.scss @@ -74,7 +74,7 @@ background: #44484b; font-size: 24px; color: #fff; - line-height: 135px; + line-height: 20px; text-align: center; position: absolute; top: 5%; diff --git a/src/sass/_paginador-abm.scss b/src/sass/_paginador-abm.scss new file mode 100644 index 0000000..9221b74 --- /dev/null +++ b/src/sass/_paginador-abm.scss @@ -0,0 +1,18 @@ +.paginador-abm { + margin-top: 1rem; + li { + &.active{ + > a { + background: $primary-color !important; + color: #FFF !important; + } + } + + > a { + background-color: transparent !important; + border-color: #67615e !important; + color: #000 !important; + + } + } +} diff --git a/src/sass/general.scss b/src/sass/general.scss index a04911f..73d44a7 100644 --- a/src/sass/general.scss +++ b/src/sass/general.scss @@ -17,6 +17,8 @@ $primary-color: #e09125; @import 'foca-crear'; @import 'logistica-pedido-ruta'; @import 'tabs'; +@import 'grid'; +@import 'paginador-abm'; //OCULTA FLECHAS INPUT NUMBER @@ -49,6 +51,26 @@ input::-webkit-inner-spin-button { z-index: 9999; } -.foca-overflow-hidden{ - overflow: hidden; +.uib-daypicker{ + outline: 0 +} + +.right-0{ + right: 0; +} + +.tabla-factura{ + word-wrap: break-word; + table-layout: fixed; +} + +.ladda-w-100 .ladda-label{ + width: 100% +} + +.btn-delete-image{ + height: 25px; + width: 25px; + top: -10px; + right: 0; } -- 1.9.1