Marcelo Puebla / wrapper-demo

Download as
Browse Code ยป

Commit 9ed161a11498461cddeab06bc7c4db509746c9b2

Authored by Eric Fernandez
2 parents 6ef87e12f8 c90d24150d
Exists in master and in 1 other branch develop

Merge branch 'develop' into 'master' 

Develop

See merge request !123
Showing 19 changed files   Show diff stats
img/FechaEntrega.png
Diff comments   View file @ 9ed161a

4.63 KB
img/clientePrincipal.png
Diff comments   View file @ 9ed161a

5.5 KB
img/datoscliente.png
Diff comments   View file @ 9ed161a

5.53 KB

6.97 KB
img/dimiciliodeentrega.png
Diff comments   View file @ 9ed161a

8.24 KB
No preview for this file type
img/fechaDeReparto.png
View file @ 9ed161a

4.19 KB
img/parametrizar.png
Diff comments   View file @ 9ed161a

10.1 KB | W: | H:

10.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

8.56 KB
img/remitoabierto.png
Diff comments   View file @ 9ed161a

6.57 KB
... ... @@ -12,9 +12,12 @@
12 12 <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet"/>
13 13 <link href="./node_modules/leaflet/dist/leaflet.css" rel="stylesheet"/>
14 14 <link href="./css/general.css" rel="stylesheet"/>
  15 + <link rel="shortcut icon" href="./img/favicon.ico" />
  16 +
15 17  
16 18 <!--VENDOR JS-->
17 19 <script src="./node_modules/jquery/dist/jquery.min.js"></script>
  20 + <script src="./node_modules/popper.js/dist/umd/popper.min.js"></script>
18 21 <script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
19 22 <script src="./node_modules/angular/angular.min.js"></script>
20 23 <script src="./node_modules/angular-cookies/angular-cookies.min.js"></script>
... ... @@ -41,6 +44,7 @@
41 44 <script src="./node_modules/angular-md5/angular-md5.min.js"></script>
42 45  
43 46 <script src="./node_modules/foca-abm-chofer/dist/foca-abm-chofer.min.js"></script>
  47 + <script src="./node_modules/foca-abm-cliente/dist/foca-abm-cliente.min.js"></script>
44 48 <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
45 49 <script src="./node_modules/foca-abm-vehiculo/dist/foca-abm-vehiculo.min.js"></script>
46 50 <script src="./node_modules/foca-abm-vendedor-cobrador/dist/foca-abm-vendedor-cobrador.min.js"></script>
... ... @@ -37,6 +37,7 @@
37 37 "chart.js": "2.7.3",
38 38 "excel-builder": "2.0.3",
39 39 "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git",
  40 + "foca-abm-cliente": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-cliente.git",
40 41 "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git",
41 42 "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git",
42 43 "foca-abm-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vehiculo.git",
... ... @@ -94,19 +95,20 @@
94 95 "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git",
95 96 "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git",
96 97 "font-awesome": "^4.7.0",
97   - "gulp-angular-templatecache": "^2.2.6",
  98 + "gulp-angular-templatecache": "^2.2.7",
98 99 "gulp-htmlmin": "^5.0.1",
99 100 "gulp-sequence": "^1.0.0",
100 101 "gulp-uglify-es": "^1.0.4",
101   - "jquery": "^3.4.0",
  102 + "jquery": "^3.4.1",
102 103 "jszip": "2.6.1",
103 104 "ladda": "1.0.6",
104 105 "leaflet": "1.3.4",
105 106 "lodash": "4.17.11",
106 107 "moment": "2.23.0",
107 108 "ngstorage": "^0.3.11",
108   - "node-sass": "^4.11.0",
  109 + "node-sass": "^4.12.0",
109 110 "pdfmake": "0.1.41",
  111 + "popper.js": "^1.15.0",
110 112 "uglify": "^0.1.5",
111 113 "ui-bootstrap4": "^3.0.6"
112 114 },
... ... @@ -18,6 +18,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
18 18 'focaAbmPreciosCondiciones',
19 19 'focaAbmVehiculo',
20 20 'focaAbmChofer',
  21 + 'focaAbmCliente',
21 22 'focaAbmVendedorCobrador',
22 23 'focaActivarHojaRuta',
23 24 'focaAdminSeguimiento',
src/js/controller.js
Diff comments   View file @ 9ed161a
... ... @@ -3,7 +3,8 @@ angular.module(&#39;appWrapperDemo&#39;)
3 3 '$scope',
4 4 '$rootScope',
5 5 '$timeout',
6   - function($scope, $rootScope, $timeout) {
  6 + '$uibModalStack',
  7 + function($scope, $rootScope, $timeout, $uibModalStack) {
7 8 $scope.usarTeclado = false;
8 9 $rootScope.$broadcast('usarTeclado', false);
9 10 $scope.mostrarTeclado = false;
... ... @@ -37,5 +38,10 @@ angular.module(&#39;appWrapperDemo&#39;)
37 38 }
38 39 }, 150);
39 40 });
  41 +
  42 + // Close all modals
  43 + $rootScope.$on('$locationChangeSuccess', function() {
  44 + $uibModalStack.dismissAll('close');
  45 + });
40 46 }
41 47 ]);
src/sass/_admin-seguimiento.scss
Diff comments   View file @ 9ed161a
... ... @@ -12,3 +12,9 @@
12 12 }
13 13 }
14 14 }
  15 +
  16 +osm-direccion {
  17 + &>div {
  18 + height: 400px;
  19 + }
  20 +}
src/sass/_bootstrap.scss
Diff comments   View file @ 9ed161a
... ... @@ -13,6 +13,7 @@ button.active{
13 13 line-height: 1.5;
14 14 border-radius: .2rem;
15 15 }
  16 +
16 17 .no-border-bottom {
17 18 border-bottom: 0 !important;
18 19 }
src/sass/_botonera-principal.scss
Diff comments   View file @ 9ed161a
... ... @@ -201,6 +201,14 @@
201 201 background-size: 90px 90px;
202 202 }
203 203 }
  204 +
  205 + &-cliente {
  206 + & button {
  207 + background-image: url('../img/clientePrincipal.png');
  208 + background-size: 90px 90px;
  209 + }
  210 + }
  211 +
204 212 &-parametros {
205 213 & button {
206 214 background-image: url('../img/parametrizar.png');
src/sass/_constants.scss
Diff comments   View file @ 9ed161a
1 1 $primary: #cd9035;
2   -$primaryTransparency: #cd9137cc;
  2 +$primaryTransparency: #d6a55bcc;
3 3 $highlightedArea: #df9424;
4 4 $default: #6c757d;
5   -$defaultTransparency: #6c757dcc;
6 5 \ No newline at end of file
  6 +
  7 +$defaultTransparency: #6c757dcc;
  8 +$danger: #dc3545;
  9 +$dangerTransparency: #e98a94;
src/sass/general.scss
Diff comments   View file @ 9ed161a
... ... @@ -48,15 +48,52 @@ input::-webkit-inner-spin-button {
48 48 background-color: $primary;
49 49 }
50 50 &:focus {
51   - box-shadow: none !important;
  51 + box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
52 52 }
53   - &:active{
  53 + &:active {
54 54 color: #FFF;
55 55 background-color: $primary !important;
56 56 box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
57 57 }
58 58 }
59 59  
  60 +.input-group-append > button {
  61 + &:focus {
  62 + border-color: $primary !important;
  63 + box-shadow: 0 0 5px $primary !important;
  64 + }
  65 + &:active {
  66 + border-color: $primary !important;
  67 + box-shadow: 0 0 5px $primary !important;
  68 + }
  69 +}
  70 +
  71 +.input-group-append > button {
  72 + &:focus {
  73 + border-color: $primary !important;
  74 + box-shadow: 0 0 5px $primary !important;
  75 + }
  76 + &:active {
  77 + border-color: $primary !important;
  78 + box-shadow: 0 0 5px $primary !important;
  79 + }
  80 +}
  81 +
  82 +
  83 +.btn-login {
  84 + box-shadow: none !important;
  85 +}
  86 +
  87 +input[type="file"] {
  88 + display: none;
  89 +}
  90 + .custom-file-upload {
  91 + border: 1px solid #ccc;
  92 + display: inline-block;
  93 + padding: 6px 12px;
  94 + cursor: pointer;
  95 + }
  96 +
60 97 .btn-brown {
61 98 background-color:$primary;
62 99 -webkit-appearance: none;
... ... @@ -70,6 +107,18 @@ input::-webkit-inner-spin-button {
70 107 }
71 108 }
72 109  
  110 +.btn-Guardar {
  111 + background-color:green;
  112 + -webkit-appearance: none;
  113 + border-color: transparent;
  114 + &:focus {
  115 + outline: 0 !important;
  116 + box-shadow: none;
  117 + }
  118 + .icon-white {
  119 + color: white;
  120 + }
  121 +}
73 122  
74 123 .page-item.active .page-link {
75 124 z-index: 1;
... ... @@ -83,6 +132,26 @@ input::-webkit-inner-spin-button {
83 132 border-color: $primary;
84 133 box-shadow: 0 0 5px $primary;
85 134 }
  135 + &:hover {
  136 + border-color: $primary;
  137 + box-shadow: 0 0 5px $primary;
  138 + }
  139 +}
  140 +
  141 +.btn-enviar {
  142 + background-color: white;
  143 + border-color: #cd9035;
  144 + &:focus {
  145 + box-shadow: none !important;
  146 + }
  147 + &:hover {
  148 + border-color: $primaryTransparency !important;
  149 + background-color: $primaryTransparency !important;
  150 + }
  151 + &:active{
  152 + background-color: $primary !important;
  153 + box-shadow: 0px 0px 0px 3px $primaryTransparency !important;
  154 + }
86 155 }
87 156  
88 157 .btn-primary {
... ... @@ -101,6 +170,21 @@ input::-webkit-inner-spin-button {
101 170 }
102 171 }
103 172  
  173 +.input-group-text {
  174 + &:focus {
  175 + outline: none;
  176 + border-color: $primary;
  177 + box-shadow: 0 0 5px $primary;
  178 + }
  179 + &:hover {
  180 + border-color: $primary;
  181 + box-shadow: 0 0 5px $primary;
  182 + }
  183 + &:active{
  184 + box-shadow: 0 0 5px $primary;
  185 + }
  186 +}
  187 +
104 188 .btn-default {
105 189 color: #FFF;
106 190 background-color: $default !important;
... ... @@ -119,6 +203,14 @@ input::-webkit-inner-spin-button {
119 203 }
120 204 }
121 205  
  206 +.btn-danger {
  207 + &:hover {
  208 + color: #FFF;
  209 + border-color: $dangerTransparency !important;
  210 + background-color: $dangerTransparency !important;
  211 + }
  212 +}
  213 +
122 214 .table-celda-total {
123 215 background-color: $highlightedArea;
124 216 }