Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/shared/popover/actions-options/actions-options.page.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { ModalController, NavParams } from '@ionic/angular';
 import { PublicationsService } from 'src/app/services/publications.service';
 
 @Component({
@@ -12,7 +12,6 @@ export class ActionsOptionsPage implements OnInit {
   id:string;
   
   constructor(
-    private popoverController: PopoverController,
     private modalController: ModalController,
     private navParams: NavParams,
     private publicationsService: PublicationsService,
@@ -21,8 +20,6 @@ export class ActionsOptionsPage implements OnInit {
   }
 
   ngOnInit() {
-    console.log(this.id);
-    
   }
 
   close () {

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -1,20 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { AttachmentsService } from 'src/app/services/attachments.service';
-import { EventsService } from 'src/app/services/events.service';
-import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { formatDate } from '@angular/common';
-import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
-import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
-import { momentG }  from 'src/plugin/momentG'
+import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.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 { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { ToastService } from 'src/app/services/toast.service';
@@ -30,45 +20,26 @@ export class DespachosOptionsPage implements OnInit {
   task: any;
   fulltask: any;
   serialnumber: string;
-  profile: string
 
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
-    private iab: InAppBrowser,
-    private attachmentsService: AttachmentsService,
-    private events: EventsService,
-    private menu: MenuController,
     private router: Router,
     private modalController: ModalController,
-    private alertService: AlertService,
     public popoverController: PopoverController,
-    private activatedRoute: ActivatedRoute,
     private animationController: AnimationController,
     private navParams: NavParams,
     private toastService: ToastService) { 
-
       this.task = this.navParams.get('task')
       this.fulltask = this.navParams.get('fulltask')
-
     }
 
   ngOnInit() {
-    
-    this.profile = "mdgpr";
-
-    this.activatedRoute.queryParams.subscribe(params => {
-      if(params["serialNumber"]) {
-        this.serialnumber = params["serialNumber"];
-        console.log(params["serialNumber"]);
-      }
-    });
   }
 
   close () {
     this.goBack()
   }
 
-
   async openExpedientActionsModal(taskAction: any, task: any) {
     this.popoverController.dismiss();
     let classs;
@@ -82,7 +53,6 @@ export class DespachosOptionsPage implements OnInit {
       componentProps: {
         taskAction: taskAction,
         task: task,
-        profile: this.profile,
       },
       cssClass: classs,
     });
@@ -91,16 +61,14 @@ export class DespachosOptionsPage implements OnInit {
       console.log(res['data']);
       if(res['data']=='openDiscart'){
         console.log('open discart');
-        
         this.distartExpedientModal();
-
       }
-
     });
   }
 
   sendExpedienteToPending(){
-    this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
+    this.popoverController.dismiss();
+    this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       console.log(res);
       this.close();
     });
@@ -124,11 +92,7 @@ export class DespachosOptionsPage implements OnInit {
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close'){
         this.close();
-        /* console.log('2Expedient Discard closed2');
-        this.close();
-        this.openMenu(); */
       }
-      
     });
   }
 
@@ -310,7 +274,6 @@ export class DespachosOptionsPage implements OnInit {
 
   }
 
-
   goBack() {
     
     let navigationExtras: NavigationExtras = {

src/app/shared/publication/edit-action/edit-action.page.html

@@ -82,14 +82,14 @@
 <ion-footer class="ion-no-border">
   <ion-toolbar class="footer-toolbar width-100 justify-space-between d-flex px-20">
     <ion-buttons slot="start">
-      <ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
+      <button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
         <ion-label>Cancelar</ion-label>
-      </ion-button>
+      </button>
     </ion-buttons>
     <ion-buttons slot="end">
-      <ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
-        <ion-label>Criar</ion-label>
-      </ion-button>
+      <button class="btn-ok" fill="clear" color="#fff" (click)="save()">
+        <ion-label>Gravar</ion-label>
+      </button>
     </ion-buttons>
   </ion-toolbar>
 </ion-footer>

src/app/shared/publication/edit-action/edit-action.page.scss

@@ -62,14 +62,13 @@
     padding: 0 !important;
   }
   .div-title{
-    width: 180px;
-  /* padding: 0!important; */
-  float: left;
-  margin: 2.5px 0 0 5px;
+    width: fit-content;
+    float: left;
+    margin: 2.5px 0 0 5px;
   }
   .title{
-  font-size: 25px;
-  }
+      font-size: 25px;
+    }
   .container-div{
       margin-bottom: 15px;
       overflow: auto;

src/app/shared/publication/edit-action/edit-action.page.ts

@@ -1,6 +1,7 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { PublicationFolder } from 'src/app/models/publicationfolder';
 import { PublicationsService } from 'src/app/services/publications.service';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-edit-action',
@@ -9,47 +10,49 @@ import { PublicationsService } from 'src/app/services/publications.service';
 })
 export class EditActionPage implements OnInit {
 
-  folderId:string;
   folder: PublicationFolder;
+  @Input() folderId: string;
   @Output() closeDesktopComponent= new EventEmitter<any>();
 
   constructor(
     private publicationsService: PublicationsService,
+    private toastService: ToastService,
   ) { 
     this.folder = new PublicationFolder();
   }
 
   ngOnInit() {
+    this.getPublicationDetail();
   }
 
   close(){
     this.closeDesktopComponent.emit();
   }
 
-  getPublicationDetail() {
-    this.publicationsService.PresidentialAction(this.folderId).subscribe(res=>{
-      console.log(res);
+  getPublicationDetail(){
+    this.publicationsService.GetPresidentialAction(this.folderId).subscribe(res=>{
+      this.folder = res; 
     });
   }
 
-  save(){
-    /* this.folder = {
-      ProcessId: null,
+  async save(){
+    let body = {
+      ProcessId: this.folderId,
       Description: this.folder.Description,
       Detail: this.folder.Detail,
       DateBegin: this.folder.DateBegin,
       DateEnd: this.folder.DateEnd,
-      ActionType: this.segment,
+      ActionType: this.folder.ActionType,
     }
-    console.log(this.folder);
+    console.log(body);
     
     try {
-      await this.publication.CreatePublicationFolder(this.folder).toPromise()
+      await this.publicationsService.UpdatePresidentialAction(body).toPromise()
       this.close();
       this.toastService.successMessage('Acção presidencial criada')
     } catch (error) {
       this.toastService.badRequest('Não foi possivel criar a acção presidencial')
-    } */
+    }
 
   }
 

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -65,7 +65,7 @@ export class ViewPublicationsPage implements OnInit {
   }
   
   getPublicationDetail() {
-    this.publications.PresidentialAction(this.folderId).subscribe(res=>{
+    this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{
       console.log(res);
       this.item = res;
     });