arnaucube/commonroutesApp
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesApp.git synced 2026-02-07 03:26:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

icon and splashscreen updated, askForCar and askForPackage implemented, visualization of type of travel in the travels view

Browse Source
This commit is contained in:
arnaucode
2017-07-11 22:36:14 +02:00
parent 72111df0d3
commit 24c503eee1
82 changed files with 370 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
www/js/app.js
View File

@@ -24,8 +24,8 @@ angular.module('starter', [
'app.travel',
'app.newTravel',
'app.offerCar',
/* 'app.askCar',
'app.askPackage',*/
'app.askForCar',
'app.askForPackage',
'app.users',
'app.user',
'app.userTravels',
@@ -137,6 +137,24 @@ angular.module('starter', [
}
}
})
.state('app.askForCar', {
url: '/askForCar',
views: {
'menuContent': {
templateUrl: 'templates/askForCar.html',
controller: 'AskForCarCtrl'
}
}
})
.state('app.askForPackage', {
url: '/askForPackage',
views: {
'menuContent': {
templateUrl: 'templates/askForPackage.html',
controller: 'AskForPackageCtrl'
}
}
})
.state('app.users', {
url: '/users',
views: {

81
www/js/askForCar.js Normal file
View File

@@ -0,0 +1,81 @@
angular.module('app.askForCar', ['pascalprecht.translate', 'ui-leaflet'])
.controller('AskForCarCtrl', function($scope, $stateParams, $translate,
$http, $filter, $ionicLoading) {
$scope.newtravel={};
$scope.newtravel.from={
lat: 0,
long:0
};
$scope.newtravel.to={
lat: 0,
long:0
};
$scope.center= {
lat: 0,
lng: 0,
zoom: 1
};
$scope.markers=new Array();
$scope.tiles= {
url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
options: {
attribution: '<a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}
};
$scope.createTravel =function(){
$scope.newtravel.type="asking";
$http({
url: urlapi + 'travels',
method: "POST",
data: $scope.newtravel
})
.then(function(data) {
console.log(data);
window.location="#app/travels"
},
function(data) { // optional
// failed
console.log(data);
$ionicLoading.show({ template: 'Complete all parameters first', noBackdrop: true, duration: 2000 });
});
};
$scope.getGeo = function(){
$scope.markers=[];
console.log($scope.newtravel.from.name);
console.log($scope.newtravel.to.name);
$http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.from.name + '&format=json&limit=1')
.then(function(data) {
console.log(data);
if(data.data[0])
{
$scope.newtravel.from.lat=data.data[0].lat;
$scope.newtravel.from.long=data.data[0].lon;
$scope.newtravel.from.name=data.data[0].display_name;
$scope.markers.push({
lat: Number(data.data[0].lat),
lng: Number(data.data[0].lon),
message: data.data[0].display_name
});
}
$http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.to.name + '&format=json&limit=1')
.then(function(data) {
if(data.data[0])
{
$scope.newtravel.to.lat=data.data[0].lat;
$scope.newtravel.to.long=data.data[0].lon;
$scope.newtravel.to.name=data.data[0].display_name;
$scope.markers.push({
lat: Number(data.data[0].lat),
lng: Number(data.data[0].lon),
message: data.data[0].display_name
});
}
});
});
};
});

81
www/js/askForPackage.js Normal file
View File

@@ -0,0 +1,81 @@
angular.module('app.askForPackage', ['pascalprecht.translate', 'ui-leaflet'])
.controller('AskForPackageCtrl', function($scope, $stateParams, $translate,
$http, $filter, $ionicLoading) {
$scope.newtravel={};
$scope.newtravel.from={
lat: 0,
long:0
};
$scope.newtravel.to={
lat: 0,
long:0
};
$scope.center= {
lat: 0,
lng: 0,
zoom: 1
};
$scope.markers=new Array();
$scope.tiles= {
url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
options: {
attribution: '<a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}
};
$scope.createTravel =function(){
$scope.newtravel.type="package";
$http({
url: urlapi + 'travels',
method: "POST",
data: $scope.newtravel
})
.then(function(data) {
console.log(data);
window.location="#app/travels"
},
function(data) { // optional
// failed
console.log(data);
$ionicLoading.show({ template: 'Complete all parameters first', noBackdrop: true, duration: 2000 });
});
};
$scope.getGeo = function(){
$scope.markers=[];
console.log($scope.newtravel.from.name);
console.log($scope.newtravel.to.name);
$http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.from.name + '&format=json&limit=1')
.then(function(data) {
console.log(data);
if(data.data[0])
{
$scope.newtravel.from.lat=data.data[0].lat;
$scope.newtravel.from.long=data.data[0].lon;
$scope.newtravel.from.name=data.data[0].display_name;
$scope.markers.push({
lat: Number(data.data[0].lat),
lng: Number(data.data[0].lon),
message: data.data[0].display_name
});
}
$http.get('http://nominatim.openstreetmap.org/search?q=' + $scope.newtravel.to.name + '&format=json&limit=1')
.then(function(data) {
if(data.data[0])
{
$scope.newtravel.to.lat=data.data[0].lat;
$scope.newtravel.to.long=data.data[0].lon;
$scope.newtravel.to.name=data.data[0].display_name;
$scope.markers.push({
lat: Number(data.data[0].lat),
lng: Number(data.data[0].lon),
message: data.data[0].display_name
});
}
});
});
};
});