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
@@ -382,7 +382,7 @@ export class CreateProcessPage implements OnInit {
} }
else{ else{
this.validateField = true; this.validateField = true;
this.toastService.badRequest('Por favor adicione uma nota'); this.toastService.badRequest('Por favor adicione uma descrição');
} }
loader.remove(); loader.remove();
break; break;
@@ -17,9 +17,9 @@ import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angul
import { __awaiter } from 'tslib'; import { __awaiter } from 'tslib';
import { DespachosprStore } from 'src/app/store/despachospr-store.service'; 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 { synchro } from 'src/app/services/socket/synchro.service';
import { SortService } from 'src/app/services/functions/sort.service'; import { SortService } from 'src/app/services/functions/sort.service';
import { SqliteService } from 'src/app/services/sqlite.service';
@Component({ @Component({
selector: 'app-despachos-pr', selector: 'app-despachos-pr',
@@ -125,7 +125,7 @@ export class DespachosPrPage implements OnInit {
"SerialNumber": element.serialNumber, "SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject, "Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender, "Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate, "CreateDate": new Date(element.taskStartDate),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente, "Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments, "DocumentsQty": element.totalDocuments,
@@ -187,7 +187,7 @@ export class DespachosPrPage implements OnInit {
"SerialNumber": element.serialNumber, "SerialNumber": element.serialNumber,
"Folio": JSON.parse(element.workflowInstanceDataFields).Subject, "Folio": JSON.parse(element.workflowInstanceDataFields).Subject,
"Senders": JSON.parse(element.workflowInstanceDataFields).Sender, "Senders": JSON.parse(element.workflowInstanceDataFields).Sender,
"CreateDate": taskDate, "CreateDate": new Date(element.taskStartDate),
"DocumentURL": JSON.parse(element.workflowInstanceDataFields).ViewerRequest, "DocumentURL": JSON.parse(element.workflowInstanceDataFields).ViewerRequest,
"Remetente": JSON.parse(element.workflowInstanceDataFields).Remetente, "Remetente": JSON.parse(element.workflowInstanceDataFields).Remetente,
"DocumentsQty": element.totalDocuments, "DocumentsQty": element.totalDocuments,
@@ -80,7 +80,7 @@ export class DiplomasAssinarPage implements OnInit {
this.diplomasList = []; this.diplomasList = [];
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma"); let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
diplomasAssinar = this.sortService.sortArrayByDate(diplomasAssinar); diplomasAssinar = this.sortService.sortArrayISODate(diplomasAssinar);
diplomasAssinar.forEach(element => { diplomasAssinar.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element) let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task); this.diplomasList.push(task);
@@ -170,7 +170,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
diplomasList.push(task); 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"); let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
@@ -181,7 +181,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
diplomasAssinadoList.push(task); diplomasAssinadoList.push(task);
}); });
console.log('diplomasAssinados', diplomasAssinados) 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); 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 diplomasAssinados = process.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
let diplomasAssinadoList = [] let diplomasAssinadoList = []
@@ -222,7 +222,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
diplomasAssinadoList.push(task); diplomasAssinadoList.push(task);
}); });
console.log('diplomasAssinados', diplomasAssinados) console.log('diplomasAssinados', diplomasAssinados)
this.diplomasAssinadoList = this.sortService.sortArrayByDate(diplomasAssinadoList).reverse(); this.diplomasAssinadoList = this.sortService.sortArrayISODate(diplomasAssinadoList).reverse();
}) })
} }
@@ -441,7 +441,7 @@ export class ExpedientTaskModalPage implements OnInit {
} }
else{ else{
this.validateField = true; this.validateField = true;
this.toastService.badRequest('Por favor adicione uma nota'); this.toastService.badRequest('Por favor adicione uma descrição');
} }
loader.remove(); loader.remove();
break; break;
+8 -3
View File
@@ -53,14 +53,19 @@ export class ChatService {
let headersc = new HttpHeaders(); let headersc = new HttpHeaders();
headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId); headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId);
headersc = headersc.set('X-Auth-Token', this.loggedUserChat['data'].authToken); 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("Host", "www.tabularium.pt");
// headersc = headersc.set("Origin", "http://localhost:8100"); // headersc = headersc.set("Origin", "http://localhost:8100");
// headersc = headersc.set("Referer", "http://localhost:8100/"); headersc = headersc.set('Referer', 'http://localhost:8100/');
let optionsc = { let optionsc = {
headers: headersc, headers: headersc,
withCredentials: true
}; };
let fullUrl = "https://www.tabularium.pt/" + url; //let fullUrl = "https://www.tabularium.pt/" + url;
return this.http.get(fullUrl, optionsc).subscribe(()=>{ return this.http.get(url, optionsc).subscribe(()=>{
//this.fileService.viewDocumentByUrl(url) //this.fileService.viewDocumentByUrl(url)
}); });
} }
@@ -12,6 +12,10 @@
</button> </button>
</div> </div>
</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 hidden class="header-bottom" (click)="addContacts()">
<div class="header-bottom-icon"> <div class="header-bottom-icon">
<ion-icon src="assets/icon/icons-user.svg"></ion-icon> <ion-icon src="assets/icon/icons-user.svg"></ion-icon>
@@ -71,9 +75,6 @@
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="frameUrl">
<iframe id="iframe" [src]="frameUrl" height="100%" width="100%" title="Iframe Example"></iframe>
</div>
{{last ? scrollToBottom() : ''}} {{last ? scrollToBottom() : ''}}
</div> </div>
</div> </div>
@@ -248,9 +248,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
this.openViewDocumentModal(file); this.openViewDocumentModal(file);
} }
else{ 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.frameUrl = fullUrl;
//this.fileService.viewDocumentByUrl(fullUrl); //this.fileService.viewDocumentByUrl(fullUrl);
this.chatService.getDocumentDetails(fullUrl);
} }
} }
@@ -74,7 +74,7 @@ constructor (
despachoList.push(task); despachoList.push(task);
}); });
despachoList = this.sortService.sortArrayByDate(despachoList).reverse() despachoList = this.sortService.sortArrayISODate(despachoList).reverse()
this.despachosprstore.reset(despachoList); this.despachosprstore.reset(despachoList);
this.skeletonLoader = false; this.skeletonLoader = false;
@@ -72,6 +72,8 @@ export class ExpedientesPrPage implements OnInit {
let task = this.expedienteTaskPipe.transform(element); let task = this.expedienteTaskPipe.transform(element);
this.taskslist.push(task); this.taskslist.push(task);
}); });
console.log(this.taskslist);
this.expedienteGdStore.reset(this.taskslist); this.expedienteGdStore.reset(this.taskslist);
this.skeletonLoader = false; this.skeletonLoader = false;
@@ -110,7 +110,7 @@ export class PedidosPage implements OnInit {
let task: customTask = this.customTaskPipe.transform(element); let task: customTask = this.customTaskPipe.transform(element);
this.deferimentoList.push(task); this.deferimentoList.push(task);
}); });
this.pedidosstore.resetdeferimento(this.sortService.sortArrayByDate(this.deferimentoList)); this.pedidosstore.resetdeferimento(this.sortService.sortArrayISODate(this.deferimentoList));
}); });
} }