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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-05 12:00:13 +01:00
parent 87edd8a21f
commit e63dd20f3e
9 changed files with 105 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+2 -2
View File
@@ -95,7 +95,7 @@ export class DespachoPage implements OnInit {
goBack() {
if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
if (window.innerWidth <= 800) {
if (window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}
else {
@@ -108,7 +108,7 @@ export class DespachoPage implements OnInit {
}
}
else{
if (window.innerWidth <= 800) {
if (window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/despachos']);
} else {
let navigationExtras: NavigationExtras = {
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+37 -17
View File
@@ -23,7 +23,8 @@ export class DiplomaPage implements OnInit {
months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
serialnumber: string;
serialNumber: string;
caller:string;
profile: string;
task: any
fulltask: any
@@ -42,32 +43,51 @@ export class DiplomaPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"]);
if(params["params"].SerialNumber) {
this.serialNumber = params["params"].SerialNumber;
}
if(params["params"].caller) {
this.caller = params["params"].caller;
}
});
}
ngOnInit() {
this.profile = "mdgpr";
this.LoadTaskDetail(this.serialnumber);
this.LoadTaskDetail(this.serialNumber);
}
goBack() {
if (window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/diplomas']);
} else {
let navigationExtras: NavigationExtras = {
queryParams: {
"diplomas": true,
if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
if (window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}
else {
let navigationExtras: NavigationExtras = {
queryParams: {
"pendentes": true,
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
else{
if (window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/diplomas']);
} else {
let navigationExtras: NavigationExtras = {
queryParams: {
'diplomas': true
}
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
async openOptions(taskAction?: any) {
@@ -147,7 +167,7 @@ export class DiplomaPage implements OnInit {
async askSignature(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"serialNumber": this.serialNumber,
"action": "Aprovar",
"ActionTypeId": 99999840,
"dataFields": {
@@ -169,7 +189,7 @@ export class DiplomaPage implements OnInit {
async askToChange(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"serialNumber": this.serialNumber,
"action": "Retificar",
"ActionTypeId": 99999841,
"dataFields": {
@@ -189,7 +209,7 @@ export class DiplomaPage implements OnInit {
async finish(note:string, documents:any){
let body = {
"serialNumber": this.serialnumber,
"serialNumber": this.serialNumber,
"action": "Concluir",
"ActionTypeId": 95,
"dataFields": {
src/app/pages/gabinete-digital/diplomas/diplomas.module.ts
-1
View File
@@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular';
import { DiplomasPageRoutingModule } from './diplomas-routing.module';
import { DiplomasPage } from './diplomas.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ComponentsModule } from 'src/app/components/components.module';
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+12 -38
View File
@@ -1,8 +1,9 @@
import { Component, Input, OnInit, } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { formatDate } from '@angular/common';
import { ModalController, NavParams } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
@@ -27,7 +28,6 @@ constructor(
private alertService: AlertService,
private router: Router,
private activatedRoute: ActivatedRoute,
private location: Location,
) {
this.activatedRoute.queryParams.subscribe(params => {
console.log('Cria');
@@ -37,42 +37,22 @@ constructor(
} else if (params['segment'] == 'assinados') {
this.segment = 'assinados';
}
this.LoadList();
});
}
ngOnInit() {
/* this.router.events.forEach((event) => {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
console.log('Atualiza');
this.LoadList();
}
}); */
//this.LoadList();
}
ngAfterContentInit(): void {
});
console.log('Init');
this.LoadList();
}
ngOnChanges(changes: import("@angular/core").SimpleChanges): void {
console.log('HERE');
}
reloadCurrentPage() {
console.log('Reload');
window.location.reload();
}
refreshComponent(){
console.log('YEASS N');
this.router.navigate([this.router.url])
}
}
segmentChanged(ev: any) {
@@ -85,17 +65,11 @@ constructor(
}
this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
// this.LoadList();
this.LoadList();
}
goToDiploma(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
}
this.router.navigate(['/home/gabinete-digital/diplomas/diploma'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
}
notImplemented(){
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+2 -16
View File
@@ -186,7 +186,7 @@ export class GabineteDigitalPage implements OnInit {
this.selectedElement='DiplomasPorValidar';
}
else if(this.router.url == '/home/gabinete-digital?diplomasassinar=true'){
this.openDiplomasPage('');
this. openDiplomasAssinarPage();
this.selectedElement='DiplomasAssinar';
}
}
@@ -445,21 +445,8 @@ export class GabineteDigitalPage implements OnInit {
openDiplomasAssinarPage() {
this.closeAllDesktopComponents();
if (this.loggeduser.Profile == 'MDGPR') {
if( window.innerWidth <= 801){
let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
}
else{
let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
this.showDiplomasAssinar = true;
}
} else {
if( window.innerWidth <= 801){
let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}};
this.router.navigate(['/home/gabinete-digital/diplomas-assinar'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/diplomas-assinar']);
}
else{
let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}};
@@ -467,6 +454,5 @@ export class GabineteDigitalPage implements OnInit {
this.showDiplomasAssinar = true;
}
}
}
}