mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -133,6 +133,7 @@
|
||||
</app-empty-container>
|
||||
<app-attendee-modal
|
||||
*ngIf="showAttendees"
|
||||
[footer]="false"
|
||||
class="d-flex flex-column height-100"
|
||||
[adding]="adding"
|
||||
[taskParticipants]="taskParticipants"
|
||||
|
||||
@@ -71,6 +71,7 @@
|
||||
|
||||
<div class="aside-righ flex-grow-1">
|
||||
<app-attendee-modal class=" d-flex flex-column height-100"
|
||||
[footer]="false"
|
||||
*ngIf="showAttendees"
|
||||
[taskParticipants]="taskParticipants"
|
||||
[taskParticipantsCc]="taskParticipantsCc"
|
||||
|
||||
@@ -290,6 +290,7 @@
|
||||
</app-approve-event>
|
||||
|
||||
<app-attendee-modal
|
||||
[footer]="true"
|
||||
class="d-flex flex-column height-100"
|
||||
*ngIf="mobileComponent.showAttendees"
|
||||
(closeComponent)="GoBackEditOrAdd()"
|
||||
|
||||
@@ -219,9 +219,11 @@
|
||||
|
||||
<app-attendee-modal class="aside-right flex-column height-100 d-none d-md-flex pt-10"
|
||||
*ngIf="showAttendees"
|
||||
[footer]="false"
|
||||
[taskParticipants]="taskParticipants"
|
||||
[taskParticipantsCc]="taskParticipantsCc"
|
||||
[adding]="adding"
|
||||
[footer]="false"
|
||||
(dynamicSetIntervenient)="dynamicSetIntervenient($event)"
|
||||
></app-attendee-modal>
|
||||
|
||||
|
||||
+1
@@ -190,6 +190,7 @@
|
||||
<div class="aside-righ flex-grow-1">
|
||||
<app-attendee-modal class=" d-flex flex-column height-100"
|
||||
*ngIf="showAttendees"
|
||||
[footer]="false"
|
||||
[taskParticipants]="taskParticipants"
|
||||
[taskParticipantsCc]="taskParticipantsCc"
|
||||
[adding]="adding"
|
||||
|
||||
+1
@@ -140,6 +140,7 @@
|
||||
*ngIf="showAttendees"
|
||||
class="d-flex flex-column height-100 hide-footer"
|
||||
[adding]="adding"
|
||||
[footer]="false"
|
||||
[taskParticipants]="taskParticipants"
|
||||
[taskParticipantsCc]="taskParticipantsCc"
|
||||
(closeComponent)="closeComponent()"
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="d-flex align-center justify-center pt-25 clear" (click)="pin=!pin">
|
||||
<div class="voltar d-flex align-center justify-center pt-25 clear" (click)="pin=!pin">
|
||||
Voltar
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -89,6 +89,7 @@ ion-content{
|
||||
border-radius: 56px;
|
||||
margin-left: 30px;
|
||||
margin-bottom: 15px;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.title{
|
||||
@@ -135,4 +136,8 @@ ion-content{
|
||||
background-position: center;
|
||||
background-position-y: 78px;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
.voltar{
|
||||
user-select: none;
|
||||
}
|
||||
@@ -70,8 +70,8 @@
|
||||
</ion-content>
|
||||
|
||||
<!-- Hide footer in gabinete-digital -->
|
||||
<ion-footer class="ion-no-border" *ngIf="currentPath != '/home/gabinete-digital' ">
|
||||
<ion-toolbar *ngIf="currentPath != '/home/events'" class="width-100 d-flex justify-space-between px-20">
|
||||
<ion-footer class="ion-no-border" *ngIf="footer" >
|
||||
<ion-toolbar class="width-100 d-flex justify-space-between px-20">
|
||||
<ion-buttons slot="start">
|
||||
<ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
|
||||
<ion-label>Cancelar</ion-label>
|
||||
|
||||
@@ -26,6 +26,8 @@ export class AttendeeModalPage implements OnInit {
|
||||
@Input() taskParticipants:EventPerson[] = [];
|
||||
@Input() taskParticipantsCc:EventPerson[] = [];
|
||||
|
||||
@Input() footer: boolean;
|
||||
|
||||
LtaskParticipants: EventPerson[] = [];
|
||||
LtaskParticipantsCc: EventPerson[] = [];
|
||||
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
border-radius: 56px;
|
||||
margin-left: 30px;
|
||||
margin-bottom: 15px;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.title{
|
||||
|
||||
@@ -231,6 +231,7 @@
|
||||
[taskParticipants]="taskParticipants"
|
||||
[taskParticipantsCc]="taskParticipantsCc"
|
||||
[adding]="adding"
|
||||
[footer]="false"
|
||||
(dynamicSetIntervenient)="dynamicSetIntervenient($event)"
|
||||
></app-attendee-modal>
|
||||
|
||||
|
||||
@@ -67,7 +67,6 @@ export class PinPage implements OnInit {
|
||||
|
||||
modal.dismiss()
|
||||
|
||||
|
||||
}
|
||||
|
||||
async badRequest(message?: string) {
|
||||
@@ -87,5 +86,4 @@ export class PinPage implements OnInit {
|
||||
},3000)
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user