Eric Fernandez / wrapper-mobile

Download as
Browse Code ยป

Commit 769dd882a7d0ca937fcf4e39d922861738eb3239

Authored by Eric Fernandez
1 parent dffb9a67d7
Exists in master

logic

Showing 15 changed files with 186 additions and 85 deletions   Show diff stats
... ... @@ -18,13 +18,11 @@ var paths = {
18 18 };
19 19  
20 20 gulp.task('uglify', function() {
21   - pump(
  21 + return pump(
22 22 [
23 23 gulp.src([paths.srcJS, paths.confJS]),
24   - concat('wrapper-demo.js'),
  24 + concat('wrapper-demo.min.js'),
25 25 replace('/src/', '/dist/'),
26   - gulp.dest(paths.dist),
27   - rename('wrapper-demo.min.js'),
28 26 gulp.dest(paths.dist)
29 27 ]
30 28 );
... ... @@ -40,7 +38,7 @@ gulp.task('html', function() {
40 38 gulp.src(paths.srcHTML),
41 39 gulp.dest(paths.distHTML)
42 40 ]);
43   -})
  41 +});
44 42  
45 43 gulp.task('sass', function() {
46 44 return gulp.src('src/sass/*.scss')

6.07 KB | W: | H:

7.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.53 KB | W: | H:

10.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

3.26 KB | W: | H:

5.37 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -3,7 +3,7 @@
3 3 <meta charset="UTF-8"/>
4 4 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
5 5 <base href="./">
6   -
  6 +
7 7 <!--CSS-->
8 8 <link href="./node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
9 9 <link href="./node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
... ... @@ -29,6 +29,7 @@
29 29 <script src="./node_modules/ngstorage/ngStorage.min.js"></script>
30 30 <script src="./vendor/cordovaGeolocationModule.min.js"></script>
31 31 <script src="./node_modules/angular-md5/angular-md5.min.js"></script>
  32 + <script src="./node_modules/angular-file-saver/dist/angular-file-saver.bundle.js"></script>
32 33  
33 34 <script src="./node_modules/foca-botonera-facturador/dist/foca-botonera-facturador.min.js"></script>
34 35 <script src="./node_modules/foca-botonera-lateral/dist/foca-botonera-lateral.min.js"></script>
... ... @@ -23,6 +23,7 @@
23 23 "angular": "^1.7.8",
24 24 "angular-chart.js": "1.1.1",
25 25 "angular-cookies": "^1.7.8",
  26 + "angular-file-saver": "^1.1.3",
26 27 "angular-i18n": "^1.7.8",
27 28 "angular-ladda": "^0.4.3",
28 29 "angular-md5": "^0.1.10",
... ... @@ -5,6 +5,7 @@ angular.module(&#39;appWrapperDemo&#39;, [
5 5 'ngCookies',
6 6 'ngRoute',
7 7 'ngStorage',
  8 + 'ngFileSaver',
8 9 'ui.bootstrap',
9 10 'ui.swiper',
10 11 'angular-md5',
src/js/controller.js
Diff comments   View file @ 769dd88
... ... @@ -12,20 +12,28 @@ angular.module(&#39;appWrapperDemo&#39;)
12 12 focaSqliteService.openDataBase();
13 13 });
14 14  
15   - if (!API_ENDPOINT.URL) {
  15 + if (!API_ENDPOINT.URL && !$localStorage.urlEndPoint) {
16 16 API_ENDPOINT.getUrl().then(success, err);
  17 + } else if ($localStorage.urlEndPoint && !API_ENDPOINT.URL) {
  18 + API_ENDPOINT.setUrl($localStorage.urlEndPoint);
17 19 }
18 20  
19 21 function success(res) {
20 22  
  23 + if (res.data === 'terminal_not_found') {
  24 + err();
  25 + return;
  26 + }
21 27 API_ENDPOINT.setUrl(res.data);
22 28 }
  29 +
23 30 function err() {
24 31  
25 32 $timeout(function() {
26 33 focaModalService.alert('Terminal no configurada: \n' + $localStorage.terminalKey);
27 34 }, 1000);
28 35 }
  36 +
29 37 $scope.usarTeclado = false;
30 38 $rootScope.$broadcast('usarTeclado', false);
31 39 $scope.mostrarTeclado = false;
src/sass/_botonera-principal.scss
Diff comments   View file @ 769dd88
... ... @@ -18,6 +18,7 @@
18 18 height: 90px;
19 19 position: relative;
20 20 width: 90px;
  21 + outline: 0;
21 22 span {
22 23 left: 0;
23 24 position: absolute;
... ... @@ -27,6 +28,14 @@
27 28 font-size: 12px;
28 29 color: #777777;
29 30 }
  31 + &:hover {
  32 + background-color:rgb(250,250,250);
  33 + filter:drop-shadow(4px 4px 4px gray);
  34 + }
  35 + &:active {
  36 + background-color: rgb(230, 230, 230);
  37 + filter:drop-shadow(4px 4px 4px gray);
  38 + }
30 39 }
31 40 &-menu {
32 41 width: 100%;
... ... @@ -36,10 +45,12 @@
36 45 }
37 46 }
38 47 &-logo {
39   - width: 80%;
  48 + width: 100%;
  49 + margin-left: 50%;
40 50 opacity: .8;
41 51 @media (max-width: 576px) {
42   - width: 100%;
  52 + width: 180%;
  53 + margin-left: 20%;
43 54 }
44 55 }
45 56 &-vacio {
... ... @@ -74,6 +85,18 @@
74 85 }
75 86 }
76 87 }
  88 + &-estado-cisterna {
  89 + & button {
  90 + background-image: url('../img/control_stock.png');
  91 + background-size: 90px 90px;
  92 + }
  93 + }
  94 + &-logistica {
  95 + & button {
  96 + background-image: url('../img/logistica.png');
  97 + background-size: 90px 90px;
  98 + }
  99 + }
77 100 &-facturador {
78 101 & button {
79 102 background-position: -270px 0px;
... ... @@ -84,127 +107,98 @@
84 107 }
85 108 &-nota-pedido {
86 109 & button {
87   - background-position: -1250px 0px;
88   - &:hover {
89   - background-position: -1250px -90px;
90   - }
  110 + background-image: url('../img/notaPedido.png');
  111 + background-size: 90px 90px;
91 112 }
92 113 }
93 114 &-remito {
94 115 & button {
95   - background-position: -4560px 0px;
96   - &:hover {
97   - background-position: -4560px -90px;
98   - }
  116 + background-image: url('../img/remito.png');
  117 + background-size: 90px 90px;
99 118 }
100 119 }
101 120 &-hoja-ruta {
102 121 & button {
103   - background-position: -4650px 0px;
104   - &:hover {
105   - background-position: -4650px -90px;
106   - }
  122 + background-image: url('../img/hoja-ruta.png');
  123 + background-size: 86px 90px;
  124 + }
  125 + }
  126 + &-activar-hoja-ruta {
  127 + & button {
  128 + background-image: url('../img/activar_hoja.png');
  129 + background-size: 90px 90px;
107 130 }
108 131 }
109 132 &-hoja-ruta-transportista {
110 133 & button {
111 134 background-image: url('../img/hojaRutaVolante.png');
112 135 background-size: 90px 90px;
113   - &:hover {
114   - background-color: rgb(250,250,250);
115   - }
116 136 }
117 137 }
118 138 &-seguimiento {
119 139 & button {
120 140 background-image: url('../img/seguimientoNotaPedido.png');
121 141 background-size: 90px 90px;
122   - background-position: 15px 10px;
123   - &:hover {
124   - background-color: rgb(250,250,250);
125   - }
126 142 }
127 143 }
128 144 &-seguimiento-hoja-ruta {
129 145 & button {
130 146 background-image: url('../img/seguimientoHojaRuta.png');
131 147 background-size: 90px 90px;
132   - background-position: 15px 10px;
133   - &:hover {
134   - background-color: rgb(250,250,250);
135   - }
136 148 }
137 149 }
138 150 &-cobranzas {
139 151 & button {
140   - background-position: -1880 0px;
141   - &:hover {
142   - background-position: -1880 -90px;
143   - }
  152 + background-image: url('../img/cobranzas.png');
  153 + background-size: 90px 90px;
144 154 }
145 155 }
146 156 &-seguimiento-cobranzas {
147 157 & button {
148 158 background-image: url('../img/seguimientoCobranza.png');
149 159 background-size: 90px 90px;
150   - background-position: 15px 10px;
151   - &:hover {
152   - background-color: rgb(250,250,250);
153   - }
154 160 }
155 161 }
156 162 &-vehiculo {
157 163 & button {
158 164 background-image: url('../img/abmVehiculos.png');
159 165 background-size: 90px 90px;
160   - &:hover {
161   - background-color: rgb(250,250,250);
162   - }
163 166 }
164 167 }
165 168 &-precio-condicion {
166 169 & button {
167 170 background-image: url('../img/abmPrecios.png');
168 171 background-size: 90px 90px;
169   - &:hover {
170   - background-color: rgb(250,250,250);
171   - }
172 172 }
173 173 }
174 174 &-chofer {
175 175 & button {
176 176 background-image: url('../img/abmChofer.png');
177 177 background-size: 90px 90px;
178   - &:hover {
179   - background-color: rgb(250,250,250);
180   - }
181 178 }
182 179 }
183 180 &-agendar-visita {
184 181 & button {
185 182 background-image: url('../img/agendarVisita.png');
186 183 background-size: 90px 90px;
187   - &:hover {
188   - background-color: rgb(250,250,250);
189   - }
190 184 }
191 185 }
192 186 &-informes {
193 187 & button {
194 188 background-image: url('../img/informes.png');
195 189 background-size: 90px 90px;
196   - &:hover {
197   - background-color: rgb(250,250,250);
198   - }
199 190 }
200 191 }
201 192 &-vendedor-cobrador {
202 193 & button {
203 194 background-image: url('../img/abmVendedorCobrador.png');
204 195 background-size: 90px 90px;
205   - &:hover {
206   - background-color: rgb(250,250,250);
207   - }
  196 + }
  197 + }
  198 + &-autorizar-nota {
  199 + & button {
  200 + background-image: url('../img/autorizarNota.png');
  201 + background-size: 90px 90px;
208 202 }
209 203 }
210 204 .swiper-pagination {
... ... @@ -213,12 +207,17 @@
213 207  
214 208 .swiper-button-next {
215 209 background-image: url('../img/derecha.png');
  210 + &:hover{
  211 + filter:drop-shadow(4px 4px 4px gray);
  212 + }
216 213 }
217 214  
218 215 .swiper-button-prev {
219 216 background-image: url('../img/izquierda.png');
  217 + &:hover{
  218 + filter:drop-shadow(4px 4px 4px gray);
  219 + }
220 220 }
221   -
222 221 @media (min-width: 992px){
223 222 a{
224 223 margin-top: 2.5rem;
src/sass/_botonera-secundaria.scss
Diff comments   View file @ 769dd88
... ... @@ -10,16 +10,15 @@
10 10 margin-right: 1px;
11 11 width: calc(100% - 1px);
12 12 margin-bottom: 1px;
13   -
14 13 &:hover{
15   - background-color: #d8b07d;
16   - border-color: #e09125 !important;
  14 + background-color: #cd903550 ;
  15 + border-color: #cd9035 !important;
17 16 }
18 17 &:focus{
19 18 box-shadow: 0 0 0 0.2rem rgb(216, 176, 125);
20 19 }
21 20 img{
22   - width: 50%;
  21 + width: 40%;
23 22 margin: auto
24 23 }
25 24 span{
... ... @@ -63,8 +62,13 @@
63 62  
64 63 @media(max-width: 576px) {
65 64 .btn-xs{
66   - max-height: 13vw;
  65 + max-height: 22vw;
67 66 }
68 67 }
69 68  
70 69 }
  70 +.foca-overflow-hidden{
  71 + overflow: hidden;
  72 + text-overflow: ellipsis;
  73 + white-space: nowrap;
  74 +}
src/sass/_login.scss
Diff comments   View file @ 769dd88
... ... @@ -20,14 +20,32 @@
20 20 margin: 5px 0 0;
21 21 }
22 22 input {
  23 + -moz-border-radius: 10px;
  24 + -khtml-border-radius: 10px;
  25 + -webkit-border-radius: 10px;
  26 + -webkit-appearance: none;
  27 + padding-right: 5%;
  28 + padding-left: 5%;
  29 + border-radius: 10px;
  30 + outline: 0;
  31 + border-color: transparent;
23 32 &:focus {
24   - outline: 3px solid #ff9900;
  33 + border-color: #ff9900;
25 34 }
26 35 }
27 36 }
28   -
29   - button {
30   - margin-right: 42px;
  37 +
  38 + &-button {
  39 + width: 80%;
  40 + background-color: #cd9035;
  41 + color: white;
  42 + &:hover{
  43 + background-color: #a7743d;
  44 + color: white
  45 + }
  46 + &:focus{
  47 + color: white;
  48 + }
31 49 }
32 50  
33 51 &-alerta-error {
src/sass/_logistica-pedido-ruta.scss
Diff comments   View file @ 769dd88
... ... @@ -22,7 +22,7 @@
22 22 width: 100%;
23 23 height: 100%;
24 24 border-radius: 50%;
25   - border: 12px solid #fff;
  25 + border: 8px solid #fff;
26 26 position: absolute;
27 27 top: 0;
28 28 left: 0;
... ... @@ -42,7 +42,7 @@
42 42 width: 100%;
43 43 height: 100%;
44 44 background: none;
45   - border-width: 12px;
  45 + border-width: 8px;
46 46 border-style: solid;
47 47 position: absolute;
48 48 top: 0;
... ... @@ -72,7 +72,7 @@
72 72 height: 90%;
73 73 border-radius: 50%;
74 74 background: #44484b;
75   - font-size: 24px;
  75 + font-size: 20px;
76 76 color: #fff;
77 77 line-height: 20px;
78 78 text-align: center;
src/sass/_swiper.scss
Diff comments   View file @ 769dd88
1 1 .swiper {
2 2 &-container {
3 3 height: 300px;
4   -
5 4 }
6 5 &-slide {
7 6 background: transparent;
... ... @@ -21,3 +20,8 @@
21 20 }
22 21 }
23 22 }
  23 +
  24 +.swiper-pagination-bullet-active {
  25 + opacity: 1;
  26 + background: #CD9035;
  27 +}
src/sass/_teclado.scss
Diff comments   View file @ 769dd88
... ... @@ -6,16 +6,19 @@
6 6 -ms-user-select: none;
7 7 user-select: none;
8 8 margin: auto;
9   - width: 855px;
10   - position: inherit;
  9 + width: 60%;
  10 + position: absolute;
11 11 height: auto;
12 12 border: 1px solid rgba(255, 128, 0, .4);
13 13 background-color: rgba(0, 0, 0, .3);
14 14 bottom: 5px;
  15 + z-index: 100000;
15 16 table {
  17 + width: auto;
  18 + height: auto;
  19 + margin: 0px auto;
16 20 border-spacing: 10px;
17 21 border-collapse: separate;
18   - z-index: 100000;
19 22 td {
20 23 touch-action: none;
21 24 }
... ... @@ -23,14 +26,15 @@
23 26  
24 27 .letter {
25 28 background-color: #bdbdbd;
26   - box-shadow: 2px 2px 3px #555555;
27   - width: 47px;
28   - height: 50px;
  29 + box-shadow: 2px 2px 3px #555555;
  30 + padding: 10px;
  31 + width: auto;
  32 + height: auto;
29 33 text-align: center;
30 34 font-family: "arial";
31 35 cursor: pointer;
32 36 color: #000;
33   - font-size: 22px;
  37 + font-size: 80%;
34 38  
35 39 &:hover {
36 40 background-color: #fafafa;
... ... @@ -43,13 +47,14 @@
43 47 .number {
44 48 background-color: #bdbdbd;
45 49 box-shadow: 2px 2px 3px #555555;
46   - width: 47px;
47   - height: 35px;
  50 + padding: 10px;
  51 + width: auto;
  52 + height: auto;
48 53 text-align: center;
49 54 font-family: "arial";
50 55 cursor: pointer;
51 56 color: #000;
52   - font-size: 22px;
  57 + font-size: 80%;
53 58  
54 59 &:hover {
55 60 background-color: #fafafa;
... ... @@ -61,7 +66,7 @@
61 66 }
62 67  
63 68 .margin {
64   - width: 40px;
65   - height: 50px;
  69 + width: 5%;
  70 + height: 5%;
66 71 }
67 72 }
src/sass/general.scss
Diff comments   View file @ 769dd88
... ... @@ -19,12 +19,14 @@ $primary-color: #e09125;
19 19 @import 'tabs';
20 20 @import 'grid';
21 21 @import 'paginador-abm';
  22 +@import 'table-autorizar-nota-pedido';
22 23  
23 24  
24 25 //OCULTA FLECHAS INPUT NUMBER
25 26 input[type='number'] {
26 27 -moz-appearance:textfield;
27 28 }
  29 +
28 30 input::-webkit-outer-spin-button,
29 31 input::-webkit-inner-spin-button {
30 32 -webkit-appearance: none;
... ... @@ -47,6 +49,64 @@ input::-webkit-inner-spin-button {
47 49 }
48 50 }
49 51  
  52 +.btn-brown {
  53 + background-color:#Cd9035;
  54 + -webkit-appearance: none;
  55 + border-color: transparent;
  56 + &:focus {
  57 + outline: 0 !important;
  58 + box-shadow: none;
  59 + }
  60 + .icon-white {
  61 + color: white;
  62 + }
  63 +}
  64 +
  65 +
  66 +.page-item.active .page-link {
  67 + z-index: 1;
  68 + color: #fff;
  69 + background-color: #Cd9035;
  70 + border-color: #Cd9035;
  71 +}
  72 +
  73 +.foca-input {
  74 + &:focus {
  75 + border-color: #Cd9035;
  76 + box-shadow: 0 0 5px #Cd9035;
  77 + }
  78 +}
  79 +
  80 +.btn-info {
  81 + background-color: #Cd9035;
  82 + border-color: #Cd9035;
  83 + &:focus {
  84 + box-shadow: none;
  85 + }
  86 + &:hover {
  87 + background-color: #Cd9035;
  88 + }
  89 +}
  90 +
  91 +.btn-primary {
  92 + background-color: #Cd9035;
  93 + border-color: #Cd9035;
  94 + &:focus {
  95 + box-shadow: none;
  96 + }
  97 + &:hover {
  98 + background-color: #Cd9035;
  99 + }
  100 +}
  101 +
  102 +.table-celda-total {
  103 + background-color: #E09524;
  104 +}
  105 +
  106 +marquee {
  107 + background-color: #E09524;
  108 +}
  109 +
50 110 .front-index{
51 111 z-index: 9999;
52 112 }
... ... @@ -65,7 +125,8 @@ input::-webkit-inner-spin-button {
65 125 }
66 126  
67 127 .ladda-w-100 .ladda-label{
68   - width: 100%
  128 + width: 100%;
  129 + float: right;
69 130 }
70 131  
71 132 .btn-delete-image{
... ... @@ -81,6 +142,7 @@ button.clear-input{
81 142 border: none;
82 143 margin-left: -24px;
83 144 z-index: 9;
  145 + color: #a3a3a3;
84 146 &:focus{
85 147 outline: none;
86 148 }