From 3e19567226f6efb83c42768759fbb2e9d7d8f0bb Mon Sep 17 00:00:00 2001
From: idoctnef <idoctnef@openmailbox.org>
Date: Thu, 6 Oct 2016 21:17:24 +0200
Subject: [PATCH] travel join updated on change, and Help page created

---
 www/img/help.png          | Bin 0 -> 701 bytes
 www/js/app.js             |   9 +++++++++
 www/js/controllers.js     |  12 +++++++++---
 www/js/translations.js    |   1 +
 www/templates/help.html   |  16 ++++++++++++++++
 www/templates/menu.html   |   4 ++++
 www/templates/travel.html |  12 ++++++------
 7 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 www/img/help.png
 create mode 100644 www/templates/help.html

diff --git a/www/img/help.png b/www/img/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..84ce649875e8894e1ea5c7e78bbeb81720f637b5
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00003b3#c}2nYz<
z;ZNWI000SaNLh0L00`Uw00`UxpXgsa0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}
zWiD@WXPfRk8UO$Q?NCfqMgRZ*Ns`+@pWjNK-$$e1N}t_Hq1;EH+)1F^NT1wCpxsBG
z-ASO_NTA$Epxj8H+(@9@NTA$FpxjBJ+)AO`OQGFNqTNlS-BG39Ql;KlsNY$s-&(2P
zV6EX}uHk2};%&3zaJA%gx8!uU<#)N|db;L<zUPF$=a0qelE&(m$?KWQ?48W)pw8{2
z(C((u?yA%8uhsCd*6_2~@U+<Rwb}8y+w!~I^1$Bn!Qb=A<Mq$x_R!|`(&+Zo>G##?
z_txt7+3Wb)?D*X6_}%UK=JNXI^ZM@g{PX$!`1}6({Qmm<{{8;{{{H{}|NkPgWj6o-
z01<RjPE!B}2pAbHNrab}!N}U<^7Hl8s4-gr00AXQL_t(I%Z*d%TEZ|8Ob>FDLJ2C0
z7v3j|H{PNGDvIy_IJVSovRnM>{Ae?oZL+(aWenhO6@*a~28uf@4_{U_pelVLyP~EM
zYQnX3udH(@dqyu+^b}M|@IC0Qi|5z#7DW7>;llX`pS{j;Z?q4$q<M&pZ;lV+XTANk
zp6!T9eUSgtb^5+}gj$knWyWSdcGJbqXfE56asQw{jfbUlu{~}=#~jA<^>zAY&6&#S
zD{m);C>BtCd3Zl>SinM}H~TLO77bZM0`3NjHjQY&>i3$)0pyCk_d4PsP4e;<^MIDw
z?P9KIqfXB-=T@sHm}wvyx7z%yX^`l5Cpc;&>-xwr39e9*f><ub#+GetmztK?+WW8V
jiwCE8^oob~@A3Zum)Sj}tsHr}00000NkvXXu0mjf;Z}Xv

literal 0
HcmV?d00001

diff --git a/www/js/app.js b/www/js/app.js
index 39c774a..f6314a0 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -43,6 +43,15 @@ angular.module('starter', ['ionic',
       }
     }
   })
+  .state('app.help', {
+    url: '/help',
+    views: {
+      'menuContent': {
+        templateUrl: 'templates/help.html',
+        controller: 'HelpCtrl'
+      }
+    }
+  })
 
   .state('app.users', {
       url: '/users',
diff --git a/www/js/controllers.js b/www/js/controllers.js
index 8ac5abd..399b6d2 100644
--- a/www/js/controllers.js
+++ b/www/js/controllers.js
@@ -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");
@@ -460,6 +460,7 @@ angular.module('starter.controllers', ['pascalprecht.translate'])
                 $scope.travels=response.data;
                 localStorage.setItem('c_travels', JSON.stringify($scope.travels));
                 localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date()));
+                $scope.travel = $filter('filter')($scope.travels, $stateParams.travelId, true)[0];
 
         },
         function(response) { // optional
@@ -487,6 +488,7 @@ angular.module('starter.controllers', ['pascalprecht.translate'])
                 $scope.travels=response.data;
                 localStorage.setItem('c_travels', JSON.stringify($scope.travels));
                 localStorage.setItem('c_travelsLastDate', JSON.stringify(new Date()));
+                $scope.travel = $filter('filter')($scope.travels, $stateParams.travelId, true)[0];
 
         },
         function(response) { // optional
@@ -601,7 +603,8 @@ console.log($scope.newComment);
         .then(function(result){
             travels = result.data;
     });
-}).controller('SettingsCtrl', function($scope, $stateParams, $translate) {
+})
+.controller('SettingsCtrl', function($scope, $stateParams, $translate) {
   if(localStorage.getItem('lang'))//initialization
   {
     $scope.lang=localStorage.getItem('lang');
@@ -615,4 +618,7 @@ console.log($scope.newComment);
       window.localStorage.setItem('lang', lang);
       $translate.use(lang);
   };
+})
+.controller('HelpCtrl', function($scope, $stateParams, $translate) {
+  console.log("help page");
 });
diff --git a/www/js/translations.js b/www/js/translations.js
index 7bc7c69..6e41fe5 100644
--- a/www/js/translations.js
+++ b/www/js/translations.js
@@ -8,6 +8,7 @@ var translations = {
 		"Users": "Users",
 		"Logout": "Logout",
 		"Settings": "Settings",
+		"Help": "Help",
 		"Login": "Login",
 		"Username": "Username",
 		"Password": "Password",
diff --git a/www/templates/help.html b/www/templates/help.html
new file mode 100644
index 0000000..28895f0
--- /dev/null
+++ b/www/templates/help.html
@@ -0,0 +1,16 @@
+<ion-view view-title="{{'Help' | translate}}">
+  <ion-content>
+    <h1>{{'Help' | translate}}</h1>
+
+    <p>
+      <img ng-src="img/newpackage.png" class="o-img-new"/>
+      <img ng-src="img/newasking.png" class="o-img-new"/>
+      <img ng-src="img/newoffering.png" class="o-img-new"/>
+    </p>
+    <p>
+      <img ng-src="img/package.png" class="o-img-new"/>
+      <img ng-src="img/asking.png" class="o-img-new"/>
+      <img ng-src="img/offering.png" class="o-img-new"/>
+    </p>
+  </ion-content>
+</ion-view>
diff --git a/www/templates/menu.html b/www/templates/menu.html
index 224b19d..13b514d 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -40,6 +40,10 @@
             <img class='o-imgMenu' src="img/settings.png" />
           {{'Settings' | translate }}
         </ion-item>
+        <ion-item menu-close href="#/app/help">
+            <img class='o-imgMenu' src="img/help.png" />
+          {{'Help' | translate }}
+        </ion-item>
         <ion-item menu-close ng-click="logout()" ng-show="storageusername">
           {{'Logout' | translate }}
         </ion-item>
diff --git a/www/templates/travel.html b/www/templates/travel.html
index 0844218..ad24a94 100644
--- a/www/templates/travel.html
+++ b/www/templates/travel.html
@@ -52,15 +52,15 @@
         <div ng-show="storageusername && storageusername!=travel.owner">
             <p class='text-right'>
               <div ng-show="arrayObjectIndexOf(travel.joins, storageusername, 'joinedUsername')==-1">
-                <a ng-show="travel.modality=='offering'" ng-click="joinTravel()" href="#" class="button button-calm o-pull-right">{{'Ask_to_join' | translate}}</a>
-                <a ng-show="travel.modality=='asking'" ng-click="joinTravel()" href="#" class="button button-calm o-pull-right">{{'Offer_car' | translate}}</a>
-                <a ng-show="travel.modality=='package'" ng-click="joinTravel()" href="#" class="button button-calm o-pull-right">{{'Offer_car' | translate}}</a>
+                <a ng-show="travel.modality=='offering'" ng-click="joinTravel()" class="button button-calm o-pull-right">{{'Ask_to_join' | translate}}</a>
+                <a ng-show="travel.modality=='asking'" ng-click="joinTravel()" class="button button-calm o-pull-right">{{'Offer_car' | translate}}</a>
+                <a ng-show="travel.modality=='package'" ng-click="joinTravel()" class="button button-calm o-pull-right">{{'Offer_car' | translate}}</a>
               </div>
 
               <div ng-show="arrayObjectIndexOf(travel.joins, storageusername, 'joinedUsername')!=-1">
-                <a ng-show="travel.modality=='offering'" ng-click="unjoinTravel()" href="#" class="button button-assertive o-pull-right">{{'Unjoin' | translate}}</a>
-                <a ng-show="travel.modality=='asking'" ng-click="unjoinTravel()" href="#" class="button button-assertive o-pull-right">{{'Unoffer_car' | translate}}</a>
-                <a ng-show="travel.modality=='package'" ng-click="unjoinTravel()" href="#" class="button button-assertive o-pull-right">{{'Unoffer_car' | translate}}</a>
+                <a ng-show="travel.modality=='offering'" ng-click="unjoinTravel()" class="button button-assertive o-pull-right">{{'Unjoin' | translate}}</a>
+                <a ng-show="travel.modality=='asking'" ng-click="unjoinTravel()" class="button button-assertive o-pull-right">{{'Unoffer_car' | translate}}</a>
+                <a ng-show="travel.modality=='package'" ng-click="unjoinTravel()" class="button button-assertive o-pull-right">{{'Unoffer_car' | translate}}</a>
               </div>
             </p>
         </div>