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

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -382,19 +382,17 @@ export class ExpedienteDetailPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then( async(res)=>{
+      alert('AQUI')
       let body = res['data'];
       if(res['data']) {
-
-        //await this.distartExpedientModal(body);
         const loader = this.toastService.loading()
         try {
           await this.processes.CompleteTask(body).toPromise();
-            //this.toastService.successMessage('Processo descartado');
-            this.goBack();
-          } catch (error) {
-            this.toastService.badRequest('Processo não descartado')
-          } finally {
-            loader.remove()
+          this.goBack();
+        } catch (error) {
+          this.toastService.badRequest('Processo não descartado')
+        } finally {
+          loader.remove()
         }
       }
       else{

src/app/pages/gabinete-digital/gabinete-digital.page.scss

@@ -149,6 +149,7 @@ ion-segment-button{
       border-radius: 15px;
       box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
       background: white;
+      border: 1px solid white;
       float: left;
     }
     .exp-card-long{
@@ -161,7 +162,7 @@ ion-segment-button{
       margin: 7px 20px;
       border-radius: 15px;
       padding: 7px;
-      border: blue !important;
+      border:1px solid white;
 
       .center-div{
         width: fit-content;
@@ -559,6 +560,7 @@ ion-list{
 .active {
   color: white !important;
   fill: white !important;
+  border: 1px solid #42b9fe !important;
   background: #42b9fe !important;
   box-sizing: border-box;
 

src/app/services/events.service.ts

@@ -41,7 +41,7 @@ export class EventsService {
 
     if(this.loggeduser){
       if(this.loggeduser.Profile == 'MDGPR') {
-      
+
         this.loggeduser.OwnerCalendars.forEach(calendar => {
           if(calendar.CalendarName == 'Oficial') {
             this.headersMdOficial = this.headersMdOficial.set('Authorization', this.loggeduser.BasicAuthKey);
@@ -52,10 +52,10 @@ export class EventsService {
             this.headersMdPessoal = this.headersMdPessoal.set('Authorization', this.loggeduser.BasicAuthKey);
             this.headersMdPessoal = this.headersMdPessoal.set('CalendarId', calendar.CalendarId);
             this.headersMdPessoal = this.headersMdPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
-  
+
           }
         });
-  
+
         this.loggeduser.SharedCalendars.forEach(sharedCalendar => {
           if(sharedCalendar.CalendarName == 'Oficial') {
             this.headersSharedOficial = this.headersSharedOficial.set('Authorization', this.loggeduser.BasicAuthKey);
@@ -70,7 +70,7 @@ export class EventsService {
         });
       }
       else if(this.loggeduser.Profile == 'PR') {
-  
+
         this.loggeduser.OwnerCalendars.forEach(calendar =>{
           if(calendar.CalendarName == 'Oficial'){
             this.headersPrOficial = this.headersPrOficial.set('Authorization', this.loggeduser.BasicAuthKey);
@@ -81,11 +81,11 @@ export class EventsService {
             this.headersPrPessoal = this.headersPrPessoal.set('Authorization', this.loggeduser.BasicAuthKey);
             this.headersPrPessoal = this.headersPrPessoal.set('CalendarId', calendar.CalendarId);
             this.headersPrPessoal = this.headersPrPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
-  
+
           }
         });
       }
-  
+
       this.headers = new HttpHeaders();
       this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey);
     }
@@ -99,10 +99,10 @@ export class EventsService {
 
     params = params.set("StartDate", startdate);
     params = params.set("EndDate", enddate);
-    
-    let options = { 
-      headers: this.headers, 
-      params: params 
+
+    let options = {
+      headers: this.headers,
+      params: params
     };
     return this.http.get<Event[]>(`${geturl}`, options);
   } */
@@ -116,10 +116,10 @@ export class EventsService {
 
     params = params.set("Start", startdate);
     params = params.set("End", enddate);
-    
-    let options = { 
-      headers: this.headersPrOficial, 
-      params: params 
+
+    let options = {
+      headers: this.headersPrOficial,
+      params: params
     };
     return this.http.get<EventList[]>(`${geturl}`, options);
   }
@@ -132,10 +132,10 @@ export class EventsService {
 
     params = params.set("Start", startdate);
     params = params.set("End", enddate);
-    
-    let options = { 
-      headers: this.headersPrPessoal, 
-      params: params 
+
+    let options = {
+      headers: this.headersPrPessoal,
+      params: params
     };
     return this.http.get<EventList[]>(`${geturl}`, options);
   }
@@ -156,25 +156,25 @@ export class EventsService {
 
     params = params.set("Start", startdate);
     params = params.set("End", enddate);
-    
-    let options = { 
-      headers: this.headersMdOficial, 
-      params: params 
+
+    let options = {
+      headers: this.headersMdOficial,
+      params: params
     };
     return this.http.get<EventList[]>(`${geturl}`, options);
   }
 
   getAllMdPessoalEvents(startdate:string, enddate:string): any{
     let geturl = environment.apiURL + 'calendar/md';
-    
+
     let params = new HttpParams();
 
     params = params.set("Start", startdate);
     params = params.set("End", enddate);
-    
-    let options = { 
-      headers: this.headersMdPessoal, 
-      params: params 
+
+    let options = {
+      headers: this.headersMdPessoal,
+      params: params
     };
     return this.http.get<any>(`${geturl}`, options)
   }
@@ -192,7 +192,7 @@ export class EventsService {
     let prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise();
     let prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise();
     const resFinal = prO.concat(prP);
-    
+
     return new Promise(resolve =>{
       return resolve(resFinal)
     });
@@ -208,13 +208,13 @@ export class EventsService {
 
     params = params.set("Start", startdate);
     params = params.set("End", enddate);
-    
-    let options = { 
-      headers: this.headersSharedOficial, 
-      params: params 
+
+    let options = {
+      headers: this.headersSharedOficial,
+      params: params
     };
     console.log(options);
-    
+
     return this.http.get<Event[]>(`${geturl}`, options);
   }
 
@@ -226,10 +226,10 @@ export class EventsService {
 
     params = params.set("Start", startdate);
     params = params.set("End", enddate);
-    
-    let options = { 
-      headers: this.headersSharedPessoal, 
-      params: params 
+
+    let options = {
+      headers: this.headersSharedPessoal,
+      params: params
     };
     return this.http.get<Event[]>(`${geturl}`, options);
   }
@@ -238,8 +238,8 @@ export class EventsService {
 
   getRecurrenceTypes(): any{
     const geturl = environment.apiURL + 'Calendar/RecurrenceTypes';
-    let options = { 
-      headers: this.headers, 
+    let options = {
+      headers: this.headers,
     };
     return this.http.get<any>(`${geturl}`, options);
   }
@@ -254,10 +254,10 @@ export class EventsService {
     params = params.set("CalendarName", calendarname);
     params = params.set("StartDate", startdate);
     params = params.set("EndDate", enddate);
-    
-    let options = { 
-      headers: this.headers, 
-      params: params 
+
+    let options = {
+      headers: this.headers,
+      params: params
     };
     return this.http.get<Event[]>(`${geturl}`, options);
   }
@@ -265,12 +265,12 @@ export class EventsService {
   getEvent(eventid: string): Observable<Event>{
     let geturl = environment.apiURL + 'calendar/GetEvent';
     let params = new HttpParams();
-    
+
     params = params.set("EventId", eventid);
-    
-    let options = { 
-      headers: this.headers, 
-      params: params 
+
+    let options = {
+      headers: this.headers,
+      params: params
     };
 
     return this.http.get<Event>(`${geturl}`, options);
@@ -284,10 +284,10 @@ export class EventsService {
 
     params = params.set("conflictResolutionMode", conflictResolutionMode.toString());
     params = params.set("sendInvitationsOrCancellationsMode", sendInvitationsOrCancellationsMode.toString());
-    
-    let options = { 
-      headers: this.headers, 
-      params: params 
+
+    let options = {
+      headers: this.headers,
+      params: params
     };
 
     return this.http.put<Event>(`${puturl}`, event, options)
@@ -305,10 +305,27 @@ export class EventsService {
     params.set('CalendarName', event.CalendarName)
     this.headers['CalendarId'] =  event.CalendarId
     this.headers['CalendarName'] =  event.CalendarName
-    
-    let options = { 
-      headers: this.headers, 
-      params: params 
+
+    if(event.CalendarName == 'Oficial'){
+      if(this.loggeduser.Profile == 'MDGPR'){
+        this.headers = this.headersMdOficial;
+      }
+      else if(this.loggeduser.Profile == 'PR'){
+        this.headers = this.headersPrOficial;
+      }
+    }
+    else{
+      if(this.loggeduser.Profile == 'MDGPR'){
+        this.headers = this.headersMdPessoal;
+      }
+      else if(this.loggeduser.Profile == 'PR'){
+        this.headers = this.headersPrPessoal;
+      }
+    }
+
+    let options = {
+      headers: this.headers,
+      params: params
     };
 
     return this.http.put<Event>(`${puturl}`, event, options)
@@ -316,7 +333,7 @@ export class EventsService {
 
   changeAgenda(body:any){
     const puturl = environment.apiURL + 'Calendar/MoveEvent';
-    let options = { 
+    let options = {
       headers: this.headers,
     };
     return this.http.post<any>(`${puturl}`, body, options);
@@ -329,14 +346,14 @@ export class EventsService {
 
     params = params.set("CalendarName", calendarName);
 
-    let options = { 
-      headers: this.headers, 
-      params: params 
+    let options = {
+      headers: this.headers,
+      params: params
     };
-    
+
     return this.http.post<Event>(`${puturl}`, event, options)
   } */
-  
+
   postEventMd(event:Event, calendarName:string)
   {
     const puturl = environment.apiURL + 'calendar/md';
@@ -348,17 +365,17 @@ export class EventsService {
     switch (calendarName) {
       case 'Oficial':
         console.log(calendarName);
-        options = { 
-          headers: this.headersMdOficial, 
-          params: params 
+        options = {
+          headers: this.headersMdOficial,
+          params: params
         };
         break;
-    
+
       case 'Pessoal':
         console.log(calendarName);
-        options = { 
-          headers: this.headersMdPessoal, 
-          params: params 
+        options = {
+          headers: this.headersMdPessoal,
+          params: params
         };
         break;
     }
@@ -377,21 +394,21 @@ export class EventsService {
     switch (calendarName) {
       case 'Oficial':
         console.log(calendarName);
-        options = { 
-          headers: this.headersPrOficial, 
-          params: params 
+        options = {
+          headers: this.headersPrOficial,
+          params: params
         };
         break;
-    
+
       case 'Pessoal':
         console.log(calendarName);
-        options = { 
-          headers: this.headersPrPessoal, 
-          params: params 
+        options = {
+          headers: this.headersPrPessoal,
+          params: params
         };
         break;
     }
-    
+
     return this.http.post<string>(`${puturl}`, event, options)
   }
 
@@ -404,11 +421,11 @@ export class EventsService {
     // 0 for occurence and 1 for serie (delete all events)
     params = params.set("eventDeleteType", eventDeleteType.toString());
 
-    let options = { 
-      headers: this.headers, 
-      params: params 
+    let options = {
+      headers: this.headers,
+      params: params
     };
-    
+
     return this.http.delete(`${puturl}`, options)
   }
   postExpedientEvent(docId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){
@@ -423,29 +440,29 @@ export class EventsService {
     switch (this.loggeduser.Profile) {
       case 'MDGPR':
         if(body.CalendarName == 'Pessoal'){
-          options = { 
+          options = {
             headers: this.headersMdPessoal,
-            params: params 
+            params: params
           };
         }
         else if(body.CalendarName == 'Oficial'){
-          options = { 
+          options = {
             headers: this.headersMdOficial,
-            params: params 
+            params: params
           };
         }
         break;
       case 'PR':
         if(body.CalendarName == 'Pessoal'){
-          options = { 
+          options = {
             headers: this.headersPrPessoal,
-            params: params 
+            params: params
           };
         }
         else if(body.CalendarName == 'Oficial'){
-          options = { 
+          options = {
             headers: this.headersPrOficial,
-            params: params 
+            params: params
           };
         }
         break;
@@ -464,29 +481,29 @@ export class EventsService {
     switch (this.loggeduser.Profile) {
       case 'MDGPR':
         if(body.CalendarName == 'Pessoal'){
-          options = { 
+          options = {
             headers: this.headersMdPessoal,
-            params: params 
+            params: params
           };
         }
         else if(body.CalendarName == 'Oficial'){
-          options = { 
+          options = {
             headers: this.headersMdOficial,
-            params: params 
+            params: params
           };
         }
         break;
       case 'PR':
         if(body.CalendarName == 'Pessoal'){
-          options = { 
+          options = {
             headers: this.headersPrPessoal,
-            params: params 
+            params: params
           };
         }
         else if(body.CalendarName == 'Oficial'){
-          options = { 
+          options = {
             headers: this.headersPrOficial,
-            params: params 
+            params: params
           };
         }
         break;
@@ -497,7 +514,7 @@ export class EventsService {
   postEventToApproveEdit(body: EventToApproveEdit) {
     const geturl = environment.apiURL + 'Tasks/EditEventTask';
 
-    let options = { 
+    let options = {
       headers: this.headers,
     };
 

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -10,7 +10,7 @@
 </ion-header>
 <ion-content>
 
-  <div class="width-100 overflow-y-auto height-100" >
+  <div class="content width-100 overflow-y-auto height-100">
 
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
     <ion-list *ngIf="expedienteGdStore.list.length >= 1">

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss

@@ -1,7 +1,6 @@
 @import '~src/function.scss';
-/* CONTENT */
+//CONTENT
 :host{
-    padding: 30px 20px 0 20px !important;
     margin: 0;
 }
 .title{
@@ -9,6 +8,7 @@
     font-size: 25px;
     color:#000;
     overflow: auto;
+    padding: 30px 20px 0 20px !important;
 
     .thetitle{
       width: fit-content;
@@ -19,19 +19,6 @@
       float: right;
     }
   }
-.item-list-small{
-    font-size: 11px;
-    overflow: auto;
-  }
-  .ion-item-class{
-    padding: 0;
-
-  }
-  .label-text{
-    width: 100%;
-    padding: 0;
-    margin: 0;
-  }
 //DIV
 ion-item{
   --background: none;
@@ -40,76 +27,28 @@ ion-item{
     //border-radius: 15px;
     //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
     //Sborder: solid 1px #e9e9e9;
-    background-color: var(--white);
+    //background-color: var(--white);
     margin: 0 auto;
     //padding: 10px;
     overflow: auto;
   }
-.div-content-expediente{
-  width: 100%;
-  float: left;
-  border-left: 3px solid #dae3f3;
-  padding:5px 5px 15px 5px;
-  margin: 10px 0 10px 0;
-  background:  #dae3f3;
-  border-radius: 20px;
-}
-.div-content-pendentes{
-  width: 100%;
-  float: left;
-  border-left: 3px solid #d9d9d9;
-  padding: 5px;
-}
-  .div-content-expediente h3, .div-content-pendentes h3{
-    margin: 0;
-    padding: 0;
-    font-size: 14pt;
-    width: 100%;
-  }
-  .div-icon{
-    width: 10%;
-    font-size: 20px;
-    float: left;
-    color: #808080;
-  }
-  .div-icon ion-icon{
-    display: block;
-    margin: 0 auto;
-
-  }
-  .div-content-expediente p, .div-content-pendentes p{
-    font-size: 14pt;
-    color: rgb(94, 92, 92);
-    padding: 0;
-    margin: 0;
-  }
-  .span-left{
-      /* border: 1px solid red; */
-      float: left;
-      font-size: 12px;
-      padding-left: 18px;
-  }
-  .span-right{
-    /* border: 1px solid blue; */
-    text-align: right;
-    float: right;
-    font-size: 12px;
-    padding-right: 18px;
-}
 
 /* New CSS */
+.content{
+  padding: 0px 20px 0 20px !important;
+}
 .expediente{
   border-radius: 15px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
   border:1px solid #e9e9e9 !important;
-  //background-color: var(--white);
+  //background-color: transparent;
   margin-bottom: 10px !important;
   padding: 15px;
 }
 .exp-list-item{
   //width: 368px;
   overflow: auto;
-  /* border-bottom: 1px solid gray; */
+  //border-bottom: 1px solid gray;
   margin: 10px auto;
 }
 
@@ -130,7 +69,7 @@ ion-item{
   .exp-icon{
     width: fit-content;
     float: right;
-   /* font-size: 13px; */
+    //font-size: 13px;
     margin: 0 !important;
     padding: 0 !important;
 
@@ -160,7 +99,7 @@ ion-item{
     .label{
       border-radius: 15px;
       background: #ffb703;
-      /* font-size: 12px; */
+      //font-size: 12px;
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
       color: #fff;
@@ -188,11 +127,11 @@ ion-item{
   .exp-remetente{
     //width: 200px;
     font-family: Roboto;
-   /*  font-size: 13px; */
+    //font-size: 13px;
     font-weight: normal;
     color: #000000;
     float: left;
-    /* border: 1px solid red; */
+    //border: 1px solid red;
   }
 }
 .div-top-header{

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -1,6 +1,6 @@
 <ion-header class="ion-no-border">
   <div class="title">
-    <div class="thetitle"><ion-label >Expediente</ion-label></div>
+    <div class="thetitle"><ion-label >Expediente11</ion-label></div>
     <div class="theicon">
       <button class="btn-no-color" (click)="doRefresh()">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
@@ -18,7 +18,7 @@
       </ion-refresher-content>
   </ion-refresher>
 
-  <div class="width-100 overflow-y-auto height-100" >
+  <div class="content width-100 overflow-y-auto height-100" >
     <div >
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
       <ion-list *ngIf="expedientegbstore.list.length >=0">

src/app/shared/gabinete-digital/expedients/expedients.page.scss

@@ -1,7 +1,6 @@
 @import '~src/function.scss';
-/* CONTENT */
+//CONTENT
 :host{
-    padding: 30px 20px 0 20px !important;
     margin: 0;
 }
 .title{
@@ -9,6 +8,7 @@
     font-size: 25px;
     color:#000;
     overflow: auto;
+    padding: 30px 20px 0 20px !important;
 
     .thetitle{
       width: fit-content;
@@ -19,19 +19,6 @@
       float: right;
     }
   }
-.item-list-small{
-    font-size: 11px;
-    overflow: auto;
-  }
-  .ion-item-class{
-    padding: 0;
-
-  }
-  .label-text{
-    width: 100%;
-    padding: 0;
-    margin: 0;
-  }
 //DIV
 ion-item{
   --background: none;
@@ -45,60 +32,11 @@ ion-item{
     //padding: 10px;
     overflow: auto;
   }
-.div-content-expediente{
-  width: 100%;
-  float: left;
-  border-left: 3px solid #dae3f3;
-  padding:5px 5px 15px 5px;
-  margin: 10px 0 10px 0;
-  background:  #dae3f3;
-  border-radius: 20px;
-  border: 1px solid red;
-}
-.div-content-pendentes{
-  width: 100%;
-  float: left;
-  border-left: 3px solid #d9d9d9;
-  padding: 5px;
-}
-  .div-content-expediente h3, .div-content-pendentes h3{
-    margin: 0;
-    padding: 0;
-    font-size: 14pt;
-    width: 100%;
-  }
-  .div-icon{
-    width: 10%;
-    font-size: 20px;
-    float: left;
-    color: #808080;
-  }
-  .div-icon ion-icon{
-    display: block;
-    margin: 0 auto;
-
-  }
-  .div-content-expediente p, .div-content-pendentes p{
-    font-size: 14pt;
-    color: rgb(94, 92, 92);
-    padding: 0;
-    margin: 0;
-  }
-  .span-left{
-      /* border: 1px solid red; */
-      float: left;
-      font-size: 12px;
-      padding-left: 18px;
-  }
-  .span-right{
-    /* border: 1px solid blue; */
-    text-align: right;
-    float: right;
-    font-size: 12px;
-    padding-right: 18px;
-}
 
 /* New CSS */
+.content{
+  padding: 0px 20px 0 20px !important;
+}
 .expediente{
   border-radius: 15px;
   box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
@@ -110,7 +48,7 @@ ion-item{
 .exp-list-item{
   //width: 368px;
   overflow: auto;
-  /* border-bottom: 1px solid gray; */
+  //border-bottom: 1px solid gray;
   margin: 10px auto;
 }
 
@@ -131,7 +69,7 @@ ion-item{
   .exp-icon{
     width: fit-content;
     float: right;
-   /* font-size: 13px; */
+    //font-size: 13px;
     margin: 0 !important;
     padding: 0 !important;
 
@@ -161,7 +99,7 @@ ion-item{
     .label{
       border-radius: 15px;
       background: #ffb703;
-      /* font-size: 12px; */
+      //font-size: 12px;
       float: right;
       padding: 2.5px 13.5px 2.5px 13.5px;
       color: #fff;
@@ -189,11 +127,11 @@ ion-item{
   .exp-remetente{
     //width: 200px;
     font-family: Roboto;
-   /*  font-size: 13px; */
+    //font-size: 13px;
     font-weight: normal;
     color: #000000;
     float: left;
-    /* border: 1px solid red; */
+    //border: 1px solid red;
   }
 }
 .div-top-header{

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -87,7 +87,7 @@ export class OptsExpedientePage implements OnInit {
     }
     else {
       this.location.back()
-      
+
 
       /* this.activatedRoute.paramMap.subscribe(params => {
         console.log('YES');
@@ -166,7 +166,7 @@ export class OptsExpedientePage implements OnInit {
             });
 
         });
-        
+
         this.popoverController.dismiss()
 
       }
@@ -325,12 +325,9 @@ export class OptsExpedientePage implements OnInit {
       console.log(res['data']);
       let body = res['data'];
       if(res['data']){
-        console.log('open discart')
-        //this.distartExpedientModal(body);
         const loader = this.toastService.loading()
         try {
           await this.processes.CompleteTask(body).toPromise();
-            this.toastService.successMessage('Processo descartado');
             this.goBack();
           } catch (error) {
             this.toastService.badRequest('Processo não descartado')