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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-10-19 14:31:14 +01:00
parent c16f44d1d6
commit b956ad4d29
11 changed files with 32 additions and 20 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/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+3 -3
View File
@@ -17,9 +17,9 @@ import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angul
import { __awaiter } from 'tslib';
import { DespachosprStore } from 'src/app/store/despachospr-store.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { synchro } from 'src/app/services/socket/synchro.service';
import { SortService } from 'src/app/services/functions/sort.service';
import { SqliteService } from 'src/app/services/sqlite.service';
@Component({
selector: 'app-despachos-pr',
@@ -125,7 +125,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,
@@ -187,7 +187,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
+4 -4
View File
@@ -170,7 +170,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 = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
@@ -181,7 +181,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();
}
@@ -212,7 +212,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 = []
@@ -222,7 +222,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
+1 -1
View File
@@ -441,7 +441,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
@@ -248,9 +248,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));
});
}