-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from phndavid13/ultimoCommit
Implementacion de arreglo para los vehiculos.
- Loading branch information
Showing
5 changed files
with
147 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,86 +2,86 @@ | |
| 1 verbose cli [ 'C:\\Program Files\\nodejs\\\\node.exe', | ||
| 1 verbose cli 'C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js', | ||
| 1 verbose cli 'install', | ||
| 1 verbose cli 'chpass' ] | ||
| 2 info using [email protected] | ||
| 3 info using [email protected] | ||
| 1 verbose cli 'magnific', | ||
| 1 verbose cli '-popup' ] | ||
| 2 info using [email protected] | ||
| 3 info using [email protected] | ||
| 4 verbose node symlink C:\Program Files\nodejs\\node.exe | ||
| 5 silly cache add args [ 'chpass', null ] | ||
| 6 verbose cache add spec chpass | ||
| 7 silly cache add parsed spec { raw: 'chpass', | ||
| 7 silly cache add scope: null, | ||
| 7 silly cache add name: 'chpass', | ||
| 7 silly cache add rawSpec: '', | ||
| 7 silly cache add spec: '*', | ||
| 7 silly cache add type: 'range' } | ||
| 8 verbose addNamed chpass@* | ||
| 9 silly addNamed semver.valid null | ||
| 10 silly addNamed semver.validRange * | ||
| 11 silly addNameRange { name: 'chpass', range: '*', hasData: false } | ||
| 12 silly mapToRegistry name chpass | ||
| 13 silly mapToRegistry using default registry | ||
| 14 silly mapToRegistry registry https://registry.npmjs.org/ | ||
| 15 silly mapToRegistry uri https://registry.npmjs.org/chpass | ||
| 16 verbose addNameRange registry:https://registry.npmjs.org/chpass not in flight; fetching | ||
| 17 verbose request uri https://registry.npmjs.org/chpass | ||
| 18 verbose request no auth needed | ||
| 19 info attempt registry request try #1 at 14:03:01 | ||
| 20 verbose request id 973ef2b05e7a6a4b | ||
| 21 http request GET https://registry.npmjs.org/chpass | ||
| 22 http 404 https://registry.npmjs.org/chpass | ||
| 23 verbose headers { date: 'Sat, 14 Mar 2015 19:03:09 GMT', | ||
| 23 verbose headers server: 'CouchDB/1.6.1 (Erlang OTP/R14B04)', | ||
| 23 verbose headers 'content-type': 'application/json', | ||
| 23 verbose headers 'cache-control': 'max-age=0', | ||
| 23 verbose headers 'content-length': '52', | ||
| 23 verbose headers 'accept-ranges': 'bytes', | ||
| 23 verbose headers via: '1.1 varnish', | ||
| 23 verbose headers age: '0', | ||
| 23 verbose headers 'x-served-by': 'cache-iad2121-IAD', | ||
| 23 verbose headers 'x-cache': 'MISS', | ||
| 23 verbose headers 'x-cache-hits': '0', | ||
| 23 verbose headers 'x-timer': 'S1426359789.238725,VS0,VE26', | ||
| 23 verbose headers 'keep-alive': 'timeout=10, max=50', | ||
| 23 verbose headers connection: 'Keep-Alive' } | ||
| 24 silly get cb [ 404, | ||
| 24 silly get { date: 'Sat, 14 Mar 2015 19:03:09 GMT', | ||
| 24 silly get server: 'CouchDB/1.6.1 (Erlang OTP/R14B04)', | ||
| 24 silly get 'content-type': 'application/json', | ||
| 24 silly get 'cache-control': 'max-age=0', | ||
| 24 silly get 'content-length': '52', | ||
| 24 silly get 'accept-ranges': 'bytes', | ||
| 24 silly get via: '1.1 varnish', | ||
| 24 silly get age: '0', | ||
| 24 silly get 'x-served-by': 'cache-iad2121-IAD', | ||
| 24 silly get 'x-cache': 'MISS', | ||
| 24 silly get 'x-cache-hits': '0', | ||
| 24 silly get 'x-timer': 'S1426359789.238725,VS0,VE26', | ||
| 24 silly get 'keep-alive': 'timeout=10, max=50', | ||
| 24 silly get connection: 'Keep-Alive' } ] | ||
| 25 verbose stack Error: 404 Not Found: chpass | ||
| 25 verbose stack at CachingRegistryClient.<anonymous> (C:\Program Files\nodejs\node_modules\npm\node_modules\npm-registry-client\lib\request.js:251:14) | ||
| 25 verbose stack at Request._callback (C:\Program Files\nodejs\node_modules\npm\node_modules\npm-registry-client\lib\request.js:178:14) | ||
| 25 verbose stack at Request.self.callback (C:\Program Files\nodejs\node_modules\npm\node_modules\request\request.js:344:22) | ||
| 25 verbose stack at Request.emit (events.js:110:17) | ||
| 25 verbose stack at Request.<anonymous> (C:\Program Files\nodejs\node_modules\npm\node_modules\request\request.js:1239:14) | ||
| 25 verbose stack at Request.emit (events.js:129:20) | ||
| 25 verbose stack at IncomingMessage.<anonymous> (C:\Program Files\nodejs\node_modules\npm\node_modules\request\request.js:1187:12) | ||
| 25 verbose stack at IncomingMessage.emit (events.js:129:20) | ||
| 25 verbose stack at _stream_readable.js:908:16 | ||
| 25 verbose stack at process._tickCallback (node.js:355:11) | ||
| 26 verbose statusCode 404 | ||
| 27 verbose pkgid chpass | ||
| 28 verbose cwd C:\Users\N.David\Documents\GitHub\integratic_1.0 | ||
| 29 error Windows_NT 6.3.9600 | ||
| 30 error argv "C:\\Program Files\\nodejs\\\\node.exe" "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "install" "chpass" | ||
| 31 error node v0.12.0 | ||
| 32 error npm v2.5.1 | ||
| 33 error code E404 | ||
| 34 error 404 Not Found: chpass | ||
| 34 error 404 | ||
| 34 error 404 'chpass' is not in the npm registry. | ||
| 34 error 404 You should bug the author to publish it (or use the name yourself!) | ||
| 34 error 404 | ||
| 34 error 404 Note that you can also install from a | ||
| 34 error 404 tarball, folder, http url, or git url. | ||
| 35 verbose exit [ 1, true ] | ||
| 5 verbose cache add [ 'magnific', null ] | ||
| 6 verbose cache add name=undefined spec="magnific" args=["magnific",null] | ||
| 7 verbose parsed url { protocol: null, | ||
| 7 verbose parsed url slashes: null, | ||
| 7 verbose parsed url auth: null, | ||
| 7 verbose parsed url host: null, | ||
| 7 verbose parsed url port: null, | ||
| 7 verbose parsed url hostname: null, | ||
| 7 verbose parsed url hash: null, | ||
| 7 verbose parsed url search: null, | ||
| 7 verbose parsed url query: null, | ||
| 7 verbose parsed url pathname: 'magnific', | ||
| 7 verbose parsed url path: 'magnific', | ||
| 7 verbose parsed url href: 'magnific' } | ||
| 8 silly lockFile ef57f856-magnific magnific | ||
| 9 verbose lock magnific C:\Users\user\AppData\Roaming\npm-cache\ef57f856-magnific.lock | ||
| 10 silly lockFile ef57f856-magnific magnific | ||
| 11 silly lockFile ef57f856-magnific magnific | ||
| 12 verbose addNamed [ 'magnific', '' ] | ||
| 13 verbose addNamed [ null, '*' ] | ||
| 14 silly lockFile b386d140-magnific magnific@ | ||
| 15 verbose lock magnific@ C:\Users\user\AppData\Roaming\npm-cache\b386d140-magnific.lock | ||
| 16 silly addNameRange { name: 'magnific', range: '*', hasData: false } | ||
| 17 verbose request where is /magnific | ||
| 18 verbose request registry https://registry.npmjs.org/ | ||
| 19 verbose request id 682ccc9c9421c8dc | ||
| 20 verbose url raw /magnific | ||
| 21 verbose url resolving [ 'https://registry.npmjs.org/', './magnific' ] | ||
| 22 verbose url resolved https://registry.npmjs.org/magnific | ||
| 23 verbose request where is https://registry.npmjs.org/magnific | ||
| 24 info trying registry request attempt 1 at 15:20:00 | ||
| 25 http GET https://registry.npmjs.org/magnific | ||
| 26 http 404 https://registry.npmjs.org/magnific | ||
| 27 verbose headers { date: 'Tue, 24 Mar 2015 20:20:00 GMT', | ||
| 27 verbose headers server: 'CouchDB/1.5.0 (Erlang OTP/R16B03)', | ||
| 27 verbose headers 'content-type': 'application/json', | ||
| 27 verbose headers 'cache-control': 'max-age=0', | ||
| 27 verbose headers 'content-length': '51', | ||
| 27 verbose headers 'accept-ranges': 'bytes', | ||
| 27 verbose headers via: '1.1 varnish', | ||
| 27 verbose headers age: '0', | ||
| 27 verbose headers 'x-served-by': 'cache-iad2133-IAD', | ||
| 27 verbose headers 'x-cache': 'MISS', | ||
| 27 verbose headers 'x-cache-hits': '0', | ||
| 27 verbose headers 'x-timer': 'S1427228400.453713,VS0,VE90', | ||
| 27 verbose headers 'keep-alive': 'timeout=10, max=50', | ||
| 27 verbose headers connection: 'Keep-Alive' } | ||
| 28 silly registry.get cb [ 404, | ||
| 28 silly registry.get { date: 'Tue, 24 Mar 2015 20:20:00 GMT', | ||
| 28 silly registry.get server: 'CouchDB/1.5.0 (Erlang OTP/R16B03)', | ||
| 28 silly registry.get 'content-type': 'application/json', | ||
| 28 silly registry.get 'cache-control': 'max-age=0', | ||
| 28 silly registry.get 'content-length': '51', | ||
| 28 silly registry.get 'accept-ranges': 'bytes', | ||
| 28 silly registry.get via: '1.1 varnish', | ||
| 28 silly registry.get age: '0', | ||
| 28 silly registry.get 'x-served-by': 'cache-iad2133-IAD', | ||
| 28 silly registry.get 'x-cache': 'MISS', | ||
| 28 silly registry.get 'x-cache-hits': '0', | ||
| 28 silly registry.get 'x-timer': 'S1427228400.453713,VS0,VE90', | ||
| 28 silly registry.get 'keep-alive': 'timeout=10, max=50', | ||
| 28 silly registry.get connection: 'Keep-Alive' } ] | ||
| 29 silly lockFile b386d140-magnific magnific@ | ||
| 30 silly lockFile b386d140-magnific magnific@ | ||
| 31 error 404 404 Not Found: magnific | ||
| 31 error 404 | ||
| 31 error 404 'magnific' is not in the npm registry. | ||
| 31 error 404 You should bug the author to publish it | ||
| 31 error 404 | ||
| 31 error 404 Note that you can also install from a | ||
| 31 error 404 tarball, folder, or http url, or git url. | ||
| 32 error System Windows_NT 6.2.9200 | ||
| 33 error command "C:\\Program Files\\nodejs\\\\node.exe" "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "install" "magnific" "-popup" | ||
| 34 error cwd C:\Users\user\Dropbox\Integratic\integratic_1.0 | ||
| 35 error node -v v0.10.33 | ||
| 36 error npm -v 1.4.28 | ||
| 37 error code E404 | ||
| 38 verbose exit [ 1, true ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,49 @@ | ||
| angular.module('app',['ngRoute']) | ||
| .config(function($routeProvider) | ||
| { | ||
| 'use strict'; | ||
| $routeProvider.when('/', | ||
| var app = angular.module('app',['ngRoute']); | ||
| app | ||
| .config(function($routeProvider) | ||
| { | ||
| 'use strict'; | ||
| $routeProvider.when('/', | ||
| { | ||
| templateUrl: 'view/map.html' | ||
| controller: 'VehiculesController' | ||
| }) | ||
| .when('/map', | ||
| .otherwise( | ||
| { | ||
| templateUrl: 'view/map.html' | ||
| }) | ||
| .when('/vehicle', | ||
| { | ||
| templateUrl: 'view/vehicle.html' | ||
| }) | ||
| .when('/remote-vehicle', | ||
| { | ||
| templateUrl: 'view/remote-vehicle.html' | ||
| }).otherwise( | ||
| { | ||
| redirectTo: '/' | ||
| }); | ||
| redirectTo: '/' | ||
| }) | ||
| }); | ||
| app.factory('vehiculesFactory',function(){ | ||
| var vehicules = [ | ||
| {model: 'Aveo 2013',placa: 'VCH-123',state: 'on', doors: 'locked',direction: 'cra 103 #11-40',trackerNumber: '3108526996'}, | ||
| {model: 'Aveo 2013',placa: 'VCH-123',state: 'on', doors: 'locked',direction: 'cra 103 #11-40',trackerNumber: '3108526996'}, | ||
| {model: 'Aveo 2013',placa: 'VCH-123',state: 'on', doors: 'locked',direction: 'cra 103 #11-40',trackerNumber: '3108526996'}, | ||
| {model: 'Aveo 2013',placa: 'VCH-123',state: 'on', doors: 'locked',direction: 'cra 103 #11-40',trackerNumber: '3108526996'}, | ||
| {model: 'Aveo 2013',placa: 'VCH-123',state: 'on', doors: 'locked',direction: 'cra 103 #11-40',trackerNumber: '3108526996'}, | ||
| {model: 'Aveo 2013',placa: 'VCH-123',state: 'on', doors: 'locked',direction: 'cra 103 #11-40',trackerNumber: '3108526996'}, | ||
| {model: 'Aveo 2013',placa: 'VCH-123',state: 'on', doors: 'locked',direction: 'cra 103 #11-40',trackerNumber: '3108526996'} | ||
| ]; | ||
| var factory={}; | ||
| factory.getVehicules = function(){ | ||
| return vehicules; | ||
| } | ||
| return factory; | ||
| }); | ||
| var controllers = {}; | ||
| controllers.VehiculesController = function($scope,vehiculesFactory){ | ||
| $scope.vehicules = vehiculesFactory.getVehicules(); | ||
| $scope.addVehicule = function(){ | ||
| console.log("se ejecuto"); | ||
| $scope.vehicules.push({model: $scope.newVehicule.model, | ||
| placa: $scope.newVehicule.placa, | ||
| state:'off', | ||
| doors: 'loocked', | ||
| direction: 'nn', | ||
| trackerNumber: $scope.newVehicule.trackerNumber | ||
| }); | ||
| $scope.newVehicule.model =''; | ||
| $scope.newVehicule.placa = ''; | ||
| $scope.newVehicule.trackerNumber = ''; | ||
| } | ||
| }; | ||
| app.controller(controllers); | ||
|
|