mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Multiples messages when evento to aprove where editedd
This commit is contained in:
@@ -48,12 +48,6 @@ models.register({
|
||||
})
|
||||
|
||||
|
||||
window['MessageModel'] = MessageModel
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
export class ActionModel extends models.Model{
|
||||
ProcessId = models.IntegerField({unique: true})
|
||||
Description = models.CharField()
|
||||
|
||||
@@ -32,25 +32,25 @@
|
||||
<div class="wrap d-flex float-left">
|
||||
<div class="event-box pointer" (click)="goToAllTaskFilter('ForToDay')">
|
||||
<!-- <p>correspondencia com prazo para hoje</p> -->
|
||||
<p>Correspondência com prazo para hoje</p>
|
||||
<p>Correspondências com prazo para hoje</p>
|
||||
<span>{{ TaskService.deadline }}</span>
|
||||
</div>
|
||||
|
||||
<div class="event-box pointer" (click)="goToAllTaskFilter('OverdueTasks')">
|
||||
<!-- <p>correspondencia em atraso</p> -->
|
||||
<p>Correspondência em atraso</p>
|
||||
<p>Correspondências em atraso</p>
|
||||
<span>{{ TaskService.overdueTasks }}</span>
|
||||
</div>
|
||||
|
||||
<div class="event-box pointer" (click)="goToAllTaskFilter('New')">
|
||||
<!-- <p>Novas correspondencia</p> -->
|
||||
<p>Novas Correspondência</p>
|
||||
<p>Novas Correspondências</p>
|
||||
<span>{{ TaskService.new }}</span>
|
||||
</div>
|
||||
|
||||
<div class="event-box pointer" (click)="goToAllTaskFilter('unread')">
|
||||
<!-- <p>correspondencia não lidas</p> -->
|
||||
<p>Correspondência não lida</p>
|
||||
<p>Correspondências não lidas</p>
|
||||
<span>{{ TaskService.unread }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -69,6 +69,7 @@ ion-slide{
|
||||
|
||||
// search result type
|
||||
.options{
|
||||
max-width: 900px;
|
||||
margin-top: 10px;
|
||||
.container{
|
||||
.d-flex{
|
||||
|
||||
@@ -328,8 +328,8 @@ export class SearchPage implements OnInit {
|
||||
|
||||
searchDocumentDate;
|
||||
|
||||
if(this.searchSubject == '') {
|
||||
this.searchSubject = undefined
|
||||
if(this.searchSubject == undefined || this.searchSubject == null) {
|
||||
this.searchSubject = ""
|
||||
}
|
||||
|
||||
if(this.type == "Agenda" ) {
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "d56c38aac",
|
||||
"SHA": "d56c38aac1f66aa95eef0ad6dd1875d93d6f4467",
|
||||
"shortSHA": "6b8e4a600",
|
||||
"SHA": "6b8e4a600bb9d03d98cde3b611a4698dd2be69c7",
|
||||
"branch": "feature/gabinete-search",
|
||||
"lastCommitAuthor": "'Eudes Inácio'",
|
||||
"lastCommitTime": "'Sat Jun 10 10:00:02 2023 +0100'",
|
||||
"lastCommitMessage": "add interveninter button text change and text on agrupadores on inicio module",
|
||||
"lastCommitNumber": "4969",
|
||||
"lastCommitTime": "'Sat Jun 10 10:55:30 2023 +0100'",
|
||||
"lastCommitMessage": "Pesquisa avançada fixed",
|
||||
"lastCommitNumber": "4972",
|
||||
"change": "",
|
||||
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 12 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts",
|
||||
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 13 and 6 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/search/search.page.scss\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts",
|
||||
"changeAuthor": "eudes.inacio"
|
||||
}
|
||||
Reference in New Issue
Block a user