Refified processService methods;

Add approve page and criate its layout;
Finish functionality for list approve page

src/app/home/home-routing.module.ts

@@ -91,7 +91,16 @@ const routes: Routes = [
                 loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
               }
             ]
-          }
+          },
+          {
+            path:'event-list',
+            children: [
+              {
+                path:'',
+                loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
+              },
+            ]  
+          },
         ]
       },
       {

src/app/models/event.model.ts

@@ -2,7 +2,6 @@ import { EventBody } from './eventbody.model';
 import { EventPerson } from './eventperson.model';
 
 export class Event{
-   
     EventId: string;
     Subject: string;
     Body: EventBody;

src/app/pages/agenda/agenda-routing.module.ts

@@ -1,17 +1,21 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { AgendaPage } from './agenda.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AgendaPage
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AgendaPage } from './agenda.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AgendaPage
+  },
+  {
+    path: 'approve-event-modal',
     loadChildren: () => import('./approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
-];
   }
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class AgendaPageRoutingModule {}
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})

src/app/pages/agenda/approve-event-modal/approve-event-modal-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ApproveEventModalPage } from './approve-event-modal.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: ApproveEventModalPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class ApproveEventModalPageRoutingModule {}

src/app/pages/agenda/approve-event-modal/approve-event-modal.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ApproveEventModalPageRoutingModule } from './approve-event-modal-routing.module';
+
+import { ApproveEventModalPage } from './approve-event-modal.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    ApproveEventModalPageRoutingModule
+  ],
+  declarations: [ApproveEventModalPage]
+})
+export class ApproveEventModalPageModule {}

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html

@@ -0,0 +1,52 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-back-button defaultHref="" (click)="close()"></ion-back-button>
+    </ion-buttons>
+    <ion-title>{{loadedEvent.workflowInstanceDataFields.Subject}}</ion-title>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <ion-item lines="none">
+    <p class="location-detail">{{loadedEvent.workflowInstanceDataFields.Location}}</p>
+    <ion-button class="button-calendar-type" class="button-calendar-type" slot="end">{{loadedEvent.workflowInstanceDataFields.Agenda}}</ion-button>
+  </ion-item>
+  <ion-item>
+    <ion-label>
+      <p>{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'fullDate'}}</p>
+      <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+      <p>(Não se repete)</p>
+    </ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-label>
+      <h3>Intervenientes</h3>
+      <p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
+    </ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-label>
+      <h3>Detalhes</h3>
+      <p>MINEC, MINFIN</p>
+    </ion-label>
+  </ion-item>
+  <ion-item lines="none">
+    <ion-label>
+      <h3>Documentos</h3>
+      <ion-item>
+        <ion-label>
+          <h4>Lei do Orçamento Geral do Estado</h4>
+          <p><span>MINEC, MINFIN</span><span>13/04/2020</span></p>
+        </ion-label>
+      </ion-item>
+    </ion-label>
+  </ion-item>
+</ion-content>
+<ion-footer>
+  <ion-toolbar>
+    <ion-button class="button-edit-event" shape="round" (click)="editEvent()">Emendar</ion-button>
+    <ion-button class="button-options" shape="round" (click)="openOptions()"><ion-icon name="ellipsis-vertical-outline"></ion-icon></ion-button>
+    <ion-button shape="round" (click)="approveEvent()">Aprovar</ion-button>
+  </ion-toolbar>
+</ion-footer>

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.scss

@@ -0,0 +1,26 @@
+.location-detail{
+    font-size: 18px;
+}
+.button-calendar-type{
+    width: 91px;
+    height: 25px;
+    --border-radius: 12.5px;
+    --background-color: #ffb703;
+}
+  .button-edit-event {
+    width: 170px;
+    height: 44px;
+    border-radius: 22.5px;
+    background-color: #e0e9ee;
+  }
+    .button-options {
+        width: 36px;
+        height: 35px;
+        object-fit: contain;
+    }
+    .button-approve {
+        width: 170px;
+        height: 44px;
+        border-radius: 22.5px;
+        background-color: #42b9fe;
+      }

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { ApproveEventModalPage } from './approve-event-modal.page';
+
+describe('ApproveEventModalPage', () => {
+  let component: ApproveEventModalPage;
+  let fixture: ComponentFixture<ApproveEventModalPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ApproveEventModalPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ApproveEventModalPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -0,0 +1,75 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { ModalController, NavParams } from '@ionic/angular';
+import { Event } from 'src/app/models/event.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+
+@Component({
+  selector: 'app-approve-event-modal',
+  templateUrl: './approve-event-modal.page.html',
+  styleUrls: ['./approve-event-modal.page.scss'],
+})
+export class ApproveEventModalPage implements OnInit {
+  event: Event;
+  loadedEvent:any;
+  serialNumber:string;
+
+  constructor(
+    private router:Router,
+    private modalController: ModalController,
+    private navParams: NavParams,
+    private processes:ProcessesService,
+    )
+    {
+      this.serialNumber = this.navParams.get('serialNumber');
+     }
+
+  ngOnInit() {
+    
+    console.log(this.serialNumber);
+    this.getTask();
+    
+    this.event = {
+      EventId: '1',
+      Subject: 'Reunião do Conselho de Ministros',
+      Body: null,
+      Location: 'Palácio Presidencial, Luanda',
+      CalendarId: 'string',
+      CalendarName: 'Oficial',
+      StartDate: new Date,
+      EndDate: new Date,
+      EventType: 'Reunião',
+      Attendees: null,
+      IsMeeting: true,
+      IsRecurring: false,
+      AppointmentState: 2,
+      TimeZone: '',
+      Organizer: '',
+      Categories: null,
+      HasAttachments: false,
+    }
+
+  }
+  close(){
+    this.router.navigate(['/home/gabinete-digital']);
+    this.modalController.dismiss(null);
+  }
+  getTask(){
+    this.processes.GetTask(this.serialNumber).subscribe(res => {
+      console.log(res);
+      this.loadedEvent = res;
+    })
+
+  }
+  editEvent(){
+
+  }
+  openOptions(){
+
+  }
+  approveEvent(){
+
+  }
+  
+
+}

src/app/pages/chat/chat.page.ts

@@ -38,14 +38,12 @@ export class ChatPage implements OnInit {
     this.result = this.chatService.getAllPrivateGroups().subscribe((res:any)=>{
       this.groupList = res.groups;
       /* console.log(this.groupList); */
-      
     }); 
   }
   getConnectedUsers(){
     this.result = this.chatService.getAllConnectedUsers().subscribe((res:any)=>{
       this.userConnectedList = res.users;
       console.log(this.userConnectedList);
-      
     }); 
   }
   async starConversation(selectedUser) {

src/app/pages/events/event-detail/event-detail.page.ts

@@ -73,6 +73,7 @@ export class EventDetailPage implements OnInit {
         {
           this.pageId = paramMap.get('eventId');
           eventid = paramMap.get('eventId');
+          
         }
 
         if (paramMap.has("caller"))

src/app/pages/gabinete-digital/event-list/event-list-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EventListPage } from './event-list.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: EventListPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class EventListPageRoutingModule {}

src/app/pages/gabinete-digital/event-list/event-list.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EventListPageRoutingModule } from './event-list-routing.module';
+
+import { EventListPage } from './event-list.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    EventListPageRoutingModule
+  ],
+  declarations: [EventListPage]
+})
+export class EventListPageModule {}

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

@@ -0,0 +1,63 @@
+<ion-header>
+  <ion-toolbar>
+    <ion-buttons slot="start">
+      <ion-back-button defaultHref="/gabinete-digital"></ion-back-button>
+    </ion-buttons>
+    <ion-title>Eventos para Aprovação</ion-title>
+  </ion-toolbar>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="segment">
+      <ion-segment-button value="MDGPR">
+        Seu calendário
+      </ion-segment-button>
+      <ion-segment-button value="PR">
+        Presidente da República
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content>
+  <div [ngSwitch]="segment">
+    <ion-list *ngSwitchCase="'MDGPR'">
+      <div *ngIf="eventsMDGPRList">
+      <ion-list>
+        <ion-item-sliding>
+          <ion-item class="Rectangle" lines="none" 
+            *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
+            <div class="content-{{event.workflowInstanceDataFields.Agenda}}">
+              <div class="approve-event-time">
+                <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
+                <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+              </div>
+              <div class="approve-event-detail">
+                <p>{{event.workflowInstanceDataFields.Location}}</p>
+                <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+              </div>
+            </div>
+          </ion-item>
+        </ion-item-sliding>
+      </ion-list>
+    </div>
+
+    </ion-list>
+    <ion-list *ngSwitchCase="'PR'">
+      <ion-item-sliding *ngIf="eventsPRList">
+        <ion-item class="Rectangle" lines="none" 
+            *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
+            <div class="content-{{event.workflowInstanceDataFields.Agenda}}">
+              <div class="approve-event-time">
+                <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
+                <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+              </div>
+              <div class="approve-event-detail">
+                <p>{{event.workflowInstanceDataFields.Location}}</p>
+                <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+              </div>
+            </div>
+          </ion-item>
+      </ion-item-sliding>
+    </ion-list>
+  </div>
+
+</ion-content>

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

@@ -0,0 +1,73 @@
+ion-item-sliding{
+  margin-top: 5px;
+}
+.Rectangle {
+  width: 360px;
+  border-radius: 15px;
+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+  border: solid 1px #e9e9e9;
+  background-color: var(--white);
+  margin: 0 auto;
+  padding: 10px;
+  margin-bottom: 10px;
+  overflow: auto;
+}
+.content-Oficial{
+  width: 340px;
+  border-radius: 5px;
+  border-right: 5px solid #99e47b;
+  overflow: auto;
+}
+.content-Pessoal{
+  width: 340px;
+  border-radius: 5px;
+  border-right: 5px solid #958bfc;
+  overflow: auto;
+}
+
+.approve-event-time{
+  float: left;
+}
+.approve-event-time p{
+  width: 33px;
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  color: var(--Antartic-grey);
+  margin: 0;
+  padding: 0;
+}
+.approve-event-detail{
+  float: left;
+  margin-left: 10px;
+}
+.approve-event-detail p{
+  width: 250px;
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  color: var(--black);
+  margin: 0;
+  padding: 0;
+}
+.approve-event-detail h3{
+  width: 250px;
+  font-family: Roboto;
+  font-size: 15px;
+  font-weight: bold;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  color: #0d89d1;
+  margin: 0;
+  padding: 0;
+}

src/app/pages/gabinete-digital/event-list/event-list.page.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { EventListPage } from './event-list.page';
+
+describe('EventListPage', () => {
+  let component: EventListPage;
+  let fixture: ComponentFixture<EventListPage>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EventListPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(EventListPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

@@ -0,0 +1,109 @@
+import { Component, OnInit } from '@angular/core';
+import { EventBody } from 'src/app/models/eventbody.model';
+import { EventPerson } from 'src/app/models/eventperson.model';
+import { Event } from 'src/app/models/event.model';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ModalController } from '@ionic/angular';
+import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-event-modal.page';
+
+@Component({
+  selector: 'app-event-list',
+  templateUrl: './event-list.page.html',
+  styleUrls: ['./event-list.page.scss'],
+})
+export class EventListPage implements OnInit {
+  segment:string;
+  eventsPRList: any;
+  eventsMDGPRList: any;
+  eventPerson: EventPerson;
+  eventBody: EventBody;
+  categories: string[];
+  serialnumber:string;
+
+
+  constructor(
+    private processes:ProcessesService,
+    private modalController: ModalController,
+    ) { }
+
+  ngOnInit() {
+    this.LoadToApproveEvents(); 
+
+    this.segment = "MDGPR";
+    this.eventBody = {
+      BodyType: 'string',
+      Text: 'string',
+    }
+    this.eventPerson = {
+      EmailAddress: 'tiago.kayaya@hotmail.com',
+      Name: 'Tiago',
+      IsRequired: false,
+    }
+
+    this.eventsPRList = [
+      {
+        EventId: '1',
+        Subject: 'Reunião do Conselho de Ministros',
+        Body: this.eventBody,
+        Location: 'Luanda',
+        CalendarId: 'string',
+        CalendarName: 'Oficial',
+        StartDate: new Date,
+        EndDate: new Date,
+        EventType: 'Reunião',
+        Attendees: null,
+        IsMeeting: true,
+        IsRecurring: false,
+        AppointmentState: 2,
+        TimeZone: '',
+        Organizer: '',
+        Categories: null,
+        HasAttachments: false,
+      },
+      {
+        EventId: '1',
+        Subject: 'Viagem',
+        Body: this.eventBody,
+        Location: 'Luanda',
+        CalendarId: 'string',
+        CalendarName: 'Pessoal',
+        StartDate: new Date,
+        EndDate: new Date,
+        EventType: 'Reunião',
+        Attendees: null,
+        IsMeeting: true,
+        IsRecurring: false,
+        AppointmentState: 2,
+        TimeZone: '',
+        Organizer: '',
+        Categories: null,
+        HasAttachments: false,
+      },
+  ]
+    
+  }
+
+  LoadToApproveEvents(){
+    this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
+      this.eventsPRList = res;
+    });
+    this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
+      this.eventsMDGPRList = res; 
+    });
+  }
+  async openApproveModal(eventSerialNumber){
+    const modal = await this.modalController.create({
+      component: ApproveEventModalPage,
+      componentProps:{
+        serialNumber: eventSerialNumber,
+      },
+      cssClass: 'cal-modal',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss();
+  }
+
+}

src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts

@@ -11,7 +11,11 @@ const routes: Routes = [
   {
     path: 'expediente',
     loadChildren: () => import('./expediente/expediente.module').then( m => m.ExpedientePageModule)
-  }
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./event-list/event-list.module').then( m => m.EventListPageModule)
+  },
 
 ];
 

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

@@ -11,6 +11,21 @@
     </ion-refresher-content>
   </ion-refresher>
   <ion-card color="#d4d5ca">
+    <ion-card-header>
+      <ion-card-title>Eventos para Aprovação</ion-card-title>
+      <ion-card-content>
+        <ion-item  [routerLink]="['/home/gabinete-digital/event-list']">
+          <ion-label>Minha agenda</ion-label>
+          <ion-button slot="end">{{count_ev_md}}</ion-button>
+        </ion-item>
+        <ion-item [routerLink]="['/home/gabinete-digital/event-list']" class="ion-item-change-color">
+          <ion-label>Agenda do Presidente</ion-label>
+          <ion-button slot="end">{{count_ev_pr}}</ion-button>
+        </ion-item>
+      </ion-card-content>
+    </ion-card-header>
+  </ion-card>
+    <ion-card color="#d4d5ca">
   <ion-card-header>
     <ion-card-title>Expediente</ion-card-title>
     <ion-card-content>

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

@@ -20,6 +20,8 @@ export class GabineteDigitalPage implements OnInit {
   count_dip_apr : string;
   count_dip_pv : string;
   count_de_pr : string;
+  count_ev_pr : string;
+  count_ev_md : string;
 
   ngOnInit() {
     this.LoadCounts();
@@ -31,12 +33,22 @@ export class GabineteDigitalPage implements OnInit {
       this.showLoader = false;
       this.count_exp_dailywork = result;
     });
+    this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
+      this.count_ev_pr = res; 
+    });
+    this.processesbackend.GetToApprovedEvents('MDGPR','true').subscribe(res=>{
+      this.count_ev_md = res;
+    });
     
     this.count_exp_pp = "-";
     this.count_exp_pd = "-";
     this.count_dip_apr = "-";
     this.count_dip_pv = "-";
     this.count_de_pr = "-";
+    this.count_ev_md='-';
+
+
+
   }
 
   doRefresh(event) {

src/app/services/attachments.service.ts

@@ -35,11 +35,13 @@ export class AttachmentsService {
   }
 
   getAttachments(source: number, sourceid: string): Observable<Attachment[]>{
-    let geturl = environment.apiURL + 'attachments/GetAttachments';
+    let geturl = environment.apiURL + 'attachments/GetSourceName';
     let params = new HttpParams();
 
     params = params.set("Source", source.toString());
-    params = params.set("SourceId", sourceid);
+    /* params = params.set("SourceId", sourceid); */
+    
+    
     
     let options = { 
       headers: this.headers, 

src/app/services/events.service.ts

@@ -55,7 +55,7 @@ export class EventsService {
   }
 
   getEvent(eventid: string): Observable<Event>{
-    let geturl = environment.apiURL + 'calendar/GetEvent';
+    let geturl = environment.apiURL + 'Calendar/GetEvent';
     let params = new HttpParams();
 
     params = params.set("EventId", eventid);

src/app/services/processes.service.ts

@@ -23,7 +23,7 @@ export class ProcessesService {
 
   GetTasksList(processname:string, onlycount:boolean): Observable<any>
   {
-    const geturl = environment.apiURL + 'processes/GetTasksList';
+    const geturl = environment.apiURL + 'tasks/List';
     let params = new HttpParams();
 
     params = params.set("ProcessName", processname);
@@ -39,17 +39,52 @@ export class ProcessesService {
 
   GetTask(serialnumber:string): Observable<any>
   {
-    const geturl = environment.apiURL + 'processes/GetTask';
+    const geturl = environment.apiURL + 'Tasks/FindTask';
     let params = new HttpParams();
 
-    params = params.set("TaskSerialNumber", serialnumber);
+    params = params.set("serialNumber", serialnumber);
     
     let options = { 
       headers: this.headers, 
       params: params 
     };
-
     return this.http.get<any>(`${geturl}`, options);
   }
 
+  GetMDOficialTasks(): Observable<any>
+  {
+    const geturl = environment.apiURL + 'tasks/GetMDOficialTasks';
+    let options = {
+      headers: this.headers, 
+    };
+    return this.http.get<any>(`${geturl}`, options);
+  }
+
+  GetMDPersonalTasks(): Observable<any>
+  {
+    const geturl = environment.apiURL + 'tasks/GetMDPersonalTasks';
+    let options = {
+      headers: this.headers, 
+    };
+    return this.http.get<any>(`${geturl}`, options);
+  }
+
+  GetToApprovedEvents(categoryname:string, count:string): Observable<any>
+  {
+    const geturl = environment.apiURL + 'Tasks/ListByCategory';
+    let params = new HttpParams();
+
+    params = params.set("categoryname", categoryname);
+    params = params.set("onlyCount", count);
+    
+    let options = { 
+      headers: this.headers, 
+      params: params 
+    };
+    return this.http.get<any>(`${geturl}`, options);
+  }
+
+  
+
+
 }