Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -431,7 +431,7 @@ export class DespachoPage implements OnInit {
       return this.animationController.create()
         .addElement(baseEl)
         .easing('ease-out')
-        .duration(500)
+        .duration(7000)
         .addAnimation([backdropAnimation, wrapperAnimation]);
     }
 
@@ -474,7 +474,7 @@ export class DespachoPage implements OnInit {
       return this.animationController.create()
         .addElement(baseEl)
         .easing('ease-out')
-        .duration(500)
+        .duration(7000)
         .addAnimation([backdropAnimation, wrapperAnimation]);
     }
 

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html

@@ -31,7 +31,7 @@
         <div class="content-details">
           <ion-label>
             <p>{{customDate}}</p>
-            <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+            <p>das12 {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
             <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
             <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
           </ion-label>

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -11,6 +11,7 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
 import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
 import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-approve-event',
@@ -46,7 +47,8 @@ export class ApproveEventPage implements OnInit {
     private menu: MenuController,
     private alertService: AlertService,
     private iab: InAppBrowser,
-    private animationController: AnimationController
+    private animationController: AnimationController,
+    private toastService: ToastService,
   ) { 
     this.activatedRoute.queryParams.subscribe(params => {
       if(params["serialNumber"]) {
@@ -61,17 +63,7 @@ export class ApproveEventPage implements OnInit {
   }
 
   goBack() {
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "eventos": true,
-      }
-    };
-    if( window.innerWidth < 801) {
-      this.router.navigate(['/home/gabinete-digital/event-list']);
-    } 
-    else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+    window.history.back();
   }
 
   async getTask(){
@@ -91,9 +83,10 @@ export class ApproveEventPage implements OnInit {
     console.log(body);
 
     try {  
-      await this.processes.PostTaskAction(body).toPromise()
-      this.successMessage()
-      this.goBack();
+      //await this.processes.PostTaskAction(body).toPromise()
+      //this.successMessage()
+      this.toastService.successMessage('Evento rejeitado!');
+      //this.goBack();
     } catch (error) {
       this.badRequest()
     }
@@ -116,13 +109,13 @@ export class ApproveEventPage implements OnInit {
   }
 
   async rejectTask(serialNumber:string){
-  
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
 
     try {    
       this.processes.PostTaskAction(body).toPromise();
-      await this.successMessage('Processo rejeitado');
+      //await this.successMessage('Processo rejeitado');
+      await this.toastService.successMessage('Processo rejeitado');
       this.goBack();
     } catch (error) {
       this.badRequest()

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -2,7 +2,7 @@
   <app-header></app-header>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
      <ion-refresher-content>
     </ion-refresher-content>

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -37,7 +37,7 @@ export class EventListPage implements OnInit {
 
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.LoadToApproveEvents();
+        this.doRefresh();
       }
     });
 
@@ -96,11 +96,10 @@ export class EventListPage implements OnInit {
 
 
 
-  doRefresh(event) {
+  doRefresh() {
     this.LoadToApproveEvents();
     console.log('refresh');
     setTimeout(() => {
-       event.target.complete();
      }, 2000);
   }
   close(){

src/app/pages/login/login.page.html

@@ -1,4 +1,5 @@
 <ion-content class="text-white">
+  <div class="main-wrapper">
   <div class="wrapper"  *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint">
     <div class="div-logo">
       <img src='assets/images/logo-no-bg.png' alt='logo'>
@@ -11,11 +12,17 @@
       </ion-item>
       <p class="form-label text-white">Palavra-passe</p>
       <ion-item class="form-input">
-        <ion-input type="password" [(ngModel)]="password" name="input-password" ></ion-input>
-      </ion-item>        
-      <ion-button class="btn-ok-login" fill="clear" expand="block" shape="round" (click)="Login()">Iniciar</ion-button>
+        <ion-input (keyup.enter)="Login()" type="password" [(ngModel)]="password" name="input-password" ></ion-input>
+      </ion-item> 
+      <div class="d-flex pt-25">
+        <button class="btn-ok btn-login" fill="clear" expand="block" shape="round" (click)="Login()">Iniciar</button>
+      </div>       
     </form>
+    <div class="msg-bottom d-flex">
+      <p class="msg-bottom-p">Uma iniciativa do Gabinete do Presidente da República</p>
+    </div>
   </div>
+  
 
   <div class="main-content  height-100" *ngIf="userLoginPreference == 'pin' || setPint">
     <div class=" align-center justify-center">
@@ -65,5 +72,8 @@
 
     </div>
   </div>
+  
+</div>
+
 
 </ion-content>

src/app/pages/login/login.page.scss

@@ -1,5 +1,26 @@
+@import '~src/function.scss';
+:host, app-login {
+    ion-content {
+        background: linear-gradient(180deg, #42B9FE 0%, #0782C9 100%)  !important;
+    }
+}
+ion-content{
+    background-color:  white !important;
+}
+
+.main-wrapper{
+    background: linear-gradient(180deg, #42B9FE 0%, #0782C9 100%)  !important;
+    display: flex;
+    height: calc(100% - 50Px);
+    overflow: auto;
+
+}
 .wrapper{
-    margin: 0 auto;
+    width: 400px;
+    height: auto;
+    padding: 0 !important;
+    margin: auto !important;
+    overflow: auto;
 }
 .div-logo{
     width: 200px;
@@ -10,19 +31,19 @@
     width: 100%;
 }
 .wrapper ion-input{
-    font-size: 18px;
+    font-size: 16px;
 }
 .wrapper ion-button{
     font-size: medium;
-    margin-top: 18px;
+    margin-top: 16px;
 }
 ion-item{
     --background: transparent;
 }
 .form{
     width: 300px;
+    margin: auto;
     overflow: auto;
-    margin: 0 auto;
 }
 .form-label{
     margin: 15px 0 5px 0;
@@ -30,33 +51,18 @@ ion-item{
 }
 .form-input{ 
     --background: #fff;
-    /* --color:#fff; */
-    border-radius: 10px;
-    margin: 5px 0 5px 0;
-}
-.btn-ok-login{
-    width: 160px !important;
-    height: 45px !important;
-    margin: 15px auto;
-    padding: 10px 15px;
+    --color:#000;
     border-radius: 22.5px;
-    background-color: #42b9fe;
-    color: #ffffff !important;
+    margin: 10px 0 10px 0;
+}
+.btn-login{
+    font-size: 16px;
   }
 
-:host, app-login {
-    ion-content {
-        background: linear-gradient(180deg, #42B9FE 0%, #0782C9 100%)  !important;
-    }
-}
 
 
-ion-content{
-    background-color:  white !important;
-}
 
 
-@import '~src/function.scss';
 
 .div-top-header{
   margin: 0 em(20px);
@@ -140,4 +146,24 @@ ion-content{
 
 .voltar{
     user-select: none;
+}
+
+.msg-bottom{
+    width: 100%;
+    color: #fff;
+    align-items: center;
+    justify-content: center;
+
+    .msg-bottom-p{
+        width: 220px;
+        position: absolute;
+        bottom: 0 !important;
+        text-align: center;
+    }
+}
+
+@media only screen and (min-width: 1024px){
+    .form{
+        width: 400px;
+    }
 }