From 7a6cc6b51ed5481e004b9cdebe598cc9ec2738c2 Mon Sep 17 00:00:00 2001 From: nau Date: Sat, 27 Aug 2016 18:27:11 +0200 Subject: [PATCH] offering travel model changed, adding askingtravel functionallity to the app --- app/www/css/style.css | 7 ++ app/www/img/asking.png | Bin 0 -> 8479 bytes app/www/img/collectivized.png | Bin 0 -> 1776 bytes app/www/img/localization.png | Bin 0 -> 891 bytes app/www/img/offering.png | Bin 0 -> 10002 bytes app/www/img/{box.png => package.png} | Bin app/www/img/telegram.png | Bin 0 -> 1013 bytes app/www/js/controllers.js | 35 +++++++--- app/www/templates/menu.html | 5 +- app/www/templates/newaskingtravel.html | 66 ++++++++++++++++++ ...{newtravel.html => newofferingtravel.html} | 20 ++++-- app/www/templates/travel.html | 14 +++- app/www/templates/travels.html | 7 +- server/controllers/travelController.js | 7 +- server/models/travelModel.js | 10 ++- 15 files changed, 148 insertions(+), 23 deletions(-) create mode 100644 app/www/img/asking.png create mode 100644 app/www/img/collectivized.png create mode 100644 app/www/img/localization.png create mode 100644 app/www/img/offering.png rename app/www/img/{box.png => package.png} (100%) create mode 100644 app/www/img/telegram.png create mode 100644 app/www/templates/newaskingtravel.html rename app/www/templates/{newtravel.html => newofferingtravel.html} (66%) diff --git a/app/www/css/style.css b/app/www/css/style.css index 2afdee5..ff2075d 100644 --- a/app/www/css/style.css +++ b/app/www/css/style.css @@ -13,3 +13,10 @@ .o-float-right{ float: right; } +.o-text-right{ + text-align: right; +} +.o-mini-text{ + font-size: 12px; + display: inline-block; +} diff --git a/app/www/img/asking.png b/app/www/img/asking.png new file mode 100644 index 0000000000000000000000000000000000000000..b7c8440b08c7cb209db01a66d69e2dd0b24cd143 GIT binary patch literal 8479 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 literal 0 HcmV?d00001 diff --git a/app/www/img/collectivized.png b/app/www/img/collectivized.png new file mode 100644 index 0000000000000000000000000000000000000000..a0815557855c5841bafec245d61dff0a1c7450a9 GIT binary patch literal 1776 zcmY*a3pA8z7@lz%mquDt=wgJW{+WONxskarG(-s-tJ!KJq9m7P7MnVWny8hz5XG*J z9F>r*>~<3(b4?{Fg^Hr2kPNc1->>Yp|2hBnz3=lr@AE$2cm6q(>F>MR$k5UdgTWYi zd-2wToq)dj+F<3C9Bu-ec7nTipuWETljnZVKxz=@^+N*K`_LCVw1{5~0tP+S+Rw81_7J4}jd<2ln9%It#py7*kU<^FgOy`3Yf+gsaX;^5urn58U#~G6b6Wy5;=)PCn0o> zM8VEckPsS?Oyx*bV1;0S)7Vl42-s33kxXYxR798#!88b=awJL;LS>6pBr=^yrm>_7 zB1{7yV1nwuI7f`)Xh{l~K%B;wC_%~+0~(zpRR9pQfE1Wyi_w$_Q`x`(LZ2ytfQA}I zaXN@WJBUeSDod;Y<4{BlyrIevnF^|CIzt0TAc4^+K?MSEC+PHh;px3*t&jiufFSo>`vLcZ(nNq0pX#H!$*G2I(jr)Boa%cIl0G<<)0`hJXu_F`b>F6W#xtH zKQCXodab7BMs00f-OYxE##>D?xm=-Asc$#mZE0w&P^)l@zO|%&M|>@gc0K{8C49O$qhhZJQf=UcQmtzObXE@Ya|{Z_Ul*?)`_X zHdIj#L|R`uf89(bEZr^`zOl@ z!#}p;X&brthOyoz=Q~+hS!?fTXExb1^$r@jb$<#l4_cUJKDFB1+{9PQg5ZRV2X6~m z`O4VDk9n)g3D@{4zq!u;>eAA>2_w^n*14j~eRe|VcY^04uXb_%^e5rkN|IM(On(Sb*Lf)cFP^>Ey(-lcK$PS3I4brGWR z798$PQYay)XJ$|`guGkb8{CFbU zYS3lh#Bhw6DZg&O!jObp9=Ml z&>XzDsTGlY(wOc>5|xSVxf{~>{#4(V2h|xJr!AW6zS9h)7U}qKSA+~Un0&w!p9uQi z_MZ?~o&O-TiyagwXdzm2uL*Ti-f_BWPu|ZowKl|@h|`N=+*fZw|8BfJe0i1bA!+{r Dzy{;n literal 0 HcmV?d00001 diff --git a/app/www/img/localization.png b/app/www/img/localization.png new file mode 100644 index 0000000000000000000000000000000000000000..3eaa343f343a8b5b7a2e01f21b4c01317edd2dda GIT binary patch literal 891 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 c(Hle~zFh;a3=E0zmt8srP_C+*LtPe zW01mLjJ({*VEqX)YaA0)z;M9 z-OU5@#p8~=kNIG?eOdF^6c{Z@9*#O^!D=h`||eu z_WAw!`uq9&{rvs?{{H{||NsC0|LKg`bN~PVD|Av$Qve4D2@Ve!86YAgEG;`pe1w;n zvAV&-#>mRr-Q(u+^7Hfc_WAnz{r>*`hjD;}0004uNklKn+Xk({3`0{7njV0@2GKqWD38je@cw)GE;@#8!~`+yoeX9~l8 z55EL|u1zC^rT{feoH;<-55BOJo8dXaQ5T?wnX|}v;F(hVy69P!II08G$l>hr+A{t= z^LjTZKLv71m;haSZx}yKx(Bx@M>|X?4J<*@dcEZy*_AmOV?se_lMr@ZdJY*!9Zbko zlzBJgyOQ})6%(=)2X#J*(5g=o{EUM%#ZmVxpb60AC&DJeFnh00000NkvXXu0mjfzUnfC literal 0 HcmV?d00001 diff --git a/app/www/js/controllers.js b/app/www/js/controllers.js index d0cac2e..5b26447 100644 --- a/app/www/js/controllers.js +++ b/app/www/js/controllers.js @@ -61,26 +61,45 @@ angular.module('starter.controllers', []) $scope.newtravel={}; // Create the login modal that we will use later - $ionicModal.fromTemplateUrl('templates/newtravel.html', { + $ionicModal.fromTemplateUrl('templates/newofferingtravel.html', { scope: $scope }).then(function(modal) { - $scope.modal = modal; + $scope.modalOffering = modal; + }); + + // Create the login modal that we will use later + $ionicModal.fromTemplateUrl('templates/newaskingtravel.html', { + scope: $scope + }).then(function(modal) { + $scope.modalAsking = modal; }); + // Triggered in the login modal to close it - $scope.closeNewTravel = function() { - $scope.modal.hide(); + $scope.closeNewOfferingTravel = function() { + $scope.modalOffering.hide(); + }; + // Triggered in the login modal to close it + $scope.closeNewAskingTravel = function() { + $scope.modalAsking.hide(); }; // Open the login modal - $scope.showNewTravel = function() { - $scope.modal.show(); + $scope.showNewOfferingTravel = function() { + $scope.modalOffering.show(); }; + // Open the login modal + $scope.showNewAskingTravel = function() { + $scope.modalAsking.show(); + }; + // Perform the login action when the user submits the login form - $scope.doNewTravel = function() { + $scope.doNewOfferingTravel = function() { console.log('Doing new travel', $scope.newtravel); $scope.newtravel.icon="lorry"; $scope.newtravel.generateddate=$scope.newtravel.date; $scope.newtravel.owner="user"; + + $scope.newtravel.modality="offering"; console.log($scope.newtravel); $http({ url: 'http://localhost:3000/api/travels', @@ -101,7 +120,7 @@ angular.module('starter.controllers', []) // Simulate a login delay. Remove this and replace with your login // code if using a login system $timeout(function() { - $scope.closeNewTravel(); + $scope.closeNewOfferingTravel(); }, 1000); }; }) diff --git a/app/www/templates/menu.html b/app/www/templates/menu.html index 0f32aab..1d1ef50 100644 --- a/app/www/templates/menu.html +++ b/app/www/templates/menu.html @@ -30,16 +30,13 @@ Travels - + Transport material Available cars - - Ask for a car - Users diff --git a/app/www/templates/newaskingtravel.html b/app/www/templates/newaskingtravel.html new file mode 100644 index 0000000..f18f0dc --- /dev/null +++ b/app/www/templates/newaskingtravel.html @@ -0,0 +1,66 @@ + + + +

+ + New Asking Travel {{newtravel.title}} +

+
+ + + + + + + + + Can carry package + + + + + + + Collectivized car + + + + + +
+ + + diff --git a/app/www/templates/newtravel.html b/app/www/templates/newofferingtravel.html similarity index 66% rename from app/www/templates/newtravel.html rename to app/www/templates/newofferingtravel.html index 1b8dc2f..69296bb 100644 --- a/app/www/templates/newtravel.html +++ b/app/www/templates/newofferingtravel.html @@ -12,10 +12,12 @@ @@ -24,7 +26,10 @@ nºSeats - + + + Can carry package + + + + Collectivized car + - - diff --git a/app/www/templates/travel.html b/app/www/templates/travel.html index f222bdc..64c820e 100644 --- a/app/www/templates/travel.html +++ b/app/www/templates/travel.html @@ -1,12 +1,19 @@
- + + Collectivized

{{travel.title}}

{{travel.owner}}

-
{{travel.date | date:"dd/MM HH:mm a"}}
+
+
{{travel.date | date:"dd/MM HH:mm a"}}
+
+
[periodic travel]
+
+
can carry package
+

{{travel.from}} - {{travel.to}}

nº car seats: {{trave.seats}}

{{travel.description}}

@@ -14,6 +21,9 @@

{{travel.phone}}

+

+ {{travel.telegram}} +

Ask to join diff --git a/app/www/templates/travels.html b/app/www/templates/travels.html index 73e97a3..edb1019 100644 --- a/app/www/templates/travels.html +++ b/app/www/templates/travels.html @@ -2,11 +2,12 @@

-
- +
+ +
- +

{{travel.title}}

{{travel.description}} diff --git a/server/controllers/travelController.js b/server/controllers/travelController.js index 5702625..eeab174 100644 --- a/server/controllers/travelController.js +++ b/server/controllers/travelController.js @@ -57,10 +57,15 @@ exports.addTravel = function(req, res) { from: req.body.from, to: req.body.to, date: req.body.date, + periodic: req.body.periodic, generateddate: req.body.generateddate, seats: req.body.seats, + package: req.body.package, icon: req.body.icon, - phone: req.body.phone + phone: req.body.phone, + telegram: req.body.telegram, + collectivized: req.body.collectivized, + modality: req.body.modality }); travel.save(function(err, travel) { diff --git a/server/models/travelModel.js b/server/models/travelModel.js index 2058f48..d0e8f3f 100644 --- a/server/models/travelModel.js +++ b/server/models/travelModel.js @@ -9,9 +9,17 @@ var travelSchema = new Schema({ from: { type: String }, to: { type: String }, date: { type: Date }, + periodic: { type: Boolean }, generateddate: { type: Date }, seats: { type: Number }, + package: { type: Boolean }, icon: { type: String }, - phone: { type: Number } + phone: { type: Number }, + telegram: { type: String }, + collectivized: { type: Boolean }, + modality: { type: String } //if is an offering travel or asking for travel }) module.exports = mongoose.model('travelModel', travelSchema); + + +//modality can be: offering, asking