Merge branch 'develop' into 'master'

Develop See merge request !24

Merge branch 'develop' into 'master'
Develop See merge request !24
Mauricio Cattafi
2 parents 4171c77462 e90c798fa3
Showing 7 changed files Show diff stats
package.json
src/js/app.js
src/js/controller.js
src/js/controllerTarjetas.js
src/views/botonera-forma-pago.html
src/views/botonera-productos.html
src/views/botonera-tarjetas.html
@@ -4,11 +4,14 @@
   "description": "Componente de botonera en facturadores",
   "main": "index.js",
   "scripts": {
+    "frefresh": "gulp uglify && cp tmp/foca-botonera-facturador.js ../wrapper-facturador/node_modules/foca-botonera-facturador/dist/foca-botonera-facturador.min.js",
+    "refresh": "gulp uglify && cp tmp/foca-botonera-facturador.js ../wrapper-demo/node_modules/foca-botonera-facturador/dist/foca-botonera-facturador.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"
+    "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",
+    "frefresh": "gulp uglify && cp tmp/foca-botonera-facturador.js ../wrapper-facturador/node_modules/foca-botonera-facturador/dist/foca-botonera-facturador.min.js"
   },
   "pre-commit": [
     "gulp-pre-commit"
@@ -6,4 +6,28 @@ angular.module(&#39;focaBotoneraFacturador&#39;, [])
             max: '<',
             botones: '<'
         }
+    })
+    .component('focaBotoneraFormaPago', {
+        templateUrl: 'src/views/botonera-forma-pago.html',
+        controller: 'focaBotoneraTarjetasController',
+        bindings: { 
+            botones: '<',
+            max: '<'
+        }
+    })
+    .component('focaBotoneraTarjetas', {
+        templateUrl: 'src/views/botonera-tarjetas.html',
+        controller: 'focaBotoneraTarjetasController',
+        bindings: { 
+            botones: '<',
+            max: '<'
+        }
+    })
+    .component('focaBotoneraProductos', {
+        templateUrl: 'src/views/botonera-productos.html',
+        controller: 'focaBotoneraTarjetasController',
+        bindings: { 
+            botones: '<',
+            max: '<'
+        }
     });
@@ -16,6 +16,7 @@ angular.module(&#39;focaBotoneraFacturador&#39;)
                 var texto = 'seleccionar';
                 var arr = string.split(' ');
                 arr.forEach(function(palabra) {
+                    palabra = palabra.normalize('NFD').replace(/[\u0300-\u036f]/g,"");
                     palabra = palabra.charAt(0).toUpperCase() + palabra.slice(1);
                     texto += palabra;
                 });
@@ -0,0 +1,43 @@
+angular.module('focaBotoneraFacturador')
+    .controller('focaBotoneraTarjetasController', [
+        '$scope',
+        '$window',
+        'APP',
+        function ($scope, $window, APP) {
+            this.$onInit = function () {
+                $scope.botones = $scope.$ctrl.botones;
+                //TODO: controlar que no se estiren los botones
+                if (APP) return;
+                var max = ($scope.$ctrl.max) ? $scope.$ctrl.max : 12;
+                if ($window.innerWidth > 576) {
+                    while (($scope.botones.length % max) !== 0) {
+                        $scope.botones.push('');
+                    }
+                } else {
+                    while (($scope.botones.length % 4) !== 0) {
+                        $scope.botones.push('');
+                    }
+                }
+            };
+
+            function nombreFuncion(string) {
+                var texto = 'seleccionar';
+                var arr = string.split(' ');
+                arr.forEach(function (palabra) {
+                    palabra = palabra.charAt(0).toUpperCase() + palabra.slice(1);
+                    texto += palabra;
+                });
+                return texto;
+            }
+
+            $scope.ejecutarFuncion = function (boton) {
+                $scope.$parent[nombreFuncion(boton.label)](boton);
+            };
+
+            $scope.activarBoton = function (boton) {
+                $scope.botones.forEach(function (boton) {
+                    boton.active = false;
+                });
+                boton.active = true;
+            };
+        }]);
@@ -0,0 +1,16 @@
+<div
+    class="col-6 col-sm-3 py-2"
+    ng-repeat="boton in botones track by $index"
+    ng-class="{'d-md-grid': boton == ''}">
+    <button
+        type="button"
+        class="btn btn-block btn-xs text-center rounded border border-light foca-overflow-hidden"
+        ng-disabled="boton.disabled"
+        ng-click="
+            (boton != '') ? ejecutarFuncion(boton) : null;
+            activarBoton(boton);"
+    >
+        <img ng-src="./img/{{boton.image}}" alt="">
+        <span>{{ boton.label }}</span>
+    </button>
+</div>
@@ -0,0 +1,14 @@
+<div
+    class="col-6 col-sm-3 p-2"
+    ng-repeat="boton in botones track by $index"
+    ng-class="{'d-md-grid': boton == ''}">
+    <button
+        type="button"
+        class="btn btn-block rounded border border-light p-0"
+        ng-click="(boton != '') ? ejecutarFuncion(boton) : null;"
+        ng-class="{'btn-producto' : boton.image, 'btn-producto-default' : !boton.image}"
+    >
+    <img ng-src="./img/{{boton.image || boton.imageDefault}}" alt="">
+        <label ng-if="!boton.image" ng-bind="boton.label"></label>
+    </button>
+</div>
@@ -0,0 +1,22 @@
+<div
+    class="col-4 col-lg-2 px-1 pb-3"
+    ng-repeat="boton in botones track by $index"
+    ng-class="{'d-md-grid': boton == ''}">
+    <button
+        type="button"
+        class="btn btn-block btn-tarjeta rounded border p-1"
+        ng-click="
+            (boton != '') ? ejecutarFuncion(boton) : null;
+            activarBoton(boton);"
+        ng-class="
+            {
+                'd-sm-block h-100': boton == '',
+                'border-light': !boton.active,
+                'border-warning': boton.active
+            }"
+        ng-disabled="boton.disable"
+    >
+        <img ng-src="./img/{{boton.image || boton.imageDefault}}" alt="">
+        <label ng-if="!boton.image" ng-bind="boton.nombre"></label>
+    </button>
+</div>
...	...	@@ -4,11 +4,14 @@
4	4	"description": "Componente de botonera en facturadores",
5	5	"main": "index.js",
6	6	"scripts": {
	7	+ "frefresh": "gulp uglify && cp tmp/foca-botonera-facturador.js ../wrapper-facturador/node_modules/foca-botonera-facturador/dist/foca-botonera-facturador.min.js",
	8	+ "refresh": "gulp uglify && cp tmp/foca-botonera-facturador.js ../wrapper-demo/node_modules/foca-botonera-facturador/dist/foca-botonera-facturador.min.js",
7	9	"test": "echo \"Error: no test specified\" && exit 1",
8	10	"compile": "gulp uglify",
9	11	"gulp-pre-commit": "gulp pre-commit",
10	12	"postinstall": "npm run compile && gulp clean-post-install",
11		- "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"
	13	+ "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",
	14	+ "frefresh": "gulp uglify && cp tmp/foca-botonera-facturador.js ../wrapper-facturador/node_modules/foca-botonera-facturador/dist/foca-botonera-facturador.min.js"
12	15	},
13	16	"pre-commit": [
14	17	"gulp-pre-commit"
...	...	@@ -6,4 +6,28 @@ angular.module('focaBotoneraFacturador', [])
6	6	max: '<',
7	7	botones: '<'
8	8	}
	9	+ })
	10	+ .component('focaBotoneraFormaPago', {
	11	+ templateUrl: 'src/views/botonera-forma-pago.html',
	12	+ controller: 'focaBotoneraTarjetasController',
	13	+ bindings: {
	14	+ botones: '<',
	15	+ max: '<'
	16	+ }
	17	+ })
	18	+ .component('focaBotoneraTarjetas', {
	19	+ templateUrl: 'src/views/botonera-tarjetas.html',
	20	+ controller: 'focaBotoneraTarjetasController',
	21	+ bindings: {
	22	+ botones: '<',
	23	+ max: '<'
	24	+ }
	25	+ })
	26	+ .component('focaBotoneraProductos', {
	27	+ templateUrl: 'src/views/botonera-productos.html',
	28	+ controller: 'focaBotoneraTarjetasController',
	29	+ bindings: {
	30	+ botones: '<',
	31	+ max: '<'
	32	+ }
9	33	});
...	...	@@ -16,6 +16,7 @@ angular.module('focaBotoneraFacturador')
16	16	var texto = 'seleccionar';
17	17	var arr = string.split(' ');
18	18	arr.forEach(function(palabra) {
	19	+ palabra = palabra.normalize('NFD').replace(/[\u0300-\u036f]/g,"");
19	20	palabra = palabra.charAt(0).toUpperCase() + palabra.slice(1);
20	21	texto += palabra;
21	22	});
...	...	@@ -0,0 +1,43 @@
	1	+angular.module('focaBotoneraFacturador')
	2	+ .controller('focaBotoneraTarjetasController', [
	3	+ '$scope',
	4	+ '$window',
	5	+ 'APP',
	6	+ function ($scope, $window, APP) {
	7	+ this.$onInit = function () {
	8	+ $scope.botones = $scope.$ctrl.botones;
	9	+ //TODO: controlar que no se estiren los botones
	10	+ if (APP) return;
	11	+ var max = ($scope.$ctrl.max) ? $scope.$ctrl.max : 12;
	12	+ if ($window.innerWidth > 576) {
	13	+ while (($scope.botones.length % max) !== 0) {
	14	+ $scope.botones.push('');
	15	+ }
	16	+ } else {
	17	+ while (($scope.botones.length % 4) !== 0) {
	18	+ $scope.botones.push('');
	19	+ }
	20	+ }
	21	+ };
	22	+
	23	+ function nombreFuncion(string) {
	24	+ var texto = 'seleccionar';
	25	+ var arr = string.split(' ');
	26	+ arr.forEach(function (palabra) {
	27	+ palabra = palabra.charAt(0).toUpperCase() + palabra.slice(1);
	28	+ texto += palabra;
	29	+ });
	30	+ return texto;
	31	+ }
	32	+
	33	+ $scope.ejecutarFuncion = function (boton) {
	34	+ $scope.$parent[nombreFuncion(boton.label)](boton);
	35	+ };
	36	+
	37	+ $scope.activarBoton = function (boton) {
	38	+ $scope.botones.forEach(function (boton) {
	39	+ boton.active = false;
	40	+ });
	41	+ boton.active = true;
	42	+ };
	43	+ }]);
...	...	@@ -0,0 +1,16 @@
	1	+<div
	2	+ class="col-6 col-sm-3 py-2"
	3	+ ng-repeat="boton in botones track by $index"
	4	+ ng-class="{'d-md-grid': boton == ''}">
	5	+ <button
	6	+ type="button"
	7	+ class="btn btn-block btn-xs text-center rounded border border-light foca-overflow-hidden"
	8	+ ng-disabled="boton.disabled"
	9	+ ng-click="
	10	+ (boton != '') ? ejecutarFuncion(boton) : null;
	11	+ activarBoton(boton);"
	12	+ >
	13	+ <img ng-src="./img/{{boton.image}}" alt="">
	14	+ <span>{{ boton.label }}</span>
	15	+ </button>
	16	+</div>
...	...	@@ -0,0 +1,14 @@
	1	+<div
	2	+ class="col-6 col-sm-3 p-2"
	3	+ ng-repeat="boton in botones track by $index"
	4	+ ng-class="{'d-md-grid': boton == ''}">
	5	+ <button
	6	+ type="button"
	7	+ class="btn btn-block rounded border border-light p-0"
	8	+ ng-click="(boton != '') ? ejecutarFuncion(boton) : null;"
	9	+ ng-class="{'btn-producto' : boton.image, 'btn-producto-default' : !boton.image}"
	10	+ >
	11	+ <img ng-src="./img/{{boton.image \|\| boton.imageDefault}}" alt="">
	12	+ <label ng-if="!boton.image" ng-bind="boton.label"></label>
	13	+ </button>
	14	+</div>
...	...	@@ -0,0 +1,22 @@
	1	+<div
	2	+ class="col-4 col-lg-2 px-1 pb-3"
	3	+ ng-repeat="boton in botones track by $index"
	4	+ ng-class="{'d-md-grid': boton == ''}">
	5	+ <button
	6	+ type="button"
	7	+ class="btn btn-block btn-tarjeta rounded border p-1"
	8	+ ng-click="
	9	+ (boton != '') ? ejecutarFuncion(boton) : null;
	10	+ activarBoton(boton);"
	11	+ ng-class="
	12	+ {
	13	+ 'd-sm-block h-100': boton == '',
	14	+ 'border-light': !boton.active,
	15	+ 'border-warning': boton.active
	16	+ }"
	17	+ ng-disabled="boton.disable"
	18	+ >
	19	+ <img ng-src="./img/{{boton.image \|\| boton.imageDefault}}" alt="">
	20	+ <label ng-if="!boton.image" ng-bind="boton.nombre"></label>
	21	+ </button>
	22	+</div>