mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Peter bug solved
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
import { models } from 'beast-orm'
|
||||
/* import { models } from 'src/plugin/src' */
|
||||
import { environment } from 'src/environments/environment'
|
||||
// import { DispatchDomain } from 'src/app/domain/process/DispatchDomain'
|
||||
const { ArrayField, JsonField} = models.indexedDB.fields
|
||||
|
||||
export class MessageModel extends models.Model {
|
||||
@@ -77,37 +75,3 @@ models.register({
|
||||
version: 14,
|
||||
models: [PublicationModel, ActionModel]
|
||||
})
|
||||
|
||||
// gabinete
|
||||
|
||||
// export class DispatchModal extends models.Model{
|
||||
// SerialNumber = models.CharField()
|
||||
// TaskStartDate = models.CharField()
|
||||
// Subject = models.CharField()
|
||||
// Folio = models.CharField()
|
||||
// Senders = models.CharField()
|
||||
// CreateDate = models.CharField()
|
||||
// DocumentsQty = models.IntegerField()
|
||||
// WorkflowName = models.CharField()
|
||||
// activityInstanceName = models.CharField()
|
||||
// Status = models.CharField()
|
||||
// Deadline = models.CharField()
|
||||
// TaskStatus = models.CharField()
|
||||
// TaskReceiveDate = models.CharField()
|
||||
|
||||
// // Busses logic
|
||||
// arquivar = DispatchDomain.arquivar
|
||||
// executado = DispatchDomain.executado
|
||||
// reexecutar = DispatchDomain.reexecutar
|
||||
// sendToPending = DispatchDomain.sendToPending
|
||||
// requestAppear = DispatchDomain.requestAppear
|
||||
// createTaskDispatch = DispatchDomain.createTaskDispatch
|
||||
// setUpMeeting = DispatchDomain.setUpMeeting
|
||||
// }
|
||||
|
||||
// models.register({
|
||||
// databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id,
|
||||
// type: 'indexedDB',
|
||||
// version: 14,
|
||||
// models: [DispatchModal]
|
||||
// })
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
||||
</div>
|
||||
<div class="buttons px-20" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
|
||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído 123</button>
|
||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Concluido')" class="btn-cancel" shape="round" >Marcar como Concluído</button>
|
||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
|
||||
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
||||
|
||||
@@ -20,6 +20,7 @@ import { RouteService } from 'src/app/services/route.service';
|
||||
import { SessionStore } from 'src/app/store/session.service';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { TaskService } from 'src/app/services/task.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-opts-expediente',
|
||||
@@ -52,7 +53,8 @@ export class OptsExpedientePage implements OnInit {
|
||||
private RouteService: RouteService,
|
||||
private expedienteService: ExpedienteService,
|
||||
public ThemeService: ThemeService,
|
||||
private httpErrorHanlde: HttpErrorHandle
|
||||
private httpErrorHanlde: HttpErrorHandle,
|
||||
public TaskService: TaskService
|
||||
) {
|
||||
|
||||
}
|
||||
@@ -203,6 +205,7 @@ export class OptsExpedientePage implements OnInit {
|
||||
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise()
|
||||
this.TaskService.loadExpedientes()
|
||||
this.close();
|
||||
this.toastService._successMessage()
|
||||
} catch(error) {
|
||||
@@ -220,6 +223,7 @@ export class OptsExpedientePage implements OnInit {
|
||||
sendExpedienteToPending() {
|
||||
this.close();
|
||||
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
|
||||
this.TaskService.loadExpedientes()
|
||||
this.goBack();
|
||||
},(error)=>{
|
||||
if(error.status == 0) {
|
||||
@@ -248,6 +252,7 @@ export class OptsExpedientePage implements OnInit {
|
||||
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise();
|
||||
this.TaskService.loadExpedientes()
|
||||
this.close();
|
||||
this.httpErrorHanlde.httpsSucessMessagge('Avaliação Superiror')
|
||||
} catch(error) {
|
||||
@@ -305,6 +310,7 @@ export class OptsExpedientePage implements OnInit {
|
||||
const loader = this.toastService.loading()
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise();
|
||||
this.TaskService.loadExpedientes()
|
||||
this.goBack();
|
||||
} catch (error) {
|
||||
if(error.status == 0) {
|
||||
@@ -344,6 +350,7 @@ export class OptsExpedientePage implements OnInit {
|
||||
|
||||
try {
|
||||
await this.expedienteService.discard({SerialNumber: this.task.SerialNumber}).toPromise()
|
||||
this.TaskService.loadExpedientes()
|
||||
this.toastService._successMessage('Processo descartado');
|
||||
this.goBack();
|
||||
} catch (error) {
|
||||
@@ -370,6 +377,7 @@ export class OptsExpedientePage implements OnInit {
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise();
|
||||
this.toastService._successMessage('Processo descartado');
|
||||
this.TaskService.loadExpedientes()
|
||||
this.goBack();
|
||||
} catch (error) {
|
||||
if(error.status == 0) {
|
||||
@@ -389,6 +397,7 @@ export class OptsExpedientePage implements OnInit {
|
||||
|
||||
try {
|
||||
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
|
||||
this.TaskService.loadExpedientes()
|
||||
this.toastService._successMessage();
|
||||
this.goBack();
|
||||
} catch (error) {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "f51c51c00",
|
||||
"SHA": "f51c51c00535a2bf030861e0c293eff4326113c9",
|
||||
"shortSHA": "afb8daf18",
|
||||
"SHA": "afb8daf187ef911f4cd481e38fc8bb51bb1ef62a",
|
||||
"branch": "feature/gabinete-search",
|
||||
"lastCommitAuthor": "'Eudes Inácio'",
|
||||
"lastCommitTime": "'Sat Jun 10 21:16:58 2023 +0100'",
|
||||
"lastCommitMessage": "pull made",
|
||||
"lastCommitNumber": "4983",
|
||||
"lastCommitTime": "'Sun Jun 11 00:07:10 2023 +0100'",
|
||||
"lastCommitMessage": "changes",
|
||||
"lastCommitNumber": "4986",
|
||||
"change": "",
|
||||
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 16 and 3 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: .gitignore\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/services/notifications.service.ts",
|
||||
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 17 and 3 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/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts",
|
||||
"changeAuthor": "eudes.inacio"
|
||||
}
|
||||
Reference in New Issue
Block a user