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-05-27 15:46:14 +01:00
parent 0f80d2a9cf 9b372c6e79
commit f890e8e3fb
34 changed files with 1511 additions and 167 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.html
+2 -2
View File
@@ -85,10 +85,10 @@
</ion-label>
</ion-item>
</div>
<div *ngIf="task.Note">
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
<p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
</ion-item>
</div>
</div>
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+2 -1
View File
@@ -20,6 +20,7 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page';
@Component({
selector: 'app-despacho-pr',
@@ -447,7 +448,7 @@ export class DespachoPrPage implements OnInit {
async openOptions(taskAction?: any) {
const popover = await this.popoverController.create({
component: OptsExpedientePage,
component: DespachosPrOptionsPage,
cssClass: 'exp-options',
componentProps: {
task: this.task,
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+3 -3
View File
@@ -41,7 +41,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content d-flex justify-space-between">
<div class="title-content d-flex justify-space-between align-center">
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
@@ -84,10 +84,10 @@
</ion-label>
</ion-item>
</div>
<div *ngIf="task.Note">
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
<p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
</ion-item>
</div>
</div>
src/app/pages/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -4,7 +4,7 @@
<ion-header class="ion-no-border header-2">
<div class="title">
<div class="title d-flex align-center">
<app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
<div class="thetitle"><ion-label >Despachos</ion-label></div>
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+11 -11
View File
@@ -94,16 +94,16 @@ export class DespachosPage implements OnInit {
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task)
@@ -124,7 +124,7 @@ export class DespachosPage implements OnInit {
}
sortArrayISODate(myArray: any){
sortArrayISODate(myArray: any) {
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+2 -2
View File
@@ -49,10 +49,10 @@
</ion-label>
</ion-item>
</div>
<div *ngIf="task.Note">
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
<p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
</ion-item>
</div>
</div>
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts
+2 -1
View File
@@ -10,6 +10,7 @@ import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
@Component({
selector: 'app-diploma-assinar',
@@ -57,7 +58,7 @@ export class DiplomaAssinarPage implements OnInit {
async openOptions(taskAction?: any) {
const popover = await this.popoverController.create({
component: OptsExpedientePage,
component: DeplomaOptionsPage,
cssClass: 'exp-options',
componentProps: {
task: this.task,
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+3 -3
View File
@@ -17,7 +17,7 @@
<!-- <ion-menu-button autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button> -->
<ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
<ion-icon class="font-25 cursor-pointer" src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div>
</div>
@@ -49,10 +49,10 @@
</ion-label>
</ion-item>
</div>
<div *ngIf="task.Note">
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
<p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
</ion-item>
</div>
</div>
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+3 -2
View File
@@ -10,6 +10,7 @@ import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component';
import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component';
import { DeplomaOptionsPage } from 'src/app/shared/popover/deploma-options/deploma-options.page';
@Component({
selector: 'app-diploma',
@@ -52,7 +53,7 @@ export class DiplomaPage implements OnInit {
this.LoadTaskDetail(this.serialnumber);
}
goBack(){
goBack() {
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "diplomas": true,
@@ -65,7 +66,7 @@ export class DiplomaPage implements OnInit {
async openOptions(taskAction?: any) {
const popover = await this.popoverController.create({
component: OptsExpedientePage,
component: DeplomaOptionsPage,
cssClass: 'exp-options',
componentProps: {
task: this.task,
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+6 -4
View File
@@ -53,10 +53,12 @@
</ion-label>
</ion-item>
</div>
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
</ion-item>
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
</ion-item>
</div>
</div>
<div class="bottom-content width-100">
<ion-list>
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+2 -2
View File
@@ -49,10 +49,10 @@
</ion-label>
</ion-item>
</div>
<div *ngIf="task.Note">
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
<p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
</ion-item>
</div>
</div>