fix merge

2026-04-20 05:16:07 +00:00 · 2023-03-10 11:47:53 +01:00
parent a25b8ba40f 52745817ef
commit e11a66d9c2
28 changed files with 113 additions and 37 deletions
@@ -533,6 +533,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
        roomId: this.roomId,
        members: this.members,
        isAdmin: this.isAdmin,
+        isCreated: this.isGroupCreated,
+        room: this.room,
+        name: this.room.name,
      },
    });
    await modal.present();
@@ -1,3 +1,7 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
 <ion-header class="ion-no-border header-2">
  <div class="main-header">
    <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
@@ -1,3 +1,7 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
 <ion-header class="ion-no-border header-2">
  
  <div class="title d-flex align-center">
@@ -1,3 +1,7 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
 <ion-content class="container-wrapper">
  <div class="main-content d-flex height-100 overflow-hidden">
    <div class="content d-flex flex-column" *ngIf="task">
@@ -179,9 +179,8 @@ export class DiplomaAssinarPage implements OnInit {
    try {
      await this.processes.CompleteTask(body).toPromise()

-      this.httpErroHandle.httpsSucessMessagge('Assinado',() => {
-        this.goBack();
-      })
+      this.httpErroHandle.httpsSucessMessagge('Assinado')
+      this.goBack();
    } catch (error) {
    this.httpErroHandle.httpStatusHandle(error)
    }
@@ -1,3 +1,8 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
+
 <ion-header class="ion-no-border header-2">
  <div class="title">
    <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
@@ -1,3 +1,8 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
+
 <ion-header class="ion-no-border header-2">

  <div class="title d-flex align-center">
@@ -1,3 +1,7 @@
+<ion-header class="ion-no-border pb-20">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
 <ion-content class="container-wrapper">
  <div class="main-content d-flex height-100 width-100 overflow-hidden">

@@ -75,10 +75,10 @@

    <div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
      <div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
-        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efectuar Despacho</button>
        <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" >Efectuar 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>
        <div class="solid"></div>
      </div>
@@ -23,6 +23,7 @@ import { TaskService } from 'src/app/Rules/task.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service'
+import { EventTrigger } from 'src/app/services/eventTrigger.service';


 import { SqliteService } from 'src/app/services/sqlite.service';
@@ -89,7 +90,8 @@ export class ExpedienteDetailPage implements OnInit {
    private dataService: DataService,
    private storage: Storage,
    private userAuth: AuthService,
-    private httpErroHandle: HttpErrorHandle
+    private httpErroHandle: HttpErrorHandle,
+    private eventTriger: EventTrigger
  ) {
    this.loggeduser = SessionStore.user
    console.log('SessionStore', SessionStore)
@@ -314,6 +316,8 @@ export class ExpedienteDetailPage implements OnInit {

        if (actionName == 'Aprovar') {
          this.approve(res.data.note, docs);
+          this.subscribeEventTrigger('update')
+
        }
        else if (actionName == 'Revisão') {
          this.sendToReview(res.data.note, docs);
@@ -323,6 +327,11 @@ export class ExpedienteDetailPage implements OnInit {
    });
  }

+  subscribeEventTrigger(value) {
+    this.eventTriger.publishSomeData({
+      expedienteDetail: value
+    })
+  }

  goBack() {
    this.RouteService.goBack();
@@ -10,6 +10,7 @@ import { BackgroundService } from '../../../services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SortService } from 'src/app/services/functions/sort.service';
 import { Storage } from '@ionic/storage';
+import { EventTrigger } from 'src/app/services/eventTrigger.service';

@Component({
  selector: 'app-expediente',
@@ -41,8 +42,17 @@ export class ExpedientePage implements OnInit {
    private backgroundservice: BackgroundService,
    public ThemeService: ThemeService,
    private sortService: SortService,
-    private storage: Storage
-  ) { }
+    private storage: Storage,
+    private eventTriger: EventTrigger
+  ) { 
+
+    this.eventTriger.getObservable().subscribe((event) => {
+      if(event.notification == "recive") {
+        this.refreshing();
+      }
+      console.log(event)
+    })
+  }

  ngOnInit() {

@@ -1,3 +1,6 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>

 <div class="ion-page d-none" id="main-content">
  <ion-menu-button></ion-menu-button>
@@ -1,3 +1,7 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
 <ion-header class="ion-no-border header-2">

  <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
@@ -1,3 +1,7 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
 <ion-header class="ion-no-border header-2">
  <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
  <div class="title">
@@ -1,3 +1,8 @@
+<ion-header class="ion-no-border">
+  <!-- <app-header > </app-header> -->
+</ion-header>
+
+
 <ion-header class="ion-no-border header-2">
  <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
  <div class="title">
@@ -18,6 +18,7 @@ import { ChatService } from 'src/app/services/chat.service';
 import { Platform } from '@ionic/angular';
 import { FirstEnterService } from '../../services/first-enter.service';
 import { Storage } from '@ionic/storage';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
@Component({
  selector: 'app-login',
  templateUrl: './login.page.html',
@@ -54,6 +55,7 @@ export class LoginPage implements OnInit {
    private platform: Platform,
    private FirstEnterService: FirstEnterService,
    private storage:Storage,
+    private httpErrorHandle: HttpErrorHandle
  ) {}

  ngOnInit() {}
@@ -176,10 +178,10 @@ export class LoginPage implements OnInit {

            
          }
-        }
+        }/* 
        else{
          this.toastService._badRequest('Ocorreu um problema por favor valide o username e password');
-        }
+        } */
      }
      else {
        this.toastService._badRequest('Por favor, insira a sua palavra-passe');
@@ -112,7 +112,7 @@ export class NewPublicationPage implements OnInit {
  async takePicture() {

    const capturedImage = await Camera.getPhoto({
-      quality: 90,
+      quality: 50,
      // allowEditing: true,
      resultType: CameraResultType.Uri,
      source: CameraSource.Camera
@@ -133,7 +133,7 @@ export class NewPublicationPage implements OnInit {
    var ctx = canvas.getContext('2d');
    canvas.width = 100
    canvas.height = 34
-    ctx.drawImage(image, 0, 0, 100, 34);
+    ctx.drawImage(image, 0, 0);
    document.body.appendChild(canvas);
  }