peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

update fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-21 11:42:34 +01:00
parent fdce8db602
commit a89b2739c8
9 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+2 -2
View File
@@ -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>
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+2 -2
View File
@@ -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>
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+10 -4
View File
@@ -95,21 +95,27 @@ 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();
}
src/app/pages/gabinete-digital/despachos/despachos.page.html
-1
View File
@@ -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>
src/app/pages/gabinete-digital/gabinete-digital.page.html
+7
View File
@@ -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>
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+10 -4
View File
@@ -202,20 +202,26 @@ 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;
});
src/app/shared/chat/new-group/new-group.page.ts
+2 -1
View File
@@ -135,8 +135,8 @@ export class NewGroupPage implements OnInit{
if(res?.result?.rid) {
this.addGroupMessage.emit(res.result.rid);
await this.ChatSystemService.getAllRooms();
this.ChatSystemService.getAllRooms(() => {
if(!this.ChatSystemService.getGroupRoom(res.result.rid)) {
this.createGroupWithAttachmentsCath(res)
} else {
@@ -146,6 +146,7 @@ export class NewGroupPage implements OnInit{
}, 500)
}
}, res.result.rid);
src/global.scss
+3
View File
@@ -1646,3 +1646,6 @@ h5, .buttons{
}
.ngx-mat-timepicker input {
user-select: none !important;
}
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "f6c911fc3",
"SHA": "f6c911fc3272645484878a6515ca68f31f223003",
"shortSHA": "fdce8db60",
"SHA": "fdce8db602a0eb8141d95d38600bc5afd23aeb2a",
"branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Sun Aug 20 21:02:08 2023 +0100'",
"lastCommitMessage": "notification event",
"lastCommitNumber": "5174",
"change": "diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html\nindex a0814f3d1..3efac5be7 100644\n--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html\n+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html\n@@ -10,7 +10,6 @@\n <div class=\"title flex-1\"><ion-label>Despachos</ion-label></div>\n <div class=\"theicon btn-refresh d-flex align-center\">\n \n-\n <div class=\"d-flex\" (click)=\"reorderList('old')\" *ngIf=\"ordinance == 'recent' \">\n \n <ion-icon class=\"mr-10\" src=\"assets/images/theme/gov/crescente.svg\"></ion-icon>",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/chat/messages/contacts/contacts.page.ts\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html",
"lastCommitTime": "'Sun Aug 20 22:00:23 2023 +0100'",
"lastCommitMessage": "update create event from document",
"lastCommitNumber": "5175",
"change": "",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group.page.ts\n\tmodified: src/global.scss",
"changeAuthor": "peter.maquiran"
}