+
+
+
-
+
-
@@ -73,7 +73,6 @@
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 3a0ea4da1..555792820 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -1,6 +1,6 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -9,8 +9,6 @@ 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 { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ToastService } from 'src/app/services/toast.service';
@Component({
@@ -20,8 +18,7 @@ import { ToastService } from 'src/app/services/toast.service';
})
export class ApproveEventPage implements OnInit {
event: Event;
- loadedEvent:any;
- loadedEvent1:any;
+ loadedEvent:any = false
loadedAttachments:any;
customDate:any;
today:any;
@@ -51,7 +48,6 @@ export class ApproveEventPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
) {
-
this.activatedRoute.paramMap.subscribe(params => {
console.log(params["params"]);
@@ -260,9 +256,7 @@ export class ApproveEventPage implements OnInit {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
-
async editar(serialNumber: string) {
-
const modal = await this.modalController.create({
component: EditEventToApproveComponent,
@@ -282,7 +276,4 @@ export class ApproveEventPage implements OnInit {
}
-
-
-
}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 7c7d75437..900815593 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -1,11 +1,10 @@
import { Component, OnInit } from '@angular/core';
import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model';
-import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
-import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, Router } from '@angular/router';
@Component({
selector: 'app-event-list',
@@ -13,11 +12,13 @@ import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angula
styleUrls: ['./event-list.page.scss'],
})
export class EventListPage implements OnInit {
+ // [desktop] event list to approve
+
profile:string;
segment:string;
showLoader: boolean;
- eventsPRList: any;
- eventsMDGPRList: any;
+ eventsPRList: any = []
+ eventsMDGPRList: any = []
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -27,8 +28,7 @@ export class EventListPage implements OnInit {
constructor(
private processes:ProcessesService,
private modalController: ModalController,
- private router: Router,
- private activatedRoute: ActivatedRoute,
+ private router: Router
) { }
ngOnInit() {
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index e2a496b4b..1a2f3e9db 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -18,6 +18,7 @@ import { Camera, CameraOptions } from '@ionic-native/camera/ngx';
import { PublicationFolder } from 'src/app/models/publicationfolder';
import { ViewPublicationsPage } from '../view-publications/view-publications.page';
import { LoadingService } from 'src/app/services/loading.service';
+import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-new-publication',
@@ -52,6 +53,7 @@ export class NewPublicationPage implements OnInit {
private navParams: NavParams,
private publications: PublicationsService,
private camera: Camera,
+ private toastService: ToastService,
) {
this.publicationType = this.navParams.get('publicationType');
@@ -112,7 +114,7 @@ export class NewPublicationPage implements OnInit {
if(this.publicationType == '3'){
console.log(this.navParams.get('publication'));
- if(this.capturedImage != ''){
+ if(this.capturedImage != '') {
this.publication = {
DateIndex: this.publication.DateIndex,
DocumentId:this.publication.DocumentId,
@@ -124,10 +126,18 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.capturedImage,
FileExtension: 'jpeg',
}
- console.log('Edit change image');
- console.log(this.publication);
- this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise();
- this.close();
+
+ try {
+ console.log(this.publication);
+
+ await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
+ this.toastService.successMessage("Publicação criado")
+
+ this.close();
+ } catch (error) {
+ this.toastService.badRequest("Publicação não criado")
+ }
+
}
else{
this.publication = {
@@ -141,10 +151,18 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.publication.FileBase64,
FileExtension: 'jpeg',
}
- console.log('Edit - keep image');
- console.log(this.publication);
- this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise();
- this.close();
+ /* console.log('Edit - keep image');
+ console.log(this.publication); */
+ try {
+ console.log(this.publication);
+ await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
+ this.toastService.successMessage("Publicação criado")
+
+ this.close();
+ } catch (error) {
+ this.toastService.badRequest("Publicação não criado")
+ }
+
}
}
else{
@@ -164,6 +182,19 @@ export class NewPublicationPage implements OnInit {
console.log(this.publication); */
this.publications.CreatePublication(this.folderId, this.publication).toPromise();
this.close();
+
+
+ try {
+ console.log(this.publication);
+ await this.publications.CreatePublication(this.folderId, this.publication).toPromise()
+ this.toastService.successMessage("Publicação criado")
+
+
+ this.close();
+ } catch (error) {
+ this.toastService.badRequest("Publicação não criado")
+ }
+
}
}
@@ -177,13 +208,13 @@ export class NewPublicationPage implements OnInit {
this.capturedImage = '';
}
setTitle(){
- if(this.publicationType == '1'){
+ if(this.publicationType == '1') {
this.publicationTitle = 'Nova Publicação Rápida';
}
- else if(this.publicationType == '2'){
+ else if(this.publicationType == '2') {
this.publicationTitle = 'Nova Publicação';
}
- else if(this.publicationType == '3'){
+ else if(this.publicationType == '3') {
this.publicationTitle = 'Editar Publicação';
this.pub = this.navParams.get('publication');
}
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index 07567ba65..482453ad1 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -13,14 +13,14 @@
-->
-
+
-
+