arnaucube/commonroutesApp
1
0
Fork 0
mirror of https://github.com/arnaucube/commonroutesApp.git synced 2026-02-06 19:16:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

travel detail from the current json, not from server

Browse Source
This commit is contained in:
idoctnef
2016-10-06 14:48:46 +02:00
parent d714f61597
commit c6fdff06c2
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config.xml
View File

@@ -1,11 +1,11 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.ionicframework.app751563" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>app</name>
<name>collectiveCar</name>
<description>
An Ionic Framework and Cordova project.
CarSharing app, for collective use.
</description>
<author email="you@example.com" href="http://example.com.com/">
Your Name Here
<author email="mail@mail.com" href="http://arnaucode.com/">
ArnauCode
</author>
<content src="index.html" />
<access origin="*" />

15
www/js/controllers.js
View File

@@ -1,6 +1,6 @@
//var urlapi="http://localhost:3000/api/";
var urlapi="https://collectivecar.paas.primustech.io/api/";
var urlapi="http://localhost:3000/api/";
//var urlapi="https://collectivecar.paas.primustech.io/api/";
//localStorage.setItem("c_username", "user2");
@@ -107,6 +107,7 @@ angular.module('starter.controllers', ['pascalprecht.translate'])
},
function(response) { // optional
// failed
$ionicLoading.show({ template: 'Username already taken', noBackdrop: true, duration: 2000 });
});
}else{
$ionicLoading.show({ template: 'First complete all parameters', noBackdrop: true, duration: 2000 });
@@ -378,14 +379,14 @@ angular.module('starter.controllers', ['pascalprecht.translate'])
};
})
.controller('TravelCtrl', function($scope, $stateParams, $http, $ionicModal, $ionicPopup) {
.controller('TravelCtrl', function($scope, $stateParams, $http, $ionicModal, $ionicPopup, $filter) {
if(localStorage.getItem('c_token')){// adding token to the headers
$http.defaults.headers.common['X-Access-Token'] = localStorage.getItem('c_token');
}
$scope.storageusername=localStorage.getItem("c_username");
$scope.travel="";
console.log($stateParams.travelId);
$http.get(urlapi + 'travels/'+$stateParams.travelId)
/*$http.get(urlapi + 'travels/'+$stateParams.travelId)
.success(function(data, status, headers,config){
console.log('data success');
console.log(data); // for browser console
@@ -398,7 +399,10 @@ angular.module('starter.controllers', ['pascalprecht.translate'])
})
.then(function(result){
travel = result.data;
});
});*/
$scope.travels= JSON.parse(localStorage.getItem('c_travels'));
$scope.travel = $filter('filter')($scope.travels, $stateParams.travelId, true)[0];
$scope.joins="";
$http.get(urlapi + 'travels/join/'+$stateParams.travelId)
.success(function(data, status, headers,config){
console.log('data success');
@@ -536,6 +540,7 @@ console.log($scope.newComment);
$scope.arrayObjectIndexOf = function(myArray, searchTerm, property) {
console.log(myArray+", "+searchTerm+", "+property);
if(myArray)
{
for(var i = 0, len = myArray.length; i < len; i++) {