mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
update fix
This commit is contained in:
@@ -317,12 +317,12 @@
|
||||
<ion-label>
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name">{{document.appName}}</span>
|
||||
<span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
|
||||
<span class="close-button text-black" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{(document.Data ||document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
<div class="main-content">
|
||||
<div *ngIf="members">
|
||||
<ion-label class="members-label">Contactos selecção:</ion-label>
|
||||
<ion-list class="members-list" *ngFor="let user of members">
|
||||
<div class="members-list" *ngFor="let user of members">
|
||||
<ion-item-sliding>
|
||||
<ion-item lines="none" class="members-checkbox ion-no-border ion-no-padding">
|
||||
<ion-checkbox checked disabled color="primary"></ion-checkbox>
|
||||
@@ -44,7 +44,7 @@
|
||||
<ion-item-option color="danger">Apagar</ion-item-option>
|
||||
</ion-item-options>
|
||||
</ion-item-sliding>
|
||||
</ion-list>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@@ -95,20 +95,26 @@ export class GroupContactsPage implements OnInit {
|
||||
|
||||
if(!foundUser) {
|
||||
this.objectUserSingleStone.push(user)
|
||||
} else {
|
||||
'not found'
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
const userContainer = {}
|
||||
for(const user of this.objectUserSingleStone) {
|
||||
const firstLetter = user.name.charAt(0)
|
||||
|
||||
if(!this.userContainer[firstLetter]) {
|
||||
this.userContainer[firstLetter] = [user]
|
||||
if(!userContainer[firstLetter]) {
|
||||
userContainer[firstLetter] = [user]
|
||||
} else {
|
||||
this.userContainer[firstLetter].push(user)
|
||||
userContainer[firstLetter].push(user)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
this.userContainer = userContainer
|
||||
|
||||
|
||||
this.showLoader = false;
|
||||
@@ -167,7 +173,7 @@ export class GroupContactsPage implements OnInit {
|
||||
|
||||
doRefresh(ev){
|
||||
this.loadUsers();
|
||||
this.getMembers();
|
||||
//this.getMembers();
|
||||
ev.target.complete();
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<div class="title flex-1"><ion-label>Despachos</ion-label></div>
|
||||
<div class="theicon btn-refresh d-flex align-center">
|
||||
|
||||
|
||||
<div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
|
||||
|
||||
<ion-icon class="mr-10" src="assets/images/theme/gov/crescente.svg"></ion-icon>
|
||||
|
||||
@@ -725,6 +725,13 @@
|
||||
TaskService.pendentesstore.newList.length}} correspondência nova</span>
|
||||
</p>
|
||||
|
||||
<p class="text-center exp-card-content">
|
||||
<span class="number">{{TaskService.pendentesstore.count}} </span>
|
||||
<span class="title1" *ngIf="TaskService.pendentesstore.count == 0">correspondência</span>
|
||||
<span class="title1" *ngIf="TaskService.pendentesstore.count == 1">correspondência</span>
|
||||
<span class="title1" *ngIf="TaskService.pendentesstore.count > 1">correspondências</span>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@@ -202,21 +202,27 @@ export class GroupContactsPage implements OnInit {
|
||||
|
||||
if(!foundUser) {
|
||||
this.objectUserSingleStone.push(user)
|
||||
} else {
|
||||
console.log('not found')
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const userContainer = {}
|
||||
|
||||
for(const user of this.objectUserSingleStone) {
|
||||
const firstLetter = user.name.charAt(0)
|
||||
|
||||
if(!this.userContainer[firstLetter]) {
|
||||
this.userContainer[firstLetter] = [user]
|
||||
if(!userContainer[firstLetter]) {
|
||||
userContainer[firstLetter] = [user]
|
||||
} else {
|
||||
this.userContainer[firstLetter].push(user)
|
||||
userContainer[firstLetter].push(user)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
this.userContainer = userContainer
|
||||
|
||||
this.showLoader = false;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -135,17 +135,18 @@ export class NewGroupPage implements OnInit{
|
||||
|
||||
if(res?.result?.rid) {
|
||||
this.addGroupMessage.emit(res.result.rid);
|
||||
await this.ChatSystemService.getAllRooms();
|
||||
|
||||
if(!this.ChatSystemService.getGroupRoom(res.result.rid)) {
|
||||
this.createGroupWithAttachmentsCath(res)
|
||||
} else {
|
||||
setTimeout(()=> {
|
||||
|
||||
this.createGroupWithAttachments(res)
|
||||
|
||||
}, 500)
|
||||
}
|
||||
|
||||
this.ChatSystemService.getAllRooms(() => {
|
||||
if(!this.ChatSystemService.getGroupRoom(res.result.rid)) {
|
||||
this.createGroupWithAttachmentsCath(res)
|
||||
} else {
|
||||
setTimeout(()=> {
|
||||
|
||||
this.createGroupWithAttachments(res)
|
||||
|
||||
}, 500)
|
||||
}
|
||||
}, res.result.rid);
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1646,3 +1646,6 @@ h5, .buttons{
|
||||
}
|
||||
|
||||
|
||||
.ngx-mat-timepicker input {
|
||||
user-select: none !important;
|
||||
}
|
||||
Reference in New Issue
Block a user