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

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-22 16:27:50 +01:00
parent 3fdadd2668 d1782a9ea5
commit 0edbfdb8f0
34 changed files with 481 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+7 -2
View File
@@ -137,12 +137,17 @@ export class DespachoPrPage implements OnInit {
});
this.getDocumentDetails(this.task.FolderId, '361');
}, ()=>{
}, (error)=>{
try {
this.toastService.badRequest('Processo não encontrado')
this.goBack()
} catch (e) {
window.history.back();
} finally {
if(error.status == 0) {
this.toastService.badRequest('Não é possível vizualizar este processo no modo offline')
} else {
this.toastService.badRequest('Processo não encontrado')
}
}
});
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+7 -2
View File
@@ -139,12 +139,17 @@ export class DespachoPage implements OnInit {
});
});
this.getDocumentDetails(this.task.FolderId, '361');
}, ()=>{
}, (error)=>{
try {
this.toastService.badRequest('Processo não encontrado')
this.goBack()
} catch (e) {
window.history.back();
} finally {
if(error.status == 0) {
this.toastService.badRequest('Não é possível vizualizar este processo no modo offline')
} else {
this.toastService.badRequest('Processo não encontrado')
}
}
});
}
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+7 -1
View File
@@ -123,12 +123,18 @@ export class DiplomaAssinarPage implements OnInit {
});
this.getDocumentDetails(this.task.FolderId, '361');
}, ()=>{
}, (error)=>{
try {
this.toastService.badRequest('Processo não encontrado')
this.goBack()
} catch (e) {
window.history.back();
} finally {
if(error.status == 0) {
this.toastService.badRequest('Não é possível vizualizar este processo no modo offline')
} else {
this.toastService.badRequest('Processo não encontrado')
}
}
});
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+7 -2
View File
@@ -138,12 +138,17 @@ export class DiplomaPage implements OnInit {
});
this.getDocumentDetails(this.task.FolderId, '361');
}, ()=>{
}, (error)=>{
try {
this.toastService.badRequest('Processo não encontrado')
this.goBack()
} catch (e) {
window.history.back();
} finally {
if(error.status == 0) {
this.toastService.badRequest('Não é possível vizualizar este processo no modo offline')
} else {
this.toastService.badRequest('Processo não encontrado')
}
}
});
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+15 -9
View File
@@ -49,14 +49,14 @@ export class ExpedienteDetailPage implements OnInit {
private activatedRoute: ActivatedRoute,
private toastService: ToastService,
) {
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
this.serialnumber = params["params"].SerialNumber;
}
if(params["params"].caller) {
this.caller = params["params"].caller;
}
});
this.activatedRoute.paramMap.subscribe(params => {
if(params["params"].SerialNumber) {
this.serialnumber = params["params"].SerialNumber;
}
if(params["params"].caller) {
this.caller = params["params"].caller;
}
});
}
ngOnInit() {
@@ -160,12 +160,18 @@ export class ExpedienteDetailPage implements OnInit {
console.log('this.task', this.task)
console.log('this.task.DocumentURL', this.task.DocumentURL)
}, ()=>{
}, (error)=>{
try {
this.toastService.badRequest('Processo não encontrado')
this.goBack()
} catch (e) {
window.history.back();
} finally {
if(error.status == 0) {
this.toastService.badRequest('Não é possível vizualizar este processo no modo offline')
} else {
this.toastService.badRequest('Processo não encontrado')
}
}
});
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+7 -1
View File
@@ -187,12 +187,18 @@ export class ExpedientePrPage implements OnInit {
})
}, ()=>{
}, (error)=>{
try {
this.toastService.badRequest('Processo não encontrado')
this.goBack()
} catch (e) {
window.history.back();
} finally {
if(error.status == 0) {
this.toastService.badRequest('Não é possível vizualizar este processo no modo offline')
} else {
this.toastService.badRequest('Processo não encontrado')
}
}
});
}
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+7 -2
View File
@@ -156,13 +156,18 @@ export class PedidoPage implements OnInit {
});
});
this.getDocumentDetails(res.workflowInstanceDataFields.FolderID, '361');
}, ()=>{
}, (error)=>{
try {
this.toastService.badRequest('Processo não encontrado')
this.goBack()
this.close()
} catch (e) {
window.history.back();
} finally {
if(error.status == 0) {
this.toastService.badRequest('Não é possível vizualizar este processo no modo offline')
} else {
this.toastService.badRequest('Processo não encontrado')
}
}
});
src/app/pages/login/login.page.ts
+1 -4
View File
@@ -124,7 +124,7 @@ export class LoginPage implements OnInit {
domainName: environment.domain,
BasicAuthKey: ""
}
let attempt = await this.authService.login(this.userattempt);
let attempt = await this.authService.login(this.userattempt)
if (attempt) {
this.authService.loginChat(this.userattempt);
@@ -138,9 +138,6 @@ export class LoginPage implements OnInit {
this.router.navigate(['/home/events']);
}
}
else {
this.toastService.badRequest('O email e/ou palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar');
}
}
else {
this.toastService.badRequest('Por favor, insira a sua palavra-passe');
src/app/pages/publications/view-publications/view-publications.page.ts
+5 -3
View File
@@ -89,10 +89,12 @@ export class ViewPublicationsPage implements OnInit {
}
getPublicationDetail() {
setTimeout(() => {
let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list)
this.item = allActions.find((e)=> e.ProcessId == this.folderId);
}, 100);
let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list)
this.item = allActions.find((e)=> e.ProcessId == this.folderId);
}, 100);
}
getPublications() {
src/app/pages/search/search.page.ts
+2 -3
View File
@@ -428,7 +428,7 @@ export class SearchPage implements OnInit {
/**
* @description set empty value to searchSubject
*/
clearSearchInput(){
clearSearchInput() {
this.searchSubject = ""
this.searchCategories = [];
@@ -436,8 +436,7 @@ export class SearchPage implements OnInit {
this.showDocuments = false;
this.wordCloud();
}
}
/**
* @param isoDate String Iso date