Marcelo Puebla / foca-botonera-lateral

Commit e0942d9e30c5ffb761c777566c666081e7590c5c

Authored by Marcelo Puebla 2019-10-15 13:00:23 -0300

Exists in master

Merge branch 'master' into 'develop'

Master(Macola)

See merge request !18

Showing 3 changed files Show diff stats

package.json

Diff comments View file @ e0942d9

 {
   "name": "foca-botonera-lateral",
   "version": "0.0.1",
   "description": "Componente de botonera lateral",
   "main": "index.js",
   "scripts": {
+    "frefresh": "gulp uglify && cp tmp/foca-botonera-principal.js ../wrapper-facturador/node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js",
     "refresh": "gulp uglify && cp tmp/foca-botonera-lateral.js ../wrapper-demo/node_modules/foca-botonera-lateral/dist/foca-botonera-lateral.min.js",
     "test": "echo \"Error: no test specified\" && exit 1",
     "compile": "gulp uglify",
     "gulp-pre-commit": "gulp pre-commit",
     "postinstall": "npm run compile && gulp clean-post-install",
     "install-dev": "npm install -D angular bootstrap font-awesome gulp gulp-angular-templatecache gulp-clean gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify-es jasmine-core jquery jshint pre-commit pump && npm install angular-sanitize"
   },
   "pre-commit": [
     "gulp-pre-commit"
   ],
   "repository": {
     "type": "git",
     "url": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-lateral.git"
   },
   "author": "Foca Software",
   "license": "ISC",
   "peerDependencies": {
     "angular": "^1.7.x",
     "bootstrap": "^4.1.x",
     "jquery": "^3.3.x",
     "font-awesome": "^4.7.x",
     "gulp": "^3.9.x",
     "gulp-concat": "2.6.x",
     "gulp-jshint": "^2.1.x",
     "gulp-rename": "^1.4.x",
     "gulp-replace": "^1.0.x",
     "gulp-uglify-es": "^1.0.x",
     "jshint": "^2.9.x",
     "pump": "^3.0.x"
   },
   "devDependencies": {
     "angular": "1.7.5",
     "angular-route": "^1.7.5",
     "angular-sanitize": "1.7.5",
     "bootstrap": "4.1.3",
     "font-awesome": "4.7.0",
     "gulp": "3.9.1",
     "gulp-angular-templatecache": "2.2.5",
     "gulp-clean": "0.4.0",
     "gulp-concat": "2.6.1",
     "gulp-connect": "5.6.1",
     "gulp-htmlmin": "5.0.1",
     "gulp-jshint": "2.1.0",
     "gulp-rename": "1.4.0",
     "gulp-replace": "1.0.0",
     "gulp-sass": "4.0.2",
     "gulp-uglify-es": "1.0.4",
     "jasmine-core": "3.3.0",
     "jquery": "3.3.1",
     "jshint": "2.9.6",
     "pre-commit": "1.2.2",
     "pump": "3.0.0"
+  },
+  "dependencies": {
+    "node-sass": "^4.12.0"
   }
 }

src/js/service.js

Diff comments View file @ e0942d9

 angular.module('focaBotoneraLateral')
     .service('focaBotoneraLateralService', ['$localStorage',
         function ($localStorage) {
+        this.botones = {
+            teclado: true,
+            salir: false,
+            cancelar: false,
+            pausar: false,
+            guardar: false,
+            pagar: false,
+            guardando: false,
+            funcionGuardar: undefined,
+            pathCancelar: undefined,
+            custom: []
+        };
             this.botones = {
                 teclado: true,
                 salir: false,
                 cancelar: false,
                 pausar: false,
                 guardar: false,
                 guardando: false,
                 funcionGuardar: undefined,
                 pathCancelar: undefined,
                 custom: []
             };
             this.pausarData = {
                 label: '',
                 val: ''
             };
+        this.showTeclado = function(value) {
+            this.botones.teclado = value;
+        };
+        this.showSalir = function(value) {
+            this.botones.custom = [];
+            this.botones.salir = value;
+        };
+        this.showPausar = function(value) {
+            this.botones.custom = [];
+            this.botones.pausar = value;
+        };
+        this.setPausarData = function(obj) {
+            this.pausarData = obj;
+        };
+        this.showCancelar = function(value, path) {
+            this.botones.custom = [];
+            this.botones.cancelar = value;
+            this.botones.pathCancelar = (path) ? path : undefined;
+        };
+        this.showGuardar = function(value, funcion) {
+            angular.element('#guardar').removeClass('guardado');
+            this.botones.custom = [];
+            this.botones.guardar = value;
+            if (value) this.botones.funcionGuardar = funcion;
+        };
+        this.showPagar = function(value, funcion) {
+            angular.element('#pagar').removeClass('guardado');
+            this.botones.custom = [];
+            this.botones.pagar = value;
+            if (value) this.botones.funcionGuardar = funcion;
+        };
+        this.addCustomButton = function(title, funcion) {
+            this.botones.custom.push({
+                title: title,
+                funcion: funcion
+            });
+        };
+        this.startGuardar = function() {
+            this.botones.guardando = true;
+        };
+        this.endGuardar = function(guardado) {
+            this.botones.guardando = false;
+            if (guardado) angular.element('#guardar').addClass('guardado');
+        };
             this.rutasPausadas = {
                 label: 'rutas',
                 val: []
             };
             this.showTeclado = function (value) {
                 this.botones.teclado = value;
             };
             this.showSalir = function (value) {
                 this.botones.custom = [];
                 this.botones.salir = value;
             };
             this.showPausar = function (value) {
                 this.botones.custom = [];
                 this.botones.pausar = value;
             };
             this.setPausarData = function (obj) {
                 this.pausarData = obj;
             };
             this.setRutasPausadas = function (obj) {
                 var auxArray = [];
                 this.rutasPausadas.val.push(obj.val);
                 angular.forEach(this.rutasPausadas.val, function (ruta) {
                     var exists = false;
                     angular.forEach(auxArray, function (val2) {
                         if (angular.equals(ruta, val2)) { exists = true };
                     });
                     if (exists == false && ruta !== "") { auxArray.push(ruta); }
                 });
                 this.rutasPausadas.val = auxArray;
             };
             this.showCancelar = function (value, path) {
                 this.botones.custom = [];
                 this.botones.cancelar = value;
                 this.botones.pathCancelar = (path) ? path : undefined;
             };
             this.showGuardar = function (value, funcion) {
                 angular.element('#guardar').removeClass('guardado');
                 this.botones.custom = [];
                 this.botones.guardar = value;
                 if (value) this.botones.funcionGuardar = funcion;
             };
             this.addCustomButton = function (title, funcion) {
                 this.botones.custom.push({
                     title: title,
                     funcion: funcion
                 });
             };
             this.startGuardar = function () {
                 this.botones.guardando = true;
             };
             this.endGuardar = function (guardado) {
                 this.botones.guardando = false;
                 if (guardado) angular.element('#guardar').addClass('guardado');
             };
             this.setLSItem = function () {
                 $localStorage[this.pausarData.label] = JSON.stringify(this.pausarData.val);
             };
             this.setLSRuta = function () {
                 $localStorage[this.rutasPausadas.label] = JSON.stringify(this.rutasPausadas.val);
             };
         }]);

src/views/botonera-lateral.html

Diff comments View file @ e0942d9

 <div class="container botonera-lateral">
     <div class="row">
         <div class="col-auto my-2 col-2 offset-10 d-none d-lg-flex" style="min-height: 176px">
             <div class="px-2 mt-auto">
                 <div class="container">
                     <div class="row">
                         <div
                             ladda="botones.guardando"
                             data-spinner-size="30"
                             data-spinner-color="#000000"
-                            class="mb-2 border rounded"
+                            class="border rounded"
+                            ng-show="botones.pagar"
+                            >
+                            <button
+                                id="pagar"
+                                ng-click="botones.funcionGuardar()"
+                                ng-disabled="botones.guardando"
+                                type="button"
+                                title="Pagar"
+                                class="btn btn-block">
+                                <strong>PAGAR</strong>
+                            </button>
+                        </div>
+                        <div
+                            ladda="botones.guardando"
+                            data-spinner-size="30"
+                            data-spinner-color="#000000"
+                            class="border rounded"
+                            ng-show="botones.guardar"
                             >
                             <button
                                 id="guardar"
                                 ng-click="botones.funcionGuardar()"
-                                ng-show="botones.guardar"
                                 ng-disabled="botones.guardando"
                                 type="button"
                                 title="Guardar"
                                 class="btn btn-block">
                                 <strong>GUARDAR</strong>
                             </button>
                         </div>
                         <button
                             ng-click="pausar()"
                             ng-show="botones.pausar"
                             type="button"
                             title="Pausar"
-                            class="btn btn-block border">
+                            class="btn btn-block mt-2 border">
                             <strong>PAUSAR</strong>
                         </button>
                         <button
                             ng-click="cancelar()"
                             ng-show="botones.cancelar"
                             type="button"
                             title="Cancelar"
-                            class="btn btn-block border border-dark">
+                            class="btn btn-block mt-2 border border-dark">
                             <strong>CANCELAR</strong>
                         </button>
                         <button
                             ng-click="salir()"
                             ng-show="botones.salir"
                             type="button"
                             title="Salir"
-                            class="btn btn-block border">
+                            class="btn btn-block mt-2 border">
                             <strong>SALIR</strong>
                         </button>
                         <button
                             ng-repeat="boton in botones.custom"
                             ng-click="boton.funcion()"
                             type="button"
                             title="{{boton.title}}"
-                            class="btn btn-block border">
+                            class="btn btn-block mt-2 border">
                             <strong
                                 class="text-uppercase"
                                 ng-bind="boton.title">
                             </strong>
                         </button>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <div class="container botonera-lateral teclado" ng-show="botones.teclado">
         <div class="row">
             <div class="col-auto my-2 col-2 offset-10 d-none d-lg-flex" style="min-height: 176px">
                 <div class="px-2 mt-auto">
                     <div class="container">
                         <div class="row">
                             <div
-                                class="btn-group-toggle btn btn-block border"
+                                class="btn-group-toggle btn btn-block mt-2 border"
                                 data-toggle="buttons"
                                 ng-click="cambioUsoTeclado()"
                                 title="Activar/desactivar teclado">
                                 <label
                                     class=" active boton-activar-teclado mb-0"
                                     ng-class="{'teclado-activar': usarTeclado}">
                                     <input
                                         type="checkbox"
                                         autocomplete="off"
                                         >
                                         <strong>TECLADO</strong>
                                 </label>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>