mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
Merge branch 'feature/calendar' into feature/chat
This commit is contained in:
@@ -22,7 +22,13 @@ export class HomePage implements OnInit {
|
|||||||
totalExpediente = 0;
|
totalExpediente = 0;
|
||||||
profile: string;
|
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() {
|
ngOnInit() {
|
||||||
/* //Initialize profile as mdgpr
|
/* //Initialize profile as mdgpr
|
||||||
|
|||||||
@@ -65,6 +65,8 @@ S
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
async openApproveModal(eventSerialNumber){
|
async openApproveModal(eventSerialNumber){
|
||||||
|
|
||||||
|
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: ApproveEventModalPage,
|
component: ApproveEventModalPage,
|
||||||
componentProps:{
|
componentProps:{
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
constructor(
|
constructor(
|
||||||
private processesbackend:ProcessesService,
|
private processesbackend:ProcessesService,
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
private eventService: EventsService,
|
|
||||||
private alertService: AlertService) {
|
private alertService: AlertService) {
|
||||||
|
|
||||||
window.onresize = (event) => {
|
window.onresize = (event) => {
|
||||||
@@ -43,8 +42,30 @@ export class GabineteDigitalPage implements OnInit {
|
|||||||
if( window.innerWidth <= 1024){
|
if( window.innerWidth <= 1024){
|
||||||
this.modalController.dismiss();
|
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(){
|
closeAllDesktopComponent(){
|
||||||
@@ -114,6 +135,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
//if( window.innerWidth <= 1024){
|
//if( window.innerWidth <= 1024){
|
||||||
|
this.adjastModalHeight();
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: EventListPage,
|
component: EventListPage,
|
||||||
componentProps:{
|
componentProps:{
|
||||||
@@ -142,6 +164,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
//if( window.innerWidth <= 1024){
|
//if( window.innerWidth <= 1024){
|
||||||
|
this.adjastModalHeight();
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: ExpedientePage,
|
component: ExpedientePage,
|
||||||
componentProps:{
|
componentProps:{
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ export class ExpedientePage implements OnInit {
|
|||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: ExpedienteDetailPage,
|
component: ExpedienteDetailPage,
|
||||||
componentProps:{
|
componentProps:{
|
||||||
|
enterAnimation: "",
|
||||||
serialNumber: serialNumber,
|
serialNumber: serialNumber,
|
||||||
profile: this.profile,
|
profile: this.profile,
|
||||||
},
|
},
|
||||||
|
|||||||
+31
-1
@@ -174,7 +174,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.timeline-box-{}
|
/* .timeline-box-{} */
|
||||||
|
|
||||||
|
|
||||||
.calendar-event-border{
|
.calendar-event-border{
|
||||||
@@ -306,25 +306,55 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
|
|||||||
.gabinete-digital-mobile-modal-to-Desktop{
|
.gabinete-digital-mobile-modal-to-Desktop{
|
||||||
top: 75px;
|
top: 75px;
|
||||||
left: 340px;
|
left: 340px;
|
||||||
|
transform: none !important;
|
||||||
ion-backdrop{
|
ion-backdrop{
|
||||||
display: none;
|
display: none;
|
||||||
|
transform: none !important;
|
||||||
}
|
}
|
||||||
.modal-wrapper{
|
.modal-wrapper{
|
||||||
|
transform: none !important;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
box-shadow: none !important;
|
box-shadow: none !important;
|
||||||
|
.ion-page {
|
||||||
|
transform: none !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.chat-mobile-modal-to-Desktop{
|
.chat-mobile-modal-to-Desktop{
|
||||||
top: 75px;
|
top: 75px;
|
||||||
left: 340px;
|
left: 340px;
|
||||||
|
transform: none !important;
|
||||||
ion-backdrop{
|
ion-backdrop{
|
||||||
display: none;
|
display: none;
|
||||||
|
transform: none !important;
|
||||||
}
|
}
|
||||||
.modal-wrapper{
|
.modal-wrapper{
|
||||||
|
transform: none !important;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
box-shadow: none !important;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user