mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 13:26:08 +00:00
changes Peter
This commit is contained in:
@@ -100,19 +100,19 @@ export class DespachoPage implements OnInit {
|
||||
}
|
||||
|
||||
close() {
|
||||
this.TaskService.loadDespachos();
|
||||
this.modalController.dismiss();
|
||||
}
|
||||
|
||||
goBack() {
|
||||
|
||||
this.TaskService.loadDespachos();
|
||||
this.RouteService.goBack();
|
||||
|
||||
}
|
||||
|
||||
async LoadTaskDetail(serial: string) {
|
||||
this.processes.GetTask(serial).subscribe((res: fullTask) => {
|
||||
|
||||
this.TaskService.loadDespachos();
|
||||
this.TaskService.loadDiplomas();
|
||||
|
||||
this.task = {
|
||||
"SerialNumber": res.serialNumber,
|
||||
|
||||
+1
-1
@@ -338,8 +338,8 @@ export class ExpedienteDetailPage implements OnInit {
|
||||
}
|
||||
|
||||
goBack() {
|
||||
this.TaskService.loadExpedientes()
|
||||
this.RouteService.goBack();
|
||||
|
||||
}
|
||||
|
||||
sendExpedienteToPending() {
|
||||
|
||||
@@ -99,6 +99,7 @@ export class ExpedientePrPage implements OnInit {
|
||||
}
|
||||
|
||||
goBack() {
|
||||
this.TaskService.loadExpedientes()
|
||||
this.RouteService.goBack();
|
||||
/* if(this.task.Status == "Pending" && this.caller != 'events'){
|
||||
if (window.innerWidth <= 800) {
|
||||
|
||||
@@ -12,6 +12,9 @@ import { PermissionService } from 'src/app/services/permission.service';
|
||||
import { ThemeService } from 'src/app/services/theme.service'
|
||||
import { RouteService } from 'src/app/services/route.service';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
|
||||
import { TaskService } from 'src/app/services/task.service'
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-despachos-pr-options',
|
||||
@@ -37,7 +40,8 @@ export class DespachosPrOptionsPage implements OnInit {
|
||||
private RouteService: RouteService,
|
||||
public p: PermissionService,
|
||||
public ThemeService: ThemeService,
|
||||
|
||||
public TaskService: TaskService,
|
||||
private httpErroHandle: HttpErrorHandle,
|
||||
) { }
|
||||
|
||||
ngOnInit() {
|
||||
@@ -103,7 +107,7 @@ export class DespachosPrOptionsPage implements OnInit {
|
||||
const loader = this.toastService.loading()
|
||||
this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{
|
||||
|
||||
this.toastService._successMessage()
|
||||
this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes')
|
||||
this.popoverController.dismiss('close')
|
||||
loader.remove()
|
||||
},(error)=>{
|
||||
@@ -299,7 +303,7 @@ export class DespachosPrOptionsPage implements OnInit {
|
||||
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise()
|
||||
this.toastService._successMessage('')
|
||||
this.httpErroHandle.httpsSucessMessagge('Concluir')
|
||||
this.close();
|
||||
} catch (error) {
|
||||
if(error.status == 0) {
|
||||
@@ -356,6 +360,7 @@ export class DespachosPrOptionsPage implements OnInit {
|
||||
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise()
|
||||
this.httpErroHandle.httpsSucessMessagge('Executado')
|
||||
this.close();
|
||||
this.toastService.successMessage()
|
||||
} catch(error) {
|
||||
@@ -382,6 +387,7 @@ export class DespachosPrOptionsPage implements OnInit {
|
||||
|
||||
try {
|
||||
await this.processes.CompleteTask(body).toPromise()
|
||||
this.httpErroHandle.httpsSucessMessagge('Reexecução')
|
||||
this.toastService.successMessage()
|
||||
this.close();
|
||||
} catch (error) {
|
||||
|
||||
@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
|
||||
import { doneITProd } from './suport/doneIt'
|
||||
|
||||
|
||||
export const environment: Environment = oaprProd;
|
||||
export const environment: Environment = doneITProd;
|
||||
@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
|
||||
import { DevDev } from './suport/dev'
|
||||
|
||||
|
||||
export const environment: Environment = oaprDev
|
||||
export const environment: Environment = doneITDev
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "985f1ad39",
|
||||
"SHA": "985f1ad3977dfb83002c9d42743d6072dcccf1b0",
|
||||
"shortSHA": "621e87c1f",
|
||||
"SHA": "621e87c1f442f31e75ee85a588e6eed0dc292fe3",
|
||||
"branch": "feature/gabinete-search",
|
||||
"lastCommitAuthor": "'Eudes Inácio'",
|
||||
"lastCommitTime": "'Mon May 29 14:05:12 2023 +0100'",
|
||||
"lastCommitMessage": "some changes",
|
||||
"lastCommitNumber": "4951",
|
||||
"lastCommitTime": "'Mon May 29 15:44:08 2023 +0100'",
|
||||
"lastCommitMessage": "changes",
|
||||
"lastCommitNumber": "4953",
|
||||
"change": "",
|
||||
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 5 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/shared/shared.module.ts",
|
||||
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 6 and 4 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/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
|
||||
"changeAuthor": "eudes.inacio"
|
||||
}
|
||||
Reference in New Issue
Block a user