prepare for presantation

This commit is contained in:
Eudes Inácio
2023-08-24 18:39:31 +01:00
28 changed files with 105 additions and 211 deletions
@@ -33,6 +33,7 @@ export class ViewDocumentPage implements OnInit {
private alertController: AlertController,
) {
this.file = this.navParams.get('file');
console.log(this.file )
this.applicationId = this.navParams.get('applicationId');
this.docId = this.navParams.get('docId');
this.Document = this.navParams.get('Document')
+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;
@@ -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>
@@ -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;
}
}
@@ -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',
+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)
}
@@ -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)
}
@@ -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>
@@ -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;
});
}
@@ -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();
@@ -144,7 +144,7 @@ export class ApproveEventPage implements OnInit {
componentProps: {
trustedUrl: '',
file: {
title: Document.Assunto,
title: Document.Description,
url: '',
title_link: '',
},
@@ -63,9 +63,10 @@
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div>
<div class="approve-event-detail">
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(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>
@@ -38,9 +38,9 @@
<div class="members" *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-checkbox">
<div class="members-checkbox" [class.inactive]="sessionStore.user.UserName == user.username">
<ion-checkbox disabled checked color="primary"></ion-checkbox>
<p class="ma-0">{{user.name}}</p>
<p class="ma-0">{{user.name }}</p>
<ion-icon class="{{user.status}}" name="ellipse"></ion-icon>
<button (click)="deleteMember(user)" class="btn-no-color detele-item-icon">
<ion-icon color="danger" name="close"></ion-icon>
@@ -49,7 +49,6 @@
</ion-list>
</div>
<div *ngFor="let userContainer of userContainer | keyvalue;" >
<div class="item-divider">
@@ -176,4 +176,9 @@
}
}
.inactive {
opacity: 0.7;
button {
display: none !important;
}
}
@@ -39,7 +39,7 @@ export class GroupContactsPage implements OnInit {
objectUserSingleStone = []
userContainer = {}
constructor(
private modalController: ModalController,
private chatService: ChatService,
@@ -1,17 +0,0 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { GroupContactsPage } from './group-contacts.page';
const routes: Routes = [
{
path: '',
component: GroupContactsPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class GroupContactsPageRoutingModule {}
@@ -1,20 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { GroupContactsPageRoutingModule } from './group-contacts-routing.module';
import { GroupContactsPage } from './group-contacts.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
GroupContactsPageRoutingModule
],
declarations: [GroupContactsPage]
})
export class GroupContactsPageModule {}
@@ -1,9 +0,0 @@
<ion-header>
<ion-toolbar>
<ion-title>group-contacts</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
</ion-content>
@@ -1,24 +0,0 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { GroupContactsPage } from './group-contacts.page';
describe('GroupContactsPage', () => {
let component: GroupContactsPage;
let fixture: ComponentFixture<GroupContactsPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ GroupContactsPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(GroupContactsPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -1,15 +0,0 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-group-contacts',
templateUrl: './group-contacts.page.html',
styleUrls: ['./group-contacts.page.scss'],
})
export class GroupContactsPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
@@ -11,12 +11,7 @@ const routes: Routes = [
{
path: 'contacts',
loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule)
},
{
path: 'group-contacts',
loadChildren: () => import('./group-contacts/group-contacts.module').then( m => m.GroupContactsPageModule)
}
];
@NgModule({
@@ -112,9 +112,9 @@
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
</div>
<div class="approve-event-detail">
<div class="h3">{{event.workflowInstanceDataFields.Subject}}</div>
<div class="p" *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</div>
<div class="p" *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</div>
<div class="h3">{{event.workflowInstanceDataFields.Subject}}</div>
</div>
<div>
<span class="dead-line ml-10" *ngIf="TaskService.deadlineIsToday(event.deadline)">Para hoje</span>
@@ -10,7 +10,7 @@
<div class="buttons">
<button *ngIf="isAdmin" (click)="addUser()" class="btn-cancel" shape="round">Adicionar</button>
<button (click)="leaveGroup()" class="btn-cancel" shape="round">Sair do Grupo</button>
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round">Alterar
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" style="min-width: 192px;">Alterar
nome do grupo</button>
<div class="solid"></div>
<button (click)="close('cancel')" full class="btn-cancel mobile-only" shape="round">Cancelar</button>
@@ -167,6 +167,7 @@ export class NewPublicationPage implements OnInit {
}
if(this.publicationType == '3') {
const loader = this.toastService.loading()
if(this.capturedImage != '') {
@@ -181,23 +182,6 @@ export class NewPublicationPage implements OnInit {
FileBase64: this.capturedImage,
FileExtension: 'jpeg',
}
const loader = this.toastService.loading()
try {
const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.httpErroHandle.httpsSucessMessagge('Criar publicação')
console.log({response})
this.goBack();
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
}
else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) { //
@@ -212,21 +196,6 @@ export class NewPublicationPage implements OnInit {
FileBase64: "",
FileExtension: this.publication.FileExtension,
}
const loader = this.toastService.loading()
try {
const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
this.httpErroHandle.httpsSucessMessagge('Criar publicação')
console.log({response})
this.goBack();
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
} else {
this.publication = {
@@ -241,28 +210,29 @@ 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.httpErroHandle.httpsSucessMessagge('Criar publicação')
console.log({response})
this.goBack();
} catch (error) {
this.httpErroHandle.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.httpErroHandle.httpsSucessMessagge('Editar publicação')
console.log({response})
this.goBack();
} catch (error) {
this.httpErroHandle.httpStatusHandle(error)
} finally {
loader.remove()
}
this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
this.PublicationFolderService.deletePost(this.publication.DocumentId, this.publication.ProcessId)
}
else {
@@ -134,6 +134,7 @@ export class PublicationDetailPage implements OnInit {
if(error.status == 404) {
this.publicationFolderService.deletePost(this.folderId, this.publicationId)
this.goBackToViewPublications.emit();
}
this.httpErrorHandle.httpStatusHandle(error)
@@ -155,6 +155,14 @@ export class PublicationFolderService {
}
async CreatePublication(folderId, publication: Publication) {
const response = await this.publications.CreatePublication(folderId, publication).toPromise()
let publicationDetails: Publication = this.publicationPipe.itemList(response)
this.publicationList[folderId].push(publicationDetails)
return publicationDetails
}
async setPublication(publicationId, folderId, publicationDetails: Publication) {
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "188e1033b",
"SHA": "188e1033b8d59e6029218c54edfc506d78e1a960",
"shortSHA": "10ca45b8a",
"SHA": "10ca45b8a0ad7ad7f9167faa7963905a99c98bc0",
"branch": "developer-prod",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Tue Aug 22 17:51:32 2023 +0100'",
"lastCommitMessage": "bug fixed",
"lastCommitNumber": "5208",
"lastCommitTime": "'Wed Aug 23 13:34:03 2023 +0100'",
"lastCommitMessage": "buttons: save is first, cancel is second",
"lastCommitNumber": "5210",
"change": "",
"changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 5 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified: src/app/modals/delegar/delegar.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.scss\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts",
"changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 6 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/agenda/agenda.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.scss\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.html\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group-routing.module.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/store/publication-folder.service.ts",
"changeAuthor": "eudes.inacio"
}