Merge with developer-c

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss

@@ -1,4 +1,5 @@
 ion-content{
+<<<<<<< HEAD
     --padding-top:0px;
     --padding-start: 20px;
     --padding-end: 20px;
@@ -139,4 +140,146 @@ ion-content{
     border-radius: 22.5px;
     --background: #ffe0e0;
   }
-  
+  
+=======
+  --padding-top:0px;
+  --padding-start: 20px;
+  --padding-end: 20px;
+  font-size: 18px;
+}
+ion-menu{
+  --height: 225px;
+}
+.header-content{
+  width: 360px;
+  overflow: auto;
+  margin: 25px auto;
+}
+.header-icon-left{
+  width: 36px;
+  font-size: 33px;
+  color: #42b9fe;
+  float: left;
+}
+.header-title{
+  width: 264px;
+  font-family: Roboto;
+  font-size: 25px;
+  margin: 0 5px 0 5px;
+  padding: 0;
+  color:#000;
+  float: left;
+}
+.header-icon-right{
+  width: 45px;
+  font-size: 45px;
+  float: left;
+  overflow: auto;
+}
+.upper-content{
+  margin-left: 50px;
+  overflow: auto;
+  font-size: 18px;
+
+  .content-location{
+    width: 360px;
+    margin: 0 auto;
+    padding: 0;
+    overflow: auto;
+  }
+
+  .location-detail{
+    width: 210px;
+    font-weight: 700;
+    font-size: 18px;
+    float: left;
+    margin: 5px 5px 5px 0px;
+  }
+  .button-calendar-type{
+      width: 91px;
+      --border-radius: 12.5px;
+      --background: #ffb703;
+      margin-left: 5px;
+      float: left;
+  }
+  .button-calendar-type ion-button{
+    height: 25px;
+  }
+  .button-edit-event {
+      width: 140px;
+      height: 44px;
+      border-radius: 22.5px;
+      --background: #e0e9ee;
+      --color:#061b52;
+  }
+  .content-details p{
+      font-size: 16px;
+  }
+}
+.middle-conten{
+  .middle-content h3, .middle-content p{
+    font-size: 16px;
+  }
+}
+
+.bottom-content{
+  width: 360px;
+  margin: 0 auto;
+  
+  .bottom-content h3{
+    font-size: 16px;
+    margin: 0 0 0 10px;
+  }
+  .attach-document{
+    font-size: 15px;
+    color: #0d89d1;
+    margin: 5px 5px 5px 10px;
+    padding: 5px;
+    float: left;
+  }
+  .attach-icon{
+    width: 37px;
+    font-size: 35px;
+    float: left;
+  }
+  .attach-title-item{
+    width: 100%;
+    font-size: 15px;
+    color:#0d89d1;
+  }
+  /* SPAN */
+  .span-left{
+    float: left;
+    font-size: 15x;
+  }
+  .span-right{
+  text-align: right;
+  float: right;
+  font-size: 13px;
+  }
+}
+
+.buttons{
+  width: 360px;
+  margin: 0 auto;
+}
+
+.button-options {
+    height: 44px;
+     --color: #42b9fe;
+     /* opacity: 0; */
+}
+.button-approve {
+  width: 140px;
+  height: 44px;
+  border-radius: 22.5px;
+  --background: #42b9fe;
+}
+.button-reject {
+  width: 140px;
+  height: 44px;
+  --color: #d30a0a;
+  border-radius: 22.5px;
+  --background: #ffe0e0;
+}
+>>>>>>> developer-c

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

@@ -32,6 +32,18 @@
       </div>
     </div>
   </div>
+  <div class="container-div">
+    <div class="ion-item-class-2">
+      <div class="ion-icon-class">
+        <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
+      </div>
+      <div class="ion-input-class">
+        <ion-select placeholder="Tipo" [(ngModel)]="postData.SubjectTypeId" interface="action-sheet" Cancel-text="Cancelar" required>
+          <ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
+        </ion-select>
+      </div>
+    </div>
+  </div>
 
   <div class="container-div">
     <div class="ion-item-class-2">

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

@@ -34,6 +34,7 @@ export class ExpedientTaskModalPage implements OnInit {
   taskDescription: string;
   user: string;
   loadedAttachments:any;
+  subjectTypes:any;
 
   postData: Despacho;
   dispatchFolder: Folder;
@@ -65,6 +66,8 @@ export class ExpedientTaskModalPage implements OnInit {
       this.postData.UsersSelected = this.participants;
       /* By Default TypeDeadline should be 'Normal' */
       this.postData.Priority = '99999861';
+      /* By Default TypeDeadline should be 'Economia' */
+      this.postData.SubjectTypeId = '99999844';
       /* Initialize 'Subject' with the title of the expedient */
       this.postData.DispatchFolder.Subject = this.task.workflowInstanceFolio;
      }
@@ -79,7 +82,9 @@ export class ExpedientTaskModalPage implements OnInit {
     
     console.log(this.task.serialNumber);
     this.getAttachments();
-    
+
+    console.log(this.getSubjectType());
+  
   }
 
   close(){
@@ -89,6 +94,12 @@ export class ExpedientTaskModalPage implements OnInit {
   cancelTask(){
     this.modalController.dismiss(null);
   }
+  getSubjectType(){
+    this.processes.GetSubjectType().subscribe(res=>{
+      console.log(res);
+      this.subjectTypes = res;
+    });
+  }
   saveTask(){
     console.log(this.taskType);
     
@@ -100,6 +111,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -113,6 +125,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -124,6 +137,7 @@ export class ExpedientTaskModalPage implements OnInit {
           CountryCode: 'AO',
           Priority: this.postData.Priority,
           UserEmail: this.user,
+          SubjectTypeId: this.postData.SubjectTypeId,
           UsersSelected: this.participants,
           DispatchFolder: this.dispatchFolder,
         }
@@ -201,6 +215,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   async distartExpedientModal(){
+    console.log(this.task.serialNumber);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {

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

@@ -149,7 +149,7 @@
 
 
   </div>
-  <div *ngIf="!eventsList"> 
+  <!-- <div *ngIf="!eventsList"> 
     <ion-list>
       <ion-list-header>
         <ion-label>
@@ -190,7 +190,7 @@
       </ion-item>
      
     </ion-list>
-  </div>
+  </div> -->
 
   
 </div>

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

@@ -12,6 +12,7 @@ import { AlertService } from 'src/app/services/alert.service';
 import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
 import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page';
 import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
+import { momentG }  from 'src/plugin/momentG'
 
 @Component({
   selector: 'app-expediente-detail',
@@ -35,18 +36,27 @@ export class ExpedienteDetailPage implements OnInit {
     private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
+<<<<<<< HEAD
     private alertService: AlertService) {
     this.serialnumber = this.navParams.get('serialNumber');
     this.profile = this.navParams.get('profile');
   }
+=======
+    private alertService: AlertService) { 
+      this.serialnumber = this.navParams.get('serialNumber');
+      this.profile = this.navParams.get('profile');
+    }
+>>>>>>> developer-c
 
   ngOnInit() {
     this.profile = "mdgpr";
+    console.log(this.serialnumber);
+    
     this.activateRoute.paramMap.subscribe(paramMap => {
       if (!paramMap.has('SerialNumber')) {
         return;
       }
-      this.serialnumber = paramMap.get('SerialNumber');
+      /* this.serialnumber = paramMap.get('SerialNumber'); */
       this.LoadTaskDetail(this.serialnumber);
       this.LoadRelatedEvents(this.serialnumber);
     });
@@ -61,9 +71,9 @@ export class ExpedienteDetailPage implements OnInit {
         "SerialNumber": res.serialNumber,
         "Folio": res.workflowInstanceFolio,
         "Senders": res.originator.email,
-        "CreateDate": formatDate(new Date(res.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-        "DocumentURL": res.formURL,
-        "Remetente": res.workflowInstanceDataFields.Remetente
+        "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
+        "DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
+        "Remetente": res.workflowInstanceDataFields.Sender,
       }
       this.fulltask = res;
       console.log(res);
@@ -88,9 +98,15 @@ export class ExpedienteDetailPage implements OnInit {
     }
   }
 
+<<<<<<< HEAD
   viewDocument() {
     const url: string = this.task.DocumentURL.replace("webTRIX.Viewer", "webTRIX.Viewer.Branch1");
     const browser = this.iab.create(url, "_blank");
+=======
+  viewDocument(){
+    const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+    const browser = this.iab.create(url,"_parent");
+>>>>>>> developer-c
     browser.show();
   }
 

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

@@ -48,7 +48,7 @@ export class ExpedientePage implements OnInit {
           "Folio": element.workflowInstanceFolio,
           "Senders": element.originator.email,
           "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-          "DocumentURL": element.formURL,
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente
         }
         this.taskslist.push(task);

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

@@ -8,7 +8,7 @@
         <div class="div-title">
           <ion-label class="title">Gabinete Digital</ion-label>
         </div>
-        <div class="div-icon">
+        <div hidden class="div-icon">
           <ion-icon slot="end" src='assets/images/icons-add.svg'></ion-icon>
         </div>
       </div>

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

@@ -22,15 +22,7 @@ export class GabineteDigitalPage implements OnInit {
     private modalController: ModalController,
     private eventService: EventsService,
     private alertService: AlertService) { 
-      function setCookie(cname, cvalue, exdays) {
-        var d = new Date();
-        d.setTime(d.getTime() + (exdays*24*60*60*1000));
-        var expires = "expires="+ d.toUTCString();
-        document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
-      }
-
-      //  AccoesPresidenciais =  Correspondencia = 8
-      setCookie('searchModalAPPType','8,361', 99999999);
+      
     }
 
   count_exp_dailywork=0;