Improve gabenite digital(possible conflict)

This commit is contained in:
Peter Maquiran
2021-04-28 11:06:55 +01:00
parent 12dff45a9c
commit a7277f0f90
19 changed files with 728 additions and 150 deletions
@@ -0,0 +1,14 @@
<ion-content class="container">
<div class="arrow-right">
<button class="btn-no-color">
<ion-icon slot="end" class="arrow-right-icon" src='assets/images/icons-arrow-arrow-right.svg'></ion-icon>
</button>
</div>
<div class="buttons">
<button class="btn-cancel" shape="round" >Efectuar Despacho</button>
<button class="btn-ok" shape="round" >Pedido de Parecer</button>
<div class="solid"></div>
<button full class="btn-cancel mobile-only" shape="round" >Pedido de Deferimento</button>
<button class="btn-delete" shape="round">Marcar reunião</button>
</div>
</ion-content>
@@ -0,0 +1,54 @@
.container{
--padding-top:20px !important;
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
}
.arrow-right{
display: none;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
.buttons{
display: flex;
flex-wrap: wrap;
justify-content: space-around;
}
.solid {
display: none;
width: 90%;
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
@media only screen and (min-width: 1024px) {
.arrow-right{
display: flex;
justify-content: flex-end;
}
.btn-cancel{
//display: none;
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-ok{
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-delete{
width: 100% !important;
margin-bottom: 10px !important;
margin-top: 10px !important;
}
.solid{
display: block;
}
.mobile-only{
display: none !important;
}
}
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { OptionsComponent } from './options.component';
describe('OptionsComponent', () => {
let component: OptionsComponent;
let fixture: ComponentFixture<OptionsComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ OptionsComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(OptionsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,14 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-options',
templateUrl: './options.component.html',
styleUrls: ['./options.component.scss'],
})
export class OptionsComponent implements OnInit {
constructor() { }
ngOnInit() {}
}
@@ -8,6 +8,7 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module';
import { ViewEventPage } from './view-event.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
@NgModule({
imports: [
@@ -17,6 +18,9 @@ import { SharedModule } from 'src/app/shared/shared.module';
SharedModule,
ViewEventPageRoutingModule
],
declarations: [ViewEventPage]
declarations: [
ViewEventPage,
ChatPopoverPage
]
})
export class ViewEventPageModule {}
@@ -42,7 +42,7 @@
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="middle flex-grow-1">
<div class="middle flex-grow-1" (click)="openOptions()">
<ion-label class="title">{{loadedEvent.Subject}}</ion-label>
</div>
@@ -120,5 +120,7 @@
</ion-list>
</div>
<!-- <div class="line"></div> -->
</div>
</div>
</ion-content>
@@ -168,4 +168,14 @@ ion-menu{
font-size: 13px;
}
}
}
}
.chat-popover .popover-content {
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
right: 0 !important;
top: calc(100% - 160px) !important;
max-height: 160px;
min-height: 160px;
}
@@ -1,5 +1,5 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { AlertController, ModalController, NavParams } from '@ionic/angular';
import { AlertController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { Attachment } from 'src/app/models/attachment.model';
import { EventBody } from 'src/app/models/eventbody.model';
import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -10,6 +10,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { momentG } from 'src/plugin/momentG';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
import { OptionsComponent } from './options/options.component';
@Component({
selector: 'app-view-event',
@@ -49,6 +51,7 @@ export class ViewEventPage implements OnInit {
private iab: InAppBrowser,
private processes: ProcessesService,
private modalController: ModalController,
public popoverController: PopoverController
)
{
this.isEventEdited = false;
@@ -176,6 +179,27 @@ export class ViewEventPage implements OnInit {
});
}
async openOptions(ev: any) {
const popover = await this.popoverController.create({
component: OptionsComponent,
cssClass: 'chat-popover modal-desktop',
event: ev,
componentProps: {
// room: this.room,
},
translucent: true
});
await popover.present();
popover.onDidDismiss().then(res=>{
console.log(res);
if(res.data){
// this.getRoomInfo();
//this.modalController.dismiss();
};
});
}
async openBookMeetingModal(task: any) {
const doc = this.loadedAttachments[ this.dicIndex];