mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
save
This commit is contained in:
@@ -229,7 +229,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div *ngFor="let event of events.value" class="EventListBox" >
|
<div *ngFor="let event of events.value" class="EventListBox" >
|
||||||
|
|
||||||
<div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
|
<div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
|
||||||
*ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
|
*ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
|
||||||
|
|
||||||
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
|
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
|
||||||
@@ -271,7 +271,7 @@
|
|||||||
|
|
||||||
<div *ngFor="let event of events.value" class="EventListBox" >
|
<div *ngFor="let event of events.value" class="EventListBox" >
|
||||||
|
|
||||||
<div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
|
<div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
|
||||||
*ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event) ">
|
*ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event) ">
|
||||||
|
|
||||||
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
|
<div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
|
||||||
@@ -327,7 +327,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- New -->
|
<!-- New -->
|
||||||
<app-new-event *ngIf="mobileComponent.showAddNewEvent"
|
<app-new-event *ngIf="mobileComponent.showAddNewEvent"
|
||||||
[profile]="profile"
|
[profile]="profile"
|
||||||
[selectedSegment]=segment
|
[selectedSegment]=segment
|
||||||
[taskParticipants]="taskParticipants"
|
[taskParticipants]="taskParticipants"
|
||||||
@@ -345,7 +345,7 @@
|
|||||||
></app-new-event>
|
></app-new-event>
|
||||||
|
|
||||||
<!-- Edit -->
|
<!-- Edit -->
|
||||||
<app-edit-event *ngIf="mobileComponent.showEditEvent"
|
<app-edit-event *ngIf="mobileComponent.showEditEvent"
|
||||||
[taskParticipants]="taskParticipants"
|
[taskParticipants]="taskParticipants"
|
||||||
[taskParticipantsCc]="taskParticipantsCc"
|
[taskParticipantsCc]="taskParticipantsCc"
|
||||||
[profile]="profile"
|
[profile]="profile"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { AfterViewChecked, AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
|
import { AfterViewChecked, AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
|
||||||
import {ActivatedRoute, Router} from '@angular/router'
|
import {ActivatedRoute, Router} from '@angular/router'
|
||||||
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
|
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
|
||||||
|
import { map } from 'rxjs/operators';
|
||||||
import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
|
import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
|
||||||
import { AlertService } from 'src/app/services/alert.service';
|
import { AlertService } from 'src/app/services/alert.service';
|
||||||
import { AuthService } from 'src/app/services/auth.service';
|
import { AuthService } from 'src/app/services/auth.service';
|
||||||
@@ -252,9 +253,18 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async serverLongPull() {
|
async serverLongPull() {
|
||||||
|
alert('YAS')
|
||||||
|
|
||||||
const roomId = this.roomId
|
const roomId = this.roomId
|
||||||
this.chatService.getRoomMessages(roomId).subscribe(async res => {
|
|
||||||
|
this.chatService.getRoomMessages(roomId).subscribe(res=>{
|
||||||
|
console.log(res);
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
/* this.chatService.getRoomMessages(roomId).subscribe(async res => {
|
||||||
|
|
||||||
|
|
||||||
if (res == 502) {
|
if (res == 502) {
|
||||||
// Connection timeout
|
// Connection timeout
|
||||||
@@ -287,7 +297,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
|
|||||||
//this.loadMessages()
|
//this.loadMessages()
|
||||||
await this.serverLongPull();
|
await this.serverLongPull();
|
||||||
}
|
}
|
||||||
});
|
}); */
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ export class ChatService {
|
|||||||
|
|
||||||
let opts = {
|
let opts = {
|
||||||
headers: this.headers,
|
headers: this.headers,
|
||||||
params: params
|
params: params,
|
||||||
}
|
}
|
||||||
return this.http.get(environment.apiChatUrl+'im.history', opts);
|
return this.http.get(environment.apiChatUrl+'im.history', opts);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
<ion-list class="width-100" *ngSwitchCase="'MDGPR'" >
|
<ion-list class="width-100" *ngSwitchCase="'MDGPR'" >
|
||||||
<div
|
<div
|
||||||
class="item ion-no-padding width-100 cursor-pointer"
|
class="item item-hover ion-no-padding width-100 cursor-pointer"
|
||||||
*ngFor="let event of eventsMDGPRList"
|
*ngFor="let event of eventsMDGPRList"
|
||||||
(click)="openApproveModal(event.serialNumber, event)"
|
(click)="openApproveModal(event.serialNumber, event)"
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user