Merge branch 'master' into 'master'

Master See merge request !2

Merge branch 'master' into 'master'
Master See merge request !2
Jose Pinto
2 parents 7dbdceaaf9 443e05cbae
Showing 3 changed files Show diff stats
package.json
src/js/controller.js
src/views/agendar-visita.html
 {
-    "name": "foca-activar-hoja-ruta",
+    "name": "foca-agendar-visita",
     "version": "0.0.1",
     "description": "",
     "main": "index.js",
@@ -13,6 +13,10 @@
     "pre-commit": [
         "gulp-pre-commit"
     ],
+    "repository": {
+        "type": "git",
+        "url": "http://git.focasoftware.com/npm/foca-agendar-visita.git"
+    },
     "author": "",
     "license": "ISC",
     "devDependencies": {
@@ -83,8 +83,6 @@ angular.module(&#39;focaAgendarVisita&#39;)
                 focaAgendarVisitaService
                     .guardarVisita({
                         idVisitante: $scope.visita.visitante.NUM,
-                        tipoVisitante: ($scope.visita.visitante.rol !== 3) ?
-                            $scope.visita.visitante.rol : $scope.rol,
                         idCliente: $scope.visita.cliente.cod
                     })
                     .then(function(data) {
@@ -92,7 +90,7 @@ angular.module(&#39;focaAgendarVisita&#39;)
                             rol,
                             data.data.id,
                             $scope.visita.observacion,
-                            true
+                            data.data.id
                         );
                     })
                     .then(function() {
@@ -69,7 +69,7 @@
             </div>
             <div class="form-group mb-2 col-md-6 d-md-flex">
                 <label class="col-form-label col-md-4 col-12">Observaciones</label>
-                <div class="input-group col-md-8 col-12 pl-0">
+                <div class="input-group col-md-8 col-12">
                     <textarea 
                         rows="5"
                         class="form-control"
1	1	{
2		- "name": "foca-activar-hoja-ruta",
	2	+ "name": "foca-agendar-visita",
3	3	"version": "0.0.1",
4	4	"description": "",
5	5	"main": "index.js",
...	...	@@ -13,6 +13,10 @@
13	13	"pre-commit": [
14	14	"gulp-pre-commit"
15	15	],
	16	+ "repository": {
	17	+ "type": "git",
	18	+ "url": "http://git.focasoftware.com/npm/foca-agendar-visita.git"
	19	+ },
16	20	"author": "",
17	21	"license": "ISC",
18	22	"devDependencies": {
...	...	@@ -83,8 +83,6 @@ angular.module('focaAgendarVisita')
83	83	focaAgendarVisitaService
84	84	.guardarVisita({
85	85	idVisitante: $scope.visita.visitante.NUM,
86		- tipoVisitante: ($scope.visita.visitante.rol !== 3) ?
87		- $scope.visita.visitante.rol : $scope.rol,
88	86	idCliente: $scope.visita.cliente.cod
89	87	})
90	88	.then(function(data) {
...	...	@@ -92,7 +90,7 @@ angular.module('focaAgendarVisita')
92	90	rol,
93	91	data.data.id,
94	92	$scope.visita.observacion,
95		- true
	93	+ data.data.id
96	94	);
97	95	})
98	96	.then(function() {
...	...	@@ -69,7 +69,7 @@
69	69	</div>
70	70	<div class="form-group mb-2 col-md-6 d-md-flex">
71	71	<label class="col-form-label col-md-4 col-12">Observaciones</label>
72		- <div class="input-group col-md-8 col-12 pl-0">
	72	+ <div class="input-group col-md-8 col-12">
73	73	<textarea
74	74	rows="5"
75	75	class="form-control"