diff --git a/gulpfile.js b/gulpfile.js
index f4e5f46..c277cbb 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -73,3 +73,7 @@ gulp.task('clean-post-install', function(){
});
gulp.task('default', ['webserver']);
+
+gulp.task('watch', function() {
+ gulp.watch([srcJS, srcViews], ['uglify']);
+});
diff --git a/package.json b/package.json
index 37a0183..1c4cbe0 100644
--- a/package.json
+++ b/package.json
@@ -1,42 +1,42 @@
{
- "name": "foca-modal-flete",
- "version": "0.0.1",
- "description": "Modal de búsqueda de fletes",
- "main": "index.js",
- "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 font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
- },
- "pre-commit": [
- "gulp-pre-commit"
- ],
- "repository": {
- "type": "git",
- "url": "https://debo.suite.repo/modulos-npm/foca-modal-flete.git"
- },
- "author": "Foca Software",
- "license": "ISC",
- "devDependencies": {
- "angular": "^1.7.5",
- "bootstrap": "^4.1.3",
- "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
- "font-awesome": "^4.7.0",
- "gulp": "^3.9.1",
- "gulp-angular-templatecache": "^2.2.2",
- "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",
- "jquery": "^3.3.1",
- "jshint": "^2.9.6",
- "pump": "^3.0.0",
- "ui-bootstrap4": "^3.0.5"
+ "name": "foca-modal-flete",
+ "version": "0.0.1",
+ "description": "Modal de búsqueda de fletes",
+ "main": "index.js",
+ "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 font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
+ },
+ "pre-commit": [
+ "gulp-pre-commit"
+ ],
+ "repository": {
+ "type": "git",
+ "url": "https://debo.suite.repo/modulos-npm/foca-modal-flete.git"
+ },
+ "author": "Foca Software",
+ "license": "ISC",
+ "devDependencies": {
+ "angular": "^1.7.5",
+ "bootstrap": "^4.1.3",
+ "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
+ "font-awesome": "^4.7.0",
+ "gulp": "^3.9.1",
+ "gulp-angular-templatecache": "2.2.2",
+ "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",
+ "jquery": "^3.3.1",
+ "jshint": "2.9.6",
+ "pump": "3.0.0",
+ "ui-bootstrap4": "^3.0.5"
}
}
diff --git a/src/js/controller.js b/src/js/controller.js
index d1a87ae..7840e9a 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -4,152 +4,32 @@ angular.module('focaModalFlete')
'$filter',
'$scope',
'$uibModalInstance',
- 'focaModalFleteService',
- function($filter, $scope, $uibModalInstance, focaModalFleteService) {
- focaModalFleteService.getFletes().then(
- function(res) {
- $scope.flete = res.data;
- $scope.search();
- }
- );
-
- // pagination
- $scope.numPerPage = 10;
- $scope.currentPage = 1;
- $scope.filteredFlete = [];
- $scope.currentPageFlete = [];
- $scope.selectedFlete = -1;
-
- //METODOS
- $scope.search = function() {
- $scope.filteredFlete = $filter('filter')(
- $scope.flete,
- {$: $scope.filters}
- );
-
- $scope.lastPage = Math.ceil(
- $scope.filteredFlete.length / $scope.numPerPage
- );
-
- $scope.resetPage();
- };
-
- $scope.resetPage = function() {
- $scope.currentPage = 1;
- $scope.selectPage(1);
- };
-
- $scope.selectPage = function(page) {
- var start = (page - 1) * $scope.numPerPage;
- var end = start + $scope.numPerPage;
- $scope.paginas = [];
- $scope.paginas = calcularPages(page);
- $scope.currentPageFlete =
- $scope.filteredFlete.slice(start, end);
- $scope.currentPage = page;
- };
-
- $scope.select = function(flete) {
- $uibModalInstance.close(flete);
+ 'parametrosFlete',
+ function($filter, $scope, $uibModalInstance, parametrosFlete) {
+ $scope.parametrosFlete = parametrosFlete;
+ $scope.aceptar = function() {
+ $uibModalInstance.close($scope.parametrosFlete);
};
$scope.cancel = function() {
$uibModalInstance.dismiss('cancel');
};
-
- $scope.busquedaDown = function(key) {
- if (key === 40) {
- primera(key);
- }
- };
-
- $scope.busquedaPress = function(key) {
- if (key === 13) {
- primera(key);
- }
- };
-
- $scope.itemProducto = function(key) {
- if (key === 38) {
- anterior(key);
- }
-
- if (key === 40) {
- siguiente(key);
- }
-
- if (key === 37) {
- retrocederPagina();
- }
-
- if (key === 39) {
- avanzarPagina();
- }
- };
-
- function calcularPages(paginaActual) {
- var paginas = [];
- paginas.push(paginaActual);
-
- if (paginaActual - 1 > 1) {
-
- paginas.unshift(paginaActual - 1);
- if (paginaActual - 2 > 1) {
- paginas.unshift(paginaActual - 2);
- }
- }
-
- if (paginaActual + 1 < $scope.lastPage) {
- paginas.push(paginaActual + 1);
- if (paginaActual + 2 < $scope.lastPage) {
- paginas.push(paginaActual + 2);
- }
- }
-
- if (paginaActual !== 1) {
- paginas.unshift(1);
- }
-
- if (paginaActual !== $scope.lastPage) {
- paginas.push($scope.lastPage);
- }
-
- return paginas;
- }
-
- function primera() {
- $scope.selectedFlete = 0;
- }
-
- function anterior() {
- if ($scope.selectedFlete === 0 && $scope.currentPage > 1) {
- retrocederPagina();
- } else {
- $scope.selectedFlete--;
- }
- }
-
- function siguiente() {
- if ($scope.selectedFlete <
- $scope.currentPageFlete.length - 1 ) {
- $scope.selectedFlete++;
- } else {
- avanzarPagina();
- }
- }
-
- function retrocederPagina() {
- if ($scope.currentPage > 1) {
- $scope.selectPage($scope.currentPage - 1);
- $scope.selectedFlete = $scope.numPerPage - 1;
- }
- }
-
- function avanzarPagina() {
- if ($scope.currentPage < $scope.lastPage) {
- $scope.selectPage($scope.currentPage + 1);
- $scope.selectedFlete = 0;
- }
+
+ $scope.validar = function() {
+ return $scope.formFlete.$pristine ||
+ (
+ $scope.parametrosFlete.flete === 'si' &&
+ (
+ (
+ $scope.parametrosFlete.bomba !== 'si' &&
+ $scope.parametrosFlete.bomba !== 'no'
+ ) ||
+ (
+ !$scope.parametrosFlete.kilometros ||
+ $scope.parametrosFlete.kilometros < 1
+ )
+ )
+ );
}
}
]
diff --git a/src/views/modal-flete.html b/src/views/modal-flete.html
index 7127af3..6350fc3 100644
--- a/src/views/modal-flete.html
+++ b/src/views/modal-flete.html
@@ -1,81 +1,103 @@