mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 13:26:08 +00:00
fix edit event to approve
This commit is contained in:
@@ -416,7 +416,7 @@
|
||||
[serialNumber] = "eventToaprove.serialNumber"
|
||||
[InstanceId] = "eventToaprove.InstanceId"
|
||||
[saveData] = "eventToaprove.saveData"
|
||||
(cloneAllmobileComponent)="viewEventDetailDismiss($event)"
|
||||
(viewEventDetailDismiss)="viewEventDetailDismiss($event)"
|
||||
(closeEventToApprove)="closeEventToApproveGoBack()"
|
||||
(AproveEventEditEvent)="AproveEventEditEvent($event)"
|
||||
(EditApproveEventDismiss)="EditApproveEventDismiss()"
|
||||
|
||||
@@ -143,7 +143,6 @@ export class EditEventToApprovePage implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
console.log('here!!!')
|
||||
if (this.restoreTemporaryData()) {
|
||||
this.setOtherData()
|
||||
} else {
|
||||
@@ -158,7 +157,7 @@ export class EditEventToApprovePage implements OnInit {
|
||||
@XTracerAsync({name:'edit-event-approve/getTask', bugPrint: true})
|
||||
async getTask(tracing?: TracingType) {
|
||||
|
||||
const res = await this.agendaDataRepository.getEventToApproveById(this.serialNumber)
|
||||
const res = await this.agendaDataRepository.getEventToApproveById(this.serialNumber, tracing)
|
||||
if(res.isOk()) {
|
||||
console.log('evento to apro to edit', res.value)
|
||||
this.eventProcess = res.value as any;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
@import '~src/function.scss';
|
||||
:host{
|
||||
margin: 0;
|
||||
background-color: white;
|
||||
}
|
||||
.header-content{
|
||||
overflow: auto;
|
||||
|
||||
@@ -74,6 +74,8 @@ export class EventListPage implements OnInit {
|
||||
|
||||
this.setCalendarByDefault()
|
||||
|
||||
console.log('remove!=================')
|
||||
|
||||
}
|
||||
|
||||
async setCalendarByDefault() {
|
||||
@@ -184,12 +186,22 @@ export class EventListPage implements OnInit {
|
||||
}
|
||||
|
||||
async openApproveModal(eventSerialNumber, data) {
|
||||
|
||||
if (window.innerWidth <= 1024) {
|
||||
if (this.router.url == '/home/agenda/event-list') {
|
||||
this.router.navigate(['/home/agenda/event-list/approve-event', eventSerialNumber, 'agenda'])
|
||||
}
|
||||
else if (this.router.url == '/home/gabinete-digital/event-list') {
|
||||
this.router.navigate(['/home/gabinete-digital/event-list/approve-event', eventSerialNumber, 'gabinete-digital'])
|
||||
}
|
||||
}
|
||||
else {
|
||||
this.approveEventDismiss.emit({
|
||||
"serialNumber": eventSerialNumber,
|
||||
"action": "Aprovar",
|
||||
"saveData": data
|
||||
});
|
||||
"serialNumber": eventSerialNumber,
|
||||
"action": "Aprovar",
|
||||
"saveData": data
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
refreshing() {
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
<!-- <button (click)="ChatMessageDebuggingPage()">Dev</button> -->
|
||||
<span *ngIf="roomStatus$ | async as roomStatus"><ion-icon *ngIf="roomStatus" class="online" name="ellipse"></ion-icon></span>
|
||||
</div>
|
||||
<div class="right" >
|
||||
<!-- <div class="right" >
|
||||
<button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()" >
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/theme/blue/icons-menu.svg"></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-menu.svg">
|
||||
</ion-icon>
|
||||
</button>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="d-flex header-bottom" >
|
||||
<div class="header-bottom-icon" *ngIf="roomType == RoomTypeEnum.Group">
|
||||
|
||||
@@ -134,7 +134,7 @@ export class HeaderPage implements OnInit {
|
||||
async getProfilpicture(tracing?: TracingType) {
|
||||
|
||||
if (this.SessionStore.user.UserPhoto) {
|
||||
|
||||
|
||||
const base = await this.UserRepositoryService.getUserProfilePhoto(this.SessionStore.user.UserPhoto, tracing)
|
||||
|
||||
if(base.isOk()) {
|
||||
|
||||
Reference in New Issue
Block a user