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

package-lock.json

@@ -20297,8 +20297,7 @@
         },
         "ssri": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "resolved": "",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
             "figgy-pudding": "^3.5.1"

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -161,6 +161,7 @@ export class BookMeetingModalPage implements OnInit {
     }
   }
   async saveTask(){
+    console.log('HERE');
     
     // issue12323423
     let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);

src/app/shared/agenda/edit-event/edit-event.page.html

@@ -40,8 +40,8 @@
         </div>
         <div class="ion-input-class flex-grow-1">
 
-          <mat-form-field  class="width-100" placeholder="Selecione agenda">
+          <mat-form-field floatLabel="never" class="width-100" >
-            <mat-select [(value)]="postEvent.CalendarName" >
+            <mat-select placeholder="Selecione agenda" [(ngModel)]="postEvent.CalendarName" >
               <mat-option value="Oficial">
                 Oficial
               </mat-option>

src/app/shared/agenda/edit-event/edit-event.page.ts

@@ -96,6 +96,7 @@ export class EditEventPage implements OnInit {
 
   ngOnInit() {
     
+
     if(!this.restoreTemporaryData()){
       // clear
  

src/app/shared/agenda/new-event/new-event.page.html

@@ -15,7 +15,7 @@
   <div class="main-content">
 
     <div class="ion-item-container">
-      <ion-input type="text"  placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
+      <ion-input type="text"  placeholder="Assunto*" [(ngModel)]="postEvent.Subject"></ion-input>
     </div>
     <div class="container-div">
       <div class="ion-item-class-2 d-flex">
@@ -23,7 +23,7 @@
           <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
         </div>
         <div class="ion-input-class flex-grow-1">
-          <ion-input type="text" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
+          <ion-input type="text" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
         </div>
       </div>
   
@@ -144,8 +144,8 @@
         </div>
         <div class="ion-input-class flex-grow-1 d-flex justify-center align-center material-inputs materia-top">
 
-          <mat-form-field  class="width-100" placeholder="Selecione repetição" value="false" interface="action-sheet" required>
+          <mat-form-field floatLabel="never" class="width-100" value="false" interface="action-sheet" required>
-            <mat-select [(value)]="postEvent.IsRecurring">
+            <mat-select placeholder="Selecione repetição*" [(ngModel)]="postEvent.IsRecurring">
               <mat-option value="false">
                 Não se repete
               </mat-option>
@@ -169,7 +169,7 @@
           <div class="list-people">
             <ion-item lines="none">
               <ion-list>
-                <ion-label *ngIf="taskParticipants.length ==0" class="list-people-title">Adicionar intervenientes</ion-label>
+                <ion-label *ngIf="taskParticipants.length ==0" class="list-people-title">Adicionar intervenientes*</ion-label>
                 <ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
               </ion-list>
             </ion-item>

src/app/shared/agenda/new-event/new-event.page.scss

@@ -91,6 +91,7 @@
       .list-people{
         width: 256px;
         float: left;
+        color: #ebebeb;
       
       }
       .add-people{
@@ -102,7 +103,7 @@
       }
       .list-people-title{
         /* font-size: 13px; */
-        color: #797979;
+        color: #a3a3a3;
       }
       .attach-document{
         font-size: 15px;

src/app/shared/agenda/new-event/new-event.page.ts

@@ -297,7 +297,10 @@ export class NewEventPage implements OnInit {
       // console.log('MD - Aqui');
       // console.log(this.postEvent);
 
-      this.showLoader = true
+      this.showLoader = true;
+
+      console.log(this.postEvent);
+      
 
       this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(
         async (id) => {

src/app/shared/agenda/view-event/view-event.page.ts

@@ -12,6 +12,7 @@ import { momentG }  from 'src/plugin/momentG';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
 import { OptsExpedientePage } from '../../popover/opts-expediente/opts-expediente.page';
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-view-event',
@@ -51,7 +52,8 @@ export class ViewEventPage implements OnInit {
     private iab: InAppBrowser,
     private processes: ProcessesService,
     private modalController: ModalController,
-    public popoverController: PopoverController
+    public popoverController: PopoverController,
+    private toastService: ToastService
   ) 
   {
     this.isEventEdited = false;
@@ -111,6 +113,7 @@ export class ViewEventPage implements OnInit {
         setTimeout(()=>{
           alert.dismiss();
         }, 1500);
+        this.toastService.successMessage('Evento apagado');
         this.close();
       });  
   }