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

Merge branch 'developer' into developer_mobilefirst

Browse Source
This commit is contained in:
Eudes Inácio
2021-07-02 09:46:54 +01:00
parent 8a0bc2348d e34b6d2908
commit 7657659b52
6 changed files with 28 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/login/login.page.html
+1
View File
@@ -1,4 +1,5 @@
<ion-content class="text-white">
<div class="main-wrapper">
<div class="wrapper" *ngIf="!hasSession && !setPin || loginPreference == 'none' && !setPin ">
src/app/pages/login/login.page.ts
+21 -22
View File
@@ -34,36 +34,34 @@ export class LoginPage implements OnInit {
private toastService: ToastService,
public alertController: AlertController
) {
}
ngOnInit() {
// App has session
if(!localStorage.getItem('UserData')) {
this.hasSession = false
} else {
this.hasSession = true
// this.router.navigate(['/home/events']);
}
// App has session
if(!localStorage.getItem('UserData')) {
this.hasSession = false
} else {
this.hasSession = true
// this.router.navigate(['/home/events']);
}
let userData = JSON.parse(localStorage.getItem('UserData')) || {}
let userData = JSON.parse(localStorage.getItem('UserData')) || {}
const loginPreference = userData?.loginPreference
const pin = userData?.PIN
const loginPreference = userData?.loginPreference
const pin = userData?.PIN
if (pin) {
this.hasPin = true
} else {
this.hasPin = false
}
if (pin) {
this.hasPin = true
} else {
this.hasPin = false
}
if (loginPreference) {
this.loginPreference = loginPreference
} else {
this.loginPreference = ''
}
if (loginPreference) {
this.loginPreference = loginPreference
} else {
this.loginPreference = ''
}
}
@@ -203,6 +201,7 @@ export class LoginPage implements OnInit {
let userData: Object = JSON.parse(localStorage.getItem('UserData')) || {}
userData['PIN'] = encrypted
userData['loginPreference'] = 'none'
localStorage.setItem('UserData', JSON.stringify(userData) )
src/app/shared/gabinete-digital/despachos/despachos.page.ts
+1 -6
View File
@@ -78,12 +78,7 @@ export class DespachosPage implements OnInit {
}
goToDespacho(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
}
notImplemented(){
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+1 -6
View File
@@ -122,12 +122,7 @@ export class ExpedientesPrPage implements OnInit {
}
goToExpediente(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/expedientes-pr/expediente-pr'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
}
async viewExpedientDetail(serialNumber:any) {
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+1 -6
View File
@@ -148,12 +148,7 @@ export class PedidosPage implements OnInit {
}
goToPedido(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
}
async viewPedidoDetail(serialNumber:any) {
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+3 -25
View File
@@ -143,38 +143,16 @@ export class PendentesPage implements OnInit {
async viewTaskDetails(serialNumber:string, workflowName:string) {
console.log(this.profile);
if(workflowName == 'Despacho'){
this.goToDespacho(serialNumber);
this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
}
else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento'){
this.goToPedido(serialNumber);
this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
}
else if(workflowName == 'Expediente'){
this.goToExpediente(serialNumber);
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
}
goToDespacho(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
}
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
}
goToPedido(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
}
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
}
goToExpediente(serialNumber:any){
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
async openDespacho(serialNumber:string){
const modal = await this.modalController.create({