Mauricio Cattafi / foca-seguimiento

Download as
Browse Code »

Commit 51a5b485650c9ddec25c007c73563bb48de2a877

Authored by Nicolás Guarnieri
2 parents a587acd43f f5ba2800f1
Exists in master and in 1 other branch develop

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request !1
Showing 2 changed files   Show diff stats
... ... @@ -8,14 +8,14 @@
8 8 "compile": "gulp compile",
9 9 "gulp-pre-commit": "gulp pre-commit",
10 10 "postinstall": "npm run compile && gulp clean-post-install",
11   - "install-dev": "npm install -D gulp gulp-connect jasmine-core pre-commit angular angular-route angular-cookies bootstrap font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-replace jquery jshint pump && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas"
  11 + "install-dev": "npm install -D gulp gulp-uglify gulp-connect jasmine-core pre-commit angular angular-route angular-cookies bootstrap font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-replace jquery jshint pump && npm i -D git+http://git.focasoftware.com/npm/foca-directivas.git"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
15 15 ],
16 16 "repository": {
17 17 "type": "git",
18   - "url": "https://debo.suite.repo/modulos-npm/foca-seguimiento.git"
  18 + "url": "http://git.focasoftware.com/npm/foca-seguimiento.git"
19 19 },
20 20 "author": "Foca Software",
21 21 "license": "ISC",
... ... @@ -32,29 +32,29 @@
32 32 "gulp-uglify-es": "^1.0.x",
33 33 "jshint": "^2.9.x",
34 34 "pump": "^3.0.x",
35   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
  35 + "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git"
36 36 },
37 37 "devDependencies": {
38 38 "angular": "^1.7.5",
39 39 "angular-cookies": "^1.7.5",
40 40 "angular-route": "^1.7.5",
41 41 "bootstrap": "^4.1.3",
42   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas",
  42 + "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
43 43 "font-awesome": "^4.7.0",
44 44 "gulp": "^3.9.1",
45   - "gulp-angular-templatecache": "2.2.3",
  45 + "gulp-angular-templatecache": "^2.2.5",
46 46 "gulp-clean": "^0.4.0",
47   - "gulp-connect": "^5.6.1",
48   - "gulp-htmlmin": "5.0.1",
49   - "gulp-jshint": "2.1.0",
50   - "gulp-rename": "1.4.0",
51   - "gulp-replace": "1.0.0",
  47 + "gulp-connect": "^5.7.0",
  48 + "gulp-htmlmin": "^5.0.1",
  49 + "gulp-jshint": "^2.1.0",
  50 + "gulp-rename": "^1.4.0",
  51 + "gulp-replace": "^1.0.0",
52 52 "gulp-sequence": "^1.0.0",
53   - "gulp-uglify-es": "1.0.4",
54   - "jasmine-core": "^3.2.1",
  53 + "gulp-uglify-es": "^1.0.4",
  54 + "jasmine-core": "^3.3.0",
55 55 "jquery": "^3.3.1",
56   - "jshint": "2.9.6",
  56 + "jshint": "^2.9.7",
57 57 "pre-commit": "^1.2.2",
58   - "pump": "3.0.0"
  58 + "pump": "^3.0.0"
59 59 }
60 60 }
... ... @@ -3,13 +3,14 @@ angular.module('focaSeguimiento')
3 3 '$http', 'API_ENDPOINT', 'cordovaGeolocationService',
4 4 function($http, API_ENDPOINT, cordovaGeolocationService) {
5 5 return {
6   - guardarPosicion: function(idUsuario, actividad, observaciones) {
  6 + guardarPosicion: function(idUsuario, actividad, observaciones, sucursal) {
7 7 cordovaGeolocationService.getCurrentPosition(function(posicion) {
8 8 var nuevaPosicion = {
9 9 posicion: {
10 10 latitud: posicion.coords.latitude,
11 11 longitud: posicion.coords.longitude,
12 12 idUsuario: idUsuario,
  13 + sucursal: sucursal,
13 14 actividad: actividad,
14 15 observaciones: observaciones
15 16 }