diff --git a/gulpfile.js b/gulpfile.js index 3f8eb78..9e455d2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -11,7 +11,7 @@ const watch = require('gulp-watch'); var paths = { srcHTML : 'src/views/*.html', - srcJS : 'src/**/*.js', + srcJS : 'src/js/*.js', dist : 'dist/', distHTML : 'dist/views/' }; @@ -73,8 +73,8 @@ gulp.task('webserver', function() { }); gulp.task('watch', function() { - gulp.watch(archivosJS, ['uglify']); - gulp.watch('css/scss/*.scss', ['sass']); + gulp.watch([paths.srcJS], ['uglify']); + gulp.watch('src/sass/*.scss', ['sass']); }) gulp.task('reload'), function() { diff --git a/index.html b/index.html index 42a40f1..d83473e 100644 --- a/index.html +++ b/index.html @@ -18,6 +18,7 @@ + @@ -31,8 +32,8 @@ - - + + diff --git a/package.json b/package.json index 95a1e3f..de43ca7 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "dependencies": { "angular": "^1.7.5", "angular-cookies": "^1.7.5", + "angular-i18n": "^1.7.5", "angular-on-screen-keyboard": "git+https://github.com/ericf97/angular-on-screen-keyboard.git", "angular-route": "^1.7.5", "angular-sanitize": "^1.7.5", @@ -39,8 +40,8 @@ "foca-modal-domicilio": "git+https://debo.suite.repo/modulos-npm/foca-modal-domicilio.git", "foca-modal-flete": "git+https://debo.suite.repo/modulos-npm/foca-modal-flete.git", "foca-modal-moneda": "git+https://debo.suite.repo/modulos-npm/foca-modal-moneda.git", - "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git", "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git", + "foca-modal-proveedor": "git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git", "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git", "foca-teclado": "git+https://debo.suite.repo/modulos-npm/foca-teclado.git", "foca-turno-apertura": "git+https://debo.suite.repo/modulos-npm/foca-turno-apertura.git", diff --git a/src/js/app.js b/src/js/app.js index f579401..52e2678 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -15,6 +15,7 @@ angular.module('appWrapperDemo', [ 'focaModalFlete', 'focaModalMoneda', 'focaModalPrecioCondicion', + 'focaModalProveedor', 'focaModalVendedores', 'focaTeclado', 'focaTurnoApertura', diff --git a/src/sass/_botonera-lateral.scss b/src/sass/_botonera-lateral.scss new file mode 100644 index 0000000..502e530 --- /dev/null +++ b/src/sass/_botonera-lateral.scss @@ -0,0 +1,5 @@ +.botonera-lateral { + >.row { + height: 420px; + } +} diff --git a/src/sass/_botonera-secundaria.scss b/src/sass/_botonera-secundaria.scss index 340937a..3a69e6a 100644 --- a/src/sass/_botonera-secundaria.scss +++ b/src/sass/_botonera-secundaria.scss @@ -1,3 +1,13 @@ .botonera-secundaria { background-color: rgba(0, 0, 0, 0.8); + .row { + border-radius: 5px; + overflow: hidden; + } + .btn { + border-radius: 0; + margin-right: 1px; + width: calc(100% - 1px); + margin-bottom: 1px; + } } diff --git a/src/sass/_contenedor.scss b/src/sass/_contenedor.scss index d84d495..d5d5a6d 100644 --- a/src/sass/_contenedor.scss +++ b/src/sass/_contenedor.scss @@ -13,7 +13,7 @@ body { /* height: 300px; */ } -.grilla-articulos { +.grilla-articulo { background-color: rgba(0, 0, 0, 0.8); height: 430px; } diff --git a/src/sass/_tabla-articulos.scss b/src/sass/_tabla-articulos.scss new file mode 100644 index 0000000..f4ad2f1 --- /dev/null +++ b/src/sass/_tabla-articulos.scss @@ -0,0 +1,47 @@ +.tabla-articulo { + max-height: 420px; + display: -moz-groupbox; + width: 100%; + display: block; + + tr { + width: 100%; + display: inline-table; + table-layout: fixed; + } + + tbody { + overflow-y: auto; + max-height: 280px; + width: 100%; + display: block; + } + + &-numero { + width: 25px; + } + + &-codigo { + width: 70px; + } + + &-descripcion { + width: 250px; + } + + &-cantidad { + width: 100px; + } + + &-precio { + width: 130px; + } + + &-subtotal { + width: 130px; + } + + &-boton { + width: 52px; + } +} diff --git a/src/sass/general.scss b/src/sass/general.scss index a210d24..c64dc5a 100644 --- a/src/sass/general.scss +++ b/src/sass/general.scss @@ -1,5 +1,6 @@ @import 'bootstrap'; @import 'botonera'; +@import 'botonera-lateral'; @import 'botonera-principal'; @import 'botonera-secundaria'; @import 'contenedor'; @@ -8,3 +9,4 @@ @import 'panel-informativo'; @import 'tabla'; @import 'teclado'; +@import 'tabla-articulos';