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

Merger with developer

Browse Source
This commit is contained in:
Eudes Inácio
2021-04-08 09:31:21 +01:00
parent dc404f5c24 a87fd0b6ed
commit 1501090495
60 changed files with 747 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+68 -2
View File
@@ -6584,6 +6584,11 @@
"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
},
"deepmerge": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
},
"default-gateway": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
@@ -7124,8 +7129,7 @@
"entities": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
"dev": true
"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
},
"env-paths": {
"version": "2.2.0",
@@ -8353,6 +8357,11 @@
"minimalistic-assert": "^1.0.1"
}
},
"he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
},
"hex-color-regex": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
@@ -8421,6 +8430,63 @@
"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
"dev": true
},
"html-to-text": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-7.0.0.tgz",
"integrity": "sha512-UR/WMSHRN8m+L7qQUhbSoxylwBovNPS+xURn/pHeJvbnemhyMiuPYBTBGqB6s8ajAARN5jzKfF0d3CY86VANpA==",
"requires": {
"deepmerge": "^4.2.2",
"he": "^1.2.0",
"htmlparser2": "^6.0.0",
"minimist": "^1.2.5"
},
"dependencies": {
"dom-serializer": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz",
"integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==",
"requires": {
"domelementtype": "^2.0.1",
"domhandler": "^4.0.0",
"entities": "^2.0.0"
}
},
"domelementtype": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
"integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
},
"domhandler": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.1.0.tgz",
"integrity": "sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==",
"requires": {
"domelementtype": "^2.2.0"
}
},
"domutils": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.1.tgz",
"integrity": "sha512-hO1XwHMGAthA/1KL7c83oip/6UWo3FlUNIuWiWKltoiQ5oCOiqths8KknvY2jpOohUoUgnwa/+Rm7UpwpSbY/Q==",
"requires": {
"dom-serializer": "^1.0.1",
"domelementtype": "^2.2.0",
"domhandler": "^4.1.0"
}
},
"htmlparser2": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz",
"integrity": "sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==",
"requires": {
"domelementtype": "^2.0.1",
"domhandler": "^4.0.0",
"domutils": "^2.4.4",
"entities": "^2.0.0"
}
}
}
},
"htmlparser2": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
src/app/app-routing.module.ts
+4
View File
@@ -35,6 +35,10 @@ const routes: Routes = [
{
path: 'expedients',
loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule)
},
{
path: 'document-detail',
loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule)
},
/* {
src/app/home/home-routing.module.ts
+4
View File
@@ -76,6 +76,10 @@ const routes: Routes = [
path: 'edit-event',
loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
},
{
path: 'emend-message-modal',
loadChildren: () => import('../pages/agenda/emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
},
]
},
{
src/app/modals/document-detail/document-detail-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { DocumentDetailPage } from './document-detail.page';
const routes: Routes = [
{
path: '',
component: DocumentDetailPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class DocumentDetailPageRoutingModule {}
src/app/modals/document-detail/document-detail.module.ts
+24
View File
@@ -0,0 +1,24 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { DocumentDetailPageRoutingModule } from './document-detail-routing.module';
import { DocumentDetailPage } from './document-detail.page';
import { SharedModule } from 'src/app/shared/shared.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
SharedModule,
DocumentDetailPageRoutingModule
],
declarations: [
DocumentDetailPage,
SharedModule,]
})
export class DocumentDetailPageModule {}
src/app/modals/document-detail/document-detail.page.html
+10
View File
@@ -0,0 +1,10 @@
<ion-header>
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<ion-toolbar>
<ion-title>document-detail</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
</ion-content>
src/app/modals/document-detail/document-detail.page.scss
View File
src/app/modals/document-detail/document-detail.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { DocumentDetailPage } from './document-detail.page';
describe('DocumentDetailPage', () => {
let component: DocumentDetailPage;
let fixture: ComponentFixture<DocumentDetailPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ DocumentDetailPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(DocumentDetailPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/modals/document-detail/document-detail.page.ts
+15
View File
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-document-detail',
templateUrl: './document-detail.page.html',
styleUrls: ['./document-detail.page.scss'],
})
export class DocumentDetailPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/pages/agenda/agenda.page.html
+7 -1
View File
@@ -335,6 +335,7 @@
[profile]="profile"
[selectedSegment]=segment
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
[selectedDate]="eventSelectedDate"
(onAddEvent)="openAddEventDismiss($event)"
(openAttendeesComponent)="openAttendeesComponent($event)"
@@ -342,7 +343,9 @@
[eventAttendees]="contacts"
(clearContact)="clearContact()"
(setContact)="setContact($event)"
(setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)"
></app-new-event>
<!-- Edit -->
<app-edit-event *ngIf="mobileComponent.showEditEvent"
@@ -353,6 +356,9 @@
(openAttendeesComponent)="openAttendeesComponent($event)"
(setContact)="setContact($event)"
(closeComponent)="closeComponentEditEventOrAdd()"
(setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)"
></app-edit-event>
<!-- View -->
src/app/pages/agenda/agenda.page.ts
+13 -11
View File
@@ -112,7 +112,6 @@ export class AgendaPage implements OnInit {
// this will make toggle add event and.
showEventEditOrOpen: "edit" | "add" | "" = ""
prEventList: Event[];
mdEventList: Event[]
@@ -894,7 +893,8 @@ export class AgendaPage implements OnInit {
const modal = await this.modalCtrl.create({
component: ViewEventPage,
componentProps:{
eventId: eventId
eventId: eventId,
adding: this.adding
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
@@ -931,6 +931,7 @@ export class AgendaPage implements OnInit {
const modal = await this.modalCtrl.create({
component: EventListPage,
componentProps:{
profile: this.profile,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
@@ -986,27 +987,23 @@ export class AgendaPage implements OnInit {
}
async AproveEventEditEvent(data){
console.log(data)
this.postEvent =data;
this.mobileComponent.transparentEventToApprove= true;
this.mobileComponent.showAddNewEvent = true;
}
// open component
async openAttendeesComponent(data){
async openAttendeesComponent(data) {
if(Array.isArray(data)){
if(data.length >= 1){
console.log('save!!!',data.length);
console.log(data);
this.contacts = data ;
}
}
this.cloneAllmobileComponent();
this.mobileComponent.showAttendees = true;
}
async clearContact(){
@@ -1049,14 +1046,19 @@ export class AgendaPage implements OnInit {
}
async setIntervenient(data){
async setIntervenient(data) {
this.taskParticipants = data;
this.postEvent
}
async setIntervenientCC(data){
async setIntervenientCC(data) {
this.taskParticipantsCc = data;
}
// Emitters
// adding
async setAdding(adding: "intervenient" | "CC" = "intervenient") {
this.adding = adding;
}
}
src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
+2 -7
View File
@@ -34,10 +34,9 @@ export class ApproveEventModalPage implements OnInit {
private popoverController: PopoverController,
private menu: MenuController,
private alertService: AlertService,
)
{
) {
this.serialNumber = this.navParams.get('serialNumber');
}
}
ngOnInit() {
this.getTask();
@@ -72,7 +71,6 @@ export class ApproveEventModalPage implements OnInit {
}
approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -80,7 +78,6 @@ export class ApproveEventModalPage implements OnInit {
}
emendTask(serialNumber:string){
/* console.log('Emendar'); */
this.menu.close();
this.openEmendMessageModal(serialNumber);
this.modalController.dismiss(null);
@@ -89,7 +86,6 @@ export class ApproveEventModalPage implements OnInit {
rejectTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -134,7 +130,6 @@ export class ApproveEventModalPage implements OnInit {
"ReviewerComments": res.data,
}
}
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.alertService.presentAlert('Operação realizada com sucesso!');
src/app/pages/agenda/edit-event/edit-event.page.html
+4 -5
View File
@@ -61,7 +61,7 @@
<div class="ion-input-class">
<ion-select placeholder="Selecione tipo"
[(ngModel)]="postEvent.Categories[0]"
selectedText="{{postEvent.Categories[0]}}"
selectedText="{{postEvent.Categories[0]}}"
interface="action-sheet"
Cancel-text="Cancelar" required>
<ion-select-option value="Reunião">Reunião</ion-select-option>
@@ -144,7 +144,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="!taskParticipants" class="list-people-title">Adicionar intervenientes</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>
@@ -164,7 +164,7 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="!taskParticipantsCc" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngIf="taskParticipantsCc.length == 0" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipantsCc">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
@@ -203,7 +203,6 @@
</div>
<div hidden>
<ion-item>
<ion-label>Documentos Anexados</ion-label>
@@ -225,7 +224,7 @@
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
[adding]="adding"
(dynamicSetIntervenient)="dynamicSetIntervenient($event)"
></app-attendee-modal>
</div>
src/app/pages/agenda/edit-event/edit-event.page.ts
+28 -23
View File
@@ -37,9 +37,12 @@ export class EditEventPage implements OnInit {
private eventsService: EventsService,
private alertService: AlertService,
public alertController: AlertController,
) {
) {
this.isEventEdited = false;
this.postEvent = this.navParams.get('event');
if(this.postEvent){
this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
}
this.taskParticipants = [];
this.taskParticipantsCc = [];
@@ -62,7 +65,7 @@ export class EditEventPage implements OnInit {
}
ngOnInit() {
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 800){
@@ -71,11 +74,12 @@ export class EditEventPage implements OnInit {
};
}
close(){
this.modalController.dismiss();
}
save(){
console.log(this.postEvent);
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
const alert = await this.alertController.create({
@@ -89,13 +93,15 @@ export class EditEventPage implements OnInit {
this.modalController.dismiss(this.isEventEdited);
}
async openAttendees(){
async openAttendees() {
if(window.innerWidth <= 1024) {
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
eventAttendees: this.postEvent.Attendees
adding: this.adding,
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee',
backdropDismiss: false
@@ -104,40 +110,39 @@ export class EditEventPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
{
let newattendees: EventPerson[] = data['data'];
this.setIntervenient(newattendees);
if(data){
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
}
}
async dynamicSetIntervenient(data){
this.taskParticipants = data['taskParticipants'];
this.taskParticipantsCc = data['taskParticipantsCc'];
}
async setIntervenient(data){
setIntervenient(data){
this.taskParticipants = data;
this.postEvent.Attendees = data;
}
async setIntervenientCC(data){
setIntervenientCC(data){
this.taskParticipantsCc = data;
}
async addParticipants(){
this.adding = 'intervenient';
addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
}
async addParticipantsCC(){
this.adding = 'CC';
addParticipantsCC(){
this.adding = 'CC'
this.openAttendees();
}
async closeComponent(){}
}
}
src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
+3 -7
View File
@@ -15,12 +15,8 @@
</ion-item>
</ion-content>
<ion-footer>
<ion-toolbar>
<div class="buttons">
<ion-item lines="none">
<ion-button class="button-reject" shape="round" (click)="close()">Cancelar</ion-button>
<ion-button class="button-approve" shape="round" (click)="save()">Gravar</ion-button>
</ion-item>
<div class="buttons width-100">
<button class="btn-delete" shape="round" (click)="close()">Cancelar</button>
<button class="btn-ok" shape="round" (click)="save()">Gravar</button>
</div>
</ion-toolbar>
</ion-footer>
src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss
+8 -1
View File
@@ -1,5 +1,5 @@
.header-content{
width: 360px;
//width: 360px;
overflow: auto;
margin: 25px auto;
}
@@ -38,4 +38,11 @@
border-radius: 22.5px;
--background: #42b9fe;
margin: 0 0px 0 12px;
}
.buttons{
display: flex;
width: 100% !important;
justify-content: space-between;
padding: 15px;
overflow: auto;
}
src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
+4 -2
View File
@@ -11,12 +11,14 @@ export class EmendMessageModalPage implements OnInit {
constructor(
private modalController: ModalController,
) { }
) {
this.emendMessage = '';
}
ngOnInit() {
}
close(){
this.modalController.dismiss(this.emendMessage);
this.modalController.dismiss('');
}
save(){
this.modalController.dismiss(this.emendMessage);
src/app/pages/agenda/new-event/new-event.page.html
+24 -9
View File
@@ -129,22 +129,30 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div (click)="openAttendees()" class="ion-input-class-no-height">
<div class="ion-input-class-no-height">
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label class="list-people-title">Adicionar participantes</ion-label>
<ion-label hidden >Text</ion-label>
</ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar interveniente</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
</div>
</ion-list>
</ion-item>
</div>
<div class="add-people">
<div (click)="addParticipants()" class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
</div>
<!-- HIDDEN -->
<div hidden class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
@@ -154,12 +162,19 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label class="list-people-title">Com conhecimento</ion-label>
<ion-label hidden >Text</ion-label>
</ion-list>
<ion-label class="list-people-title">Com conhecimento</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="!taskParticipants" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
</div>
</ion-list>
</ion-item>
</div>
<div class="add-people">
<div (click)="addParticipantsCC()" class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
src/app/pages/agenda/new-event/new-event.page.ts
+43 -14
View File
@@ -11,6 +11,7 @@ import { AttendeesPage } from '../../events/attendees/attendees.page';
templateUrl: './new-event.page.html',
styleUrls: ['./new-event.page.scss'],
})
export class NewEventPage implements OnInit {
postEvent: Event;
eventBody: EventBody;
@@ -21,6 +22,11 @@ export class NewEventPage implements OnInit {
selectedDate: Date;
minDate: string;
adding: "intervenient" | "CC";
taskParticipants: any = [];
taskParticipantsCc: any = [];
constructor(
private modalController: ModalController,
private navParams: NavParams,
@@ -28,7 +34,7 @@ export class NewEventPage implements OnInit {
) {
this.postEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""};
this.postEvent.Body = this.eventBody;
this.postEvent.Body = this.eventBody;
this.profile = this.navParams.get('profile');
this.selectedSegment = this.navParams.get('segment');
@@ -88,21 +94,19 @@ export class NewEventPage implements OnInit {
};
}
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 1024){
this.modalController.dismiss();
}
};
}
close(){
this.modalController.dismiss();
}
save(){
console.log(this.postEvent);
console.log(this.profile);
/* console.log(this.postEvent);
console.log(this.profile); */
if(this.profile=='mdgpr'){
@@ -114,12 +118,13 @@ export class NewEventPage implements OnInit {
this.modalController.dismiss(this.postEvent);
}
async openAttendees()
{
async openAttendees() {
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
eventAttendees: this.postEvent.Attendees
eventAttendees: this.postEvent.Attendees,
adding: this.adding,
taskParticipants: this.taskParticipants
},
cssClass: 'attendee',
backdropDismiss: false
@@ -128,12 +133,36 @@ export class NewEventPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((data) => {
if (data['data'] != null)
{
let newattendees: EventPerson[] = data['data'];
this.postEvent.Attendees = newattendees;
if(data){
data = data['data'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
}
}
}
setIntervenient(data){
this.taskParticipants = data;
this.postEvent.Attendees = data;
}
setIntervenientCC(data){
this.taskParticipantsCc = data;
}
addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
}
addParticipantsCC(){
this.adding = 'CC'
this.openAttendees();
}
}
src/app/pages/agenda/view-event/view-event.page.html
+16 -15
View File
@@ -52,21 +52,22 @@
<div class="line"></div>
<div class="middle-content">
<div *ngIf="loadedEvent.Attendees">
<h5>Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let attendee of loadedEvent.Attendees">
<p>{{attendee.Name}}</p>
</div>
</ion-label>
</ion-item>
</div>
<div *ngIf="loadedEvent.Body.Text">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<textarea disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></textarea>
</ion-item>
</div>
<h5>Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let attendee of loadedEvent.Attendees">
<p>{{attendee.Name}}</p>
</div>
</ion-label>
</ion-item>
</div>
<div *ngIf="loadedEvent.Body.Text">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
</ion-item>
</div>
<div class="line"></div>
</div>
<div *ngIf="loadedAttachments" class="bottom-content width-100">
src/app/pages/chat/messages/messages.page.html
+1 -1
View File
@@ -13,7 +13,7 @@
<ion-icon (click)="openMessagesOptions()" src="assets/images/icons-menu.svg"></ion-icon>
</div>
</div>
<div class="header-bottom" (click)="addContacts()">
<div hidden class="header-bottom" (click)="addContacts()">
<div class="header-bottom-icon">
<ion-icon src="assets/icon/icons-user.svg"></ion-icon>
</div>
src/app/pages/events/attendees/attendees.page.html
+59 -30
View File
@@ -1,42 +1,71 @@
<ion-header class="ion-no-border">
<ion-toolbar>
<ion-title>Participantes</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment-button value="true">
Intervenientes
</ion-segment-button>
<ion-segment-button value="false">
Com Conhecimento
</ion-segment-button>
</ion-segment>
<ion-header class="ion-no-border px-20">
<ion-toolbar class="px-10">
<ion-title class="pa-0">Adicionar intervenientes</ion-title>
</ion-toolbar>
<ion-searchbar class="attendee-search-bar" (ionChange)="onChange($event)" placeholder="Insira email para adicionar destinatário"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
</ion-header>
<ion-content>
<ion-item-group>
<ion-button class="btn-ok-no-width" fill="clear" color="#fff" shape="round" (click)="addAttendees()" expand="block">
<ion-label>Adicionar participantes</ion-label>
</ion-button>
</ion-item-group>
<ion-item-group [ngSwitch]="segment" *ngFor="let attendee of eventAttendees">
<ion-list *ngSwitchCase="attendee.IsRequired.toString()">
<ion-item-sliding>
<ion-item-options side="end">
<ion-item-option color="danger" (click)="removeAttendee(attendee)">Apagar</ion-item-option>
</ion-item-options>
<ion-item lines="none">
<ion-icon slot="start" name="person"></ion-icon>
<ion-content class="height-100 overflow-y-auto">
<ion-item-group class="d-flex flex-column height-100 ">
<ion-list lines="none" class="flex-grow-1 overflow-y-auto height-100" >
<ion-item-sliding class="px-20">
<div *ngFor="let attendee of contacts;">
<ion-item lines="none" (click)="selectContact(attendee)" *ngIf="filterSearchList(attendee)" >
<div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
</div>
<ion-label>
<h3>{{ attendee.Name }}</h3>
<p>{{ attendee.EmailAddress }}</p>
</ion-label>
</ion-item>
</div>
</ion-item-sliding>
</ion-list>
<hr/>
<ion-list lines="none" *ngIf="taskParticipants.length >= 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
<div class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1" > Destinatário</div>
<ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipants;" class="d-flex">
<div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
</div>
<ion-label>
<h3>{{ attendee.Name }}</h3>
<p>{{ attendee.EmailAddress }}</p>
</ion-label>
</ion-label>
<div style="color:red" (click)="remove(attendee)">
X
</div>
</ion-item>
</ion-item-sliding>
</ion-list>
<ion-list lines="none" *ngIf="taskParticipantsCc.length >= 1 && adding == 'CC' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
<div class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb;font-weight: 500;" *ngIf="taskParticipants.length >= 1 || taskParticipantsCc.length >= 1" > Destinatário</div>
<ion-item-sliding class="px-20">
<ion-item lines="none" *ngFor="let attendee of taskParticipantsCc;" class="d-flex">
<div class="pr-10">
<ion-icon class="font-35" src="assets/images/icons-userprofile.svg"></ion-icon>
</div>
<ion-label>
<h3>{{ attendee.Name }}</h3>
<p>{{ attendee.EmailAddress }}</p>
</ion-label>
<div style="color:red" (click)="remove(attendee)">
X
</div>
</ion-item>
</ion-item-sliding>
</ion-list>
</ion-item-group>
</ion-content>
</ion-content>
<ion-footer class="ion-no-border">
<ion-toolbar class="d-flex">
@@ -48,7 +77,7 @@
</ion-buttons>
<ion-buttons class="flex-grow-1" slot="end">
<ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
<ion-label>OK</ion-label>
<ion-label>Gravar</ion-label>
<ion-icon name="checkmark" slot="start"></ion-icon>
</ion-button>
</ion-buttons>
src/app/pages/events/attendees/attendees.page.ts
+122 -63
View File
@@ -1,8 +1,7 @@
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { EventPerson } from 'src/app/models/eventperson.model';
import { EventsService } from 'src/app/services/events.service';
import { ModalController, NavController } from '@ionic/angular';
// import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
import { ModalController, NavParams } from '@ionic/angular';
import { ContactsService } from 'src/app/services/contacts.service';
@Component({
selector: 'app-attendees',
@@ -11,83 +10,143 @@ import { ModalController, NavController } from '@ionic/angular';
})
export class AttendeesPage implements OnInit {
// Defined by the API
contacts: EventPerson[];
showLoader: boolean = false;
selectedContact: EventPerson[] =[];
eventPersons: EventPerson[];
adding: "intervenient" | "CC";
currentPath = window.location.pathname;
segment:string = "true";
shouldShowCancel:boolean = true;
searchCountryString = ''; // initialize your searchCountryString string empty
@Output() openAttendeeModal = new EventEmitter<any>();
@Output() openAddEvent = new EventEmitter<any>();
@Input() eventAttendees: EventPerson[];
@Output() GoBackEditOrAdd = new EventEmitter<any>();
constructor(private eventService: EventsService, private modalCtrl: ModalController,
private navCtrl: NavController) {
}
taskParticipants:EventPerson[] = [];
taskParticipantsCc:EventPerson[] = [];
constructor(
private modalCtrl: ModalController,
private contactsService: ContactsService,
private navParams: NavParams,
private modalController: ModalController) {
this.adding = this.navParams.get('adding');
this.taskParticipants = this.navParams.get('taskParticipants');
this.taskParticipantsCc = this.navParams.get('taskParticipantsCc');
}
ngOnInit() {
this.fetchContacts("");
if(this.taskParticipants == null || this.taskParticipants == undefined){
this.taskParticipants = [];
}
if(this.taskParticipantsCc == null || this.taskParticipantsCc == undefined){
this.taskParticipantsCc = [];
}
}
ngOnChanges(event){}
save(){
this.GoBackEditOrAdd.emit();
//this.openAddEvent.emit();
this.modalCtrl.dismiss(this.eventAttendees);
this.modalController.dismiss({
'taskParticipants': this.taskParticipants,
'taskParticipantsCc': this.taskParticipantsCc
});
}
close(){
this.GoBackEditOrAdd.emit();
this.modalCtrl.dismiss(null);
//this.openAddEvent.emit();
this.modalController.dismiss(false);
}
removeAttendee(attendee: EventPerson)
{
let index: number = this.eventAttendees.findIndex((att) => {
return att.EmailAddress == attendee.EmailAddress
});
this.eventAttendees.splice(index, 1);
onChange(evt: any) {
this.fetchContacts(evt.detail.value);
}
async addAttendees() {
console.log('Event Intervenient');
this.openAttendeeModal.emit();
/* const modal = await this.modalCtrl.create({
component: AttendeeModalPage,
componentProps: {
eventPersons: this.eventAttendees
},
cssClass: 'attendee-modal',
backdropDismiss: false
});
filterSearchList(itm: EventPerson): boolean {
await modal.present();
if(this.adding == "intervenient"){
const result = this.taskParticipants.find((contact, index)=>{
if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
index = index;
return contact;
}
});
return undefined == result;
modal.onDidDismiss().then((data) => {
let newattendees: EventPerson[] = data['data'];
if (newattendees != null)
{
newattendees.forEach(newattendee => {
let att = {
"EmailAddress": newattendee.EmailAddress,
"Name": newattendee.Name,
"IsRequired": (this.segment == "true")
};
if (this.eventAttendees == null)
{
this.eventAttendees = new Array();
}
this.eventAttendees.push(att);
});
}
}); */
} else if (this.adding == "CC") {
const result = this.taskParticipantsCc.find((contact, index)=>{
if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
index = index;
return contact;
}
});
return undefined == result;
}
}
remove(itm: EventPerson){
if(this.adding == "intervenient"){
this.taskParticipants = this.taskParticipants.filter((contact, index) =>{
if(contact.Name != itm.Name && contact.EmailAddress != itm.EmailAddress){
return contact;
}
return false;
});
} else if (this.adding == "CC") {
this.taskParticipantsCc = this.taskParticipantsCc.filter((contact, index) =>{
if(contact.Name != itm.Name && contact.EmailAddress != itm.EmailAddress){
return contact;
}
return false;
});
}
}
async selectContact(itm: EventPerson){
if(this.adding == "intervenient"){
this.taskParticipants.push(itm);
} else if (this.adding == "CC") {
this.taskParticipantsCc.push(itm);
}
}
async fetchContacts(filter: string) {
this.showLoader = true;
this.contactsService.getContacts(filter).subscribe(result =>
{
if (this.eventPersons != null)
{
this.eventPersons.forEach(attendee => {
const index: number = result.findIndex((cont) => {
return cont.EmailAddress == attendee.EmailAddress
});
result.splice(index, 1);
});
}
this.contacts = result;
this.showLoader = false;
}
);
}
}
src/app/pages/events/events.page.html
-1
View File
@@ -34,7 +34,6 @@
<ion-label>
<p class="event-number p-small ion-text-center"> <strong>{{totalEvent}}</strong> eventos agendados para hoje</p>
</ion-label>
<div class="next-meeting">
<div class="meeting-time">{{currentHoursMinutes | date: 'HH:mm'}}</div>
<div class="meeting-description"> "{{currentEvent}}"</div>
src/app/pages/events/events.page.ts
+2 -1
View File
@@ -95,6 +95,7 @@ export class EventsPage implements OnInit {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.RefreshEvents();
this.LoadList();
}
});
/* this.storageService.get(AuthConnstants.PROFILE).then(res=>{
@@ -106,8 +107,8 @@ export class EventsPage implements OnInit {
doRefresh(event) {
this.RefreshEvents();
event.target.complete();
this.LoadList();
event.target.complete();
}
onSegmentChange(){
src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<div class="header-content">
<div class="header-title">
<label>Deseja eliminar este espediente?</label>
<label>Deseja eliminar este expediente?</label>
</div>
<div class="header-icon-left">
<ion-icon (click)="close()" name="close-outline"></ion-icon>
src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts
+2 -2
View File
@@ -40,7 +40,7 @@ export class DiscartExpedientModalPage implements OnInit {
}
save(){
/* if(this.action != 'discart'){
if(this.action != 'discart'){
let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
console.log(body);
this.processes.PostTaskAction(body);
@@ -49,7 +49,7 @@ export class DiscartExpedientModalPage implements OnInit {
let body = { "serialNumber": this.serialNumber, "action": "Passivo" }
console.log(body);
this.processes.PostTaskAction(body);
} */
}
this.router.navigate(['/home/gabinete-digital/expediente']);
this.modalController.dismiss('close');
}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+13 -7
View File
@@ -25,7 +25,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Emendar1</ion-label>
<ion-label>Emendar</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
@@ -56,11 +56,11 @@
</div>
<div class="middle-content">
<h5>Intervenientes</h5>
<ion-item>
<ion-item class="ion-no-padding ion-no-margin">
<p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
</ion-item>
<h5>Detalhes</h5>
<ion-item>
<ion-item class="ion-no-padding ion-no-margin">
<p>{{loadedEvent.workflowInstanceDataFields.Body}}</p>
</ion-item>
</div>
@@ -68,7 +68,7 @@
<div *ngIf="loadedAttachments" class="bottom-content">
<ion-list>
<h3>Documentos Anexados</h3>
<ion-item>
<ion-item class="ion-no-padding ion-no-margin">
<ion-label>
<p class="attach-title-item">Receita por Natureza</p>
<p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
@@ -78,11 +78,11 @@
</div>
</ion-content>
<ion-footer>
<ion-toolbar>
<!-- <ion-toolbar>
<div class="buttons">
<ion-item lines="none">
<p>
<ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</ion-button>
<ion-button class="button-edit-event" shape="round" (click)="emendTask(loadedEvent.serialNumber)">11Emendar</ion-button>
</p>
<p>
<ion-menu-button autoHide="false">
@@ -99,5 +99,11 @@
</p>
</ion-item>
</div>
</ion-toolbar>
</ion-toolbar> -->
<div class="buttons width-100">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
<button class="btn-no-color" shape="round" (click)="openMenu()"> <ion-icon name="ellipsis-vertical-outline"></ion-icon></button>
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
</div>
</ion-footer>
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss
+7
View File
@@ -138,3 +138,10 @@ ion-menu{
border-radius: 22.5px;
--background: #ffe0e0;
}
.buttons{
display: flex;
justify-content: space-between;
padding: 20px;
overflow: auto;
}
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+2
View File
@@ -32,6 +32,8 @@ export class EventListPage implements OnInit {
ngOnInit() {
this.profile = this.navParams.get('profile');
console.log(this.profile);
/* console.log(this.navParams.get('md')); */
if(this.profile == "mdgpr"){
this.profile = 'MDGPR'
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+5 -5
View File
@@ -6,8 +6,8 @@
</div>
</ion-header> -->
<ion-content class="height-100">
<div class="main-content d-flex height-100">
<ion-content>
<div class="main-content d-flex">
<div class="content d-flex flex-column width-100">
<div class="header-content">
<div class="header-title">
@@ -150,12 +150,12 @@
</div>
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-input [(ngModel)]="postData.Body.Text" placeholder="Detalhes"></ion-input>
<div class="ion-input-class-no-height width-100">
<ion-textarea [(ngModel)]="postData.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
</div>
</div>
</div>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+1 -1
View File
@@ -134,4 +134,4 @@
<button class="btn-cancel" shape="round" (click)="cancelTask()">Cancelar</button>
<button class="btn-ok" shape="round" (click)="saveTask()">Gravar</button>
</div>
</ion-footer>
</ion-footer>
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+2 -1
View File
@@ -40,8 +40,9 @@ export class ExpedientePage implements OnInit {
LoadList(){
this.processes.GetTasksList("Expediente", false).subscribe(result => {
let tasksListReverse = result.reverse();
this.taskslist = new Array();
result.forEach(element => {
tasksListReverse.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
src/app/pages/gabinete-digital/gabinete-digital.page.html
+5 -1
View File
@@ -12,7 +12,11 @@
<!-- Aside left -->
<div class="aside-wrapper d-flex flex-column pt-25 justify-center width-md-40 ">
<p class="text-center mt-0 aside-title px-20">Gabinete Digital</p>
<div class="title-container">
<span class="text-center mt-0 aside-title px-20">Gabinete Digital</span>
<ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
</div>
<div class="aside overflow-y-auto d-flex d-md-block flex-wrap justify-center width-100 px-20">
<div class="exp-card d-flex flex-column justify-center" (click)="openEventsToApprovePage('MDGPR')">
<div class="d-flex justify-center">
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+9
View File
@@ -11,6 +11,15 @@ ion-content{
ion-card-title{
text-align: center;
}
.title-container{
margin-bottom: 15px;
.title-icon{
float: right;
margin-right: 20px;
font-size: 30px;
color: #0782c9;
}
}
ion-card{
background-color: #d4d5ca;
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+31 -4
View File
@@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service';
import { ModalController } from '@ionic/angular';
import { EventListPage } from './event-list/event-list.page';
import { ExpedientePage } from './expediente/expediente.page';
import { ActivatedRoute } from '@angular/router';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
@Component({
selector: 'app-gabinete-digital',
@@ -44,7 +44,8 @@ export class GabineteDigitalPage implements OnInit {
private processesbackend:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private route: ActivatedRoute,
private activatedRoute: ActivatedRoute,
private router: Router,
) {
window.onresize = (event) => {
@@ -57,10 +58,23 @@ export class GabineteDigitalPage implements OnInit {
this.adjastModalHeight();
this.route.queryParams.subscribe(params => {
/* this.activatedRoute.queryParams.subscribe(params => {
if(params["show"]){
this.openExpedientListPage();
}
}
else if(params["events-to-approve"]){
this.openEventsToApprovePage("MDGPR");
}
}); */
this.activatedRoute.paramMap.subscribe(paramMap =>{
if (paramMap.has("show")){
this.openExpedientListPage();
}
else if(paramMap.has("events")){
this.openEventsToApprovePage("MDGPR");
this.LoadCounts();
}
});
}
@@ -93,6 +107,15 @@ export class GabineteDigitalPage implements OnInit {
ngOnInit() {
//Initialize profile as mdgpr
this.profile = "MDGPR";
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.LoadCounts();
}
});
this.LoadCounts();
/* this.eventService.getAllMdEvents.subscribe(res=>{
console.log(res);
@@ -137,6 +160,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{
}
doRefresh(event) {
this.closeAllDesktopComponents();
this.showEmptyContainer = true;
this.LoadCounts();
setTimeout(() => {
@@ -149,6 +174,8 @@ this.processesbackend.GetActionsList().subscribe(res=>{
}
openEventsToApprovePage(profile:any){
console.log(profile);
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openEventsToApproveList(profile);
src/app/pages/publications/new-action/new-action.page.html
-1
View File
@@ -15,7 +15,6 @@
</ion-header>
<ion-content>
<div class="content-top"></div>
<div class="content-container">
<div class="title-content">
<div class="div-title">
src/app/pages/publications/new-publication/new-publication.page.html
-1
View File
@@ -15,7 +15,6 @@
</ion-header>
<ion-content>
<div class="content-top"></div>
<div class="content-container">
<div class="title-content">
<div class="div-title">
src/app/pages/publications/publications.page.html
+1
View File
@@ -22,6 +22,7 @@
</div>
<div class="div-icon">
<ion-icon (click)="AddPublicationFolder()" slot="end" src='assets/images/icons-add.svg'></ion-icon>
<ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
</div>
</div>
</div>
src/app/pages/publications/publications.page.scss
+7 -4
View File
@@ -67,15 +67,18 @@ ion-toolbar{
font-size: 25px;
}
.div-icon{
width: 40px;
float: right;
display: flex;
/* width: 45px;
float: right; */
font-size: 35px;
overflow: auto;
padding: 1px;
padding: 0 !important;
align-items: center;
justify-content: flex-end;
}
.div-icon ion-icon{
float: right;
padding-left: 20px;
padding-left: 10px;
}
}
.main-content{
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+1 -2
View File
@@ -22,7 +22,7 @@ export class PublicationDetailPage implements OnInit {
private publications:PublicationsService,
) {
this.publicationId = this.navParams.get('publicationId');
/* this.folderId = this.navParams.get('folderIdId'); */
this.folderId = this.navParams.get('folderId');
this.publication = {
DateIndex: null,
DocumentId: '',
@@ -78,7 +78,6 @@ export class PublicationDetailPage implements OnInit {
deletePost(){
this.publications.DeletePublication(this.folderId, this.publicationId).then(res =>{
console.log(res);
});
this.close();
}
src/app/pages/publications/view-publications/view-publications.page.scss
+1
View File
@@ -113,6 +113,7 @@
width: 92px;
float: right;
overflow: auto;
border: 1px solid red;
}
.actions-icon ion-icon{
margin-left: 10px;
src/app/pages/publications/view-publications/view-publications.page.ts
+2 -1
View File
@@ -107,13 +107,14 @@ export class ViewPublicationsPage implements OnInit {
component: PublicationDetailPage,
componentProps:{
publicationId: publicationId,
folderId: this.folderId,
},
cssClass: 'publication-detail',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(()=>{
this.doRefresh(event);
this.getPublications();
});
}
src/app/pages/search/search.page.html
+3 -3
View File
@@ -105,7 +105,7 @@
<!-- most searched word-->
<div class="most-searched-words d-md-flex flex-md-column">
<p class="title ion-text-center">Assunto mais pesquisado</p>
<p class="title ion-text-center">Assuntos mais recebidos</p>
<div class="most-searched-word-container height-100 overflow-y-auto">
</div>
</div>
@@ -121,8 +121,8 @@
<div class="d-flex sort-by ion-justify-content-center">
<p>
<span class="order">Order por:</span>
<span *ngIf="ordinance == 'recent'" class="order-labal">Mais Recente</span>
<span *ngIf="ordinance == 'old'" class="order-labal">Mais Antigo</span>
<span *ngIf="ordinance == 'recent'" class="order-labal">Mais Recentes</span>
<span *ngIf="ordinance == 'old'" class="order-labal">Mais Antigos</span>
</p>
</div>
<div>
src/app/pages/search/search.page.ts
+30 -1
View File
@@ -9,6 +9,7 @@ import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-e
import WordCloud from 'src/plugin/wordcloud2.js';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
@Component({
selector: 'app-search',
templateUrl: './search.page.html',
@@ -421,6 +422,8 @@ export class SearchPage implements OnInit {
async viewDetail(id:any) {
console.log(id);
if(window.location.pathname == '/home/agenda'){
@@ -430,7 +433,6 @@ export class SearchPage implements OnInit {
eventId: id
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((res)=>{});
@@ -439,6 +441,10 @@ export class SearchPage implements OnInit {
this.viewPublicationDetail(id);
}
else if(window.location.pathname == '/home/gabinete-digital'){
console.log('OPEN DOC');
}
}
@@ -456,5 +462,28 @@ export class SearchPage implements OnInit {
modal.onDidDismiss().then(()=>{});
}
async viewExpedientDetail(serialNumber:any) {
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'gabinete-digital-mobile-modal-to-Desktop'
}
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
serialNumber: serialNumber,
profile: 'mdgpr',
},
cssClass: classs,
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((res)=>{
});
}
}
src/app/services/processes.service.ts
+14
View File
@@ -196,6 +196,20 @@ export class ProcessesService {
return this.http.get<any>(`${geturl}`, options);
}
GetDocumentDetails(DocId:string, FsId:string){
const geturl = environment.apiURL + 'ecm/document/viewrequestshort';
let params = new HttpParams();
params = params.set("docId", DocId);
params = params.set("applicationid", FsId);
let options = {
headers: this.headers,
params: params
};
return this.http.get<any>(`${geturl}`, options);
}
src/app/services/publications.service.ts
+10 -2
View File
@@ -3,7 +3,8 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { environment } from 'src/environments/environment';
import { AuthService } from '../services/auth.service';
import { User } from '../models/user.model';
import { Observable } from 'rxjs';
import { Observable, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators'
@Injectable({
providedIn: 'root'
@@ -80,7 +81,8 @@ export class PublicationsService {
headers: this.headers,
params: params
};
return this.http.get<any>(`${geturl}`, options);
return this.http.get<any>(`${geturl}`, options)
.pipe(catchError(this.handleError));
}
GetPublicationById( publicationId:any){
@@ -140,6 +142,12 @@ export class PublicationsService {
handleError(error){
return throwError(error || 'Server Error');
}
}
src/app/shared/agenda/approve-event/approve-event.component.html
+7 -7
View File
@@ -68,13 +68,13 @@
<div class="line"></div>
<div class="middle-content">
<div *ngIf="loadedEvent.workflowInstanceDataFields.Participants">
<h5>Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
</ion-label>
</ion-item>
</div>
<h5>Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<p>{{loadedEvent.workflowInstanceDataFields.Participants}}</p>
</ion-label>
</ion-item>
</div>
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
src/app/shared/agenda/approve-event/approve-event.component.ts
+14 -2
View File
@@ -1,5 +1,5 @@
import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
import { Router } from '@angular/router';
import { NavigationExtras, Router } from '@angular/router';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service';
@@ -136,6 +136,8 @@ export class ApproveEventComponent implements OnInit {
await modal.present();
modal.onDidDismiss().then(res => {
console.log(res.data);
if(res.data !== ''){
let body = { "serialNumber": serialNumber,
"action": "Emendar",
@@ -145,8 +147,9 @@ export class ApproveEventComponent implements OnInit {
}
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
//this.router.navigate(['/home/gabinete-digital/event-list']);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.goToEventsToApprove();
}
else{
this.alertService.presentAlert('Operação cancelada!');
@@ -154,4 +157,13 @@ export class ApproveEventComponent implements OnInit {
});
}
goToEventsToApprove(){
let navigationExtras: NavigationExtras = {
queryParams: {
"events": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
src/app/shared/agenda/edit-event/edit-event.component.ts
+15 -8
View File
@@ -30,19 +30,24 @@ export class EditEventComponent implements OnInit {
@Output() openAttendeesComponent = new EventEmitter<any>();
@Output() closeComponent = new EventEmitter<any>();
@Output() setIntervenient = new EventEmitter<any>();
@Output() setIntervenientCC = new EventEmitter<any>();
constructor(
private modalController: ModalController,
private eventsService: EventsService,
public alertController: AlertController,
) {
)
{
}
ngOnInit() {
let innerHtml :string = this.postEvent.Body.Text;
this.postEvent.Body.Text = innerHtml;
if(this.postEvent){
this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, '');
}
console.log(this.postEvent);
this.isEventEdited = false;
@@ -73,14 +78,16 @@ export class EditEventComponent implements OnInit {
this.closeComponent.emit();
this.clearContact.emit();
this.setIntervenient.emit([]);
this.setIntervenientCC.emit([]);
}
async openAttendees()
{
async openAttendees() {
this.openAttendeesComponent.emit();
this.clearContact.emit();
}
}
}
src/app/shared/agenda/new-event/new-event.component.html
+2 -3
View File
@@ -147,17 +147,16 @@
</div>
</div>
<div hidden class="container-div">
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-people-cc.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1-no-height">
<div class="ion-input-class-no-height flex-grow-1">
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label class="list-people-title">Com conhecimento</ion-label>
<ion-label hidden >Text</ion-label>
</ion-list>
</ion-item>
</div>
src/app/shared/agenda/new-event/new-event.component.ts
+9 -1
View File
@@ -21,6 +21,11 @@ export class NewEventPage implements OnInit {
@Input() selectedSegment: string;
@Input() selectedDate: Date;
@Input() taskParticipants: EventPerson[];
@Input() taskParticipantsCc: any = [];
@Output() setIntervenient = new EventEmitter<any>();
@Output() setIntervenientCC = new EventEmitter<any>();
@Output() onAddEvent = new EventEmitter<any>();
@Output() openAttendeesComponent = new EventEmitter<any>();
@@ -58,7 +63,7 @@ export class NewEventPage implements OnInit {
Body: this.eventBody,
Location: '',
CalendarId: '',
CalendarName: this.selectedSegment,
CalendarName: '',
StartDate: selectedStartdDate,
EndDate: new Date(selectedEndDate),
EventType: 'Reunião',
@@ -122,6 +127,9 @@ export class NewEventPage implements OnInit {
this.onAddEvent.emit(this.postEvent);
this.GoBackEditOrAdd.emit();
this.setIntervenient.emit([]);
this.setIntervenientCC.emit([]);
}
async openAttendees(){
src/app/shared/agenda/view-event/view-event.page.html
+6 -4
View File
@@ -44,10 +44,12 @@
</ion-label>
</ion-item>
</div>
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<ion-textarea [innerHTML]="loadedEvent.Body.Text"></ion-textarea>
</ion-item>
<div *ngIf="loadedEvent.Body.Text">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<div [innerHTML]="loadedEvent.Body.Text"></div>
</ion-item>
</div>
</div>
<div class="line"></div>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+4 -1
View File
@@ -1,6 +1,9 @@
<ion-content>
<div class="title width-100">
<label>Eventos para Aprovação</label>
<div class="title-container">
<span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
<ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="profile">
<ion-segment-button value="MDGPR">
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+9
View File
@@ -2,6 +2,15 @@
padding: 30px 20px 0 20px !important;
margin: 0;
}
.title-container{
margin-bottom: 15px;
.title-icon{
float: right;
margin-right: 20px;
font-size: 30px;
color: #0782c9;
}
}
.title{
font-family: Roboto;
font-size: 25px;
src/app/shared/publication/view-publications/view-publications.page.html
+6 -2
View File
@@ -13,7 +13,8 @@
</div>
<div class="actions-icon">
<!-- <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
<ion-icon (click)="AddPublication('2',item.ProcessId)" slot="end" src='assets/images/icons-add.svg'></ion-icon>
<ion-icon (click)="AddPublication('2',item.ProcessId)" src='assets/images/icons-add.svg'></ion-icon>
<ion-icon (click)="doRefresh($event)" class="title-icon" name="reload-circle"></ion-icon>
</div>
</div>
</div>
@@ -49,7 +50,10 @@
</div>
</div>
</div>
<div *ngIf="!publicationList" class="post-item">
<div *ngIf="!publicationList">
<p>{{error}}</p>
</div>
<div hidden *ngIf="!publicationList" class="post-item">
<div class="post-img">
<img src="/assets/icon/icon-no-image.svg" alt="image">
</div>
src/app/shared/publication/view-publications/view-publications.page.scss
+9 -3
View File
@@ -107,15 +107,21 @@
}
.actions-icon{
width: 92px;
float: right;
display: flex;
overflow: auto;
align-items: top;
justify-content: flex-end;
padding: 0 !important;
}
.actions-icon ion-icon{
margin-left: 10px;
margin-left: 5px;
font-size: 35px;
float: right;
padding: 0 !important;
}
/* .title-icon{
font-size: 40px !important;
} */
.item-content-date{
color: #797979;
font-size: 13px;
src/app/shared/publication/view-publications/view-publications.page.ts
+9
View File
@@ -19,6 +19,8 @@ export class ViewPublicationsPage implements OnInit {
publicationList: Publication[];
item: PublicationFolder;
error: any;
@Input() folderId: string;
@Output() addNewPublication = new EventEmitter<any>();
@Output() openPublicationDetails= new EventEmitter<any>();
@@ -95,6 +97,13 @@ export class ViewPublicationsPage implements OnInit {
});
console.log(this.publicationList);
this.showLoader = false;
},
(error)=>{
if(error.status == '404'){
console.log('NOT FOUND');
this.error = 'Sem publicações disponíveis!';
}
});
}
src/global.scss
+5
View File
@@ -568,4 +568,9 @@ border-top: 1px solid #d8d8d8;
-moz-border-radius: 3px !important;
-ms-border-radius: 3px !important;
-o-border-radius: 3px !important;
}
.title-icon{
font-size: 40px !important;
color: #0782c9;
overflow: auto;
}
src/theme/variables.scss
+3
View File
@@ -444,6 +444,9 @@
color: #061b52 !important;
margin: 0 auto !important;
}
.btn-no-color{
background-color: #fff;
}
.bg-blue{
--background:#0782c9;
background:#0782c9;