mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 21:06:06 +00:00
Improve agenda
This commit is contained in:
@@ -17,6 +17,8 @@ import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.componen
|
||||
import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.component';
|
||||
import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page';
|
||||
import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component";
|
||||
import { ApproveEventComponent } from "src/app/shared/agenda/approve-event/approve-event.component";
|
||||
|
||||
|
||||
registerLocaleData(localeDe);
|
||||
|
||||
@@ -42,7 +44,8 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
|
||||
NewEventPage,
|
||||
EditEventComponent,
|
||||
ViewEventPage,
|
||||
EventListComponent
|
||||
EventListComponent,
|
||||
ApproveEventComponent
|
||||
],
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||
providers: [
|
||||
|
||||
@@ -289,7 +289,8 @@
|
||||
mobileComponent.showAddNewEvent == false &&
|
||||
mobileComponent.showEditEvent == false &&
|
||||
mobileComponent.showEventDitails == false &&
|
||||
mobileComponent.showEventList == false
|
||||
mobileComponent.showEventList == false &&
|
||||
mobileComponent.showEventToApprove == false
|
||||
)
|
||||
"
|
||||
class="text-black nothing-to-show">
|
||||
@@ -323,13 +324,25 @@
|
||||
(viewEventDetailDismiss)="viewEventDetailDismiss($event)"
|
||||
></app-view-event>
|
||||
|
||||
<app-event-list *ngIf="mobileComponent.showEventList"
|
||||
|
||||
<app-event-list [class.transparent]="mobileComponent.transparentEventList" *ngIf="mobileComponent.showEventList"
|
||||
[segment]="segment"
|
||||
(approveEventDismiss) = "approveEventDismiss($event)"
|
||||
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
|
||||
>
|
||||
|
||||
</app-event-list>
|
||||
|
||||
<app-approve-event class="d-flex flex-column" *ngIf="mobileComponent.showEventToApprove"
|
||||
[serialNumber] = "eventToaprove.serialNumber"
|
||||
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
|
||||
(closeEventToApprove)="closeEventToApprove($event)"
|
||||
>
|
||||
|
||||
</app-approve-event>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -554,12 +554,14 @@ app-view-event{
|
||||
display: flex;
|
||||
flex-wrap: wrap-reverse;
|
||||
flex-direction: column;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
app-edit-event{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
app-new-event{
|
||||
@@ -567,6 +569,7 @@ app-new-event{
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
app-event-list{
|
||||
@@ -575,6 +578,21 @@ app-event-list{
|
||||
height: 100%;
|
||||
height: 100%;
|
||||
flex-wrap: wrap-reverse;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
app-approve-event{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
height: 100%;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
.transparent{
|
||||
position: absolute;
|
||||
z-index: 0;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.nothing-to-show{
|
||||
|
||||
@@ -9,7 +9,7 @@ import { AlertService } from 'src/app/services/alert.service';
|
||||
import { NewEventPage } from './new-event/new-event.page';
|
||||
import { ViewEventPage } from './view-event/view-event.page';
|
||||
import { momentG } from 'src/plugin/momentG';
|
||||
import {DomSanitizer} from "@angular/platform-browser";
|
||||
import { DomSanitizer } from "@angular/platform-browser";
|
||||
|
||||
// showTimeline
|
||||
import { setHours, setMinutes } from 'date-fns';
|
||||
@@ -20,7 +20,6 @@ import {
|
||||
DAYS_OF_WEEK,
|
||||
} from 'angular-calendar';
|
||||
import { CustomDateFormatter } from './custom-date-formatter.provider';
|
||||
import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
|
||||
import { EventListPage } from '../gabinete-digital/event-list/event-list.page';
|
||||
|
||||
@Component({
|
||||
@@ -107,7 +106,15 @@ export class AgendaPage implements OnInit {
|
||||
showAddNewEvent: false,
|
||||
showEditEvent: false,
|
||||
showEventDitails: false,
|
||||
showEventList: false
|
||||
showEventList: false,
|
||||
transparentEventList: false,
|
||||
showEventToApprove: false
|
||||
}
|
||||
|
||||
eventToaprove: any = {
|
||||
back: false,
|
||||
serialNumber: "",
|
||||
saveData: {}
|
||||
}
|
||||
|
||||
constructor(
|
||||
@@ -722,15 +729,45 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
approveEventDismiss({saveData, serialNumber, action}){
|
||||
|
||||
if(action == 'Aprovar'){
|
||||
this.eventToaprove = {
|
||||
back: true,
|
||||
saveData: saveData,
|
||||
serialNumber:serialNumber
|
||||
}
|
||||
// this.mobileComponent.showEventList = false;
|
||||
this.mobileComponent.transparentEventList = true;
|
||||
this.mobileComponent.showEventToApprove = true;
|
||||
}
|
||||
}
|
||||
|
||||
closeEventToApprove(){
|
||||
if (this.eventToaprove.back ==true && this.mobileComponent.showEventList ==true){
|
||||
this.mobileComponent.transparentEventList = false;
|
||||
this.mobileComponent.showEventToApprove = false;
|
||||
this.eventToaprove.back = false;
|
||||
}
|
||||
else {
|
||||
this.mobileComponent.showEventToApprove = false;
|
||||
this.mobileComponent.showEventList = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async cloneAllmobileComponent(){
|
||||
|
||||
this.mobileComponent= {
|
||||
showAddNewEvent: false,
|
||||
showEditEvent: false,
|
||||
showEventDitails: false,
|
||||
showEventList: false
|
||||
showEventList: false,
|
||||
showEventToApprove: false
|
||||
}
|
||||
|
||||
this.closeEventToApprove();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user