diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bf9275c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/node_modules
+/dist
+/tmp
+package-lock\.json
+
+src/etc/develop\.js
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..d8cbb07
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,64 @@
+{
+ /*
+ * ENVIRONMENTS
+ * =================
+ */
+
+ // Define globals exposed by modern browsers.
+ "browser": true,
+
+ // Define globals exposed by jQuery.
+ "jquery": true,
+
+ // Define globals exposed by Node.js.
+ "node": true,
+
+ // Allow ES6.
+ "esversion": 6,
+
+ /*
+ * ENFORCING OPTIONS
+ * =================
+ */
+
+ // Force all variable names to use either camelCase style or UPPER_CASE
+ // with underscores.
+ "camelcase": true,
+
+ // Prohibit use of == and != in favor of === and !==.
+ "eqeqeq": true,
+
+ // Enforce tab width of 2 spaces.
+ "indent": 4,
+
+ // Prohibit use of a variable before it is defined.
+ "latedef": false,
+
+ // Enforce line length to 100 characters
+ "maxlen": 100,
+
+ // Require capitalized names for constructor functions.
+ "newcap": true,
+
+ // Enforce use of single quotation marks for strings.
+ "quotmark": "single",
+
+ // Enforce placing 'use strict' at the top function scope
+ "strict": false,
+
+ // Prohibit use of explicitly undeclared variables.
+ "undef": true,
+
+ // Warn when variables are defined but never used.
+ "unused": true,
+
+ // Para que funcione en angular
+ "predef": ["angular", "alert", "spyOn", "expect", "it", "inject", "beforeEach", "describe"],
+ /*
+ * RELAXING OPTIONS
+ * =================
+ */
+
+ // Suppress warnings about == null comparisons.
+ "eqnull": true
+}
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000..e6abd86
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,94 @@
+const templateCache = require('gulp-angular-templatecache');
+const concat = require('gulp-concat');
+const htmlmin = require('gulp-htmlmin');
+const rename = require('gulp-rename');
+const uglify = require('gulp-uglify');
+const gulp = require('gulp');
+const pump = require('pump');
+const jshint = require('gulp-jshint');
+const replace = require('gulp-replace');
+const connect = require('gulp-connect');
+const clean = require('gulp-clean');
+
+var paths = {
+ srcJS: 'src/js/*.js',
+ srcViews: 'src/views/*.html',
+ tmp: 'tmp',
+ dist: 'dist/'
+};
+
+gulp.task('clean', function() {
+ return gulp.src(['tmp', 'dist'], {read: false})
+ .pipe(clean());
+});
+
+gulp.task('templates', ['clean'], function() {
+ return pump(
+ [
+ gulp.src(paths.srcViews),
+ htmlmin(),
+ templateCache('views.js', {
+ module: 'focaModalInformeChofer',
+ root: ''
+ }),
+ gulp.dest(paths.tmp)
+ ]
+ );
+});
+
+gulp.task('uglify', ['templates'], function() {
+ return pump(
+ [
+ gulp.src([
+ paths.srcJS,
+ 'tmp/views.js'
+ ]),
+ concat('foca-modal-informe-chofer.js'),
+ replace('src/views/', ''),
+ gulp.dest(paths.tmp),
+ rename('foca-modal-informe-chofer.min.js'),
+ uglify(),
+ gulp.dest(paths.dist)
+ ]
+ );
+});
+
+gulp.task('pre-commit', function() {
+ return pump(
+ [
+ gulp.src(paths.srcJS),
+ jshint('.jshintrc'),
+ jshint.reporter('default'),
+ jshint.reporter('fail')
+ ]
+ );
+
+ gulp.start('uglify');
+});
+
+gulp.task('webserver', function() {
+ pump [
+ connect.server({port: 3000})
+ ]
+});
+
+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('default', ['webserver']);
+
+gulp.task('watch', function() {
+ gulp.watch([paths.srcJS, paths.srcViews], ['uglify'])
+});
+
+gulp.task('copy', ['uglify'], function() {
+ gulp.src('dist/*.js')
+ .pipe(gulp.dest('../wrapper-demo/node_modules/foca-informe-hoja-ruta/dist'));
+});
+
+gulp.task('watchAndCopy', function() {
+ return gulp.watch([paths.srcJS, paths.srcViews], ['copy']);
+});
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..bc73867
--- /dev/null
+++ b/package.json
@@ -0,0 +1,62 @@
+{
+ "name": "foca-modal-informe-hoja-ruta",
+ "version": "0.0.1",
+ "description": "Modal para generar informes de correlatividad de hojas de ruta",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1",
+ "gulp-pre-commit": "gulp pre-commit",
+ "compile": "gulp uglify",
+ "postinstall": "npm run compile && gulp clean-post-install",
+ "install-dev": "npm install -D angular angular-ladda ladda@1.0.6 bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+http://git.focasoftware.com/npm/foca-directivas.git"
+ },
+ "pre-commit": [
+ "gulp-pre-commit"
+ ],
+ "repository": {
+ "type": "git",
+ "url": "http://git.focasoftware.com/npm/foca-modal-informe-hoja-ruta"
+ },
+ "author": "Nicolás Guarnieri",
+ "license": "ISC",
+ "peerDependencies": {
+ "angular": "^1.7.4",
+ "bootstrap": "^4.1.3",
+ "font-awesome": "^4.7.0",
+ "ui-bootstrap4": "^3.0.4",
+ "gulp": "^3.9.1",
+ "gulp-angular-templatecache": "^2.2.1",
+ "gulp-concat": "^2.6.1",
+ "gulp-connect": "^5.6.1",
+ "gulp-htmlmin": "^5.0.1",
+ "gulp-rename": "^1.4.0",
+ "gulp-replace": "^1.0.0",
+ "gulp-uglify": "^3.0.1",
+ "jquery": "^3.3.1",
+ "pump": "^3.0.0",
+ "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git"
+ },
+ "devDependencies": {
+ "angular": "^1.7.5",
+ "angular-ladda": "^0.4.3",
+ "bootstrap": "^4.1.3",
+ "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
+ "font-awesome": "^4.7.0",
+ "gulp": "^3.9.1",
+ "gulp-angular-templatecache": "^2.2.3",
+ "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-uglify": "^3.0.1",
+ "jasmine-core": "^3.3.0",
+ "jquery": "^3.3.1",
+ "jshint": "^2.9.6",
+ "ladda": "1.0.6",
+ "pre-commit": "^1.2.2",
+ "pump": "^3.0.0",
+ "ui-bootstrap4": "^3.0.5"
+ }
+}
diff --git a/src/etc/develop.js.ejemplo b/src/etc/develop.js.ejemplo
new file mode 100644
index 0000000..9e81e3f
--- /dev/null
+++ b/src/etc/develop.js.ejemplo
@@ -0,0 +1,4 @@
+angular.module('focaModalInformeChofer')
+ .constant("API_ENDPOINT", {
+ 'URL': '//127.0.0.1:9000'
+ });
diff --git a/src/js/app.js b/src/js/app.js
new file mode 100644
index 0000000..17ab9bb
--- /dev/null
+++ b/src/js/app.js
@@ -0,0 +1 @@
+angular.module('focaModalInformeChofer', []);
diff --git a/src/js/controller.js b/src/js/controller.js
new file mode 100644
index 0000000..926d93e
--- /dev/null
+++ b/src/js/controller.js
@@ -0,0 +1,145 @@
+angular.module('focaModalInformeChofer')
+ .controller('focaModalInformeChoferController',
+ [
+ '$filter',
+ '$scope',
+ '$uibModalInstance',
+ 'focaModalInformeChoferService',
+ 'i18nService',
+ function($filter, $scope, $uibModalInstance,
+ focaModalInformeChoferService, i18nService
+ ) {
+ var fecha = new Date();
+ $scope.generando = false;
+ $scope.fechaHasta = new Date();
+ $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
+ $scope.buscar = true;
+ $scope.informe = {};
+ i18nService.setCurrentLang('es');
+ $scope.gridOptions = {
+ enableGridMenu: true,
+ exporterMenuCsv: false,
+ exporterPdfPageSize: 'A4',
+ exporterPdfFooter: function (currentPage, pageCount) {
+ return {
+ columns: [
+ {text: $filter('date')(new Date(), 'dd/MM/yyyy'),
+ margin: [40, 0]},
+ {text: currentPage + ' de ' + pageCount,
+ margin: [28, 0], alignment: 'right'}
+ ]
+ };
+ },
+
+ };
+ $scope.generarInforme = function() {
+ $scope.generando = true;
+ focaModalInformeChoferService
+ .getDescargas(
+ $scope.fechaDesde.toISOString().split('.')[0],
+ $scope.fechaHasta.toISOString().split('.')[0]
+ )
+ .then(function(res) {
+ var promesas = [];
+ $scope.gridOptions.data = orderData(res.data);
+
+ res.data.forEach(function(descargas) {
+ var idsRemito = descargas.map(function(descarga) {
+ return descarga.remito.id;
+ });
+ idsRemito = eliminarDuplicados(idsRemito);
+ promesas.push(
+ focaModalInformeChoferService.getDistanciaPorIdRemito(idsRemito));
+ });
+ return Promise.all(promesas);
+ })
+ .then(function(res) {
+ res.forEach(function(movimiento, idx) {
+ //Calculo lts/km y los agrego a la grilla
+ var ltsPorKm =
+ $scope.gridOptions.data[idx].litros / movimiento.data.totalKms;
+ $scope.gridOptions.data[idx].kmRecorridos =
+ $filter('number')(movimiento.data.totalKms);
+ $scope.gridOptions.data[idx].ltsPorKm =
+ $filter('number')(ltsPorKm, 7);
+ });
+ //TODO: sacar id empresa hardcodeado
+ return focaModalInformeChoferService.getEmpresa(1);
+ })
+ .then(function(res) {
+ //Seteo filename para PDF y Excel, y cabecera de PDF
+ var filenameStamp = 'Informe choferes - ' +
+ $filter('date')(new Date(), 'dd/MM/yyyy');
+ $scope.informe.nombreEmpresa = res.data.NOM.trim();
+ $scope.informe.direccionEmpresa = res.data.DIR.trim();
+ $scope.gridOptions.exporterPdfFilename = filenameStamp + '.pdf';
+ $scope.gridOptions.exporterExcelFilename = filenameStamp + '.xlsx';
+ $scope.gridOptions.exporterPdfHeader = {
+ columns: [
+ {
+ text: $scope.informe.nombreEmpresa,
+ margin: [40, 0],
+ fontSize: 9
+ },
+ {
+ text: '\nInforme de choferes',
+ margin: [-170, -4, 0, 0],
+ fontSize: 12
+ },
+ {
+ text: [
+ '\n\nFiltros: ',
+ 'Fecha desde: ',
+ $filter('date')($scope.fechaDesde, 'dd/MM/yyyy'),
+ ' Fecha hasta: ',
+ $filter('date')($scope.fechaHasta, 'dd/MM/yyyy')
+ ],
+ margin: [-380, 2, 0, 0],
+ fontSize: 9
+ },
+ {
+ text: $scope.informe.direccionEmpresa,
+ margin: [28, 0],
+ alignment: 'right',
+ fontSize: 9
+ }
+ ]
+ };
+ $scope.buscar = false;
+ $scope.generando = false;
+ });
+ };
+ $scope.volver = function() {
+ $scope.buscar = true;
+ };
+ $scope.cancel = function() {
+ $uibModalInstance.dismiss('Cancelar');
+ };
+
+ function orderData(data) {
+ var result = [];
+ data.forEach(function(descargas) {
+ var row = {
+ chofer: descargas[0].remito.hojaRuta.chofer.nombre,
+ litros: 0
+ };
+ descargas.forEach(function(descarga) {
+ row.litros += descarga.cantidad;
+ });
+ result.push(row);
+ });
+ return result;
+ }
+
+ function eliminarDuplicados(datos) {
+ var result = [];
+ datos.forEach(function(dato) {
+ if (result.indexOf(dato) === -1) {
+ result.push(dato);
+ }
+ });
+ return result;
+ }
+ }
+ ]
+ );
diff --git a/src/js/service.js b/src/js/service.js
new file mode 100644
index 0000000..140e2de
--- /dev/null
+++ b/src/js/service.js
@@ -0,0 +1,19 @@
+angular.module('focaModalInformeChofer')
+ .factory('focaModalInformeChoferService', [
+ '$http',
+ 'API_ENDPOINT',
+ function($http, API_ENDPOINT) {
+ return {
+ getDescargas: function(fechaDesde, fechaHasta) {
+ return $http.get(API_ENDPOINT.URL + '/cisterna-movimiento/groupedBy/chofer/' +
+ fechaDesde + '/' + fechaHasta);
+ },
+ getEmpresa: function(id) {
+ return $http.get(API_ENDPOINT.URL + '/empresa/' + id);
+ },
+ getDistanciaPorIdRemito: function(ids) {
+ return $http.post(API_ENDPOINT.URL + '/remito/distancia', {ids: ids});
+ }
+ };
+ }
+ ]);
diff --git a/src/views/modal-informe-chofer.html b/src/views/modal-informe-chofer.html
new file mode 100644
index 0000000..69e1137
--- /dev/null
+++ b/src/views/modal-informe-chofer.html
@@ -0,0 +1,85 @@
+
+
+