event

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget id="net.simplico.whitesports" version="1.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="net.simplico.whitesports" version="1.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>White Sports</name>
     <description>Virtual Run Mobile App</description>
     <author email="patumos@gmail.com" href="http://www.simplico.net/">Suebpong Sittimalairut</author>
-    <content original-src="index.html" src="http://localhost:8100" />
+    <content src="index.html" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
     <allow-navigation href="http://10.107.138.80:8100" />
     <allow-navigation href="http://203.159.52.44:8100" />
     <allow-navigation href="http://203.159.52.32:8100" />
-    <allow-navigation href="http://localhost:8100" sessionid="2f1d5c27" />
 </widget>

src/pages/event-upload/event-upload.html

 
 
 <ion-content padding>
-     <button ion-button (click)="selectImage()" color="tertiary" size='small'>Upload</button>
+    <h2>{{ title }}</h2>
+    <button ion-button (click)="selectImage()" color="tertiary" size='small' block>{{ msg }}</button>
+     <div *ngIf="eventPhotos">
+        <ion-card *ngFor="let p of eventPhotos">
+            <img [src]="'https://hc.simplico.net/static/events/'+p.fileURL"/>
+            <ion-card-content>
+            <p>Created At: {{ p.created_at.$date | date :"medium" }}</p>
+            </ion-card-content>
+        </ion-card>
+     </div>
 
 </ion-content>

src/pages/event-upload/event-upload.ts

      croppedImagePath:string = "";
 
      photoURL: any;
-     msg:string = "Upload Your Photo";
+    eventPhotos: Array<any>;
+     msg:string = "Upload Stat Photo";
+    eventId:string;
+    title: string;
 
     constructor(public navCtrl: NavController, public navParams: NavParams, private camera: Camera,   public actionSheetController: ActionSheetController, private hp: HealthProvider) {
-        let eventId = navParams.get('eventId');
-        console.log("eventId "+eventId);
+        this.eventId = navParams.get('eventId');
+        this.title = navParams.get('title');
+        //console.log("eventId "+eventId);
     }
 
-    ionViewDidLoad() {
+    async ionViewDidEnter() {
         console.log('ionViewDidLoad EventUploadPage');
+        this.eventPhotos = await this.hp.getEventPhotos(this.eventId);
+        console.log(JSON.stringify(this.eventPhotos));
     }
       async selectImage() {
          const actionSheet = await this.actionSheetController.create({
-             header: "Select Image source",
+             title: "Select Image source",
              buttons: [{
                  text: 'Load from Library',
                  handler: () => {
 
             console.log(this.croppedImagePath);
             this.msg = "Uploading ...";
-            let r0  = await this.hp.uploadPhoto(imageData);
-            this.photoURL = await this.hp.getPhoto();
+            let r0  = await this.hp.uploadPhoto(this.eventId, imageData);
+            this.eventPhotos = await this.hp.getEventPhotos(this.eventId);
+            //this.photoURL = await this.hp.getPhoto();
             this.msg = "Upload Your Photo";
             console.log("r0");
             console.log(r0);

src/pages/event/event.html

       </button>
     </ion-col>
     <ion-col>
-      <button ion-button icon-start color='success' block (click)="joinEvent(p.id)">
+      <button ion-button icon-start color='success' block (click)="joinEvent(p.id, p.title.rendered)">
         <ion-icon name="text"></ion-icon>
-        <div>Join</div>
+        <div>Upload</div>
       </button>
     </ion-col>
   </ion-row>

src/pages/event/event.ts

 import { NativeStorage } from '@ionic-native/native-storage';
 import { InAppBrowser } from '@ionic-native/in-app-browser';
 import { EventUploadPage }  from '../event-upload/event-upload';
+import { LoginPage }  from '../login/login';
 /**
  * Generated class for the EventPage page.
  *
     openLink(link: string) {
          this.ab.create(link, '_blank');
     }
-    joinEvent(id) {
-        console.log("join "+id);
-        this.navCtrl.push(EventUploadPage, { eventId: id });
+    async joinEvent(id, title) {
+        if(await this.hp.isLogin() == false ) {
+            this.navCtrl.parent.select(3);
+            console.log("token");
+        }else {
+            this.navCtrl.push(EventUploadPage, { eventId: id , title: title});
+        }
     }
 }

src/pages/login/login.html

                                     <ion-card-title>
                                         {{ profileObject.firstname }} {{ profileObject.lastname }}
                                     </ion-card-title>
+                                    <br/>
+                                    <p>
+                                    
+                                    Bib No.:
+                                    <span style='background-color:#f00; color:#fff; font-weight:bold; font-size:large;padding:0.5em'>
+                                       {{ profileObject.athId }}
+                                    </span></p>
                                     <p>
                                     {{ profileObject.city }} {{ profileObject.state }} {{ profileObject.country }}<br>
                                     {{ profileObject.description }}
                                         </div>
                                     </ion-label>
                                     <ion-input placeholder="Enter Tel." [(ngModel)]="profile.tel" required name='tel' #tel="ngModel"></ion-input>
-
                                     <ion-label color="danger" *ngIf="tel.invalid && (tel.dirty || tel.touched)">
                                         <div *ngIf="tel.errors.required">
                                             Tel. is required.
                                         </div>
                                     </ion-label>
+                                    <ion-item>
+                                        <ion-label>Birthdate: </ion-label>
+                                        <ion-datetime displayFormat="DD/MM/YYYY" [(ngModel)]="profile.birthDate" required name='birthDate' #birthDate="ngModel" placeholder="Enter Your Birthdate"></ion-datetime>
+
+                                    <ion-label color="danger" *ngIf="birthDate.invalid && (birthDate.dirty || birthDate.touched)">
+                                        <div *ngIf="birthDate.errors.required">
+                                            Birthdate. is required.
+                                        </div>
+                                    </ion-label>
+                                    </ion-item>
                                      <ion-textarea placeholder="Enter Your Address" [(ngModel)]="profile.address" required name='address' #address="ngModel"></ion-textarea>
 
                                     <ion-label color="danger" *ngIf="address.invalid && (address.dirty || address.touched)">
                                         </div>
                                     </ion-label>
                                         <button ion-button  color="primary" name='updateProfile' type='submit' block>
-                                            <ion-icon name='save'></ion-icon>
+                                            <ion-icon name='create'></ion-icon>
                                             Update Profile
                                         </button>
                                         <!--

src/pages/login/login.ts

     email: string;
     tel: string;
     address: string;
+    birthDate: string;
 }
 //@IonicPage()
 
                                 console.dir(acts.output.firstname, acts.output.lastname);
                                 this.nativeStorage.setItem('profileObject', acts.output);
                                 this.profileObject = acts.output;
+
+                                this.nativeStorage.setItem('athId', this.profileObject.athId);
                                 this.hp.getWSProfile(this.profileObject.athId,this.token)
                                     .subscribe( wsdata => {
                                         console.log(JSON.stringify(wsdata));
                                         this.profile.tel = wsdata['output']['tel'];
                                         this.profile.email = wsdata['output']['email'];
                                         this.profile.address = wsdata['output']['address'];
+                                        this.profile.birthDate = (new Date(wsdata['output']['birthDate']['$date'])).toISOString();
                                         console.log(JSON.stringify(this.profile));
                                     }, error => {
                                         console.log("error "+error);
                 tel: f.value.tel,
                 address: f.value.address,
                 token: this.token,
+                birthDate: f.value.birthDate
             };
             this.hp.saveWSProfile(profile)
                 .subscribe(

src/providers/health/health.ts

 import { FileTransfer, FileUploadOptions, FileTransferObject } from '@ionic-native/file-transfer';
 import { NativeStorage } from '@ionic-native/native-storage';
 
+
 /*
   Generated class for the HealthProvider provider.
 
 const REDEEM_API = HOSTBASE + "/coredata/api/redeem";
 const SV_API = HOSTBASE + "/strava/api";
 const UPLOAD_API = HOSTBASE + "/strava/uploadPhoto";
+const GET_EVENT_PHOTO_API = HOSTBASE + "/strava/getEventPhotos";
 const WP = "https://whitesports.net/wp-json/wp/v2/";
 
 @Injectable()
         return this.http.post(COREAPI, {token: token, action: "HISTORY"});
     }
 
+    async isLogin(){
+        return await this.storage.getItem('token')
+            .then(
+                data => { return data;  }, 
+                error => { return false;  }
+            );
+    }
+    async getAthId(){
+        return await this.storage.getItem('athId')
+            .then(
+                data => { return data;  }, 
+                error => { return false;  }
+            );
+    }
     totalCal(): Observable<any> {
         return this.http.post(COREAPI, {action: "TOTALCAL"});
     }
         console.log("get ath ", athId);
         return this.http.post(COREAPI, {action: "GETRUNNER", athId: athId});
     }
+    async getEventPhotos(eventId) {
+         let athId = await this.getAthId();
+        console.log(GET_EVENT_PHOTO_API)
+        let photos = await this.nhttp.get(GET_EVENT_PHOTO_API+"?athId="+athId+"&eventId="+ eventId,{}, {}).then(
+            res => {
+                console.log("res ", JSON.stringify(res));
+                let data = JSON.parse(res.data);
+                return data.output;
+            },
+            error => {
+                console.log(JSON.stringify(error));
+                return null;
+            }
+        );
+        return photos;
+    }
     saveWSProfile(profile) {
-        return this.http.post(SV_API, {action: "UPDATE_PROFILE", athId: profile['athId'],  fullName: profile['fullName'], email: profile['email'], tel: profile['tel'], address: profile['address'], token: profile['token']});
+        let d = new Date(profile['birthDate']);
+        console.log(d.getMonth())
+        let fd = d.getFullYear()  + "-" + (d.getMonth() + 1) + "-" +d.getDate();
+
+        return this.http.post(SV_API, {action: "UPDATE_PROFILE", athId: profile['athId'],  fullName: profile['fullName'], email: profile['email'], tel: profile['tel'], address: profile['address'], token: profile['token'], birthDate: fd});
     }
+
     getWSProfile(athId, token) {
         return this.http.post(SV_API, {action: "GET_WS_PROFILE", athId: athId,   token: token });
     }
         let url = UPLOAD_API + "?eventId="+eventId+"&athId="+athId;
         return url;
     }
-     async uploadPhoto(filePath) {
+    
+     async uploadPhoto(eventId, filePath) {
+         let athId = await this.getAthId();
+
+         if( athId ) {
+             const fileTransfer: FileTransferObject = this.transfer.create();
+
+             let options: FileUploadOptions = {
+                 fileKey: 'file',
+                 //fileName: 'name.jpg',
+             }
+
+             return fileTransfer.upload(filePath, this.uploadPhotoUrl(eventId, athId), options)
+                 .then((data) => {
+                     // success
+                     console.log("from tranfer");
+                     console.log(data);
+                     return JSON.parse(data.response);
+                 }, (err) => {
+                     // error
+                     return err;
+                 })
+         } else {
+             return null;
+         }
 
          /*
          let info = await this.kohaService.getPatronInfo();