peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 05:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-03-16 10:46:14 +01:00
parent 49d36e2528 b7f59b76b6
commit 4fe1ca8e12
11 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.html
+1 -1
View File
@@ -160,7 +160,7 @@
</div>
<div *ngIf="postData" class="aside-right flex-column height-100">
<div *ngIf="postData && loggeduser.Profile != 'PR'" class="aside-right flex-column height-100">
<app-empty-container
[texto]="emptyTextDescription"
*ngIf="!showAttendees"
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+1 -1
View File
@@ -333,7 +333,7 @@
</div>
</div>
<div class="aside-righ flex-grow-1">
<div *ngIf="loggeduser.Profile != 'PR'" class="aside-righ flex-grow-1">
<app-empty-container
[texto]="emptyTextDescription"
*ngIf="!showAttendees"
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+2
View File
@@ -84,6 +84,8 @@
</div>
<div class="buttons" *ngIf="task.activityInstanceName == 'Diploma Assinado'">
<button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
</div>
</div>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+1 -1
View File
@@ -293,7 +293,7 @@
</div>
</div>
<div class="aside-righ flex-grow-1">
<div *ngIf="loggeduser.Profile != 'PR'" class="aside-righ flex-grow-1">
<app-empty-container
[texto]="emptyTextDescription"
*ngIf="!showAttendees"
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+1 -1
View File
@@ -209,7 +209,7 @@
</div>
</div>
<div *ngIf="postData" class="aside-right flex-column height-100">
<div *ngIf="postData && loggeduser.Profile != 'PR'" class="aside-right flex-column height-100">
<app-empty-container
[texto]="emptyTextDescription"
*ngIf="!showAttendees"
src/app/services/http-error-handle.service.ts
+1 -1
View File
@@ -57,7 +57,7 @@ export class HttpErrorHandle {
this.toastService._successMessage('Despacho executado!')
break;
case 'Gerar Diploma':
this.toastService._successMessage('Diploma gerado!')
this.toastService._successMessage('Enviado com sucesso!')
break;
case 'Efetuar Despacho':
this.toastService._successMessage('Despacho efetuado!')
src/app/shared/agenda/approve-event/approve-event.page.ts
+10 -23
View File
@@ -8,7 +8,8 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
import { ToastService } from 'src/app/services/toast.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { ThemeService } from 'src/app/services/theme.service'
import { ThemeService } from 'src/app/services/theme.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
selector: 'app-approve-event',
@@ -46,7 +47,8 @@ export class ApproveEventPage implements OnInit {
private attachmentsService: AttachmentsService,
private popoverController: PopoverController,
private toastService: ToastService,
public ThemeService: ThemeService
public ThemeService: ThemeService,
private httpErroHandle: HttpErrorHandle,
) {
// Event to approve list
@@ -87,14 +89,9 @@ export class ApproveEventPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.modalController.dismiss(serialNumber);
this.toastService._successMessage('Evento aprovar')
this.httpErroHandle.httpsSucessMessagge('Aprovar')
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Evento não aprovar')
}
this.httpErroHandle.httpStatusHandle(error)
} finally {
this.close()
loader.remove()
@@ -111,14 +108,9 @@ export class ApproveEventPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.toastService._successMessage('Evento rejeitado')
this.httpErroHandle.httpsSucessMessagge('Rejeitar');
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Evento não rejeitado')
}
this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
@@ -203,15 +195,10 @@ export class ApproveEventPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService._successMessage('Evento enviado para revisão');
this.httpErroHandle.httpsSucessMessagge('Rever')
this.close();
} catch (error) {
if(error.status == 0) {
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
} else {
this.toastService._badRequest('Evento não enviado para revisão');
}
this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
src/app/shared/popover/deploma-options/deploma-options.page.html
+3 -4
View File
@@ -13,7 +13,6 @@
<button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
<button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar despacho</button>
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
@@ -25,10 +24,10 @@
<div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
<button (click)="openAddNoteModal('Assinar Diploma')" class="btn-cancel" shape="round" >Assinado</button>
</div>
<div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivo</button>
<div class="buttons width-100">
<button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
</div>
<div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
<div class="buttons width-100" *ngIf="task.activityInstanceName != 'Revisar Diploma'">
<button (click)="openExpedientActionsModal('0',task)" class="btn-cancel" shape="round" >Efetuar despacho</button>
</div>
</div>
src/environments/environment.prod.ts
+1 -1
View File
@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
import { doneITProd } from './suport/doneIt'
export const environment: Environment = doneITProd;
export const environment: Environment = oaprProd;
src/environments/environment.ts
+1 -1
View File
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
import { doneITDev } from './suport/doneIt'
export const environment: Environment = doneITDev;
export const environment: Environment = oaprDev