peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refinamentos 1

Browse Source
This commit is contained in:
Paulo Pinto
2020-08-28 12:43:19 +01:00
parent 4c7dc5003e
commit e30e38f253
16 changed files with 16 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/attachments/attachments-routing.module.ts
-4
View File
@@ -7,10 +7,6 @@ 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 -19
View File
@@ -3,8 +3,6 @@ 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',
@@ -16,7 +14,7 @@ export class AttachmentsPage implements OnInit {
loadedEventAttachments: Attachment[];
pageId: string;
constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router, private modalCtrl: ModalController) { }
constructor(private attachamentsService: AttachmentsService, private activatedRoute: ActivatedRoute, private iab: InAppBrowser, private route: Router) { }
ngOnInit() {
/* Emit new data when something changes */
@@ -39,23 +37,9 @@ export class AttachmentsPage implements OnInit {
async viewDocument(documenturl:string)
{
//var ref = cordova.InAppBrowser.open(documenturl, '_blank', 'location=yes');
const browser = this.iab.create(documenturl, "_self")
const url: string = documenturl.replace("webTRIX.Viewer","webTRIX.Viewer/branch1");
const browser = this.iab.create(url,"_blank");
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
-17
View File
@@ -1,17 +0,0 @@
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
-20
View File
@@ -1,20 +0,0 @@
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
-22
View File
@@ -1,22 +0,0 @@
<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.scss
View File
src/app/pages/events/attachments/viewer/viewer.page.spec.ts
-24
View File
@@ -1,24 +0,0 @@
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
-21
View File
@@ -1,21 +0,0 @@
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.ts
-3
View File
@@ -78,9 +78,6 @@ export class EventDetailPage implements OnInit {
async deleteConfirm()
{
console.log(this.loadedEvent.Attendees);
console.log(this.loadedEvent.CalendarName);
const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Apagar evento!',
src/app/pages/feed/feed.page.ts
-4
View File
@@ -25,17 +25,13 @@ export class FeedPage implements OnInit {
timeDate = this.today.getHours() + ":" + this.today.getMinutes();
showGreeting(){
if(this.today.getHours() >= 6 && this.today.getHours() < 12){
console.log(this.grettings[0]+this.today.getHours());
this.greetting = this.grettings[0];
}
else if(this.today.getHours() >= 12 && this.today.getHours() < 18){
console.log(this.grettings[1]+this.today.getHours());
this.greetting = this.grettings[1];
}
else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */{
console.log(this.grettings[2]+this.today.getHours());
this.greetting = this.grettings[2];
}
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+3 -3
View File
@@ -16,8 +16,7 @@ export class ExpedienteDetailPage implements OnInit {
constructor(private activateRoute: ActivatedRoute,
private processes:ProcessesService,
private iab: InAppBrowser,
private loadingService: LoadingService) { }
private iab: InAppBrowser) { }
task: DailyWorkTask;
@@ -48,7 +47,8 @@ export class ExpedienteDetailPage implements OnInit {
viewDocument()
{
const browser = this.iab.create(this.task.DocumentURL,"_blank");
const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer/branch1");
const browser = this.iab.create(url,"_blank");
browser.show();
}
}
src/app/pages/gabinete-digital/gabinete-digital.page.html
+5 -5
View File
@@ -21,11 +21,11 @@
<ion-label>Correspondência</ion-label>
<ion-button slot="end">{{ count_exp_dailywork }}</ion-button>
</ion-item>
<ion-item (click)="load()" class="ion-activated">
<ion-item (click)="notImplemented()" class="ion-activated">
<ion-label>Pedidos de parecer</ion-label>
<ion-button slot="end">{{count_exp_pp}}</ion-button>
</ion-item>
<ion-item (click)="load()">
<ion-item (click)="notImplemented()">
<ion-label>Pedidos de deferimento</ion-label>
<ion-button slot="end">{{count_exp_pd}}</ion-button>
</ion-item>
@@ -36,11 +36,11 @@
<ion-card-header>
<ion-card-title>Diplomas</ion-card-title>
<ion-card-content>
<ion-item (click)="load()" class="ion-item-change-color">
<ion-item (click)="notImplemented()" class="ion-item-change-color">
<ion-label>Assinados pelo PR</ion-label>
<ion-button slot="end">{{count_dip_apr}}</ion-button>
</ion-item>
<ion-item primary (click)="load()" class="ion-activated">
<ion-item primary (click)="notImplemented()" class="ion-activated">
<ion-label>Por validar (MDGPR)</ion-label>
<ion-button slot="end">{{count_dip_pv}}</ion-button>
</ion-item>
@@ -51,7 +51,7 @@
<ion-card-header>
<ion-card-title>Despachos Efectuados</ion-card-title>
<ion-card-content>
<ion-item (click)="load()" class="ion-item-change-color">
<ion-item (click)="notImplemented()" class="ion-item-change-color">
<ion-label>Presidente da República</ion-label>
<ion-button slot="end">{{count_de_pr}}</ion-button>
</ion-item>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+4 -3
View File
@@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service';
import { AlertService } from 'src/app/services/alert.service';
@Component({
selector: 'app-gabinete-digital',
@@ -11,7 +12,7 @@ export class GabineteDigitalPage implements OnInit {
segment:string;
showLoader: boolean;
constructor(private processesbackend:ProcessesService) { }
constructor(private processesbackend:ProcessesService, private alertService: AlertService) { }
count_exp_dailywork : number;
count_exp_pp : string;
@@ -46,9 +47,9 @@ export class GabineteDigitalPage implements OnInit {
}, 2000);
}
load()
notImplemented()
{
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
}