Report list fix

eduardoumpierre · Apr 26, 2018 · 7a6ba5a · 7a6ba5a
1 parent 0afcfe3
commit 7a6ba5a
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/src/pages/reports/detail/reports-detail.html b/src/pages/reports/detail/reports-detail.html
@@ -10,6 +10,20 @@
     </ion-navbar>
 </ion-header>
 
-<ion-content padding>
+<ion-content>
+    <ion-list class="single-item" *ngIf="report">
+        <ion-item class="list-item">
+            <div class="highlight">{{ report.name }}</div>
+            <div>Total: {{ report.total | currency:'BRL':'R$' }}</div>
+        </ion-item>
 
+        <ion-item *ngFor="let item of report.list" class="list-item">
+            <ion-avatar item-start>
+                <img src="assets/images/placeholder-60.jpg" alt="" width="60" height="60">
+            </ion-avatar>
+
+            <p class="highlight">{{ item.name }}</p>
+            <p>Preço Un: {{ item.total | currency:'BRL':'R$' }}</p>
+        </ion-item>
+    </ion-list>
 </ion-content>
diff --git a/src/pages/reports/detail/reports-detail.ts b/src/pages/reports/detail/reports-detail.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import { ApiProvider } from "../../../providers/api/api";
 
 /**
  * Generated class for the ReportsDetailPage page.
@@ -14,6 +15,22 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
     templateUrl: 'reports-detail.html',
 })
 export class ReportsDetailPage {
-    constructor(public navCtrl: NavController, public navParams: NavParams) {
+    private id;
+    private category;
+    private report;
+
+    constructor(public navCtrl: NavController, public navParams: NavParams, private apiProvider: ApiProvider) {
+        this.id = this.navParams.get('id');
+        this.category = this.navParams.get('category');
+    }
+
+    /**
+     *
+     */
+    ionViewWillEnter() {
+        console.log('will enter');
+
+        this.apiProvider.builder('reports/' + this.category + '/' + this.id).loader().get()
+            .subscribe((res) => this.report = res);
     }
 }
diff --git a/src/pages/reports/view/reports-view.html b/src/pages/reports/view/reports-view.html
@@ -12,7 +12,7 @@
 
 <ion-content>
     <ion-list class="single-item">
-        <ion-item *ngFor="let report of reports; let i = index" class="list-item" (click)="goToDetails(report.id)">
+        <ion-item *ngFor="let report of reports" class="list-item" (click)="goToDetails(report.id)">
             <div class="highlight">{{ report.name }}</div>
             <div>Total: {{ report.total | currency:'BRL':'R$' }}</div>
         </ion-item>

diff --git a/src/pages/reports/view/reports-view.ts b/src/pages/reports/view/reports-view.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import { ApiProvider } from "../../../providers/api/api";
+import { ReportsDetailPage } from "../detail/reports-detail";
 
 /**
  * Generated class for the ReportsViewPage page.
@@ -22,8 +23,19 @@ export class ReportsViewPage {
         this.category = this.navParams.get('category');
     }
 
-    ionViewDidLoad() {
+    /**
+     *
+     */
+    ionViewWillEnter() {
         this.apiProvider.builder('reports/' + this.category).loader().get()
             .subscribe((res) => this.reports = res);
     }
+
+    /**
+     *
+     * @param {number} id
+     */
+    goToDetails(id: number) {
+        this.navCtrl.push(ReportsDetailPage, {'id': id, 'category': this.category});
+    }
 }