peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-23 15:53:14 +01:00
parent d923fe381e 0f3fb2a602
commit 149ac76410
68 changed files with 361 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+2 -11
View File
@@ -1175,17 +1175,8 @@ export class AgendaPage implements OnInit {
async viewEventsToApprove(){
await this.cloneAllmobileComponent()
if( window.innerWidth <= 1024){
const modal = await this.modalCtrl.create({
component: EventListPage,
componentProps:{
profile: this.profile,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
if( window.innerWidth <= 801){
this.router.navigate(['/home/agenda/event-list']);
} else {
// hide all components
this.cloneAllmobileComponent();
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+2 -3
View File
@@ -70,7 +70,7 @@ export class EventActionsPopoverPage implements OnInit {
}
async emendarTask() {
console.log('Mobile');
this.closePopover();
const modal = await this.modalController.create({
component: EmendMessageModalPage,
@@ -122,8 +122,7 @@ export class EventActionsPopoverPage implements OnInit {
}
async editTask() {
console.log(this.serialNumber);
console.log(this.instanceId);
this.closePopover();
const modal = await this.modalController.create({
component: EditEventToApproveComponent,
componentProps: {