mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
merge
This commit is contained in:
@@ -15,6 +15,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
|
||||
import { EventToApproveEdit } from 'src/app/models/event.model';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
import { Router } from '@angular/router';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
|
||||
|
||||
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
|
||||
@@ -131,6 +132,7 @@ export class EditEventToApprovePage implements OnInit {
|
||||
private processes:ProcessesService,
|
||||
private toastService: ToastService,
|
||||
public ThemeService: ThemeService,
|
||||
public httpErrorHandler: HttpErrorHandle
|
||||
) {
|
||||
this.isEventEdited = false;
|
||||
}
|
||||
@@ -362,9 +364,10 @@ export class EditEventToApprovePage implements OnInit {
|
||||
|
||||
this.close()
|
||||
|
||||
this.toastService._successMessage('Evento editado');
|
||||
this.httpErrorHandler.httpsSucessMessagge('Editar evento');
|
||||
|
||||
} catch(e) {
|
||||
this.httpErrorHandler.httpStatusHandle(e);
|
||||
this.toastService._badRequest('Evento não editado');
|
||||
}
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
</ion-buttons>
|
||||
<ion-buttons slot="end">
|
||||
<button class="btn-ok" fill="clear" color="#fff" (click)="save()">
|
||||
<ion-label>Selecionar</ion-label>
|
||||
<ion-label>Adicionar</ion-label>
|
||||
</button>
|
||||
</ion-buttons>
|
||||
</ion-toolbar>
|
||||
|
||||
@@ -4,7 +4,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
import MiniSearch from 'minisearch'
|
||||
/* import MiniSearch from 'minisearch' */
|
||||
|
||||
@Component({
|
||||
selector: 'app-all-processes',
|
||||
@@ -21,10 +21,10 @@ export class AllProcessesPage implements OnInit {
|
||||
|
||||
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
|
||||
|
||||
miniSearch = new MiniSearch({
|
||||
/* miniSearch = new MiniSearch({
|
||||
fields: ['Folio', 'Senders'], // fields to index for full-text search
|
||||
idField: 'DocId'
|
||||
})
|
||||
}) */
|
||||
|
||||
AllProcess = []
|
||||
ordinance: string = 'old'
|
||||
|
||||
Reference in New Issue
Block a user