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

Merge branch 'feature/calendar' into feature/chat

Browse Source
This commit is contained in:
tiago.kayaya
2021-03-04 19:16:49 +01:00
parent ccc7593cca e8bef5dcc0
commit b2d32c0408
5 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.ts
+7 -1
View File
@@ -22,7 +22,13 @@ export class HomePage implements OnInit {
totalExpediente = 0;
profile: string;
constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController,) { }
constructor(private zone: NgZone,private eventService: EventsService, private processesbackend: ProcessesService, private router: Router, private modalController: ModalController) {
router.events.subscribe((val) => {
document.querySelectorAll('ion-modal').forEach((e)=>e.remove())
});
}
ngOnInit() {
/* //Initialize profile as mdgpr
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+2
View File
@@ -65,6 +65,8 @@ S
});
}
async openApproveModal(eventSerialNumber){
const modal = await this.modalController.create({
component: ApproveEventModalPage,
componentProps:{
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+24 -1
View File
@@ -35,7 +35,6 @@ export class GabineteDigitalPage implements OnInit {
constructor(
private processesbackend:ProcessesService,
private modalController: ModalController,
private eventService: EventsService,
private alertService: AlertService) {
window.onresize = (event) => {
@@ -43,10 +42,32 @@ export class GabineteDigitalPage implements OnInit {
if( window.innerWidth <= 1024){
this.modalController.dismiss();
}
this.adjastModalHeight();
};
this.adjastModalHeight();
}
adjastModalHeight(){
setTimeout(() => {
if( window.innerWidth <= 1366){
document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{
console.log('adjast width')
e.setAttribute('style',`height:${window.innerHeight - (74 + 57)}px`)
})
} else if( window.innerWidth >= 1366){
document.querySelectorAll('.gabinete-digital-mobile-modal-to-Desktop').forEach(e=>{
console.log('adjast width')
e.setAttribute('style',`height:${window.innerHeight - (74)}px`)
})
}
}, 200);
}
closeAllDesktopComponent(){
this.desktopComponent = {
showEventList: false,
@@ -114,6 +135,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
}
//if( window.innerWidth <= 1024){
this.adjastModalHeight();
const modal = await this.modalController.create({
component: EventListPage,
componentProps:{
@@ -142,6 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
}
//if( window.innerWidth <= 1024){
this.adjastModalHeight();
const modal = await this.modalController.create({
component: ExpedientePage,
componentProps:{
src/app/shared/gabinete-digital/expediente/expediente.page.ts
+1
View File
@@ -76,6 +76,7 @@ export class ExpedientePage implements OnInit {
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
src/global.scss
+33 -3
View File
@@ -174,7 +174,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
display: none;
}
.timeline-box-{}
/* .timeline-box-{} */
.calendar-event-border{
@@ -306,25 +306,55 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.gabinete-digital-mobile-modal-to-Desktop{
top: 75px;
left: 340px;
transform: none !important;
ion-backdrop{
display: none;
display: none;
transform: none !important;
}
.modal-wrapper{
transform: none !important;
width: 100%;
height: 100%;
box-shadow: none !important;
.ion-page {
transform: none !important;
}
}
}
.chat-mobile-modal-to-Desktop{
top: 75px;
left: 340px;
transform: none !important;
ion-backdrop{
display: none;
display: none;
transform: none !important;
}
.modal-wrapper{
transform: none !important;
width: 100%;
height: 100%;
box-shadow: none !important;
.ion-page {
transform: none !important;
}
}
}
@media only screen and (min-width: 1024px) {
.gabinete-digital-mobile-modal-to-Desktop{
top: 75px;
left: 340px;
.modal-wrapper{
transform: none !important;
width: 100%;
height: 100%;
box-shadow: none !important;
.ion-page {
transform: none !important;
}
}
}
}