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

src/app/app-routing.module.ts

@@ -10,6 +10,10 @@ const routes: Routes = [
     path: '',
     loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
   },
+  {
+    path: 'viewer',
+    loadChildren: () => import('./pages/events/attachments/viewer/viewer.module').then( m => m.ViewerPageModule)
+  },
  /*  {
     path: 'cal-modal',
     loadChildren: () => import('./pages/cal-modal/cal-modal.module').then( m => m.CalModalPageModule)

src/app/app.module.ts

@@ -11,7 +11,6 @@ import { AppComponent } from './app.component';
 import { HttpClientModule } from '@angular/common/http';
 
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-/* import { IonicSelectableModule } from 'ionic-selectable'; */
 
 @NgModule({
   declarations: [AppComponent],
@@ -23,7 +22,6 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
     HttpClientModule,
     { provide: RouteReuseStrategy, useClass: IonicRouteStrategy },
     InAppBrowser,
-    /* IonicSelectableModule */
   ],
   bootstrap: [AppComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]

src/app/pages/events/attachments/attachments-routing.module.ts

@@ -7,6 +7,10 @@ const routes: Routes = [
   {
     path: '',
     component: AttachmentsPage
+  },
+  {
+    path: 'viewer',
+    loadChildren: () => import('./viewer/viewer.module').then( m => m.ViewerPageModule)
   }
 ];
 

src/app/pages/events/attachments/attachments.page.ts

@@ -3,6 +3,8 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { Attachment } from 'src/app/models/attachment.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
+import { AlertController, ModalController } from '@ionic/angular';
+import { ViewerPage } from 'src/app/pages/events/attachments/viewer/viewer.page'
 
 @Component({
   selector: 'app-attachments',
@@ -14,7 +16,7 @@ export class AttachmentsPage implements OnInit {
   loadedEventAttachments: Attachment[];
   pageId: string;
 
-  constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router) { }
+  constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router, private modalCtrl: ModalController) { }
 
   ngOnInit() {
         /* Emit new data when something changes */
@@ -32,14 +34,28 @@ export class AttachmentsPage implements OnInit {
     this.attachamentsService.getEventAttachments(eventid).subscribe(attachments => {
       this.loadedEventAttachments = attachments;
       this.pageId = eventid;
-      console.log(this.pageId);
     });
   }
 
-  viewDocument(documenturl:string)
+  async viewDocument(documenturl:string)
   {
-    const browser = this.iab.create(documenturl);
+    //var ref = cordova.InAppBrowser.open(documenturl, '_blank', 'location=yes');
+
+    const browser = this.iab.create(documenturl, "_self")
     browser.show();
+
+    // const modal = await this.modalCtrl.create({
+    //   component: ViewerPage,
+    //    componentProps: {
+    //     externalLink: documenturl
+    //   },
+    //   cssClass: 'viewer',
+    //   backdropDismiss: false
+    // });
+
+    // await modal.present();
+
+    // modal.onDidDismiss();
   }
 
   navigateBack(){

src/app/pages/events/attachments/viewer/viewer-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ViewerPage } from './viewer.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ViewerPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ViewerPageRoutingModule {}

src/app/pages/events/attachments/viewer/viewer.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ViewerPageRoutingModule } from './viewer-routing.module';
+
+import { ViewerPage } from './viewer.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ViewerPageRoutingModule
+  ],
+  declarations: [ViewerPage]
+})
+export class ViewerPageModule {}

src/app/pages/events/attachments/viewer/viewer.page.html

@@ -0,0 +1,22 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-title>viewer</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <iframe class="e2e-iframe-untrusted-src" *ngIf="externalLink" [src]="externalLinkSanitized" width="100%" height="100%" frameborder="0" 
+    sandbox="allow-scripts 
+    allow-pointer-lock 
+    allow-same-origin 
+    allow-popups 
+    allow-forms"></iframe>
+    <!-- <iframe class="e2e-iframe-untrusted-src" *ngIf="externalLink" [src]="externalLinkSanitized" width="100%" height="100%" frameborder="0" 
+    sandbox="allow-presentation 
+    allow-scripts 
+    allow-top-navigation 
+    allow-pointer-lock 
+    allow-same-origin 
+    allow-popups 
+    allow-forms"></iframe> -->
+</ion-content>

src/app/pages/events/attachments/viewer/viewer.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ViewerPage } from './viewer.page';
+
+describe('ViewerPage', () => {
+  let component: ViewerPage;
+  let fixture: ComponentFixture<ViewerPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ViewerPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ViewerPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/events/attachments/viewer/viewer.page.ts

@@ -0,0 +1,21 @@
+import { Component, OnInit } from '@angular/core';
+import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
+
+@Component({
+  selector: 'app-viewer',
+  templateUrl: './viewer.page.html',
+  styleUrls: ['./viewer.page.scss'],
+})
+export class ViewerPage implements OnInit {
+
+  externalLink: string;
+  externalLinkSanitized: SafeResourceUrl;
+
+  constructor(public sanitizer: DomSanitizer) { }
+
+  ngOnInit() {
+    this.externalLinkSanitized = this.sanitizer.bypassSecurityTrustResourceUrl(this.externalLink);
+    console.log(this.externalLinkSanitized);
+  }
+
+}

src/app/pages/events/event-detail/event-detail.page.html

@@ -4,14 +4,19 @@
       <ion-back-button defaultHref="/home/events"></ion-back-button>
     </ion-buttons>
     <ion-title>Visualizar Evento</ion-title>
+    <ion-buttons slot="end">
+      <button (click)="deleteConfirm()" class="ion-icon-delete">
+        <ion-icon name="trash"></ion-icon>
+      </button>
+    </ion-buttons>
   </ion-toolbar>
 </ion-header>
 
 <ion-content padding>
+  <div *ngIf="loadedEvent">
   <ion-item-group>
     <ion-item>
       <ion-label position="stacked">Assunto</ion-label>
-      <!-- <ion-input value='{{event.Subject}}'></ion-input> -->
       <ion-input [(ngModel)]="loadedEvent.Subject"></ion-input>
     </ion-item>
     <ion-item>
@@ -22,11 +27,6 @@
       <ion-label position="stacked">Localização</ion-label>
       <ion-input [(ngModel)]='loadedEvent.Location'></ion-input>
     </ion-item>
-    <!-- <ion-item-sliding>
-      <ion-item (click)="openAttendees()">
-        <ion-label position="stacked">Pessoas</ion-label>
-      </ion-item>
-    </ion-item-sliding> -->
     <ion-item>
       <ion-label position="stacked">Calendário</ion-label>
       <ion-input [(ngModel)]='loadedEvent.CalendarName'></ion-input>
@@ -51,12 +51,6 @@
           displayFormat="D MMM YYYY H:mm"
           monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"></ion-datetime>
     </ion-item>
-    <!-- <ion-item-sliding>
-      <ion-item
-        [routerLink]="['/home/attachments', loadedEvent.EventId]">
-        <ion-label position="stacked">Anexos</ion-label>
-      </ion-item>
-    </ion-item-sliding> -->
     <div class="div-card-button">
       <ion-card (click)="openAttendees()">
         <ion-card-header>
@@ -84,10 +78,75 @@
       </ion-card>
     </div>
   </ion-item-group>
+</div>
+   <!-- Skeleton screen -->
+<div *ngIf="!loadedEvent">
+  <div class="ion-padding custom-skeleton">
+    <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+    <ion-skeleton-text animated></ion-skeleton-text>
+    <ion-skeleton-text animated style="width: 88%"></ion-skeleton-text>
+    <ion-skeleton-text animated style="width: 70%"></ion-skeleton-text>
+    <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+  </div>
+
+  <ion-list>
+    <ion-list-header>
+      <ion-label>
+        <ion-skeleton-text animated style="width: 20%"></ion-skeleton-text>
+      </ion-label>
+    </ion-list-header>
+    <ion-item>
+      <ion-avatar slot="start">
+        <ion-skeleton-text animated></ion-skeleton-text>
+      </ion-avatar>
+      <ion-label>
+        <h3>
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </h3>
+        <p>
+          <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+        </p>
+        <p>
+          <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+        </p>
+      </ion-label>
+    </ion-item>
+    <ion-item>
+      <ion-thumbnail slot="start">
+        <ion-skeleton-text animated></ion-skeleton-text>
+      </ion-thumbnail>
+      <ion-label>
+        <h3>
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </h3>
+        <p>
+          <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+        </p>
+        <p>
+          <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+        </p>
+      </ion-label>
+    </ion-item>
+    <ion-item>
+      <ion-skeleton-text animated style="width: 27px; height: 27px" slot="start"></ion-skeleton-text>
+      <ion-label>
+        <h3>
+          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+        </h3>
+        <p>
+          <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+        </p>
+        <p>
+          <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+        </p>
+      </ion-label>
+    </ion-item>
+  </ion-list>
+</div>
 </ion-content>
 <ion-footer class="ion-no-border">
   <div class="event-detail-buttons">
-    <ion-button shape="round" fill="outline" class="ion-button-left" (click)="deleteConfirm()">Apagar</ion-button>
+    <!-- <ion-button shape="round" fill="outline" class="ion-button-left" (click)="deleteConfirm()">Apagar</ion-button> -->
     <ion-button shape="round" class="ion-button-right" (click)="Save()">Gravar</ion-button>
   </div>
 </ion-footer>

src/app/pages/events/event-detail/event-detail.page.scss

@@ -73,4 +73,10 @@ ion-card{
 }
 .ion-button-right{
   float: right;
+}
+.ion-icon-delete{
+  font-size: 22px;
+  color: red;
+  background-color: white;
+  padding-right: 5px;
 }

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -8,6 +8,8 @@
 </ion-header>
 
 <ion-content  padding>
+  <div *ngIf="task">
+
   <ion-item-group>
     <ion-item>
       <ion-label position="stacked">Assunto</ion-label>
@@ -26,5 +28,69 @@
       Ver documento
     </ion-button>
   </ion-item-group>
+</div>
+  <div *ngIf="!task">
+    <div class="ion-padding custom-skeleton">
+      <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+      <ion-skeleton-text animated></ion-skeleton-text>
+      <ion-skeleton-text animated style="width: 88%"></ion-skeleton-text>
+      <ion-skeleton-text animated style="width: 70%"></ion-skeleton-text>
+      <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+    </div>
+  
+    <ion-list>
+      <ion-list-header>
+        <ion-label>
+          <ion-skeleton-text animated style="width: 20%"></ion-skeleton-text>
+        </ion-label>
+      </ion-list-header>
+      <ion-item>
+        <ion-avatar slot="start">
+          <ion-skeleton-text animated></ion-skeleton-text>
+        </ion-avatar>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-thumbnail slot="start">
+          <ion-skeleton-text animated></ion-skeleton-text>
+        </ion-thumbnail>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-skeleton-text animated style="width: 27px; height: 27px" slot="start"></ion-skeleton-text>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+    </ion-list>
+  </div>
 </ion-content>
 

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -6,6 +6,7 @@ import { ActivatedRoute } from '@angular/router';
 import { formatDate } from '@angular/common';
 import { LoadingService } from 'src/app/services/loading.service';
 
+
 @Component({
   selector: 'app-expediente-detail',
   templateUrl: './expediente-detail.page.html',
@@ -18,12 +19,11 @@ export class ExpedienteDetailPage implements OnInit {
     private iab: InAppBrowser,
     private loadingService: LoadingService) { }
 
-  task = new DailyWorkTask();
+  task: DailyWorkTask;
 
   serialnumber:string;
 
   ngOnInit() {
-    this.loading();
     this.activateRoute.paramMap.subscribe(paramMap => {
       if (!paramMap.has('SerialNumber')){
         return;
@@ -48,10 +48,7 @@ export class ExpedienteDetailPage implements OnInit {
 
   viewDocument()
   {
-    const browser = this.iab.create(this.task.DocumentURL);
+    const browser = this.iab.create(this.task.DocumentURL,"_blank");
     browser.show();
   }
-  loading(){
-    this.loadingService.simpleLoading("A carregar...");
-  }
 }

src/app/pages/gabinete-digital/expediente/expediente.page.html

@@ -27,7 +27,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div [ngSwitch]="segment">
+  <div [ngSwitch]="segment" *ngIf="taskslist">
     <ion-list *ngSwitchCase="'expediente'">
       <ion-item-group>
         <ion-item-sliding>
@@ -46,23 +46,72 @@
     <ion-list *ngSwitchCase="'pendentes'">
       <ion-item-group>
         <ion-item-sliding>
-          <!-- <ion-item lines="none">
-            <div class="div-content-pendentes">
-              <ion-item lines="none">
-                <ion-icon slot="end" name="document-outline"></ion-icon>
-                 <h3>Avaliação de execução dos projectos públicos</h3>
-              </ion-item>
-              <p><span class="span-left">MINEC, MINFIN</span><span class="span-right">05 JAN</span></p>
-            </div>
-          </ion-item> -->
         </ion-item-sliding>
       </ion-item-group>
     </ion-list>
   </div>
-  <!-- <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-    <ion-fab-button>
-      <ion-icon name="create" (click)="openExpedienteModal()"></ion-icon>
-    </ion-fab-button>
-  </ion-fab> -->
+  <div *ngIf="!taskslist">
+    <div class="ion-padding custom-skeleton">
+      <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+      <ion-skeleton-text animated></ion-skeleton-text>
+      <ion-skeleton-text animated style="width: 88%"></ion-skeleton-text>
+      <ion-skeleton-text animated style="width: 70%"></ion-skeleton-text>
+      <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+    </div>
+  
+    <ion-list>
+      <ion-list-header>
+        <ion-label>
+          <ion-skeleton-text animated style="width: 20%"></ion-skeleton-text>
+        </ion-label>
+      </ion-list-header>
+      <ion-item>
+        <ion-avatar slot="start">
+          <ion-skeleton-text animated></ion-skeleton-text>
+        </ion-avatar>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-thumbnail slot="start">
+          <ion-skeleton-text animated></ion-skeleton-text>
+        </ion-thumbnail>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-skeleton-text animated style="width: 27px; height: 27px" slot="start"></ion-skeleton-text>
+        <ion-label>
+          <h3>
+            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
+          </h3>
+          <p>
+            <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
+          </p>
+          <p>
+            <ion-skeleton-text animated style="width: 60%"></ion-skeleton-text>
+          </p>
+        </ion-label>
+      </ion-item>
+    </ion-list>
+  </div>
 </ion-content>
 

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -30,7 +30,6 @@ export class ExpedientePage implements OnInit {
   ngOnInit() {
     //Inicializar segment
     this.segment = "expediente";
-    this.loading();
     this.LoadList();
   }
 
@@ -63,9 +62,6 @@ export class ExpedientePage implements OnInit {
     });
   }
 
-  loading(){
-    this.loadingService.simpleLoading("A carregar...");
-  }
   doRefresh(event) {
     this.LoadList();
 

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

@@ -3,8 +3,16 @@
     <ion-title>Gabinete Digital</ion-title>
   </ion-toolbar>
 </ion-header>
-
+<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
 <ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content
+      pullingIcon="chevron-down-circle-outline"
+      pullingText="deslize para actualizar"
+      refreshingSpinner="circles"
+      refreshingText="A actualizar...">
+    </ion-refresher-content>
+  </ion-refresher>
   <ion-card color="#d4d5ca">
   <ion-card-header>
     <ion-card-title>Expediente</ion-card-title>

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

@@ -9,6 +9,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 export class GabineteDigitalPage implements OnInit {
 
   segment:string;
+  showLoader: boolean;
 
   constructor(private processesbackend:ProcessesService) { }
 
@@ -24,7 +25,9 @@ export class GabineteDigitalPage implements OnInit {
   }
 
   LoadCounts() {
+    this.showLoader = true;
     this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
+      this.showLoader = false;
       this.count_exp_dailywork = result;
     });
     
@@ -35,4 +38,12 @@ export class GabineteDigitalPage implements OnInit {
     this.count_de_pr = "-";
   }
 
+  doRefresh(event) {
+    this.LoadCounts();
+
+    setTimeout(() => {
+      event.target.complete();
+    }, 2000);
+  }
+
 }