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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-30 17:14:59 +01:00
parent 0379b722cf 71ab74974d
commit f472d5ac0b
43 changed files with 70 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/create-process/create-process.page.html
+1 -1
View File
@@ -87,7 +87,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/modals/delegar/delegar.page.html
+1 -1
View File
@@ -17,7 +17,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/modals/document-detail/document-detail.page.html
+1 -1
View File
@@ -25,7 +25,7 @@
</div>
<div class="line"></div>
<div class="middle-content">
<h5 *ngIf="LoadedDocument.ApplicationId == 361 || LoadedDocument.ApplicationID == 361" >Participantes</h5>
<h5 *ngIf="LoadedDocument.ApplicationId == 361 || LoadedDocument.ApplicationID == 361" >Intervenientes</h5>
<h5 *ngIf="LoadedDocument.ApplicationId == 8 || LoadedDocument.ApplicationID == 8" >Remetente</h5>
<ion-item class="ion-no-margin ion-no-padding">
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+1 -1
View File
@@ -249,7 +249,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/modals/forward/forward.page.html
+1 -1
View File
@@ -18,7 +18,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/modals/profile/edit-profile/edit-profile.page.ts
+1 -1
View File
@@ -148,7 +148,7 @@ export class EditProfilePage implements OnInit {
const capturedImage = await Camera.getPhoto({
width: 188,
height: 188,
quality: 50,
quality: 100,
// allowEditing: true,
resultType: CameraResultType.Base64,
source: CameraSource.Camera
src/app/modals/profile/profile.page.ts
+1
View File
@@ -422,6 +422,7 @@ export class ProfilePage implements OnInit {
modal.onDidDismiss().then(() => {
this.isProfileOpen = false;
this.getProfilpicture()
}, (error) => {
console.log(error)
})
src/app/modals/view-event/view-event.page.html
+1 -1
View File
@@ -74,7 +74,7 @@
<div class="line"></div>
<div class="middle-content">
<div *ngIf="loadedEvent.Attendees">
<h5 class="font-17-rem">Participantes</h5>
<h5 class="font-17-rem">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let attendee of loadedEvent.Attendees">
src/app/pages/agenda/agenda.page.html
+1 -1
View File
@@ -45,7 +45,7 @@
</div>
<div style="
<div *ngIf="SessionStore.user.RoleID !== 100000014" style="
padding-bottom: 10px;
padding-left: 10px;
padding-right: 10px;
src/app/pages/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -252,7 +252,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -275,7 +275,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/pages/agenda/new-event/new-event.page.html
+1 -1
View File
@@ -209,7 +209,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/pages/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -69,7 +69,7 @@
<div class="line"></div>
<div class="middle-content">
<div *ngIf="loadedEvent.Attendees">
<h5 class="font-17-rem">Participantes</h5>
<h5 class="font-17-rem">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let attendee of loadedEvent.Attendees">
src/app/pages/chat/messages/messages.page.ts
+6 -3
View File
@@ -747,6 +747,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async addFileToChatMobile(types: typeof FileType[]) {
console.log('add image from gallery')
const roomId = this.roomId
const file = await Camera.getPhoto({
@@ -819,7 +820,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async addFileToChat(types: typeof FileType[]) {
console.log('add file')
const roomId = this.roomId
const file: any = await this.fileService.getFileFromDevice(types);
@@ -837,6 +838,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
const formData = new FormData();
formData.append('blobFile', blob);
console.log('add file', fileBase64)
this.ChatSystemService.getDmRoom(roomId).send({
file: {
@@ -855,7 +857,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
});
} else {
console.log('file not supported')
}
@@ -901,6 +903,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.takePicture()
}
else if (res['data'] == 'add-picture') {
console.log('add-picture')
this.addImageMobile()
}
else if (res['data'] == 'add-document') {
@@ -1041,7 +1044,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
await Filesystem.writeFile({
path: fileName,
data: pdfString,
directory: Directory.Documents,
directory: Directory.Data,
}).then((dir) => {
console.log('DIR ', dir)
this.fileOpener
src/app/pages/events/edit-event/edit-event.page.html
+1 -1
View File
@@ -66,7 +66,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/pages/events/event-detail-modal/event-detail-modal.page.html
+1 -1
View File
@@ -68,7 +68,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/pages/events/event-detail/event-detail.page.html
+1 -1
View File
@@ -68,7 +68,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+1 -1
View File
@@ -36,7 +36,7 @@
<div class="overflow-y-auto">
<div class="middle-content" >
<div *ngIf="intervenientes.length > 0">
<h5 >Participantes</h5>
<h5 >Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label *ngIf="intervenientes">
<div *ngFor="let interveniente of intervenientes">
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+1 -1
View File
@@ -35,7 +35,7 @@
<div class="overflow-y-auto" style="margin-right: -20px; margin-right: -20px;">
<div class="middle-content">
<h5 *ngIf="intervenientes">Participantes</h5>
<h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let task of intervenientes">
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
+1 -1
View File
@@ -37,7 +37,7 @@
</div>
<div class="line"></div>
<div class="middle-content">
<h5 *ngIf="intervenientes">Participantes</h5>
<h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+1 -1
View File
@@ -74,7 +74,7 @@
</div>
<div *ngIf="loadedEvent.workflowInstanceDataFields.Participants" class="middle-content">
<div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
<h5 class="font-17-rem">Participantes</h5>
<h5 class="font-17-rem">Intervenientes</h5>
<div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
<ion-label>{{att.Name}}</ion-label>
</div>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+1 -1
View File
@@ -73,7 +73,7 @@
<div class="overflow-y-auto">
<div class="middle-content">
<div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
<h5 class="font-17-rem">Participantes</h5>
<h5 class="font-17-rem">Intervenientes</h5>
<div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
<ion-label>{{att.Name}}</ion-label>
</div>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+1 -1
View File
@@ -213,7 +213,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+1 -1
View File
@@ -140,7 +140,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+1 -1
View File
@@ -44,7 +44,7 @@
<div class="overflow-y-auto">
<div class="middle-content">
<!-- <h5 *ngIf="intervenientes">Participantes</h5>
<!-- <h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+1 -1
View File
@@ -37,7 +37,7 @@
<div class="overflow-y-auto">
<div class="middle-content">
<h5 *ngIf="intervenientes">Participantes</h5>
<h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
src/app/services/events/edit-event/edit-event.page.html
+1 -1
View File
@@ -66,7 +66,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/services/events/event-detail-modal/event-detail-modal.page.html
+1 -1
View File
@@ -68,7 +68,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/services/events/event-detail/event-detail.page.html
+1 -1
View File
@@ -68,7 +68,7 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Participantes</ion-label>
<ion-label class="attach-label">Intervenientes</ion-label>
</ion-item>
<div *ngIf="loadedEvent.Attendees">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
src/app/services/notifications.service.ts
+2
View File
@@ -140,6 +140,7 @@ export class NotificationsService {
this.eventtrigger.publishSomeData({
notification: "recive"
})
}
);
@@ -174,6 +175,7 @@ export class NotificationsService {
console.log(result);
this.storageService.store("Notifications", result)
src/app/services/processes.service.ts
+9
View File
@@ -487,4 +487,13 @@ export class ProcessesService {
return this.http.get<any>(`${geturl}`, options);
}
uploadFiles(file) {
const geturl = environment.apiURL + 'Tasks/AttachDocImage';
let options = {
headers: this.headers,
};
return this.http.post<any>(`${geturl}`,file, options);
}
}
src/app/services/task.service.ts
+3 -3
View File
@@ -311,9 +311,9 @@ export class TaskService {
async loadEventosParaAprovacao() {
this.showLoaderNum++
console.log('PR')
// PR dont have event to approve
if(this.SessionStore.user.Profile != 'PR') {
/* if(this.SessionStore.user.Profile != 'PR') { */
try {
for(let calendar of this.eventService.calendarNamesAry) {
if(calendar == 'Meu calendario') {
@@ -345,7 +345,7 @@ export class TaskService {
} catch (error) {
}
}
/* } */
this.showLoaderNum--
src/app/shared/agenda/approve-event/approve-event.page.html
+1 -1
View File
@@ -83,7 +83,7 @@
<div class="overflow-y-auto">
<div class="middle-content">
<div *ngIf="loadedEvent.workflowInstanceDataFields.ParticipantsList">
<h5 class="font-17-rem">Participantes</h5>
<h5 class="font-17-rem">Intervenientes</h5>
<div *ngFor="let att of loadedEvent.workflowInstanceDataFields.ParticipantsList">
<ion-label>{{att.Name}}</ion-label>
</div>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+2 -2
View File
@@ -282,7 +282,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -305,7 +305,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/shared/agenda/edit-event/edit-event.page.html
+1 -1
View File
@@ -219,7 +219,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<div *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</div>
<div *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</div>
<div *ngFor="let participant of taskParticipants">{{participant.Name}}</div>
</ion-list>
</ion-item>
src/app/shared/agenda/event-list/event-list.page.ts
+2 -2
View File
@@ -96,9 +96,9 @@ export class EventListPage implements OnInit {
async LoadToApproveEvents() {
if(SessionStore.user.Profile == 'PR') {
/* if(SessionStore.user.Profile == 'PR') {
return false
}
} */
this.showLoader = true;
src/app/shared/agenda/new-event/new-event.page.html
+1 -1
View File
@@ -246,7 +246,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants.length ==0" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants.length ==0" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/shared/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -95,7 +95,7 @@
<div class="line"></div>
<div class="middle-content">
<div *ngIf="loadedEvent.Attendees">
<h5 class="font-17-rem">Participantes</h5>
<h5 class="font-17-rem">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let attendee of loadedEvent.Attendees">
src/app/shared/chat/group-messages/group-messages.page.ts
+1 -1
View File
@@ -863,7 +863,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
quality: 90,
// allowEditing: true,
resultType: CameraResultType.Base64,
source: CameraSource.Camera
source: CameraSource.Photos
});
const imageBase64 = 'data:image/jpeg;base64,' + file.base64String
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+2 -2
View File
@@ -224,7 +224,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Participantes*</ion-label>
<ion-label *ngIf="taskParticipants?.length < 1" class="list-people-title">Adicionar Intervenientes*</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -247,7 +247,7 @@
<div class="list-people flex-grow-1">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc?.length < 1" class="list-people-title">Adicionar Intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-content>
<div *ngIf="task" class="overflow-y-auto height-100">
<div class="middle-content">
<h5 class="font-17-rem" *ngIf="intervenientes">Participantes</h5>
<h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+1 -1
View File
@@ -33,7 +33,7 @@
<ion-content>
<div *ngIf="task" class="overflow-y-auto height-100 px-20">
<div class="middle-content">
<h5 class="font-17-rem" *ngIf="intervenientes">Participantes</h5>
<h5 class="font-17-rem" *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
src/app/shared/header/header.page.ts
+3 -2
View File
@@ -77,7 +77,7 @@ export class HeaderPage implements OnInit {
async ngOnInit() {
this.hideSearch();
this.notificationLengthData();
/* this.notificationLengthData(); */
this.getProfilpicture();
}
@@ -115,7 +115,7 @@ export class HeaderPage implements OnInit {
await this.storageservice.get("Notifications").then((value) => {
/* var data = JSON.parse(value); */
this.notificationLength = value.length;
}).catch((error) => {
@@ -223,6 +223,7 @@ export class HeaderPage implements OnInit {
modal.onDidDismiss().then(() => {
this.notificationLengthData()
this.getProfilpicture()
this.showProfileModal = false
})