Commit c40e281e3858379ea4bbda5200190e012a44faf4

Authored by Pablo Marco del Pont
Exists in master

Merge branch 'master' into 'master'

Master (pmarco)

See merge request Wrappers/wrapper-demo!8

501 KB

1 <html ng-app="appWrapperDemo"> 1 <html ng-app="appWrapperDemo">
2 <head> 2 <head>
3 <meta charset="UTF-8"/> 3 <meta charset="UTF-8"/>
4 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> 4 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
5 <base href="./"> 5 <base href="./">
6 6
7 <!--CSS--> 7 <!--CSS-->
8 <link href="./node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/> 8 <link href="./node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
9 <link href="./node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/> 9 <link href="./node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
10 <link href="css/general.css" rel="stylesheet"/> 10 <link href="css/general.css" rel="stylesheet"/>
11 11
12 <!--VENDOR JS--> 12 <!--VENDOR JS-->
13 <script src="./node_modules/jquery/dist/jquery.min.js"></script> 13 <script src="./node_modules/jquery/dist/jquery.min.js"></script>
14 <script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script> 14 <script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
15 <script src="./node_modules/angular/angular.min.js"></script> 15 <script src="./node_modules/angular/angular.min.js"></script>
16 <script src="./node_modules/angular-route/angular-route.min.js"></script> 16 <script src="./node_modules/angular-route/angular-route.min.js"></script>
17 <script src="./node_modules/angular-cookies/angular-cookies.min.js"></script> 17 <script src="./node_modules/angular-cookies/angular-cookies.min.js"></script>
18 <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script> 18 <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
19 19
20 <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script> 20 <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
21 <script src="./node_modules/foca-botonera-horizontal/dist/botonera-horizontal.min.js"></script> 21 <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script>
22 <script src="./node_modules/foca-turno-apertura/dist/foca-turno-apertura.min.js"></script> 22 <script src="./node_modules/foca-turno-apertura/dist/foca-turno-apertura.min.js"></script>
23 <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script> 23 <script src="./node_modules/foca-abm-plazo-pago/dist/foca-abm-plazo-pago.min.js"></script>
24 <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script> 24 <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
25 <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script> 25 <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script>
26 <script src="./node_modules/foca-crear-nota-pedido/dist/foca-crear-nota-pedido.min.js"></script> 26 <script src="./node_modules/foca-crear-nota-pedido/dist/foca-crear-nota-pedido.min.js"></script>
27 <script src="./node_modules/foca-login/dist/foca-login.min.js"></script> 27 <script src="./node_modules/foca-login/dist/foca-login.min.js"></script>
28 <script src="./node_modules/foca-modal/dist/foca-modal.min.js"></script> 28 <script src="./node_modules/foca-modal/dist/foca-modal.min.js"></script>
29 <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script> 29 <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
30 <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script> 30 <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script>
31 <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script> 31 <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script>
32 <script src="./node_modules/foca-modal-petroleras/dist/foca-modal-petroleras.min.js"></script> 32 <script src="./node_modules/foca-modal-petroleras/dist/foca-modal-petroleras.min.js"></script>
33 <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script> 33 <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script>
34 <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script> 34 <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script>
35 <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script> 35 <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script>
36 36
37 <!-- BUILD --> 37 <!-- BUILD -->
38 <script src="./src/js/app.js"></script> 38 <script src="./src/js/app.js"></script>
39 <script src="./src/etc/develop.js"></script> 39 <script src="./src/etc/develop.js"></script>
40 <!-- /BUILD --> 40 <!-- /BUILD -->
41 41
42 </head> 42 </head>
43 <body> 43 <body>
44 <style> 44 <style>
45 </style> 45 </style>
46 <botonera-horizontal></botonera-horizontal> 46 <botonera-horizontal></botonera-horizontal>
47 <div ng-view class="container contenedor"></div> 47 <div ng-view class="container contenedor"></div>
48 </body> 48 </body>
49 </html> 49 </html>
50 50
1 { 1 {
2 "name": "wrapper-demo", 2 "name": "wrapper-demo",
3 "version": "0.0.1", 3 "version": "0.0.1",
4 "description": "", 4 "description": "",
5 "main": "main.js", 5 "main": "main.js",
6 "scripts": { 6 "scripts": {
7 "initdev": "npm install gulp --global && npm install && npm install -g jshint", 7 "initdev": "npm install gulp --global && npm install && npm install -g jshint",
8 "gulp-pre-commit": "gulp pre-commit", 8 "gulp-pre-commit": "gulp pre-commit",
9 "compile": "gulp uglify && gulp sass", 9 "compile": "gulp uglify && gulp sass",
10 "electron": "electron .", 10 "electron": "electron .",
11 "electron-build": "gulp uglify && gulp html && gulp sass && electron ." 11 "electron-build": "gulp uglify && gulp html && gulp sass && electron ."
12 }, 12 },
13 "pre-commit": [ 13 "pre-commit": [
14 "gulp-pre-commit" 14 "gulp-pre-commit"
15 ], 15 ],
16 "repository": { 16 "repository": {
17 "type": "git", 17 "type": "git",
18 "url": "https://debo.suite.repo/Wrappers/wrapper-demo.git" 18 "url": "https://debo.suite.repo/Wrappers/wrapper-demo.git"
19 }, 19 },
20 "author": "Foca Software", 20 "author": "Foca Software",
21 "license": "ISC", 21 "license": "ISC",
22 "dependencies": { 22 "dependencies": {
23 "angular": "^1.7.5", 23 "angular": "^1.7.5",
24 "angular-cookies": "^1.7.5", 24 "angular-cookies": "^1.7.5",
25 "angular-route": "^1.7.5", 25 "angular-route": "^1.7.5",
26 "bootstrap": "^4.1.3", 26 "bootstrap": "^4.1.3",
27 "foca-abm-plazo-pago": "git+https://debo.suite.repo/modulos-npm/foca-abm-plazo-pago.git", 27 "foca-abm-plazo-pago": "git+https://debo.suite.repo/modulos-npm/foca-abm-plazo-pago.git",
28 "foca-abm-precios-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-abm-precios-condiciones.git", 28 "foca-abm-precios-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-abm-precios-condiciones.git",
29 "foca-abm-sectores": "git+https://debo.suite.repo/modulos-npm/foca-abm-sectores", 29 "foca-abm-sectores": "git+https://debo.suite.repo/modulos-npm/foca-abm-sectores",
30 "foca-botonera-horizontal": "git+https://debo.suite.repo/modulos-npm/foca-botonera-horizontal.git", 30 "foca-botonera-principal": "git+https://debo.suite.repo/modulos-npm/foca-botonera-principal.git",
31 "foca-busqueda-cliente": "git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git", 31 "foca-busqueda-cliente": "git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git",
32 "foca-crear-nota-pedido": "git+https://debo.suite.repo/modulos-npm/foca-crear-nota-pedido.git", 32 "foca-crear-nota-pedido": "git+https://debo.suite.repo/modulos-npm/foca-crear-nota-pedido.git",
33 "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git", 33 "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
34 "foca-login": "git+https://debo.suite.repo/modulos-npm/foca-login.git", 34 "foca-login": "git+https://debo.suite.repo/modulos-npm/foca-login.git",
35 "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal", 35 "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal",
36 "foca-modal-busqueda-productos": "git+https://debo.suite.repo/modulos-npm/foca-modal-busqueda-productos", 36 "foca-modal-busqueda-productos": "git+https://debo.suite.repo/modulos-npm/foca-modal-busqueda-productos",
37 "foca-modal-flete": "git+https://debo.suite.repo/modulos-npm/foca-modal-flete.git", 37 "foca-modal-flete": "git+https://debo.suite.repo/modulos-npm/foca-modal-flete.git",
38 "foca-modal-moneda": "git+https://debo.suite.repo/modulos-npm/foca-modal-moneda.git", 38 "foca-modal-moneda": "git+https://debo.suite.repo/modulos-npm/foca-modal-moneda.git",
39 "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git", 39 "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git",
40 "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git", 40 "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git",
41 "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git", 41 "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git",
42 "foca-turno-apertura": "git+https://debo.suite.repo/modulos-npm/foca-turno-apertura.git", 42 "foca-turno-apertura": "git+https://debo.suite.repo/modulos-npm/foca-turno-apertura.git",
43 "font-awesome": "^4.7.0", 43 "font-awesome": "^4.7.0",
44 "gulp-angular-templatecache": "^2.2.1", 44 "gulp-angular-templatecache": "^2.2.1",
45 "gulp-htmlmin": "^5.0.1", 45 "gulp-htmlmin": "^5.0.1",
46 "gulp-uglify": "^3.0.1", 46 "gulp-uglify": "^3.0.1",
47 "jquery": "^3.3.1", 47 "jquery": "^3.3.1",
48 "node-sass": "^4.9.4", 48 "node-sass": "^4.9.4",
49 "uglify": "^0.1.5", 49 "uglify": "^0.1.5",
50 "ui-bootstrap4": "^3.0.5" 50 "ui-bootstrap4": "^3.0.5"
51 }, 51 },
52 "devDependencies": { 52 "devDependencies": {
53 "electron": "^3.0.2", 53 "electron": "^3.0.2",
54 "gulp": "^3.9.1", 54 "gulp": "^3.9.1",
55 "gulp-clean": "^0.4.0", 55 "gulp-clean": "^0.4.0",
56 "gulp-concat": "^2.6.1", 56 "gulp-concat": "^2.6.1",
57 "gulp-connect": "^5.6.1", 57 "gulp-connect": "^5.6.1",
58 "gulp-jshint": "^2.1.0", 58 "gulp-jshint": "^2.1.0",
59 "gulp-rename": "^1.4.0", 59 "gulp-rename": "^1.4.0",
60 "gulp-replace": "^1.0.0", 60 "gulp-replace": "^1.0.0",
61 "gulp-sass": "^4.0.1", 61 "gulp-sass": "^4.0.1",
62 "gulp-uglify-es": "^1.0.4", 62 "gulp-uglify-es": "^1.0.4",
63 "gulp-watch": "^5.0.1", 63 "gulp-watch": "^5.0.1",
64 "jasmine-core": "^3.2.1", 64 "jasmine-core": "^3.2.1",
65 "jshint": "^2.9.6", 65 "jshint": "^2.9.6",
66 "pre-commit": "^1.2.2", 66 "pre-commit": "^1.2.2",
67 "pump": "^3.0.0" 67 "pump": "^3.0.0"
68 } 68 }
69 } 69 }
70 70
1 angular.module('appWrapperDemo', [ 1 angular.module('appWrapperDemo', [
2 'ngCookies', 2 'ngCookies',
3 'ngRoute', 3 'ngRoute',
4 'ui.bootstrap', 4 'ui.bootstrap',
5 'focaAbmPlazoPago', 5 'focaAbmPlazoPago',
6 'focaAbmPreciosCondiciones', 6 'focaAbmPreciosCondiciones',
7 'focaAbmSectores', 7 'focaAbmSectores',
8 'focaBotoneraHorizontal', 8 'focaBotoneraPrincipal',
9 'focaBusquedaCliente', 9 'focaBusquedaCliente',
10 'focaBusquedaProductos', 10 'focaBusquedaProductos',
11 'focaCrearNotaPedido', 11 'focaCrearNotaPedido',
12 'focaDirectivas', 12 'focaDirectivas',
13 'focaLogin', 13 'focaLogin',
14 'focaModal', 14 'focaModal',
15 'focaModalFlete', 15 'focaModalFlete',
16 'focaModalMoneda', 16 'focaModalMoneda',
17 'focaModalPrecioCondicion', 17 'focaModalPrecioCondicion',
18 'focaModalVendedores', 18 'focaModalVendedores',
19 'focaTurnoApertura' 19 'focaTurnoApertura'
20 ]); 20 ]);
21 21
src/sass/_botonera-principal.scss
File was created 1 .botonera-principal {
2 margin: 0;
3 padding-left: 30px;
4 padding-top: 30px;
5 & menuitem {
6 display: inline-block;
7 height: 130px;
8 text-align: center;
9 width: 180px;
10 }
11 & button {
12 background-image: url('../img/botonera.png');
13 border-radius: 12px;
14 border-width: 0;
15 height: 90px;
16 position: relative;
17 width: 90px;
18 }
19 & span {
20 left: 0;
21 position: absolute;
22 text-align: center;
23 top: 90px;
24 width: 100%;
25 font-size: 12px;
26 color: #777777;
27 }
28 &-abrir-turno {
29 & button {
30 background-position: 0 0;
31 &:hover {
32 background-position: 0 -90px;
33 }
34 }
35 }
36 &-cerrar-turno {
37 & button {
38 background-position: -90px 0;
39 &:hover {
40 background-position: -90px -90px;
41 }
42 }
43 }
44 &-caja {
45 & button {
46 background-position: -180px 0;
47 &:hover {
48 background-position: -180px -90px;
49 }
50 }
51 }
52 &-facturador {
53 & button {
54 background-position: -270px 0px;
55 &:hover {
56 background-position: -270px -90px;
57 }
58 }
59 }
60 &-nota-pedido {
61 & button {
62 background-position: -270px 0px;
63 &:hover {
64 background-position: -270px -90px;
65 }
66 }
67 }
68 }
69
src/sass/_botonera-secundaria.scss
1 .botonera-secundaria { 1 .botonera-secundaria {
2 background-color: rgba(0, 0, 0, 0.8); 2 background-color: rgba(0, 0, 0, 0.8);
3 .btn-xs {
4 padding: .15rem .5rem;
5 font-size: .8rem;
6 line-height: 1.5;
7 border-radius: .2rem;
8 }
3 } 9 }
4 10
src/sass/_contenedor.scss
1 body { 1 body {
2 background-color: #cccccc; 2 background-color: #cccccc;
3 } 3 }
4 4
5 .contenedor { 5 .contenedor {
6 background-image: radial-gradient(circle at 50% 50%, #ebecf1, #abaec3); 6 background-image: radial-gradient(circle at 50% 50%, #ebecf1, #abaec3);
7 min-height: 600px; 7 min-height: 600px;
8 min-width: 800px; 8 min-width: 800px;
9 } 9 }
10
11 .grilla-articulos {
12 background-color: rgba(0, 0, 0, 0.8);
13 height: 430px;
14 }
15
16 .crear-nota-pedido {
17 form {
18 margin-bottom: 0;
19 }
20 table {
21 margin-bottom: 0;
22 }
23 }
10 24
src/sass/_panel-informativo.scss
1 .panel-informativo { 1 .panel-informativo {
2 background: linear-gradient(#ccc, #eee); 2 background: linear-gradient(#ccc, #eee);
3 .form-group { 3 .form-group {
4 margin-bottom: 5px; 4 margin-bottom: 5px;
5 } 5 }
6 .form-control-xs {
7 height: calc(1.6rem);
8 padding: .25rem .5rem;
9 font-size: .8rem;
10 line-height: 1.3;
11 border-radius: .2rem;
12 }
13 .label {
14 font-size: .8em;
15 }
16 .valor {
17 font-size: .8em;
18 }
6 } 19 }
7 20
src/sass/_tabla.scss
1 .table { 1 .table {
2 &-nonfluid { 2 &-nonfluid {
3 width: auto; 3 width: auto;
4 } 4 }
5 &-celda-total {
6 color: #000000;
7 background-color: #FF9900;
8 }
5 } 9 }
6 10
src/sass/general.scss
1 @import 'bootstrap'; 1 @import 'bootstrap';
2 @import 'botonera'; 2 @import 'botonera';
3 @import 'botonera-principal';
3 @import 'botonera-secundaria'; 4 @import 'botonera-secundaria';
4 @import 'contenedor'; 5 @import 'contenedor';
5 @import 'lista'; 6 @import 'lista';
6 @import 'login'; 7 @import 'login';
7 @import 'panel-informativo'; 8 @import 'panel-informativo';
8 @import 'tabla'; 9 @import 'tabla';
9 10