Jose Pinto / foca-abm-plazo-pago

Commit aa29546865c2aa07b2fda36376e5a6d85687a17c

Authored by Pablo Marco del Pont 2018-10-16 14:18:08 -0300

Exists in master

- Agrego archivo develop de ejemplo.

- Agregué ruta de develop al gitignore.
- Modifiqué el gulp para incluir las librerias necesarias.
- Agregué las tareas clean-post-install, webserver y default.
- Agregué archivo index para desarrollo.
- Agregué los paquetes necesarios en el package.json
- Agregué modulos ngRoute y ui.bootstrap a la aplicación.
- Modifiqué el controller para tomar la ruta anidada.
- Modifiqué la ruta de los templates.
- Modifiqué la vista del listado para ingresar a la ruta adecuada.

Showing 9 changed files with 94 additions and 37 deletions Show diff stats

.gitignore

Diff comments View file @ aa29546

1	/node_modules	1	/node_modules
2	/dist	2	/dist
3	/tmp	3	/tmp
4	package-lock\.json	4	package-lock\.json
		5	/src/etc/develop.js
5		6

gulpfile.js

Diff comments View file @ aa29546

-const templateCache = require('gulp-angular-templatecache');
-const concat        = require('gulp-concat');
 const clean         = require('gulp-clean');
+const concat        = require('gulp-concat');
+const connect       = require('gulp-connect');
+const gulp          = require('gulp');
 const htmlmin       = require('gulp-htmlmin');
+const jshint        = require('gulp-jshint');
+const pump          = require('pump');
 const rename        = require('gulp-rename');
+const templateCache = require('gulp-angular-templatecache');
 const uglify        = require('gulp-uglify-es').default;
-const gulp          = require('gulp');
-const pump          = require('pump');
-const jshint        = require('gulp-jshint');
 var paths = {
+    dist:  'dist/',
     srcJS: 'src/js/*.js',
     srcViews: 'src/views/*.html',
-    tmp:   'tmp',
+    tmp:   'tmp'
-    dist:  'dist/'
 };
-gulp.task('templates', function() {
+gulp.task('templates', ['clean'], function() {
     return pump(
         [
             gulp.src(paths.srcViews),
             htmlmin(),
             templateCache('views.js', {
                 module: 'focaAbmPlazoPago',
                 root: ''
             }),
             gulp.dest(paths.tmp)
         ]
     );
 });
 gulp.task('uglify', ['templates'], function() {
     return pump(
         [
             gulp.src([
                 paths.srcJS,
                 'tmp/views.js'
             ]),
             concat('foca-abm-plazo-pago.js'),
+            replace('src/views/', ''),
+            replace("['ngRoute', 'ui.bootstrap']", '[]'),
             gulp.dest(paths.tmp),
             rename('foca-abm-plazo-pago.min.js'),
             uglify(),
             gulp.dest(paths.dist)
         ]
     );
 });
 gulp.task('clean', function(){
     return gulp.src(['tmp', 'dist'], {read: false})
     .pipe(clean());
 });
 gulp.task('pre-commit', function() {
     pump(
         [
             gulp.src(paths.srcJS),
             jshint('.jshintrc'),
             jshint.reporter('default'),
             jshint.reporter('fail')
         ]
     );
 });
+gulp.task('clean-post-install', function() {
+    return gulp.src([
+        'src', 'tmp', '.jshintrc', 'readme.md', '.gitignore', 'gulpfile.js', 'index.html'
+    ], {read: false})
+    .pipe(clean());
+});
+gulp.task('webserver', function() {
+    pump [

index.html

Diff comments View file @ aa29546

		1	<html ng-app="focaAbmPlazoPago">
		2	<head>
		3	<meta charset="UTF-8" />
		4	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
		5
		6	<!--CSS-->
		7	<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
		8	<link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
		9
		10	<!--VENDOR JS-->
		11	<script src="node_modules/jquery/dist/jquery.min.js"></script>
		12	<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
		13	<script src="node_modules/angular/angular.min.js"></script>
		14	<script src="node_modules/angular-route/angular-route.min.js"></script>
		15	<script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
		16
		17	<!-- BUILD -->
		18	<script src="src/js/app.js"></script>
		19	<script src="src/js/route.js"></script>
		20	<script src="src/js/controller.js"></script>
		21	<script src="src/js/service.js"></script>
		22	<script src="src/etc/develop.js"></script>
		23	<!-- /BUILD -->
		24
		25	<body>
		26	<div ng-view></div>
		27	</body>
		28	</html>
		29

package.json

Diff comments View file @ aa29546

 {
     "name": "foca-abm-plazo-pago",
     "version": "1.0.0",
     "description": "ABM de Plazos de Pago",
     "main": "dist/foca-abm-plazo-pago.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "compile": "gulp uglify",
-        "pre-commit": [
+        "gulp-pre-commit": "gulp pre-commit",
-            "gulp-pre-commit"
+        "postinstall": "npm run compile && gulp clean-post-install",
-        ],
+        "install-dev": "npm install -D jasmine-core pre-commit angular angular-route bootstrap ui-bootstrap4 font-awesome gulp gulp-angular-templatecache gulp-connect gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es jquery jshint pump"
-        "postinstall": "npm run compile && rm -R src && rm index.html && rm .jshintrc && rm gulpfile.js"
     },
+    "pre-commit": [
+        "gulp-pre-commit"
+    ],
     "repository": {
         "type": "git",
         "url": "https://192.168.0.11/modulos-npm/foca-abm-plazo-pago.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",
+        "bootstrap": "^4.1.3",
+        "font-awesome": "^4.7.0",
+        "gulp": "^3.9.1",
+        "gulp-angular-templatecache": "^2.2.2",
+        "gulp-clean": "^0.4.0",
         "gulp-connect": "^5.6.1",
-        "jasmine-core": "3.2.1",
+        "gulp-htmlmin": "^5.0.1",
-        "pre-commit": "^1.2.2"
+        "gulp-jshint": "^2.1.0",
-    },
+        "gulp-rename": "^1.4.0",
-    "dependencies": {
+        "gulp-replace": "^1.0.0",
-        "angular": "1.7.4",
+        "gulp-sequence": "^1.0.0",
-        "bootstrap": "4.1.3",
+        "gulp-uglify-es": "^1.0.4",
-        "font-awesome": "4.7.0",
+        "jasmine-core": "^3.2.1",
-        "gulp-angular-templatecache": "2.2.1",
+        "jquery": "^3.3.1",
-        "gulp-clean": "0.4.0",
+        "jshint": "^2.9.6",
-        "gulp-htmlmin": "5.0.1",
+        "pre-commit": "^1.2.2",
-        "gulp-jshint": "2.1.0",
+        "pump": "^3.0.0",
-        "gulp-rename": "1.4.0",
+        "ui-bootstrap4": "^3.0.5"
-        "gulp-replace": "1.0.0",
-        "gulp-sequence": "1.0.0",

src/etc/develop.ejemplo.js

Diff comments View file @ aa29546

File was created	1	angular.module('focaAbmPlazoPago')
	2	.constant("API_ENDPOINT", {
	3	'URL': '//127.0.0.1:9000'
	4	});
	5

src/js/app.js

Diff comments View file @ aa29546

1	angular.module('focaAbmPlazoPago', []);	1	angular.module('focaAbmPlazoPago', ['ngRoute', 'ui.bootstrap']);
2		2

src/js/controller.js

Diff comments View file @ aa29546

src/js/route.js

Diff comments View file @ aa29546

1	angular.module('focaAbmPlazoPago')	1	angular.module('focaAbmPlazoPago')
2	.config([	2	.config([
3	'$routeProvider',	3	'$routeProvider',
4	function($routeProvider) {	4	function($routeProvider) {
5	$routeProvider.when('/plazo-pago', {	5	$routeProvider.when('/plazo-pago', {
6	controller: 'focaAbmPlazosPagoController',	6	controller: 'focaAbmPlazosPagoController',
7	templateUrl: 'foca-abm-plazos-pago-listado.html'	7	templateUrl: 'src/views/foca-abm-plazos-pago-listado.html'
8	});	8	});
9	}	9	}
10	])	10	])
11	.config([	11	.config([
12	'$routeProvider',	12	'$routeProvider',
13	function($routeProvider) {	13	function($routeProvider) {
14	$routeProvider.when('/precio-condicion/:idPreciosCondiciones/plazo-pago/:id', {	14	$routeProvider.when('/precio-condicion/:idPreciosCondiciones/plazo-pago/:id', {
15	controller: 'focaAbmPlazoPagoController',	15	controller: 'focaAbmPlazoPagoController',
16	templateUrl: 'foca-abm-plazos-pago-item.html'	16	templateUrl: 'src/views/foca-abm-plazos-pago-item.html'
17	});	17	});
18	}	18	}
19	]);	19	]);
20		20

src/views/foca-abm-plazos-pago-listado.html

Diff comments View file @ aa29546

 <table class="table table-sm table-hover table-nonfluid">
     <tr>
         <th>Item</th>
         <th>Dias</th>
         <th colspan="2" class="text-center">
-            <button class="btn btn-default" ng-click="editar(0)">
+            <button class="btn btn-default" ng-click="editar(0, 0)">
                 <i class="fa fa-plus"></i>
             </button>
         </th>
     </tr>
     <tr ng-repeat="plazoPago in plazosPago">
         <td ng-bind="plazoPago.item"></td>
         <td ng-bind="plazoPago.dias"></td>
         <td>
-            <button class="btn btn-default" ng-click="editar(plazoPago.id)">
+            <button
+                class="btn btn-default"
+                ng-click="editar(plazoPago.idPreciosCondiciones, plazoPago.id)"
+            >
                 <i class="fa fa-pencil"></i>
             </button>
             <button class="btn btn-default" ng-click="solicitarConfirmacion(plazoPago)">
                 <i class="fa fa-trash"></i>
             </button>
         </td>
     </tr>
 </table>

1	angular.module('focaAbmPlazoPago')	1	angular.module('focaAbmPlazoPago')
2	.controller('focaAbmPlazosPagoController', [	2	.controller('focaAbmPlazosPagoController', [
3	'$scope', 'focaAbmPlazoPagoService', '$location', '$uibModal',	3	'$scope', 'focaAbmPlazoPagoService', '$location', '$uibModal',
4	function($scope, focaAbmPlazoPagoService, $location, $uibModal) {	4	function($scope, focaAbmPlazoPagoService, $location, $uibModal) {
5	focaAbmPlazoPagoService.obtenerPlazosPago().then(function(datos) {	5	focaAbmPlazoPagoService.obtenerPlazosPago().then(function(datos) {
6	$scope.plazosPago = datos.data;	6	$scope.plazosPago = datos.data;
7	});	7	});
8	$scope.editar = function(id) {	8	$scope.editar = function(idPreciosCondiciones, id) {
9	$location.path('/plazo-pago/' + id);	9	$location.path('/precio-condicion/' + idPreciosCondiciones + '/plazo-pago/' + id);
10	};	10	};
11	$scope.solicitarConfirmacion = function(plazoPago) {	11	$scope.solicitarConfirmacion = function(plazoPago) {
12	$uibModal.open({	12	$uibModal.open({
13	templateUrl: 'foca-abm-plazos-pago-modal-confirmar.html',	13	templateUrl: 'foca-abm-plazos-pago-modal-confirmar.html',
14	controller: 'focaAbmPlazosPagoModalConfirmarController',	14	controller: 'focaAbmPlazosPagoModalConfirmarController',
15	animation: false,	15	animation: false,
16	backdrop: false,	16	backdrop: false,
17	resolve: {plazoPago: function(){return plazoPago;}}	17	resolve: {plazoPago: function(){return plazoPago;}}
18	})	18	})
19	.result.then(function(plazoPago){	19	.result.then(function(plazoPago){
20	focaAbmPlazoPagoService.borrarPlazoPago(plazoPago.id);	20	focaAbmPlazoPagoService.borrarPlazoPago(plazoPago.id);
21	$scope.plazosPago.splice(	21	$scope.plazosPago.splice(
22	$scope.plazosPago.indexOf(plazoPago), 1	22	$scope.plazosPago.indexOf(plazoPago), 1
23	);	23	);
24	});	24	});
25	};	25	};
26	}	26	}
27	])	27	])
28	.controller('focaAbmPlazoPagoController', [	28	.controller('focaAbmPlazoPagoController', [
29	'$scope', 'focaAbmPlazoPagoService',	29	'$scope', 'focaAbmPlazoPagoService',
30	'$routeParams', '$location',	30	'$routeParams', '$location',
31	function(	31	function(
32	$scope, focaAbmPlazoPagoService,	32	$scope, focaAbmPlazoPagoService,
33	$routeParams, $location	33	$routeParams, $location
34	) {	34	) {
35	focaAbmPlazoPagoService.obtenerPlazoPago($routeParams.id)	35	focaAbmPlazoPagoService.obtenerPlazoPago($routeParams.id)
36	.then(function(datos) {	36	.then(function(datos) {
37	$scope.plazoPago = {	37	$scope.plazoPago = {
38	id: 0,	38	id: 0,
39	idPreciosCondiciones: $routeParams.idPreciosCondiciones,	39	idPreciosCondiciones: $routeParams.idPreciosCondiciones,
40	item: '',	40	item: '',
41	dias: ''	41	dias: ''
42	};	42	};
43	if(datos.data.id) {	43	if(datos.data.id) {
44	$scope.plazoPago = datos.data;	44	$scope.plazoPago = datos.data;
45	}	45	}
46	});	46	});
47	$scope.cancelar = function() {	47	$scope.cancelar = function() {
48	$location.path('/precio-condicion/' + $routeParams.idPreciosCondiciones);	48	$location.path('/precio-condicion/' + $routeParams.idPreciosCondiciones);
49	};	49	};
50	$scope.guardar = function(plazoPago) {	50	$scope.guardar = function(plazoPago) {
51	focaAbmPlazoPagoService.guardarPlazoPago(plazoPago)	51	focaAbmPlazoPagoService.guardarPlazoPago(plazoPago)
52	.then(function() {	52	.then(function() {
53	$location.path('/precio-condicion/' + $routeParams.idPreciosCondiciones);	53	$location.path('/precio-condicion/' + $routeParams.idPreciosCondiciones);
54	});	54	});
55	};	55	};
56	}	56	}
57	])	57	])
58	.controller('focaAbmPlazosPagoModalConfirmarController', [	58	.controller('focaAbmPlazosPagoModalConfirmarController', [
59	'$uibModalInstance', '$scope', 'plazoPago',	59	'$uibModalInstance', '$scope', 'plazoPago',
60	function($uibModalInstance, $scope, plazoPago) {	60	function($uibModalInstance, $scope, plazoPago) {
61	$scope.plazoPago = plazoPago;	61	$scope.plazoPago = plazoPago;
62	$scope.cancelar = function() {	62	$scope.cancelar = function() {
63	$uibModalInstance.dismiss();	63	$uibModalInstance.dismiss();
64	};	64	};
65	$scope.borrar = function() {	65	$scope.borrar = function() {
66	$uibModalInstance.close(plazoPago);	66	$uibModalInstance.close(plazoPago);
67	};	67	};
68	}	68	}
69	]);	69	]);
70		70