This commit is contained in:
Peter Maquiran
2023-08-08 09:43:26 +01:00
parent 834840fc41
commit 67a69d2e47
27 changed files with 153 additions and 54 deletions
@@ -210,7 +210,7 @@ export class EditEventPage implements OnInit {
participantes: new FormControl(this.taskParticipants, [
// Validators.required
]),
Date: new FormControl( new Date(this._postEvent.StartDate).toLocaleString('pt') <= new Date(this._postEvent.EndDate).toLocaleString('pt')? 'ok': null,[
Date: new FormControl( new Date(this._postEvent.StartDate).toLocaleString('pt') < new Date(this._postEvent.EndDate).toLocaleString('pt')? 'ok': null,[
Validators.required
]),
@@ -264,7 +264,7 @@ export class GroupContactsPage implements OnInit {
"userId":user._id,
}
this.chatService.addUserToGroup(body).subscribe(res=>{
this.ChatSystemService.getGroupRoom(roomId).updateContacts()
});
});
}
@@ -3,7 +3,7 @@
<div class="main-header">
<div class="header-top">
<div class="middle">
<ion-label class="title">{{groupNameFormart }}</ion-label>
<ion-label class="title">{{ ChatSystemService.getGroupRoom(roomId).name }}</ion-label>
</div>
<div class="right">
<button title="Menu" class="btn-no-color" (click)="openGroupMessagesOptions()">
@@ -17,8 +17,8 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
</div>
<div class="header-bottom-contacts">
<ion-label class="contacts-list" *ngFor="let member of members" >
<div class="header-bottom-contacts" *ngIf="ChatSystemService.getGroupRoom(roomId)">
<ion-label class="contacts-list" *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe" >
{{member.name}},
</ion-label>
</div>
@@ -109,19 +109,19 @@ export class ChatPopoverPage implements OnInit {
}
//Delete
deleteGroup(){
let body = { "roomId":this.roomId, }
this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
deleteGroup() {
let body = { "roomId":this.roomId }
this.chatService.getRoomInfo(this.roomId).subscribe(room => {
this.room = room['room'];
if(this.room.t === 'p') {
this.chatService.deleteGroup(body).subscribe(res=>{
this.ChatSystemService.deleteRoom(this.roomId)
// this.ChatSystemService.deleteRoom(this.roomId)
});
}
else {
this.chatService.deleteChannel(body).subscribe(res=>{
this.ChatSystemService.deleteRoom(this.roomId)
// this.ChatSystemService.deleteRoom(this.roomId)
});
}
});
@@ -82,6 +82,7 @@
placeholder="Data de fim*"
[(ngModel)]="folder.DateEnd"
[disabled]="disabled"
[min]="folder.DateBegin"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker2