peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove limites

Browse Source
This commit is contained in:
Peter Maquiran
2023-06-10 14:17:41 +01:00
parent de531bc550
commit 04b5373eaa
10 changed files with 146 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -83,3 +83,6 @@ migrat/
cypress/videos
*.rar
src/app/domain
src/app/controller
src/app/models/beast-orm.ts
+23 -1
View File
@@ -47,7 +47,7 @@ models.register({
models: [MessageModel, DeleteMessageModel, attachments]
})
// acçoes
export class ActionModel extends models.Model{
ProcessId = models.IntegerField({unique: true})
Description = models.CharField()
@@ -76,3 +76,25 @@ models.register({
version: 14,
models: [PublicationModel, ActionModel]
})
// gabinete
export class DispatchModal extends models.Model{
DateIndex = models.CharField()
DocumentId = models.IntegerField({unique: true})
ProcessId = models.CharField()
Title = models.CharField()
Message = models.CharField()
DatePublication = models.CharField()
OriginalFileName = models.CharField()
FileBase64 = models.CharField()
FileExtension = models.CharField()
OrganicEntityId = models.IntegerField()
}
models.register({
databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id,
type: 'indexedDB',
version: 14,
models: [DispatchModal]
})
src/app/pages/events/events.page.html
+7 -5
View File
@@ -155,16 +155,18 @@
</div>
<div class="content overflow-y-auto flex-grow-1 height-100">
<ion-list>
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of listToPresentexpediente"
(click)="goToExpediente(task.SerialNumber)">
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of AllProcess"
(click)="TaskService.goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
<div class="item-exp d-flex">
<div class="schedule-date">
<div class="time-end">{{task.TaskStartDate | date: 'dd-MM-yy'}}</div>
<div class="time-start">{{task.TaskStartDate | date: 'HH:mm'}}</div>
</div>
<div class="schedule-details pointer">
<div class="description">{{ task.Subject }}</div>
<div class="location">{{ task.Senders }}</div>
<div class="description">{{task.Folio || task.Subject || task.workflowInstanceDataFields.Subject }}</div>
<div class="location" *ngIf="task.Senders">{{ task.Senders }}</div>
<div class="location" *ngIf="task.workflowInstanceDataFields">{{task.workflowInstanceDataFields.Sender }}</div>
<!-- <div class="location" *ngIf="!task.Senders && !task.workflowInstanceDataFields">{{task.workflowInstanceDataFields.Sender }}</div> -->
</div>
</div>
</ion-item>
@@ -275,7 +277,7 @@
</div>
<div class="content overflow-y-auto flex-grow-1 height-100">
<ion-list>
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of listToPresentexpediente"
<ion-item class="item-hover cursor-pointer" lines="none" *ngFor = "let task of AllProcess"
(click)="goToExpediente(task.SerialNumber)">
<div class="item-exp d-flex">
<div class="schedule-date">
src/app/pages/events/events.page.scss
+4
View File
@@ -201,6 +201,7 @@ ion-toolbar{
color: var(--subtitle-text-color);
font-size: 16px;
margin: 0 auto;
min-height: 19px;
}
.div-botton-middle{
width: 75%;
@@ -445,10 +446,13 @@ ion-toolbar{
flex-wrap: wrap;
align-items: center;
width: 78%;
min-height: 39px;
align-items: baseline;
.location{
font-family: Roboto;
font-size: 15px;
color: black;
min-height: 19px;
width: 100%;
}
src/app/pages/events/events.page.ts
+42
View File
@@ -68,6 +68,13 @@ export class EventsPage implements OnInit {
showCorrespondenciasLoader = false
loadingAllTask = false
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Não lidos'
showSearch = true;
searchSubject: string = '';
AllProcess = []
ordinance: string = 'old'
constructor(
private eventService: EventsService,
private router: Router,
@@ -102,6 +109,13 @@ export class EventsPage implements OnInit {
this.listToPresentexpediente = []
})
this.TaskService.registerCallback({
id: import.meta.url,
funx:() => {
this.dynamicSearch()
}
})
}
ngOnInit() {
@@ -128,6 +142,34 @@ export class EventsPage implements OnInit {
}
async dynamicSearch() {
const ordinance = this.ordinance
if(this.showSearch && this.searchSubject) {
const AllProcess = this.TaskService.AllProcess.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
}).filter( task => this.TaskService.filter(task, this.filterName))
if(ordinance == this.ordinance) {
this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
}
} else {
const AllProcess = this.TaskService.AllProcess
if(ordinance == this.ordinance) {
this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
.filter( task => this.TaskService.filter(task, this.filterName))
}
}
}
async loadAllTask() {
this.loadingAllTask = true
await this.TaskService.LoadTask()
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+4 -2
View File
@@ -212,17 +212,19 @@ export class GabineteDigitalPage implements OnInit {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
return subject.includes(this.searchSubject.toLowerCase())
}).filter( task => this.TaskService.filter(task, this.filterName))
})
if(ordinance == this.ordinance) {
this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
.filter( task => this.TaskService.filter(task, this.filterName))
}
} else {
const AllProcess = this.TaskService.AllProcess
const AllProcess = this.TaskService.AllProcess.filter( task => this.TaskService.filter(task, this.filterName))
if(ordinance == this.ordinance) {
this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
.filter( task => this.TaskService.filter(task, this.filterName))
}
}
src/app/services/processes.service.ts
+3
View File
@@ -60,6 +60,9 @@ export class ProcessesService {
params = params.set("ProcessName", processname);
params = params.set("OnlyCount", onlycount.toString());
params = params.set("OnlyCount", onlycount.toString());
params = params.set("pageNum", "1");
params = params.set("pageSize", "500");
let options = {
headers: this.headers,
src/app/services/task.service.ts
+51
View File
@@ -16,6 +16,7 @@ import { SessionStore } from 'src/app/store/session.service';
import { EventsService } from './events.service';
import { SortService } from './functions/sort.service';
import { customTask } from '../models/dailyworktask.model';
import { Router } from '@angular/router';
@Injectable({
providedIn: 'root'
@@ -61,6 +62,7 @@ export class TaskService {
private despachoRule: DespachoService,
public eventService: EventsService,
private sortService: SortService,
private router: Router,
) {
window['all-process-gabinete'] = () => {
@@ -364,4 +366,53 @@ export class TaskService {
}
}
goToProcess(serialNumber: string, workflowName: string, activityName: string) {
if (workflowName == 'Despacho') {
if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
}
}
else if (workflowName == 'Despacho do Presidente da República') {
if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']);
}
else if (activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma') {
this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
}
else if (activityName == 'Diploma Assinado') {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
} else {
}
}
else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
}
else if (workflowName == 'Expediente') {
this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
}
else if (workflowName == 'Expediente' && SessionStore.user.Profile == 'PR') {
this.router.navigate(['/home/gabinete-digital/expedientes-pr', serialNumber, 'gabinete-digital']);
}
else if (workflowName == "Pedido de Parecer do Presidente") {
this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
}
/* else if (workflowName == "Expediente") {
this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
} */
else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == "Aprovar Evento" || workflowName == "Agendar Evento") {
this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
}
else {
throw(`${workflowName} && ${activityName} no route`)
}
}
}
src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+1 -1
View File
@@ -303,7 +303,7 @@ export class DespachosPrOptionsPage implements OnInit {
try {
await this.processes.CompleteTask(body).toPromise()
this.httpErroHandle.httpsSucessMessagge('Concluir')
this.httpErroHandle.httpsSucessMessagge('Concluir Despacho')
this.close();
} catch (error) {
if(error.status == 0) {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "ab43d697e",
"SHA": "ab43d697eacabe1b9ba3063422805328de10e95d",
"shortSHA": "de531bc55",
"SHA": "de531bc5508a74ef4ad4407aef91d729cb82faf3",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Sat Jun 10 10:52:13 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "4960",
"lastCommitTime": "'Sat Jun 10 12:19:46 2023 +0100'",
"lastCommitMessage": "improve",
"lastCommitNumber": "4961",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: version/git-version.ts",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}