From 3e39b5762f2460f9ca45330f1ecc584ce23d0f3a Mon Sep 17 00:00:00 2001
From: Eduardo Pieretti Umpierre <eduardoumpierre@hotmail.com>
Date: Thu, 9 Aug 2018 12:08:19 -0300
Subject: [PATCH] Order edit button added and login button style fix

---
 package.json                          |  2 +-
 src/app/app.component.ts              |  2 --
 src/app/app.scss                      | 28 ++++++++++++++++++++++
 src/index.html                        |  2 +-
 src/pages/login-form/login-form.scss  |  6 +++++
 src/pages/login-form/login-form.ts    |  2 --
 src/pages/orders/form/order-form.ts   |  2 ++
 src/pages/orders/index/orders.scss    | 21 +++++++++--------
 src/pages/orders/view/order-view.html |  5 ++++
 src/pages/orders/view/order-view.ts   | 34 ++++++++++-----------------
 10 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/package.json b/package.json
index e298e3f..90de022 100644
--- a/package.json
+++ b/package.json
@@ -86,4 +86,4 @@
       "android"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 714ddf8..392a6b4 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -19,8 +19,6 @@ export class MyApp {
             // Here you can do any higher level native things you might need.
             storage.get('token')
                 .then((res) => {
-                    console.log('token', res);
-
                     if (res && res != null) {
                         this.rootPage = HomePage;
                     } else {
diff --git a/src/app/app.scss b/src/app/app.scss
index 8fbb5dc..4ff3785 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -329,6 +329,10 @@ ion-list {
                     margin-bottom: 0;
                     margin-top: 0;
 
+                    > .list-item__content {
+                        padding: 0;
+                    }
+
                     > div {
 
                         > div {
@@ -381,6 +385,13 @@ ion-list {
             }
         }
     }
+
+    .table-grid--product-list {
+
+        > .single-item {
+            padding: 1rem 0;
+        }
+    }
 }
 
 form {
@@ -518,6 +529,23 @@ form {
     }
 }
 
+@media screen and (max-width: map_get($screen-breakpoints, lg)) {
+    .table-grid--product-list {
+
+        .single-item {
+            border-bottom: 1px solid #F1F1F1;
+
+            &:last-child {
+                border-bottom: none;
+            }
+
+            > ion-item {
+                padding: 0;
+            }
+        }
+    }
+}
+
 @each $size, $size-value in $screen-breakpoints {
     .hide-#{$size} {
         @media (min-width: $size-value) {
diff --git a/src/index.html b/src/index.html
index e24e32a..91d85c5 100644
--- a/src/index.html
+++ b/src/index.html
@@ -21,7 +21,7 @@
         .then(() => console.log('service worker installed'))
         .catch(err => console.error('Error', err));
     }
-  </script>-->
+  </script> -->
 
   <link href="build/main.css" rel="stylesheet">
 
diff --git a/src/pages/login-form/login-form.scss b/src/pages/login-form/login-form.scss
index 642630d..2c69009 100644
--- a/src/pages/login-form/login-form.scss
+++ b/src/pages/login-form/login-form.scss
@@ -1,4 +1,5 @@
 page-login-form {
+
     ion-navbar {
         color: #000000;
 
@@ -41,6 +42,7 @@ page-login-form {
             }
 
             &.item-input {
+
                 > .item-inner {
                     border-bottom: 1px solid #cccbd0 !important;
                     -webkit-box-shadow: none !important;
@@ -57,6 +59,10 @@ page-login-form {
             color: #FFF;
             font-size: 1.4rem;
             background-color: #3b5998;
+
+            &:hover {
+                background-color: #31497d !important;
+            }
         }
     }
 }
diff --git a/src/pages/login-form/login-form.ts b/src/pages/login-form/login-form.ts
index bffe666..c4d9b61 100644
--- a/src/pages/login-form/login-form.ts
+++ b/src/pages/login-form/login-form.ts
@@ -39,8 +39,6 @@ export class LoginFormPage {
             .then((res) => {
                 this.AuthProvider.hideLoader();
 
-                console.log('res', res);
-
                 this.storage.set('token', res.access_token).then(() => {
                     this.AuthProvider.getUser().subscribe((user) => {
                         this.storage.set('user', user).then(() => this.navCtrl.setRoot(HomePage))
diff --git a/src/pages/orders/form/order-form.ts b/src/pages/orders/form/order-form.ts
index 7fa7ad4..86d0d9c 100644
--- a/src/pages/orders/form/order-form.ts
+++ b/src/pages/orders/form/order-form.ts
@@ -82,6 +82,8 @@ export class OrderFormPage {
 
                 this.order = orderProducts;
                 this.paymentDays = paymentDate.diff(deliveryDate, 'days');
+
+                this.updateTotal();
             });
         }
 
diff --git a/src/pages/orders/index/orders.scss b/src/pages/orders/index/orders.scss
index 01d2a52..f5abae9 100644
--- a/src/pages/orders/index/orders.scss
+++ b/src/pages/orders/index/orders.scss
@@ -1,23 +1,24 @@
 page-orders {
-    @media screen and (min-width: map-get($screen-breakpoints, lg)) {
-        ion-col {
 
-            &:not(.was-read) {
+    ion-col {
+
+        &:not(.was-read) {
 
-                ion-label {
+            ion-label {
 
-                    > .list-item__content {
-                        color: #333;
+                > .list-item__content {
+                    color: #333;
 
-                        &,
-                        > .highlight {
-                            font-weight: 700;
-                        }
+                    &,
+                    > .highlight {
+                        font-weight: 700;
                     }
                 }
             }
         }
+    }
 
+    @media screen and (min-width: map-get($screen-breakpoints, lg)) {
         .table-grid--orders {
 
             ion-label {
diff --git a/src/pages/orders/view/order-view.html b/src/pages/orders/view/order-view.html
index f162302..7bfcbc2 100644
--- a/src/pages/orders/view/order-view.html
+++ b/src/pages/orders/view/order-view.html
@@ -3,6 +3,11 @@
         <ion-title *ngIf="order">Pedido {{ order.id }}</ion-title>
 
         <ion-buttons end>
+            <button ion-button icon-only (click)="goToForm()" *ngIf="currentUser && currentUser.role == 1">
+                <ion-icon name="create"></ion-icon>
+                <span class="hide-xs hide-sm show-lg show-xl">Editar</span>
+            </button>
+
             <button ion-button icon-only (click)="download()">
                 <ion-icon name="download"></ion-icon>
                 <span class="hide-xs hide-sm show-lg show-xl">Download</span>
diff --git a/src/pages/orders/view/order-view.ts b/src/pages/orders/view/order-view.ts
index 2e64ebe..f1ac579 100644
--- a/src/pages/orders/view/order-view.ts
+++ b/src/pages/orders/view/order-view.ts
@@ -1,15 +1,9 @@
 import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams } from 'ionic-angular';
 import { ApiProvider } from '../../../providers/api/api';
-import { ListFormPage } from "../../list-form/list-form";
 import { DownloadProvider } from "../../../providers/download/download";
-
-/**
- * Generated class for the OrderViewPage page.
- *
- * See http://ionicframework.com/docs/components/#navigation for more info
- * on Ionic pages and navigation.
- */
+import { OrderFormPage } from "../form/order-form";
+import { Storage } from "@ionic/storage";
 
 @IonicPage()
 @Component({
@@ -19,9 +13,14 @@ import { DownloadProvider } from "../../../providers/download/download";
 export class OrderViewPage {
     public order;
     private id;
+    private currentUser;
 
     constructor(public navCtrl: NavController, public navParams: NavParams, private apiProvider: ApiProvider,
-                private downloadProvider: DownloadProvider) {
+                private downloadProvider: DownloadProvider, private storage: Storage) {
+        this.storage.get('user').then((user) => {
+            this.currentUser = user;
+            console.log(user);
+        });
     }
 
     /**
@@ -30,22 +29,15 @@ export class OrderViewPage {
     ionViewDidLoad() {
         this.id = this.navParams.get('id');
 
-        this.apiProvider.builder('orders/' + this.id).loader().get().subscribe((res) => {
-            this.order = res;
-            console.log(res);
-        });
+        this.apiProvider.builder('orders/' + this.id).loader().get().subscribe((res) => this.order = res);
     }
 
     /**
-     * Push to list form page
+     * Push to order form page
      */
-    // goToForm() {
-    //     this.navCtrl.push(ListFormPage, {
-    //         customer: this.order.customer.id,
-    //         orderId: this.id,
-    //         order: this.order.order_product
-    //     });
-    // }
+    goToForm() {
+        this.navCtrl.push(OrderFormPage, {id: this.id});
+    }
 
     /**
      * Calls the download method