peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +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-08-02 08:35:16 +01:00
parent 426fe4c98e da544b8821
commit 7f8e095a5d
98 changed files with 844 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+4 -9
View File
@@ -15,8 +15,7 @@ import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page';
import { ToastService } from 'src/app/services/toast.service';
import { DespachoMdService } from 'src/app/Rules/despacho-md.service'
import { NavigationService } from 'src/app/services/navigation.service';
import { DespachoService } from 'src/app/Rules/despacho.service'
import { Location } from '@angular/common'
@Component({
@@ -47,14 +46,10 @@ export class DespachoPage implements OnInit {
private events: EventsService,
private menu: MenuController,
private modalController: ModalController,
private alertService: AlertService,
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
private router: Router,
private animationController: AnimationController,
private toastService: ToastService,
private despachoMdService: DespachoMdService,
private navigationService: NavigationService,
private despachoService: DespachoService,
private location: Location
) {
@@ -205,7 +200,7 @@ export class DespachoPage implements OnInit {
const loader = this.toastService.loading()
try {
await this.despachoMdService.executado(note, documents, this.serialnumber)
await this.despachoService.executado(note, documents, this.serialnumber)
this.toastService.successMessage('Processo criado')
this.close();
} catch(error) {
@@ -301,7 +296,7 @@ export class DespachoPage implements OnInit {
async sendExpedienteToPending() {
this.despachoMdService.sendExpedienteToPending(this.serialnumber).subscribe(res=>{
this.despachoService.sendExpedienteToPending(this.serialnumber).subscribe(res=>{
this.goBack();
this.toastService.successMessage('Processo enviado para despacho')
},
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+2 -1
View File
@@ -19,6 +19,7 @@ import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.pag
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
import { task } from 'src/app/models/ExpedientTaskModalPage';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
@@ -49,7 +50,7 @@ export class ExpedientTaskModalPage implements OnInit {
'Solicitar Deferimento'
];
taskType:string;
task: any;
task: task;
taskParticipants: any = [];
taskParticipantsCc: any = [];