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

Merge branch 'developer-c' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-04-08 17:25:57 +01:00
parent fe41c17cf8 0fb7adf5a0
commit 422c318df0
5 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+20 -10
View File
@@ -45,9 +45,19 @@
</ion-row>
<ion-row class="ion-align-items-center">
<ion-icon *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none" src="assets/images/icons-profile-calendar-md.svg">ddddddd</ion-icon>
<ion-icon *ngIf="profile == 'pr' " (click)="changeProfile()" class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg">dddddddd</ion-icon>
<ion-icon (click)="viewEventsToApprove()" class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
<button *ngIf="profile == 'mdgpr' " (click)="changeProfile()" class="right-icons d-md-none">
<ion-icon src="assets/images/icons-profile-calendar-md.svg">ddddddd</ion-icon>
</button>
<button *ngIf="profile == 'pr' " (click)="changeProfile()" class="btn-no-color">
<ion-icon class="right-icons d-md-none" src="assets/images/icons-profile-calendar-pr.svg">dddddddd</ion-icon>
</button>
<button class="btn-no-color" (click)="viewEventsToApprove()">
<ion-icon class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
</button>
<button class="btn-no-color" (click)="clearContact();openAddEvent()">
<ion-icon class="right-icons" src="assets/images/icons-add-new-event.svg" ></ion-icon>
</button>
@@ -323,13 +333,13 @@
<div class="event-details bg-blue ">
<div *ngIf="(
mobileComponent.showAddNewEvent == false &&
mobileComponent.showEditEvent == false &&
mobileComponent.showEventDetails == false &&
mobileComponent.showEventList == false &&
mobileComponent.showEventToApprove == false &&
mobileComponent.showAttendees == false &&
mobileComponent.showAttendeeModal == false
mobileComponent.showAddNewEvent == false &&
mobileComponent.showEditEvent == false &&
mobileComponent.showEventDetails == false &&
mobileComponent.showEventList == false &&
mobileComponent.showEventToApprove == false &&
mobileComponent.showAttendees == false &&
mobileComponent.showAttendeeModal == false
)
"
class="text-black nothing-to-show">
src/app/pages/agenda/agenda.page.ts
+2 -4
View File
@@ -152,7 +152,7 @@ export class AgendaPage implements OnInit {
private router: Router,
private alertController: AlertService,
private sanitizer: DomSanitizer
) {
) {
this.calendarHeight = "333px";
this.showCalendar = true;
@@ -166,8 +166,6 @@ export class AgendaPage implements OnInit {
ngOnInit() {
this.profile = "mdgpr";
//Inicializar segment
/* localStorage.setItem('test', this.eventSelectedDate.toString()); */
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == "/home/agenda") {
@@ -180,7 +178,6 @@ export class AgendaPage implements OnInit {
}
});
window.onresize = (event) => {
// if not table remove all component
if( window.innerWidth <= 1024){
@@ -1002,6 +999,7 @@ export class AgendaPage implements OnInit {
this.adding = data.type
alert(this.adding)
this.cloneAllmobileComponent();
this.mobileComponent.showAttendees = true;
}