peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +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:
Eudes Inácio
2021-10-19 15:06:47 +01:00
parent 9a07ceaf5a 39cd9963a5
commit f24e794e7c
17 changed files with 75 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.ts
+1 -1
View File
@@ -382,7 +382,7 @@ export class CreateProcessPage implements OnInit {
}
else{
this.validateField = true;
this.toastService.badRequest('Por favor adicione uma nota');
this.toastService.badRequest('Por favor adicione uma descrição');
}
loader.remove();
break;
src/app/modals/document-detail/document-detail.page.ts
+9 -33
View File
@@ -72,33 +72,9 @@ export class DocumentDetailPage implements OnInit {
let folder: SearchFolderDetails = this.LoadedDocument
if(this.LoadedDocument.ApplicationID == 361 || this.LoadedDocument.ApplicationId == 361) {
// task = {
// serialNumber: folder.DispatchNumber,
// taskStartDate: folder.DateDispatch,
// isEvent: true,
// workflowInstanceDataFields: {
// FolderID: folder['FolderId'] || folder['FolderID'] || folder.folderId,
// Subject: folder.Assunto,
// SourceSecFsID: folder.ApplicationID || folder['ApplicationId'],
// SourceType: 'FOLDER',
// SourceID: folder.folderId,
// DispatchNumber: folder.DispatchNumber
// },
// }
} else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
// task = {
// serialNumber: document.DocId,
// taskStartDate: document.DocDate,
// isEvent: true,
// workflowInstanceDataFields: {
// FolderID: null,
// Subject: document.Assunto,
// DispatchNumber: null,
// SourceSecFsID: document.ApplicationID || document.folderId,
// SourceType: 'DOC',
// SourceID: document.DocId,
// }
// }
} else {
console.log('unexpected ApplicationID')
}
@@ -155,7 +131,7 @@ export class DocumentDetailPage implements OnInit {
const selectedDoc = this.LoadedDocument.Documents[ this.dicIndex]
this.task = {
let task = {
serialNumber: '',
taskStartDate: '',
isEvent: true,
@@ -174,15 +150,15 @@ export class DocumentDetailPage implements OnInit {
componentProps: {
trustedUrl: '',
file: {
title: this.task.workflowInstanceDataFields.Subject,
title: task.workflowInstanceDataFields.Subject,
url: '',
title_link: '',
},
Document: this.LoadedDocument.Documents[ this.dicIndex],
applicationId: this.task.workflowInstanceDataFields.SourceSecFsID,
docId: this.task.workflowInstanceDataFields.SourceID ,
applicationId: task.workflowInstanceDataFields.SourceSecFsID,
docId: task.workflowInstanceDataFields.SourceID ,
folderId: '',
task: this.task
task: task
},
cssClass: 'modal modal-desktop'
});
@@ -215,7 +191,7 @@ export class DocumentDetailPage implements OnInit {
component: ExpedientTaskModalPage,
componentProps: {
taskAction: taskAction,
task: this.task,
task: this.DocumentTask,
seachDocuments: this.LoadedDocument,
aplicationId: this.LoadedDocument.ApplicationId || this.LoadedDocument.ApplicationID
},
@@ -238,7 +214,7 @@ export class DocumentDetailPage implements OnInit {
const modal = await this.modalController.create({
component: DocumentSetUpMeetingPage,
componentProps: {
subject: this.task.workflowInstanceDataFields.Subject,
subject: this.LoadedDocument.Assunto,
document: this.LoadedDocument,
},
cssClass: classs,
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
-1
View File
@@ -184,7 +184,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
}
else{
console.log(this.document);
alert('PARA')
this.docs.push({
ApplicationId: this.document.ApplicationId || this.document.ApplicationType,
Source: 1,
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+2
View File
@@ -118,6 +118,8 @@ export class DespachoPrPage implements OnInit {
"activityInstanceName": res.activityInstanceName,
}
this.fulltask = res;
console.log(this.task);
console.log('GetTask', res);
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+2 -2
View File
@@ -145,7 +145,7 @@ export class DespachosPrPage implements OnInit {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"CreateDate": new Date(element.taskStartDate),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
@@ -196,7 +196,7 @@ export class DespachosPrPage implements OnInit {
"SerialNumber": element.serialNumber,
"Folio": JSON.parse(element.workflowInstanceDataFields).Subject,
"Senders": JSON.parse(element.workflowInstanceDataFields).Sender,
"CreateDate": taskDate,
"CreateDate": new Date(element.taskStartDate),
"DocumentURL": JSON.parse(element.workflowInstanceDataFields).ViewerRequest,
"Remetente": JSON.parse(element.workflowInstanceDataFields).Remetente,
"DocumentsQty": element.totalDocuments,
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+1 -1
View File
@@ -80,7 +80,7 @@ export class DiplomasAssinarPage implements OnInit {
this.diplomasList = [];
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
diplomasAssinar = this.sortService.sortArrayByDate(diplomasAssinar);
diplomasAssinar = this.sortService.sortArrayISODate(diplomasAssinar);
diplomasAssinar.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task);
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+10 -10
View File
@@ -175,26 +175,26 @@ export class DiplomasPage implements OnInit, OnDestroy {
this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.skeletonLoader = false
this.showLoader = false;
let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
let diplomasList = [];
diplomasValidar.forEach(async element => {
let task = this.pipeTask(element)
diplomasList.push(task);
});
this.diplomasList = this.sortService.sortArrayByDate(diplomasList.reverse());
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
let diplomasAssinadoList = []
diplomasAssinados.forEach(async element => {
let task = this.pipeTask(element)
diplomasAssinadoList.push(task);
});
@@ -219,7 +219,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
diplomasList.push(task);
});
this.diplomasList = this.sortService.sortArrayByDate(diplomasList).reverse();
this.diplomasList = this.sortService.sortArrayISODate(diplomasList).reverse();
let diplomasAssinados = process.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
let diplomasAssinadoList = []
@@ -229,7 +229,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
diplomasAssinadoList.push(task);
});
console.log('diplomasAssinados', diplomasAssinados)
this.diplomasAssinadoList = this.sortService.sortArrayByDate(diplomasAssinadoList).reverse();
this.diplomasAssinadoList = this.sortService.sortArrayISODate(diplomasAssinadoList).reverse();
})
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+4 -1
View File
@@ -111,6 +111,9 @@ export class ExpedientTaskModalPage implements OnInit {
this.loggeduser = userAuth.ValidatedUser;
this.task = this.navParams.get('task');
console.log('create dispatch with this data', this.task);
this.SearchFolder = this.navParams.get('SearchFolder');
this.aplicationId = this.navParams.get('aplicationId')
@@ -441,7 +444,7 @@ export class ExpedientTaskModalPage implements OnInit {
}
else{
this.validateField = true;
this.toastService.badRequest('Por favor adicione uma nota');
this.toastService.badRequest('Por favor adicione uma descrição');
}
loader.remove();
break;
src/app/services/chat.service.ts
+8 -3
View File
@@ -53,14 +53,19 @@ export class ChatService {
let headersc = new HttpHeaders();
headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId);
headersc = headersc.set('X-Auth-Token', this.loggedUserChat['data'].authToken);
headersc = headersc.set('Sec-Fetch-Dest', 'attachment');
headersc = headersc.set('Sec-Fetch-Mode', 'navigate');
headersc = headersc.set('Cookie', 'rc_uid=fsMwcNdufWvdnChj7');
headersc = headersc.set('Cookie', 'rc_token=MLbhikLQI4xo9_vL43HqheKPPbxjag7hKfwxe9AjcvY');
// headersc = headersc.set("Host", "www.tabularium.pt");
// headersc = headersc.set("Origin", "http://localhost:8100");
// headersc = headersc.set("Referer", "http://localhost:8100/");
headersc = headersc.set('Referer', 'http://localhost:8100/');
let optionsc = {
headers: headersc,
withCredentials: true
};
let fullUrl = "https://www.tabularium.pt/" + url;
return this.http.get(fullUrl, optionsc).subscribe(()=>{
//let fullUrl = "https://www.tabularium.pt/" + url;
return this.http.get(url, optionsc).subscribe(()=>{
//this.fileService.viewDocumentByUrl(url)
});
}
src/app/shared/chat/messages/messages.page.html
+4 -3
View File
@@ -12,6 +12,10 @@
</button>
</div>
</div>
<!-- <div *ngIf="frameUrl" class="width-100">
<iframe id="iframe" [src]="frameUrl" height="20%" width="100%" title="Iframe Example">
</iframe>
</div> -->
<div hidden class="header-bottom" (click)="addContacts()">
<div class="header-bottom-icon">
<ion-icon src="assets/icon/icons-user.svg"></ion-icon>
@@ -71,9 +75,6 @@
</div>
</div>
</div>
<div *ngIf="frameUrl">
<iframe id="iframe" [src]="frameUrl" height="100%" width="100%" title="Iframe Example"></iframe>
</div>
{{last ? scrollToBottom() : ''}}
</div>
</div>
src/app/shared/chat/messages/messages.page.ts
+5 -1
View File
@@ -246,9 +246,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.openViewDocumentModal(file);
}
else{
let fullUrl = "https://www.tabularium.pt" + url;
let fullUrl;
fullUrl = "https://www.tabularium.pt" + url;
//fullUrl = "http://www.africau.edu/images/default/sample.pdf";
this.frameUrl = fullUrl;
//this.fileService.viewDocumentByUrl(fullUrl);
this.chatService.getDocumentDetails(fullUrl);
}
}
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+1 -1
View File
@@ -74,7 +74,7 @@ constructor (
despachoList.push(task);
});
despachoList = this.sortService.sortArrayByDate(despachoList).reverse()
despachoList = this.sortService.sortArrayISODate(despachoList).reverse()
this.despachosprstore.reset(despachoList);
this.skeletonLoader = false;
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+3 -1
View File
@@ -40,7 +40,7 @@ export class ExpedientesPrPage implements OnInit {
ngOnInit() {
this.LoadList()
this.router.events.forEach((event) => {
if (event instanceof NavigationStart &&
event.url.startsWith('/home/gabinete-digital?expedientespr=true') ||
@@ -72,6 +72,8 @@ export class ExpedientesPrPage implements OnInit {
let task = this.expedienteTaskPipe.transform(element);
this.taskslist.push(task);
});
console.log(this.taskslist);
this.expedienteGdStore.reset(this.taskslist);
this.skeletonLoader = false;
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+1 -1
View File
@@ -110,7 +110,7 @@ export class PedidosPage implements OnInit {
let task: customTask = this.customTaskPipe.transform(element);
this.deferimentoList.push(task);
});
this.pedidosstore.resetdeferimento(this.sortService.sortArrayByDate(this.deferimentoList));
this.pedidosstore.resetdeferimento(this.sortService.sortArrayISODate(this.deferimentoList));
});
}