+
+
+
+
+
+
+
+ {{travel.date | date:"dd/MM HH:mm a"}}
+
+
+
+
+
+
+
+
+ {{travel.title}}
+
+
+
+
+ From: {{travel.from.name}}
+
+
+ To: {{travel.from.name}}
+
+
+ Description: {{travel.description}}
+
+
+ Can carry package
+
+
+
+
+
+
diff --git a/app/views/travel/travel.js b/app/views/travel/travel.js
new file mode 100755
index 0000000..1241a07
--- /dev/null
+++ b/app/views/travel/travel.js
@@ -0,0 +1,61 @@
+'use strict';
+
+angular.module('app.travel', ['ngRoute', 'ui-leaflet'])
+
+ .config(['$routeProvider', function($routeProvider) {
+ $routeProvider.when('/travel/:travelid', {
+ templateUrl: 'views/travel/travel.html',
+ controller: 'TravelCtrl'
+ });
+ }])
+
+ .controller('TravelCtrl', function($scope, $http, $routeParams,
+ leafletData, leafletBoundsHelpers) {
+ $scope.travel = {};
+
+
+ //map
+ $scope.center = {
+ /*lat: 0,
+ lng: 0,
+ zoom: 1*/
+ };
+ $scope.bounds = {};
+ $scope.markers = [];
+ $scope.tiles = {
+ url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+ options: {
+ attribution: '
OpenStreetMap contributors'
+ }
+ };
+
+ $http.get(urlapi + 'travels/id/' + $routeParams.travelid)
+ .then(function(data, status, headers, config) {
+ console.log('data success');
+ console.log(data);
+
+ $scope.travel = data.data;
+
+ //map
+ $scope.markers = [];
+ $scope.markers.push({
+ lat: Number($scope.travel.from.lat),
+ lng: Number($scope.travel.from.long),
+ message: $scope.travel.from.name
+ });
+ $scope.markers.push({
+ lat: Number($scope.travel.to.lat),
+ lng: Number($scope.travel.to.long),
+ message: $scope.travel.to.name
+ });
+ $scope.center = {
+ lat: (Number($scope.travel.from.lat) + Number($scope.travel.to.lat)) / 2,
+ lng: (Number($scope.travel.from.long) + Number($scope.travel.to.long)) / 2,
+ zoom: 4
+ };
+ }, function(data, status, headers, config) {
+ console.log('data error');
+ });
+
+
+ });
diff --git a/app/views/travels/travels.html b/app/views/travels/travels.html
new file mode 100755
index 0000000..3ce543f
--- /dev/null
+++ b/app/views/travels/travels.html
@@ -0,0 +1,52 @@
+
+
+
+
+
+
All travels
+
+
+
+
+
+ | Type |
+ From |
+ To |
+ Date |
+
+ |
+
+
+
+
+ |
+
+
+
+ |
+ {{travel.from.name}} |
+ {{travel.to.name}} |
+ {{travel.date | date:'yyyy/MM/dd'}} |
+
+ View |
+
+
+
+
+
+
+
+
+
diff --git a/app/views/travels/travels.js b/app/views/travels/travels.js
new file mode 100755
index 0000000..e195715
--- /dev/null
+++ b/app/views/travels/travels.js
@@ -0,0 +1,73 @@
+'use strict';
+
+angular.module('app.travels', ['ngRoute', 'ui-leaflet'])
+
+ .config(['$routeProvider', function($routeProvider) {
+ $routeProvider.when('/travels', {
+ templateUrl: 'views/travels/travels.html',
+ controller: 'TravelsCtrl'
+ });
+ }])
+
+ .controller('TravelsCtrl', function($scope, $http) {
+ $scope.travels = [];
+ $scope.loadMorePagination = true;
+ $scope.page = 0;
+
+ //map
+ $scope.center = {};
+ $scope.bounds = {};
+ $scope.markers = [];
+ $scope.paths = [];
+ $scope.tiles = {
+ url: "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+ options: {
+ attribution: '
OpenStreetMap contributors'
+ }
+ };
+
+ $http.get(urlapi + 'travels?page=' + $scope.page)
+ .then(function(data) {
+ console.log('data success');
+ console.log(data);
+ $scope.travels = data.data;
+ //draw markers on map
+ $scope.markers = [];
+ for (var i = 0; i < $scope.travels.length; i++) {
+ $scope.markers.push({
+ lat: Number($scope.travels[i].from.lat),
+ lng: Number($scope.travels[i].from.long),
+ message: $scope.travels[i].from.name
+ });
+ $scope.markers.push({
+ lat: Number($scope.travels[i].to.lat),
+ lng: Number($scope.travels[i].to.long),
+ message: $scope.travels[i].to.name
+ });
+ }
+ //draw lines between markers on map
+ $scope.paths = {};
+ var paths = [];
+ for (var i = 0; i < $scope.markers.length; i++) {
+ var x = $scope.markers[i].lat;
+ var y = $scope.markers[i].lng;
+ paths.push([x, y]);
+ }
+ $scope.paths = {
+ p1: {
+ color: '#9575CD',
+ weight: 8,
+ latlngs: paths
+ }
+ };
+ //var maplines = L.polyline(lines).addTo(map)
+
+ $scope.center = {
+ lat: (Number($scope.travels[0].from.lat) + Number($scope.travels[0].to.lat)) / 2,
+ lng: (Number($scope.travels[0].from.long) + Number($scope.travels[0].to.long)) / 2,
+ zoom: 4
+ };
+ }, function(data) {
+ console.log('data error');
+ });
+ });
diff --git a/index.html b/index.html
index 07b8383..e28697e 100755
--- a/index.html
+++ b/index.html
@@ -60,9 +60,15 @@
Download
+
+ Code
+
FairCoop
+
+ Travels
+