mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Changes made on event to aprove and added to diploma
This commit is contained in:
@@ -84,6 +84,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Diploma Assinado'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Diploma Assinado'">
|
||||||
<button (click)="openAddNoteModal('Concluir diploma')" class="btn-cancel" shape="round" >Concluir</button>
|
<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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -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 { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
|
||||||
import { ToastService } from 'src/app/services/toast.service';
|
import { ToastService } from 'src/app/services/toast.service';
|
||||||
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
|
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({
|
@Component({
|
||||||
selector: 'app-approve-event',
|
selector: 'app-approve-event',
|
||||||
@@ -46,7 +47,8 @@ export class ApproveEventPage implements OnInit {
|
|||||||
private attachmentsService: AttachmentsService,
|
private attachmentsService: AttachmentsService,
|
||||||
private popoverController: PopoverController,
|
private popoverController: PopoverController,
|
||||||
private toastService: ToastService,
|
private toastService: ToastService,
|
||||||
public ThemeService: ThemeService
|
public ThemeService: ThemeService,
|
||||||
|
private httpErroHandle: HttpErrorHandle,
|
||||||
) {
|
) {
|
||||||
// Event to approve list
|
// Event to approve list
|
||||||
|
|
||||||
@@ -87,14 +89,9 @@ export class ApproveEventPage implements OnInit {
|
|||||||
try {
|
try {
|
||||||
await this.processes.PostTaskAction(body).toPromise()
|
await this.processes.PostTaskAction(body).toPromise()
|
||||||
this.modalController.dismiss(serialNumber);
|
this.modalController.dismiss(serialNumber);
|
||||||
this.toastService._successMessage('Evento aprovar')
|
this.httpErroHandle.httpsSucessMessagge('Aprovar')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if(error.status == 0) {
|
this.httpErroHandle.httpStatusHandle(error)
|
||||||
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
|
|
||||||
} else {
|
|
||||||
|
|
||||||
this.toastService._badRequest('Evento não aprovar')
|
|
||||||
}
|
|
||||||
} finally {
|
} finally {
|
||||||
this.close()
|
this.close()
|
||||||
loader.remove()
|
loader.remove()
|
||||||
@@ -111,14 +108,9 @@ export class ApproveEventPage implements OnInit {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await this.processes.PostTaskAction(body).toPromise()
|
await this.processes.PostTaskAction(body).toPromise()
|
||||||
this.toastService._successMessage('Evento rejeitado')
|
this.httpErroHandle.httpsSucessMessagge('Rejeitar');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if(error.status == 0) {
|
this.httpErroHandle.httpStatusHandle(error)
|
||||||
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
|
|
||||||
} else {
|
|
||||||
|
|
||||||
this.toastService._badRequest('Evento não rejeitado')
|
|
||||||
}
|
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
loader.remove()
|
loader.remove()
|
||||||
@@ -203,15 +195,10 @@ export class ApproveEventPage implements OnInit {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await this.processes.PostTaskAction(body).toPromise();
|
await this.processes.PostTaskAction(body).toPromise();
|
||||||
this.toastService._successMessage('Evento enviado para revisão');
|
this.httpErroHandle.httpsSucessMessagge('Rever')
|
||||||
this.close();
|
this.close();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if(error.status == 0) {
|
this.httpErroHandle.httpStatusHandle(error)
|
||||||
this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
|
|
||||||
} else {
|
|
||||||
|
|
||||||
this.toastService._badRequest('Evento não enviado para revisão');
|
|
||||||
}
|
|
||||||
} finally {
|
} finally {
|
||||||
loader.remove()
|
loader.remove()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
|
|||||||
import { doneITProd } from './suport/doneIt'
|
import { doneITProd } from './suport/doneIt'
|
||||||
|
|
||||||
|
|
||||||
export const environment: Environment = doneITProd;
|
export const environment: Environment = oaprProd;
|
||||||
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
|
|||||||
import { doneITDev } from './suport/doneIt'
|
import { doneITDev } from './suport/doneIt'
|
||||||
|
|
||||||
|
|
||||||
export const environment: Environment = doneITDev;
|
export const environment: Environment = oaprDev
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "54e1f9bee",
|
"shortSHA": "08253646e",
|
||||||
"SHA": "54e1f9bee3acfcd0ab352b45affb0d84a503b69a",
|
"SHA": "08253646e6d133425af3b48b641a89b6bc437a0a",
|
||||||
"branch": "no_bug_movemente",
|
"branch": "no_bug_movemente",
|
||||||
"lastCommitAuthor": "'Eudes Inácio'",
|
"lastCommitAuthor": "'Eudes Inácio'",
|
||||||
"lastCommitTime": "'Fri Mar 10 16:26:42 2023 +0100'",
|
"lastCommitTime": "'Fri Mar 10 16:31:12 2023 +0100'",
|
||||||
"lastCommitMessage": "publcation moved getfromDB",
|
"lastCommitMessage": "pull made",
|
||||||
"lastCommitNumber": "4868",
|
"lastCommitNumber": "4871",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts",
|
"changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
|
||||||
"changeAuthor": "eudes.inacio"
|
"changeAuthor": "eudes.inacio"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user