Jose Pinto / foca-abm-chofer

Browse Code »

Commit 61cf6ef413e205841a6d4f7c3716a5280b2a42c1

Authored by Jose Pinto 2018-12-20 18:32:30 -0300

1 parent 8d5a298bc6

Exists in master

Nuevo diseño

Showing 7 changed files with 168 additions and 83 deletions Show diff stats

index.html

Diff comments View file @ 61cf6ef

 <html ng-app="focaAbmChofer">
     <head>
         <meta charset="UTF-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <!--CSS-->
         <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
         <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
         <!--VENDOR JS-->
         <script src="node_modules/jquery/dist/jquery.min.js"></script>
         <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
         <script src="node_modules/angular/angular.min.js"></script>
         <script src="node_modules/angular-route/angular-route.min.js"></script>
         <script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
         <script src="node_modules/foca-modal/dist/foca-modal.min.js"></script>
+        <script src="node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
         <!-- BUILD -->
         <script src="src/js/app.js"></script>
         <script src="src/js/controller.js"></script>
         <script src="src/js/route.js"></script>
         <script src="src/js/service.js"></script>
         <!-- /BUILD -->
         <!-- CONFIG PARA DEVELOP -->
         <script src="src/etc/develop.js"></script>
     </head>
     <body style="background: #afafaf;padding: 25px">
         <div class="container-fluid pt-3 pb-3" ng-view style="background: #fff"></div>
     </body>
 </html>

package.json

Diff comments View file @ 61cf6ef

 {
     "name": "foca-abm-chofer",
     "version": "0.0.1",
     "description": "Abm de chofer",
     "main": "index.html",
     "scripts": {
         "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 ui-bootstrap4 font-awesome jquery gulp gulp-connect jasmine-core pre-commit gulp-angular-templatecache gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-uglify gulp-clean jshint pump git+http://git.focasoftware.com/npm/foca-modal.git"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
         "url": "http://git.focasoftware.com/npm/foca-abm-chofer.git"
     },
     "author": "Foca Software",
     "license": "ISC",
     "peerDependencies": {
         "angular": "^1.7.x",
         "angular-route": "^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",
+        "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
         "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git",
         "font-awesome": "^4.7.0",
         "gulp": "^3.9.1",
         "gulp-angular-templatecache": "^2.2.5",
         "gulp-clean": "^0.4.0",
         "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-uglify": "^3.0.1",
         "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",
         "ui-bootstrap4": "^3.0.5"
     }
 }

src/js/controller.js

Diff comments View file @ 61cf6ef

1	angular.module('focaAbmChofer')	1	angular.module('focaAbmChofer')
2	.controller('focaAbmChoferesController', [	2	.controller('focaAbmChoferesController', [
3	'$scope', 'focaAbmChoferService', '$location',	3	'$scope', 'focaAbmChoferService', '$location', '$uibModal',
4	'focaModalService', 'focaBotoneraLateralService', '$timeout',	4	'focaModalService', 'focaBotoneraLateralService', '$timeout',
5	function($scope, focaAbmChoferService, $location, focaModalService,	5	function($scope, focaAbmChoferService, $location, $uibModal, focaModalService,
6	focaBotoneraLateralService, $timeout) {	6	focaBotoneraLateralService, $timeout) {
7		7
		8	$scope.now = new Date();
8	$scope.filters = '';	9	$scope.filters = '';
9	$scope.choferes = [];	10	$scope.choferes = [];
10	$scope.choferesFiltrados = [];	11	$scope.botonera = ['Transportista'];
11		12	$scope.focused = 1;
12	focaAbmChoferService.getChoferes().then(function(datos) {
13	$scope.choferes = datos.data;
14	$scope.choferesFiltrados = $scope.choferes;
15	});
16		13
17	//SETEO BOTONERA LATERAL	14	//SETEO BOTONERA LATERAL
18	$timeout(function() {	15	$timeout(function() {
19	focaBotoneraLateralService.showSalir(true);	16	focaBotoneraLateralService.showSalir(true);
20	focaBotoneraLateralService.showPausar(false);	17	focaBotoneraLateralService.showPausar(false);
21	focaBotoneraLateralService.showCancelar(false);	18	focaBotoneraLateralService.showCancelar(false);
22	focaBotoneraLateralService.showGuardar(false);	19	focaBotoneraLateralService.showGuardar(false);
23	});	20	});
24		21
		22	if(focaAbmChoferService.transportistaSeleccionado.COD) {
		23	elegirTransportista(focaAbmChoferService.transportistaSeleccionado);
		24	}
		25
25	$scope.editar = function(id) {	26	$scope.editar = function(id) {
26	$location.path('/chofer/' + id);	27	$location.path('/chofer/' + id + '/' + $scope.idTransportista);
27	};	28	};
28		29
29	$scope.solicitarConfirmacion = function(chofer) {	30	$scope.solicitarConfirmacion = function(chofer) {
30	focaModalService.confirm('¿Está seguro que desea borrar el chofer ' +	31	focaModalService.confirm('¿Está seguro que desea borrar el chofer ' +
31	chofer.nombre + ' ?').then(function(confirmed) {	32	chofer.nombre + ' ?').then(function(confirmed) {
32	if(confirmed) {	33	if(confirmed) {
33	focaAbmChoferService.deleteChofer(chofer.id);	34	focaAbmChoferService.deleteChofer(chofer.id);
34	$scope.choferes.splice($scope.choferes.indexOf(chofer), 1);	35	$scope.choferes.splice($scope.choferes.indexOf(chofer), 1);
35	}	36	}
36	});	37	});
37	};	38	};
38
39		39
		40	$scope.seleccionarTransportista = function() {
		41	var modalInstance = $uibModal.open(
		42	{
		43	ariaLabelledBy: 'Busqueda de Transportista',
		44	templateUrl: 'modal-proveedor.html',
		45	controller: 'focaModalProveedorCtrl',
		46	size: 'lg',
		47	resolve: {
		48	transportista: function() {
		49	return true;
		50	}
		51	}
		52	}
		53	);
		54	modalInstance.result.then(
		55	function(transportista) {
		56	elegirTransportista(transportista);
		57	focaAbmChoferService.transportistaSeleccionado = transportista;
		58	}, function() {}
		59	);
		60	};
		61
		62	function elegirTransportista(transportista) {
		63	buscar(transportista.COD);
		64	var codigo = ('00000' + transportista.COD).slice(-5);
		65	$scope.idTransportista = transportista.COD;
		66	$timeout(function() {
		67	$scope.$broadcast('addCabecera', {
		68	label: 'Transportista:',
		69	valor: codigo + ' - ' + transportista.NOM
		70	});
		71	});
		72	}
		73
		74	function buscar(id) {
		75	focaAbmChoferService.getChoferPorTransportista(id).then(function(res) {
		76	$scope.choferes = res.data;
		77	});
		78	}
40	}	79	}
41	])	80	])
42	.controller('focaAbmChoferController', [	81	.controller('focaAbmChoferController', [
43	'$scope', 'focaAbmChoferService', '$routeParams',	82	'$scope', 'focaAbmChoferService', '$routeParams',
44	'$location', 'focaBotoneraLateralService', '$timeout',	83	'$location', 'focaBotoneraLateralService', '$timeout',
45	function($scope, focaAbmChoferService, $routeParams,	84	function($scope, focaAbmChoferService, $routeParams,
46	$location, focaBotoneraLateralService, $timeout) {	85	$location, focaBotoneraLateralService, $timeout) {
47		86	$scope.nuevo = $routeParams.id === '0';
48	$scope.chofer = {};	87	$scope.chofer = {};
49	$scope.transportistas = [];	88	$scope.transportistas = [];
		89	$scope.now = new Date();
		90	$scope.next = function(key) {
		91	if (key === 13) $scope.focused++;
		92	};
50		93
51	//SETEO BOTONERA LATERAL	94	//SETEO BOTONERA LATERAL
52	$timeout(function() {	95	$timeout(function() {
53	focaBotoneraLateralService.showSalir(false);	96	focaBotoneraLateralService.showSalir(false);
54	focaBotoneraLateralService.showPausar(true);	97	focaBotoneraLateralService.showPausar(true);
55	focaBotoneraLateralService.showCancelar(true);	98	focaBotoneraLateralService.showCancelar(true);
56	focaBotoneraLateralService.showGuardar(true, $scope.guardar);	99	focaBotoneraLateralService.showGuardar(true, $scope.guardar);
57	});	100	});
58		101
		102	if($scope.nuevo) {
		103	focaAbmChoferService
		104	.getTransportistaPorId($routeParams.idTransportista)
		105	.then(function(res) {
		106	var codigo = ('00000' + res.data.COD).slice(-5);
		107	$scope.chofer.idTransportista = res.data.COD;
		108	$scope.chofer.transportista = res.data;
		109	$scope.$broadcast('addCabecera', {
		110	label: 'Transportista:',
		111	valor: codigo + ' - ' + res.data.NOM
		112	});
		113	});
		114	}
		115
59	focaAbmChoferService.getChofer($routeParams.id).then(function(res) {	116	focaAbmChoferService.getChofer($routeParams.id).then(function(res) {
60	if(res.data) $scope.chofer = res.data;	117	if(res.data) {
		118	var codigo = ('00000' + res.data.transportista.COD).slice(-5);
		119	$scope.chofer = res.data;
		120	$scope.$broadcast('addCabecera', {
		121	label: 'Transportista:',
		122	valor: codigo + ' - ' + res.data.transportista.NOM
		123	});
		124	}
61	});	125	});
62		126
63	focaAbmChoferService.getTransportistas().then(function(res) {	127	focaAbmChoferService.getTransportistas().then(function(res) {
64	$scope.transportistas = res.data;	128	$scope.transportistas = res.data;
65	});	129	});
66		130
67	$scope.cancelar = function() {	131	$scope.cancelar = function() {
68	$location.path('/chofer');	132	$location.path('/chofer');
69	};	133	};
70		134
71	$scope.guardar = function() {	135	$scope.guardar = function() {
72	$scope.chofer.idTransportista = $scope.chofer.transportista.COD;	136	$scope.chofer.idTransportista = $routeParams.idTransportista;
73	delete $scope.chofer.transportista;	137	delete $scope.chofer.transportista;
74	focaAbmChoferService.guardarChofer($scope.chofer).then(function() {	138	focaAbmChoferService.guardarChofer($scope.chofer).then(function() {
75	$location.path('/chofer');	139	$location.path('/chofer');

src/js/route.js

Diff comments View file @ 61cf6ef

1	angular.module('focaAbmChofer')	1	angular.module('focaAbmChofer')
2	.config([	2	.config([
3	'$routeProvider',	3	'$routeProvider',
4	function($routeProvider) {	4	function($routeProvider) {
5	$routeProvider.when('/chofer', {	5	$routeProvider.when('/chofer', {
6	controller: 'focaAbmChoferesController',	6	controller: 'focaAbmChoferesController',
7	templateUrl: 'src/views/foca-abm-choferes-listado.html'	7	templateUrl: 'src/views/foca-abm-choferes-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('/chofer/:id', {	14	$routeProvider.when('/chofer/:id/:idTransportista', {
15	controller: 'focaAbmChoferController',	15	controller: 'focaAbmChoferController',
16	templateUrl: 'src/views/foca-abm-choferes-item.html'	16	templateUrl: 'src/views/foca-abm-choferes-item.html'
17	});	17	});
18	}	18	}
19	]);	19	]);
20		20

src/js/service.js

Diff comments View file @ 61cf6ef

 angular.module('focaAbmChofer')
     .factory('focaAbmChoferService', ['$http', 'API_ENDPOINT', function($http, API_ENDPOINT) {
         return {
             getChoferes: function() {
                 return $http.get(API_ENDPOINT.URL + '/chofer');
             },
             getChofer: function(id) {
                 return $http.get(API_ENDPOINT.URL + '/chofer/' + id);
             },
+            getChoferPorTransportista: function(id) {
+                return $http.get(API_ENDPOINT.URL + '/chofer/transportista/' + id);
+            },
             guardarChofer: function(chofer) {
                 return $http.post(API_ENDPOINT.URL + '/chofer', {chofer: chofer});
             },
             getTransportistas: function() {
                 return $http.get(API_ENDPOINT.URL + '/transportista');
             },
+            getTransportistaPorId: function(id) {
+                return $http.get(API_ENDPOINT.URL + '/transportista/' + id);
+            },
             deleteChofer: function(id) {
                 return $http.delete(API_ENDPOINT.URL + '/chofer/' + id);
-            }
+            },
+            transportistaSeleccionado: {}
         };
     }]);

src/views/foca-abm-choferes-item.html

Diff comments View file @ 61cf6ef

1	<h4 class="pt-4">Chofer</h4>	1	<div class="row">
2	<form name="formChofer">	2	<foca-cabecera-facturador
3	<input type="hidden" name="id" ng-model="chofer.id" />	3	titulo="'Chofer'"
4	<div class="form-group row">	4	fecha="now"
5	<label class="offset-sm-1 col-sm-2 col-form-label">Transportista</label>	5	class="mb-0 col-lg-12"
6	<div class="col-sm-4">	6	></foca-cabecera-facturador>
7	<select class="form-control" ng-model="chofer.transportista"	7	</div>
8	ng-options="transportista as transportista.NOM for transportista in transportistas"	8	<div class="row">
9	>	9	<form name="formChofer" class="col-md-12">
10	</select>	10	<input type="hidden" name="id" ng-model="chofer.id" />
11	</div>	11	<div class="form-group row">
12	</div>	12	<label class="offset-sm-1 col-sm-2 col-form-label">Transportista</label>
13	<div class="form-group row">	13	<div class="col-sm-4">
14	<label class="offset-sm-1 col-sm-2 col-form-label">Nombre</label>	14	<input
15	<div class="col-sm-4">	15	class="form-control"
16	<input	16	type="text"
17	class="form-control"	17	teclado-virtual
18	type="text"	18	ng-model="chofer.transportista.NOM"
19	teclado-virtual	19	readonly
20	ng-model="chofer.nombre"	20	/>
21	ng-required="true"	21	</div>
22	/>
23	</div>	22	</div>
24	</div>	23	<div class="form-group row">
25	<div class="form-group row">	24	<label class="offset-sm-1 col-sm-2 col-form-label">Nombre</label>
26	<label class="offset-sm-1 col-sm-2 col-form-label">DNI</label>
27	<div class="col-sm-4">	25	<div class="col-sm-4">
28	<input	26	<input
29	class="form-control"	27	class="form-control"
30	type="text"	28	type="text"
31	teclado-virtual	29	teclado-virtual
32	ng-model="chofer.dni"	30	ng-model="chofer.nombre"
33	ng-required="true"	31	ng-required="true"
		32	ng-keypress="next($event.keyCode)"
		33	foca-focus="focused == 1"
		34	ng-focus="focused = 1"
34	/>	35	/>
35	</div>	36	</div>
36	</div>	37	</div>
37	<div class="form-group row">	38	<div class="form-group row">
38	<label class="offset-sm-1 col-sm-2 col-form-label">Teléfono</label>	39	<label class="offset-sm-1 col-sm-2 col-form-label">DNI</label>
39	<div class="col-sm-4">	40	<div class="col-sm-4">
40	<input	41	<input
41	class="form-control"	42	class="form-control"
42	type="text"	43	type="number"
43	teclado-virtual	44	teclado-virtual
44	ng-model="chofer.telefono"	45	ng-model="chofer.dni"
45	ng-required="true"	46	ng-required="true"
46	/>	47	ng-keypress="next($event.keyCode)"
		48	foca-focus="focused == 2"
		49	ng-focus="focused = 2"
		50	/>
		51	</div>
		52	</div>
		53	<div class="form-group row">
		54	<label class="offset-sm-1 col-sm-2 col-form-label">Teléfono</label>
		55	<div class="col-sm-4">
		56	<input
		57	class="form-control"
		58	type="text"
		59	teclado-virtual
		60	ng-model="chofer.telefono"
		61	ng-required="true"
		62	ng-keypress="next($event.keyCode)"
		63	foca-focus="focused == 3"
		64	ng-focus="focused = 3"
		65	/>
		66	</div>
47	</div>	67	</div>
48	</div>	68	</form>

src/views/foca-abm-choferes-listado.html

Diff comments View file @ 61cf6ef

 <div class="row">
-    <div class="col-12 col-md-10 pt-4 pr-4 pl-4">
+    <foca-cabecera-facturador
-        <h4 class="mb-4">Choferes</h4>
+    titulo="'Choferes'"
-        <div class="form-group input-group">
+    fecha="now"
-            <input
+    class="mb-0 col-lg-12"
-                type="text"
+    ></foca-cabecera-facturador>
-                class="form-control form-control-sm"
+</div>
-                id="search"
+<div class="row">
-                placeholder="Búsqueda"
+    <div class="col-12 col-md-10 p-0 mt-4 border border-white rounded">
-                ng-model="filters"
+        <div class="row px-5 py-2 botonera-secundaria">
-                teclado-virtual
+            <div class="col-12">
-                ng-keypress="busquedaPress($event.keyCode)"
+                <foca-botonera-facturador botones="botonera" extra="5" class="row"></foca-botonera-facturador>
-            />
-            <div class="input-group-append">
-                <button
-                    ladda="searchLoading"
-                    class="btn btn-outline-secondary"
-                    type="button"
-                    ng-click="busquedaPress(13)"
-                >
-                    <i class="fa fa-search" aria-hidden="true"></i>
-                </button>
             </div>
         </div>
-        <table class="table table-sm table-striped table-dark mb-0">
+        <table class="table table-default table-hover table-sm table-abm table-striped mb-0">
             <thead>
                 <tr>
                     <th>Código</th>
                     <th>Nombre</th>
                     <th>DNI</th>
                     <th>Teléfono</th>
-                    <th>Transportista</th>
                     <th class="text-center">
-                        <button class="btn btn-default boton-accion" ng-click="editar(0)">
+                        <button
+                            ng-disabled="!idTransportista"
+                            title="Agregar"
+                            class="btn btn-outline-debo boton-accion"
+                            ng-click="editar(0)">
                             <i class="fa fa-plus"></i>
                         </button>
                     </th>
                 </tr>
             </thead>
             <tbody>
                 <tr ng-repeat="chofer in choferes | filter:filters">
                     <td ng-bind="chofer.id"></td>
                     <td ng-bind="chofer.nombre"></td>
                     <td ng-bind="chofer.dni"></td>
                     <td ng-bind="chofer.telefono"></td>
-                    <td ng-bind="chofer.transportista.NOM || 'No tiene'"></td>
                     <td class="text-center">
                         <button
-                            class="btn btn-default boton-accion"
+                            class="btn btn-outline-dark boton-accion"
+                            title="Editar"
                             ng-click="editar(chofer.id)"
                         >
                             <i class="fa fa-pencil"></i>
                         </button>
                         <button
-                            class="btn btn-default boton-accion"
+                            class="btn btn-outline-dark boton-accion"
+                            title="Eliminar"
                             ng-click="solicitarConfirmacion(chofer)"
                         >
                             <i class="fa fa-trash"></i>
                         </button>
                     </td>
                 </tr>
             </body>