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

Fix

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-17 17:02:41 +01:00
parent 39b4bc9ed6
commit 53d6896abf
8 changed files with 58 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/dar-parecer/dar-parecer.page.ts
+8 -5
View File
@@ -35,7 +35,7 @@ export class DarParecerPage implements OnInit {
}
cancel(){
cancel() {
this.modalController.dismiss();
}
@@ -64,15 +64,18 @@ export class DarParecerPage implements OnInit {
}
console.log(body);
try {
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise();
this.modalController.dismiss();
this.toastService.successMessage('Pedido de Parecer solicitado')
this.toastService.successMessage('Parecer enviado');
} catch (error) {
this.toastService.badRequest("Pedido de Parecer não solicitado")
this.toastService.badRequest("Parecer não solicitado");
} finally {
loader.remove()
}
}
removeAttachment(index: number){
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+1 -3
View File
@@ -1,11 +1,9 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { ModalController, NavParams } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+33 -29
View File
@@ -27,43 +27,47 @@
</div>
</div>
<div class="line"></div>
<div class="middle-content">
<h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
<p>{{interveniente.Name}}</p>
</div>
</ion-label>
</ion-item>
<div *ngIf="cc.length > 0">
<h5>Com conhecimento</h5>
<div class="overflow-y-auto" style="margin-right: -20px; margin-right: -20px;">
<div class="middle-content">
<h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let c of cc">
<p>{{c.Name}}</p>
<div *ngFor="let interveniente of intervenientes">
<p>{{interveniente.Name}}</p>
</div>
</ion-label>
</ion-item>
<div *ngIf="cc.length > 0">
<h5>Com conhecimento</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let c of cc">
<p>{{c.Name}}</p>
</div>
</ion-label>
</ion-item>
</div>
<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 *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 class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
<ion-label class="d-block" (click)="viewDocument(Document.DocId)">
<p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
<div class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
<ion-label class="d-block" (click)="viewDocument(Document.DocId)">
<p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="task" class="aside-right flex-column height-100">
src/app/pages/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -7,7 +7,7 @@
<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>
<div class="title"><ion-label >Despachos</ion-label></div>
<div class="theicon btn-refresh">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
-2
View File
@@ -20,7 +20,6 @@
display: flex;
font-family: Roboto;
background-color: #fff;
overflow:auto;
color:#000;
transform: translate3d(0, 1px, 0);
.title-content{
@@ -63,7 +62,6 @@ ion-button{
.upper-content{
font-family: Roboto;
margin-left: 41px;
overflow: auto;
font-size: 18px;
.label{
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+3 -4
View File
@@ -68,9 +68,8 @@ export class AllProcessesPage implements OnInit {
this.allProcessesList = removeDuplicate( this.allProcessesList)
this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse();
});
//this.pendentesstore.reset(this.allProcessesList);
this.skeletonLoader = false;
this.skeletonLoader = false;
}
sortArrayISODate(myArray: any){
@@ -98,8 +97,8 @@ export class AllProcessesPage implements OnInit {
let diffMinutes = minutes;
console.log(allday);
if(totalDays == 0){
if(allday){
if(totalDays == 0) {
if(allday) {
customDate = this.getCustomDate(start)+", "+this.getCustomHours(start)+" (todo dia)";
console.log(customDate);
return customDate;
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+1
View File
@@ -60,6 +60,7 @@
</div>
</div>
</div>
</ion-list>
</div>
src/app/shared/popover/request-options/request-options.page.ts
+11 -20
View File
@@ -48,7 +48,6 @@ export class RequestOptionsPage implements OnInit {
console.log('serialnumber', this.serialnumber)
this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
if(!this.showEnviarPendentes) this.showEnviarPendentes = false
@@ -66,17 +65,16 @@ export class RequestOptionsPage implements OnInit {
};
}
close(){
close() {
if( window.innerWidth < 801){
this.popoverController.dismiss();
}
else{
this.modalController.dismiss();
this.popoverController.dismiss('close');
} else {
this.modalController.dismiss('close');
}
this.router.navigate(['/home/gabinete-digital/pedidos']);
}
sendExpedienteToPending(){
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
console.log(res);
this.close();
@@ -90,7 +88,7 @@ export class RequestOptionsPage implements OnInit {
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
if( window.innerWidth <= 800) {
classs = 'book-meeting-modal modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
@@ -135,13 +133,10 @@ export class RequestOptionsPage implements OnInit {
this.distartExpedientModal();
}
this.modalController.dismiss('close')
this.popoverController.dismiss('close')
});
}
async distartExpedientModal(){
async distartExpedientModal() {
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
@@ -159,9 +154,6 @@ export class RequestOptionsPage implements OnInit {
modal.onDidDismiss().then(res=>{
if(res['data']=='close'){
this.close();
/* console.log('2Expedient Discard closed2');
this.close();
this.openMenu(); */
}
});
@@ -258,12 +250,9 @@ export class RequestOptionsPage implements OnInit {
this.toastService.badRequest('Processo não arquivado')
}
}
async openDarParecer(task: any) {
this.popoverController.dismiss('close');
// console.log(task);
let classs;
if( window.innerWidth <= 800){
@@ -281,12 +270,14 @@ export class RequestOptionsPage implements OnInit {
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
modal.onDidDismiss().then( () => {
this.popoverController.dismiss('close');
});
}
async openDelegarModal(task: any) {
this.popoverController.dismiss();
// console.log(task);
let classs;
if( window.innerWidth <= 800){