peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

prepare for presantation

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-24 18:39:31 +01:00
parent 10ca45b8a0 3d00f33d4c
commit 3451e74c90
28 changed files with 105 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+1 -2
View File
@@ -44,8 +44,7 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="icon-only" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg"></ion-icon>
</div>
<div style="
<div *ngIf="SessionStore.user.RoleID !== 100000014" style="
padding-bottom: 10px;
padding-left: 10px;
padding-right: 10px;
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+2 -2
View File
@@ -34,7 +34,7 @@
<div *ngIf="members">
<ion-label class="members-label">Contactos selecção:</ion-label>
<div class="members-list" *ngFor="let user of members">
<ion-item-sliding>
<ion-item-sliding [class.inactive]="sessionStore.user.UserName == user.username">
<ion-item lines="none" class="members-checkbox ion-no-border ion-no-padding">
<ion-checkbox checked disabled color="primary"></ion-checkbox>
<p>{{user.name}}</p>
@@ -43,7 +43,7 @@
<ion-item-options (click)="deleteMember(user)" class="members-options" side="end">
<ion-item-option color="danger">Apagar</ion-item-option>
</ion-item-options>
</ion-item-sliding>
</ion-item-sliding>
</div>
</div>
src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss
+7 -2
View File
@@ -136,7 +136,7 @@
.item-checkbox p, .members-checkbox p{
display: block;
margin: 0 !important;
width: 330px;
padding-left: 10px;
font-size: rem(15);
color: var(--title-text-color);
@@ -165,4 +165,9 @@
}
}
.inactive {
opacity: 0.7;
ion-item-options {
display: none !important;
}
}
src/app/pages/chat/group-messages/group-messages.page.ts
+1 -1
View File
@@ -894,7 +894,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
members: this.members,
members: this.ChatSystemService.getGroupRoom(this.roomId).members,
name: this.room.name,
},
cssClass: 'contacts',
src/app/pages/events/events.page.scss
+2
View File
@@ -453,6 +453,7 @@ ion-toolbar{
color: black;
min-height: 19px;
width: 100%;
}
.description{
@@ -460,6 +461,7 @@ ion-toolbar{
font-family: Roboto;
font-size: rem(13);
font-weight: bold;
//color: #0d89d1;
color: var(--title-text-color)
}
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+2 -1
View File
@@ -254,7 +254,7 @@ export class ApproveEventPage implements OnInit {
componentProps: {
trustedUrl: '',
file: {
title: Document.Assunto,
title: Document.Description,
url: '',
title_link: '',
},
@@ -382,6 +382,7 @@ export class ApproveEventPage implements OnInit {
try {
this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.loadedEvent.workflowInstanceDataFields.InstanceId).toPromise();
console.log(this.loadedAttachments)
} catch (error) {
console.error('getAttchaments',error)
}
src/app/pages/gabinete-digital/event-list/event-list.page.html
+3 -2
View File
@@ -114,10 +114,11 @@
<p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div>
<div class="approve-event-detail">
<div class="approve-event-detail ">
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
<p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
<div *ngIf="event.activityInstanceName">
<div class="label-event-type font-13-rem"> {{ event.activityInstanceName }} </div>
</div>
src/app/pages/publications/new-publication/new-publication.page.ts
+24 -40
View File
@@ -210,6 +210,7 @@ export class NewPublicationPage implements OnInit {
if (this.publicationType == '3') {
const loader = this.toastService.loading()
// has captured image
if (this.capturedImage != '') {
@@ -225,20 +226,7 @@ export class NewPublicationPage implements OnInit {
FileExtension: 'jpeg',
}
const loader = this.toastService.loading()
try {
const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Publicação Editada')
console.log({response})
this.close()
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
}
// no file names
@@ -255,19 +243,6 @@ export class NewPublicationPage implements OnInit {
FileExtension: "",
}
const loader = this.toastService.loading()
try {
const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Criar publicação')
console.log({response})
this.close()
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
} else {
this.publication = {
@@ -281,23 +256,30 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.publication.FileBase64,
FileExtension: 'jpeg',
}
const loader = this.toastService.loading()
try {
const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.httpErrorHandle.httpsSucessMessagge('Publicação Editada')
console.log({response})
this.close()
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
}
try {
const response = await this.publications.CreatePublication(this.publication.ProcessId, this.publication).toPromise()
try {
await this.publications.DeletePublication(this.folderId, this.publication.DocumentId).toPromise();
} catch(error) {}
this.httpErrorHandle.httpsSucessMessagge('Editar publicação')
console.log({response})
this.close();
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
this.PublicationFolderService.deletePost(this.publication.DocumentId, this.publication.ProcessId)
this.PublicationFolderService.deletePost(this.folderId, this.publication.ProcessId)
this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
}
else {
@@ -336,11 +318,13 @@ export class NewPublicationPage implements OnInit {
}
}
this.PublicationFolderService.getPublicationsIds(this.folderId)
}
close() {
this.modalController.dismiss().then(() => {
this.modalController.dismiss(this.publication).then(() => {
this.showLoader = true;
});
}
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+13 -6
View File
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { AnimationController, ModalController } from '@ionic/angular';
import { ActivatedRoute } from '@angular/router';
import { ModalController } from '@ionic/angular';
import { Publication } from 'src/app/models/publication';
import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
@@ -134,6 +134,9 @@ export class PublicationDetailPage implements OnInit {
if(this.isModal) {
this.close()
} else {
if(window['app-view-publications-page-doRefresh']) {
window['app-view-publications-page-doRefresh']()
}
this.RouteService.goBack();
}
@@ -156,6 +159,7 @@ export class PublicationDetailPage implements OnInit {
} catch (error) {
if(error.status == 404) {
this.publicationFolderService.deletePost(this.folderId, this.publicationId)
this.goBack();
}
this.httpErrorHandle.httpStatusHandle(error)
} finally {
@@ -178,10 +182,13 @@ export class PublicationDetailPage implements OnInit {
backdropDismiss: false
});
modal.onDidDismiss().then(()=>{
setTimeout(() => {
this.getPublicationDetail();
}, 5000);
modal.onDidDismiss().then((data) => {
if(data.data) {
this.publication = data.data
if(window['app-view-publications-page-doRefresh']) {
window['app-view-publications-page-doRefresh']()
}
}
});
await modal.present();