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

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -115,16 +115,11 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   ngOnInit() {
-
     this.taskDate = new Date(this.task.taskStartDate);
-
     if(!this.task.hasOwnProperty('isEvent')) {
-      // if not 
       this.getAttachments();
     }
-
     this.getSubjectType();
-    
   }
 
   close(){
@@ -132,15 +127,15 @@ export class ExpedientTaskModalPage implements OnInit {
     this.modalController.dismiss(null);
   }
   
-  getSubjectType() {
+  getSubjectType(){
     this.processes.GetSubjectType().subscribe(res=>{
       console.log(res);
       this.subjectTypes = res;
     });
   }
+
   cancelTask() {
     this.modalController.dismiss(null);
-    
   }
 
   async saveTask(){
@@ -157,9 +152,7 @@ export class ExpedientTaskModalPage implements OnInit {
     else if(this.postData.Priority=='99999864'){
       this.dispatchFolder.DeadlineType = 'Urgentíssimo';
     }
-    
     let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
-
     attendees = attendees.map(function(val) {
       return {
         UserEmail: val.EmailAddress,
@@ -205,7 +198,14 @@ export class ExpedientTaskModalPage implements OnInit {
           // console.log('this.postData', this.postData, this.taskType);
           
           try {
-            this.taskResult = await this.processes.postDespatcho(this.postData).toPromise()
+            switch(this.loggeduser.Profile){
+              case 'MDGPR':
+                this.taskResult = await this.processes.postDespatcho(this.postData).toPromise();
+                break;
+              case 'PR':
+                this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise();
+                break;
+            }
             await this.successMessage('Processo efetuado')
           } catch (error) {
             await this.badRequest('Processo não efetuado')
@@ -239,7 +239,15 @@ export class ExpedientTaskModalPage implements OnInit {
           //console.log(this.postData);
       
           try {
-            this.taskResult = await this.processes.postParecer(this.postData).toPromise()
+            switch(this.loggeduser.Profile){
+              case 'MDGPR':
+                this.taskResult = await this.processes.postParecer(this.postData).toPromise();
+                break;
+              case 'PR':
+                this.taskResult = await this.processes.postParecerPr(this.postData).toPromise();
+                break;
+            }
+           
             await this.successMessage('Processo efetuado')
           } catch (error) {
             await this.badRequest('Processo não efetuado')

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html

@@ -137,8 +137,16 @@
     </div>
 
     <div *ngIf="task" class="aside-right flex-column height-100">
-      <div class="buttons">
-        <button (click)="markToDispatch()" class="btn-ok" shape="round" >Marcar para Despacho</button>
+      <div *ngIf="loggeduser.Profile =='MDGPR' " class="buttons">
+        <button class="btn-cancel" shape="round" >Aprovar</button>
+        <button class="btn-cancel" shape="round" >Mandar para arevisão</button>
+        <div class="solid"></div>
+        <button (click)="distartExpedientModal(fulltask)" class="btn-cancel" shape="round" >Descartar</button>
+        <div hidden class="solid"></div>
+        <button hidden class="btn-cancel" shape="round" >Delegar</button>
+      </div>
+      <div *ngIf="loggeduser.Profile =='PR' " class="buttons">
+        <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Marcar para Despacho</button>
         <button (click)="distartExpedientModal(fulltask)" class="btn-cancel" shape="round" >Descartar</button>
         <div class="solid"></div>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -15,6 +15,8 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart
 import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
 import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
+import { User } from 'src/app/models/user.model';
+import { AuthService } from 'src/app/services/auth.service';
 
 @Component({
   selector: 'app-expediente-pr',
@@ -34,6 +36,8 @@ export class ExpedientePrPage implements OnInit {
   profile: string;
   intervenientes: any;
   cc: any;
+  
+  loggeduser: User;
 
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
@@ -46,7 +50,9 @@ export class ExpedientePrPage implements OnInit {
     private alertService: AlertService,
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
-    ) { 
+    private userAuth: AuthService
+    ) {
+      this.loggeduser = userAuth.ValidatedUser;
       this.activatedRoute.queryParams.subscribe(params => {
         if(params["serialNumber"]) {
           this.serialnumber = params["serialNumber"];
@@ -97,11 +103,16 @@ export class ExpedientePrPage implements OnInit {
 
   async LoadTaskDetail(serial: string) {
     this.processes.GetTask(serial).subscribe(res => {
+
+      let date = new Date(res.taskStartDate);
+      date.setMonth(date.getMonth() + 1);
+      let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+
       this.task = {
         "SerialNumber": res.serialNumber,
         "Folio": res.workflowInstanceDataFields.Subject,
         "Senders": res.originator.email,
-        "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
+        "CreateDate":taskDate,
         "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
         "Remetente": res.workflowInstanceDataFields.Sender,
         "Note": res.workflowInstanceDataFields.Note,

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

@@ -396,11 +396,13 @@ export class GabineteDigitalPage implements OnInit {
 
   openExpedientesPrPage(segment:string){
     this.closeAllDesktopComponents();
-    if( window.innerWidth <= 800){
-      this.openDespachoList();
+    if( window.innerWidth <= 800) {
+      //this.openExpedientList();
+      this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
     }
-    else{
-      let navigationExtras: NavigationExtras = {queryParams: {"expedientespr": true,}};
+    else {
+      this.selectedElement='ExpedientesPr'
+      let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,}};
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showExpedientesPr = true;
     }