mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
change actions date field
This commit is contained in:
@@ -364,7 +364,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
this.setIntervenientCC(newAttendeesCC);
|
this.setIntervenientCC(newAttendeesCC);
|
||||||
}
|
}
|
||||||
}, (error) => {
|
}, (error) => {
|
||||||
// console.log(error)
|
console.log(error)
|
||||||
});
|
});
|
||||||
|
|
||||||
await modal.present()
|
await modal.present()
|
||||||
|
|||||||
@@ -468,7 +468,10 @@ export class DiplomaPage implements OnInit {
|
|||||||
|
|
||||||
this.TaskService.loadDiplomas()
|
this.TaskService.loadDiplomas()
|
||||||
|
|
||||||
this.goBack();
|
if(taskAction != '0') {
|
||||||
|
this.goBack();
|
||||||
|
}
|
||||||
|
|
||||||
}, (error) => {
|
}, (error) => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -33,7 +33,8 @@
|
|||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
[stepHour]="1" [stepMinute]="12"
|
[stepHour]="1" [stepMinute]="12"
|
||||||
[stepSecond]="stepSecond"
|
[stepSecond]="stepSecond"
|
||||||
[touchUi]="touchUi">
|
[touchUi]="touchUi"
|
||||||
|
[hideTime]="true">
|
||||||
</ngx-mat-datetime-picker>
|
</ngx-mat-datetime-picker>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
@@ -60,7 +61,8 @@
|
|||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
[stepHour]="1" [stepMinute]="15"
|
[stepHour]="1" [stepMinute]="15"
|
||||||
[stepSecond]="stepSecond"
|
[stepSecond]="stepSecond"
|
||||||
[touchUi]="touchUi">
|
[touchUi]="touchUi"
|
||||||
|
[hideTime]="true">
|
||||||
</ngx-mat-datetime-picker>
|
</ngx-mat-datetime-picker>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -526,12 +526,9 @@ export class ChatSystemService {
|
|||||||
for ( const user in this.users) {
|
for ( const user in this.users) {
|
||||||
if(this.users[user]._id == userId) {
|
if(this.users[user]._id == userId) {
|
||||||
this.users[user].status = statusText
|
this.users[user].status = statusText
|
||||||
console.log('set status')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('user status', d)
|
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -549,7 +546,6 @@ export class ChatSystemService {
|
|||||||
return "offline"
|
return "offline"
|
||||||
}
|
}
|
||||||
else if(text == '1') {
|
else if(text == '1') {
|
||||||
console.log('oneline')
|
|
||||||
return "online"
|
return "online"
|
||||||
}
|
}
|
||||||
else if(text == '2') {
|
else if(text == '2') {
|
||||||
|
|||||||
@@ -131,7 +131,7 @@
|
|||||||
<ion-footer *ngIf="loadedEvent" class="display-none-{{showAside}} ion-no-border">
|
<ion-footer *ngIf="loadedEvent" class="display-none-{{showAside}} ion-no-border">
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Enviar para Revisão</button>
|
<button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Enviar para Revisão</button>
|
||||||
<button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
|
<button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-cancel" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
|
||||||
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
|
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
|
||||||
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)" >Rejeitar</button>
|
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)" >Rejeitar</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -45,7 +45,9 @@
|
|||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
[stepHour]="stepHour" [stepMinute]="stepMinute"
|
[stepHour]="stepHour" [stepMinute]="stepMinute"
|
||||||
[stepSecond]="stepSecond"
|
[stepSecond]="stepSecond"
|
||||||
[touchUi]="touchUi">
|
[touchUi]="touchUi"
|
||||||
|
[hideTime]="true"
|
||||||
|
>
|
||||||
</ngx-mat-datetime-picker>
|
</ngx-mat-datetime-picker>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
@@ -83,7 +85,9 @@
|
|||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
[stepHour]="stepHour" [stepMinute]="stepMinute"
|
[stepHour]="stepHour" [stepMinute]="stepMinute"
|
||||||
[stepSecond]="stepSecond"
|
[stepSecond]="stepSecond"
|
||||||
[touchUi]="touchUi">
|
[touchUi]="touchUi"
|
||||||
|
[hideTime]="true"
|
||||||
|
>
|
||||||
</ngx-mat-datetime-picker>
|
</ngx-mat-datetime-picker>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,10 +6,28 @@ import { PublicationsService } from 'src/app/services/publications.service';
|
|||||||
import { ToastService } from 'src/app/services/toast.service';
|
import { ToastService } from 'src/app/services/toast.service';
|
||||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||||
|
|
||||||
|
import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
|
||||||
|
import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
|
||||||
|
|
||||||
|
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||||
|
parse: {
|
||||||
|
dateInput: "YYYY-MMMM-DD HH:mm"
|
||||||
|
},
|
||||||
|
display: {
|
||||||
|
dateInput: "DD MMM YYYY",
|
||||||
|
monthYearLabel: "MMM YYYY",
|
||||||
|
dateA11yLabel: "LL",
|
||||||
|
monthYearA11yLabel: "MMMM YYYY"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-edit-action',
|
selector: 'app-edit-action',
|
||||||
templateUrl: './edit-action.page.html',
|
templateUrl: './edit-action.page.html',
|
||||||
styleUrls: ['./edit-action.page.scss'],
|
styleUrls: ['./edit-action.page.scss'],
|
||||||
|
providers: [
|
||||||
|
{ provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
|
||||||
|
]
|
||||||
})
|
})
|
||||||
export class EditActionPage implements OnInit {
|
export class EditActionPage implements OnInit {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user