Luigi / wrapper-demo

Commit 8e18714e1c5212140c53b7f3aa9456c9a7e4a9bb

Authored by Nicolás Guarnieri 2018-12-10 17:19:52 -0300

Exists in master

Merge branch 'master' into 'master'

Master(efernandez)

See merge request !13

Showing 6 changed files Show diff stats

img/hojaRutaVolante.png

Diff comments View file @ 8e18714

9.99 KB

img/seguimientoCobranza.png

Diff comments View file @ 8e18714

12.1 KB

index.html

Diff comments View file @ 8e18714

 <html ng-app="appWrapperDemo">
     <head>
         <meta charset="UTF-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <base href="./">
         <!--CSS-->
         <link href="./node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
         <link href="./node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
         <link href="./node_modules/angular-ui-swiper/dist/angular-ui-swiper.css" rel="stylesheet"/>
         <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet"/>
         <link href="./node_modules/leaflet/dist/leaflet.css" rel="stylesheet"/>
         <link href="./css/general.css" rel="stylesheet"/>
         <!--VENDOR JS-->
         <script src="./node_modules/jquery/dist/jquery.min.js"></script>
         <script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
         <script src="./node_modules/angular/angular.min.js"></script>
         <script src="./node_modules/angular-cookies/angular-cookies.min.js"></script>
         <script src="./node_modules/angular-i18n/angular-locale_es-ar.js"></script>
         <script src="./node_modules/angular-route/angular-route.min.js"></script>
         <script src="./node_modules/angular-sanitize/angular-sanitize.min.js"></script>
         <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
         <script src="./node_modules/angular-ui-swiper/dist/angular-ui-swiper.js"></script>
         <script src="./node_modules/ladda/dist/spin.min.js"></script>
         <script src="./node_modules/ladda/dist/ladda.min.js"></script>
         <script src="./node_modules/angular-ladda/dist/angular-ladda.min.js"></script>
         <script src="./node_modules/leaflet/dist/leaflet.js"></script>
         <script src="./node_modules/ngstorage/ngStorage.min.js"></script>
         <script src="./vendor/cordovaGeolocationModule.min.js"></script>
         <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script>
         <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
         <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script>
         <script src="./node_modules/foca-admin-seguimiento/dist/foca-admin-seguimiento.min.js"></script>
         <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script>
         <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script>
         <script src="./node_modules/foca-configuracion/dist/foca-configuracion.min.js"></script>
         <script src="./node_modules/foca-crear-cobranza/dist/foca-crear-cobranza.min.js"></script>
         <script src="./node_modules/foca-crear-hoja-ruta/dist/foca-crear-hoja-ruta.min.js"></script>
         <script src="./node_modules/foca-crear-nota-pedido/dist/foca-crear-nota-pedido.min.js"></script>
         <script src="./node_modules/foca-crear-remito/dist/foca-crear-remito.min.js"></script>
         <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
         <script src="./node_modules/foca-filtros/dist/foca-filtros.min.js"></script>
         <script src="./node_modules/foca-hoja-ruta/dist/foca-hoja-ruta.min.js"></script>
         <script src="./node_modules/foca-login/dist/foca-login.min.js"></script>
         <script src="./node_modules/foca-modal/dist/foca-modal.min.js"></script>
         <script src="./node_modules/foca-modal-banco/dist/foca-modal-banco.min.js"></script>
         <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
         <script src="./node_modules/foca-modal-cheque/dist/foca-modal-cheque.min.js"></script>
         <script src="./node_modules/foca-modal-chofer/dist/foca-modal-chofer.min.js"></script>
         <script src="./node_modules/foca-modal-cotizacion/dist/foca-modal-cotizacion.min.js"></script>
         <script src="./node_modules/foca-modal-detalle-hoja-ruta/dist/foca-modal-detalle-hoja-ruta.min.js"></script>
         <script src="./node_modules/foca-modal-domicilio/dist/foca-modal-domicilios.min.js"></script>
         <script src="./node_modules/foca-modal-factura/dist/foca-modal-factura.min.js"></script>
         <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
         <script src="./node_modules/foca-modal-localidad/dist/foca-modal-localidad.min.js"></script>
         <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script>
         <script src="./node_modules/foca-modal-nota-pedido/dist/foca-modal-nota-pedido.min.js"></script>
         <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
         <script src="./node_modules/foca-modal-proveedor/dist/foca-modal-proveedor.min.js"></script>
         <script src="./node_modules/foca-modal-provincia/dist/foca-modal-provincia.min.js"></script>
         <script src="./node_modules/foca-modal-remito/dist/foca-modal-remito.min.js"></script>
         <script src="./node_modules/foca-modal-tarifa-flete/dist/foca-modal-tarifa-flete.min.js"></script>
         <script src="./node_modules/foca-modal-transportista/dist/foca-modal-transportista.min.js"></script>
         <script src="./node_modules/foca-modal-vehiculo/dist/foca-modal-vehiculo.min.js"></script>
         <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script>
         <script src="./node_modules/foca-nombre-empresa/dist/foca-nombre-empresa.min.js"></script>
         <script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script>
         <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script>
         <script src="./node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script>
         <script src="./node_modules/foca-modal-efectivo/dist/foca-modal-efectivo.min.js"></script>
         <script src="./node_modules/foca-modal-cobrador/dist/foca-modal-cobradores.min.js"></script>
+        <script src="./node_modules/foca-modal-cobranza/dist/foca-modal-cobranza.min.js"></script>
         <script src="./src/js/app.js"></script>
         <script src="./src/js/controller.js"></script>
         <script src="./src/etc/develop.js"></script>
     </head>
     <body>
         <style>
         </style>
         <foca-nombre-empresa></foca-nombre-empresa>
         <div ng-view class="container contenedor"></div>
         <div ng-controller="appWrapperDemoController" class="container d-none d-md-block">
             <div
                 class="btn-group-toggle"
                 data-toggle="buttons"
                 ng-click="cambioUsoTeclado()">
                 <label
                     class="btn btn-secondary active boton-activar-teclado"
                     ng-class="{'teclado-activar': usarTeclado}">
                     <input
                         type="checkbox"
                         autocomplete="off"
                         >
                         <i class="fa fa-keyboard-o fa-3x" aria-hidden="true"></i>
                 </label>
             </div>
             <foca-teclado
                 ng-show="usarTeclado && mostrarTeclado"
                 alfanumeric="true"
                 numeric="true"
                 >
             </foca-teclado>
         </div>
     </body>
 </html>

package.json

Diff comments View file @ 8e18714

 {
     "name": "wrapper-demo",
     "version": "0.0.1",
     "description": "",
     "main": "main.js",
     "scripts": {
         "initdev": "npm install gulp --global && npm install && npm install -g jshint",
         "gulp-pre-commit": "gulp pre-commit",
         "compile": "gulp uglify && gulp sass",
         "postinstall": "npm install foca-abm-plazo-pago foca-abm-precios-condiciones foca-abm-sectores foca-abm-vehiculo foca-admin-seguimiento foca-botonera-principal foca-busqueda-cliente foca-configuracion foca-crear-cobranza foca-crear-hoja-ruta foca-crear-nota-pedido foca-crear-remito foca-directivas foca-filtros foca-hoja-ruta foca-login foca-modal foca-modal-banco foca-modal-busqueda-productos foca-modal-cheque foca-modal-chofer foca-modal-cobrador foca-modal-cotizacion foca-modal-detalle-hoja-ruta foca-modal-domicilio foca-modal-efectivo foca-modal-factura foca-modal-flete foca-modal-localidad foca-modal-moneda foca-modal-nota-pedido foca-modal-precio-condiciones foca-modal-proveedor foca-modal-provincia foca-modal-remito foca-modal-tarifa-flete foca-modal-transportista foca-modal-vehiculo foca-modal-vendedores foca-nombre-empresa foca-seguimiento foca-teclado",
         "actualizar": "git pull origin master",
         "install-dev": "gulp pre-install && npm install && gulp post-install"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
         "url": "ssh://git@debonline.dyndns.org:npm/wrapper-demo.git"
     },
     "author": "Foca Software",
     "license": "ISC",
     "dependencies": {
         "angular": "^1.7.5",
         "angular-cookies": "^1.7.5",
         "angular-i18n": "^1.7.5",
         "angular-ladda": "^0.4.3",
         "angular-route": "^1.7.5",
         "angular-sanitize": "^1.7.5",
         "angular-ui-swiper": "^2.3.8",
         "bootstrap": "^4.1.3",
         "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git",
         "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git",
         "foca-abm-sectores": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-sectores.git",
         "foca-abm-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vehiculo.git",
         "foca-admin-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-admin-seguimiento.git",
         "foca-botonera-principal": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-principal.git",
         "foca-busqueda-cliente": "git+ssh://git@debonline.dyndns.org:npm/foca-busqueda-cliente.git",
         "foca-configuracion": "git+ssh://git@debonline.dyndns.org:npm/foca-configuracion.git",
         "foca-crear-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-cobranza.git",
         "foca-crear-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-hoja-ruta.git",
         "foca-crear-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-nota-pedido.git",
         "foca-crear-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-remito.git",
         "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git",
         "foca-filtros": "git+ssh://git@debonline.dyndns.org:npm/foca-filtros.git",
         "foca-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-hoja-ruta.git",
         "foca-login": "git+ssh://git@debonline.dyndns.org:npm/foca-login.git",
         "foca-modal": "git+ssh://git@debonline.dyndns.org:npm/foca-modal.git",
         "foca-modal-banco": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-banco.git",
         "foca-modal-busqueda-productos": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-busqueda-productos.git",
         "foca-modal-cheque": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cheque.git",
         "foca-modal-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-chofer.git",
         "foca-modal-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobrador.git",
+        "foca-modal-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobranza.git",
         "foca-modal-cotizacion": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cotizacion.git",
         "foca-modal-detalle-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalle-hoja-ruta.git",
         "foca-modal-domicilio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-domicilio.git",
         "foca-modal-efectivo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-efectivo.git",
         "foca-modal-factura": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-factura.git",
         "foca-modal-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-flete.git",
         "foca-modal-localidad": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-localidad.git",
         "foca-modal-moneda": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-moneda.git",
         "foca-modal-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-nota-pedido.git",
         "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git",
         "foca-modal-proveedor": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-proveedor.git",
         "foca-modal-provincia": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-provincia.git",
         "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git",
         "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git",
         "foca-modal-transportista": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-transportista.git",
         "foca-modal-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vehiculo.git",
         "foca-modal-vendedores": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vendedores.git",
         "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git",
         "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git",
         "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git",
         "font-awesome": "^4.7.0",
         "gulp-angular-templatecache": "^2.2.1",
         "gulp-htmlmin": "^5.0.1",
         "gulp-uglify": "^3.0.1",
         "gulp-uglify-es": "^1.0.4",
         "jquery": "^3.3.1",
         "ladda": "1.0.6",
         "leaflet": "1.3.4",
         "ngstorage": "^0.3.11",
         "node-sass": "^4.10.0",
         "uglify": "^0.1.5",
         "ui-bootstrap4": "^3.0.5"
     },
     "devDependencies": {
         "electron": "^3.0.2",
         "gulp": "^3.9.1",
         "gulp-clean": "^0.4.0",
         "gulp-concat": "^2.6.1",
         "gulp-connect": "^5.6.1",
         "gulp-jshint": "^2.1.0",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "^1.0.0",
         "gulp-sass": "^4.0.1",
         "gulp-uglify": "^1.0.4",
         "gulp-watch": "^5.0.1",
         "jasmine-core": "^3.2.1",
         "jshint": "^2.9.6",
         "pre-commit": "^1.2.2",
         "pump": "^3.0.0"
     }
 }

src/js/app.js

Diff comments View file @ 8e18714

 angular.module('appWrapperDemo', [
     //EXTERNOS
     'angular-ladda',
     'cordovaGeolocationModule',
     'ngCookies',
     'ngRoute',
     'ngSanitize',
     'ngStorage',
     'onScreenKeyboard',
     'ui.bootstrap',
     'ui.swiper',
     // MODULOS FOCA
     'focaAbmPlazoPago',
     'focaAbmPreciosCondiciones',
     'focaAbmSectores',
     'focaAbmVehiculo',
     'focaAdminSeguimiento',
     'focaBotoneraPrincipal',
     'focaBusquedaCliente',
     'focaBusquedaProductos',
     'focaConfiguracion',
     'focaCrearCobranza',
     'focaCrearHojaRuta',
     'focaCrearNotaPedido',
     'focaCrearRemito',
     'focaDirectivas',
     'focaFiltros',
     'focaHojaRuta',
     'focaLogin',
     'focaModal',
     'focaModalBanco',
     'focaModalCheque',
     'focaModalChofer',
     'focaModalCobradores',
+    'focaModalCobranza',
     'focaModalCotizacion',
     'focaModalDetalleHojaRuta',
     'focaModalDomicilio',
     'focaModalEfectivo',
     'focaModalFactura',
     'focaModalFlete',
     'focaModalLocalidad',
     'focaModalMoneda',
     'focaModalNotaPedido',
     'focaModalPrecioCondicion',
     'focaModalProveedor',
     'focaModalProvincia',
     'focaModalRemito',
     'focaModalTarifaFlete',
     'focaModalTransportista',
     'focaModalVehiculo',
     'focaModalVendedores',
     'focaNombreEmpresa',
     'focaSeguimiento',
     'focaTeclado'
 ]);

src/sass/_botonera-principal.scss

Diff comments View file @ 8e18714

 .botonera-principal {
     menuitem {
         display: inline-block;
         height: 130px;
         text-align: center;
         width: 180px;
         @media (max-width: 576px) {
             width: 100%;
         }
     }
     button {
         background-image: url('../img/botonera.png');
         border-radius: 12px;
         border-width: 0;
         height: 90px;
         position: relative;
         width: 90px;
         span {
             left: 0;
             position: absolute;
             text-align: center;
             top: 90px;
             width: 100%;
             font-size: 12px;
             color: #777777;
         }
     }
     &-menu {
         padding-left: 90px;
         @media (max-width: 576px) {
             padding: 0;
         }
     }
     &-logo {
         width: 80%;
         opacity: .8;
         @media (max-width: 576px) {
             width: 100%;
         }
     }
     &-vacio {
         & button {
             background-position: -4380px 0;
             &:hover {
                 background-position: -4380px -90px;
             }
         }
     }
     &-abrir-turno {
         & button {
             background-position: 0 0;
             &:hover {
                 background-position: 0 -90px;
             }
         }
     }
     &-cerrar-turno {
         & button {
             background-position: -90px 0;
             &:hover {
                 background-position: -90px -90px;
             }
         }
     }
     &-caja {
         & button {
             background-position: -180px 0;
             &:hover {
                 background-position: -180px -90px;
             }
         }
     }
     &-facturador {
         & button {
             background-position: -270px 0px;
             &:hover {
                 background-position: -270px -90px;
             }
         }
     }
     &-nota-pedido {
         & button {
             background-position: -1250px 0px;
             &:hover {
                 background-position: -1250px -90px;
             }
         }
     }
     &-remito {
         & button {
             background-position: -4560px 0px;
             &:hover {
                 background-position: -4560px -90px;
             }
         }
     }
     &-hoja-ruta {
         & button {
             background-position: -4650px 0px;
             &:hover {
                 background-position: -4650px -90px;
             }
         }
     }
     &-seguimiento {
         & button {
             background-position: -4470px 0px;
             &:hover {
                 background-position: -4470px -90px;
             }
         }
     }
+    &-seguimiento-hoja-ruta {
+        & button {
+            background-image: url('../img/hojaRutaVolante.png');
+            background-size: 90px 90px;
+        }
+    }
     &-cobranzas {
         & button {
             background-position: -1880 0px;
             &:hover {
                 background-position: -1880 -90px;
             }
         }
     }
+    &-seguimiento-cobranzas {
+        & button {
+            background-image: url('../img/seguimientoCobranza.png');
+            background-size: 90px 90px;
+        }
+    }
+    &-vehiculo {
+        & button {
+            background-position: -4560px 0px;
+            &:hover {
+                background-position: -4560px -90px;
+            }
+        }
+    }
+    &-precio-condicion {
+        & button {
+            background-position: -4560px 0px;
+            &:hover {
+                background-position: -4560px -90px;
+            }
+        }
+    }
     .swiper-pagination {
         bottom: 0px !important;
     }
     .swiper-button-next {
         background-image: url('../img/derecha.png');
     }
     .swiper-button-prev {
         background-image: url('../img/izquierda.png');
     }
 }