mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
fix
This commit is contained in:
@@ -283,6 +283,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
this.dispatchFolder.SubjectTypes = this.selectedTypes;
|
this.dispatchFolder.SubjectTypes = this.selectedTypes;
|
||||||
const loader = this.toastService.loading()
|
const loader = this.toastService.loading()
|
||||||
|
|
||||||
|
console.log(this.fulltask, 'fulltask')
|
||||||
|
|
||||||
if (this.fulltask.activityInstanceName == "Assinar Diploma") {
|
if (this.fulltask.activityInstanceName == "Assinar Diploma") {
|
||||||
this.postData = {
|
this.postData = {
|
||||||
@@ -307,6 +308,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
console.log('1')
|
||||||
if (this.loggeduser.Profile != 'PR') {
|
if (this.loggeduser.Profile != 'PR') {
|
||||||
switch (this.taskType) {
|
switch (this.taskType) {
|
||||||
case '0': // Despacho
|
case '0': // Despacho
|
||||||
@@ -394,6 +396,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
} else if (this.loggeduser.Profile == 'PR') {
|
} else if (this.loggeduser.Profile == 'PR') {
|
||||||
switch (this.taskType) {
|
switch (this.taskType) {
|
||||||
case '0': // Despacho PR
|
case '0': // Despacho PR
|
||||||
|
console.log('12')
|
||||||
this.postData = {
|
this.postData = {
|
||||||
DistributionType: "Paralelo",
|
DistributionType: "Paralelo",
|
||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
@@ -424,6 +427,8 @@ export class CreateProcessPage implements OnInit {
|
|||||||
loader.remove();
|
loader.remove();
|
||||||
break;
|
break;
|
||||||
case '1': // Pedido de Parecer
|
case '1': // Pedido de Parecer
|
||||||
|
|
||||||
|
console.log('13')
|
||||||
this.postData = {
|
this.postData = {
|
||||||
DistributionType: "Paralelo",
|
DistributionType: "Paralelo",
|
||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
@@ -455,6 +460,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
case '2': // Pedido de Deferimento
|
case '2': // Pedido de Deferimento
|
||||||
|
console.log('123')
|
||||||
this.postData = {
|
this.postData = {
|
||||||
DistributionType: "Paralelo",
|
DistributionType: "Paralelo",
|
||||||
CountryCode: 'AO',
|
CountryCode: 'AO',
|
||||||
|
|||||||
@@ -130,8 +130,9 @@ export class DespachoPrPage implements OnInit {
|
|||||||
"TaskStartDate": res.taskStartDate
|
"TaskStartDate": res.taskStartDate
|
||||||
}
|
}
|
||||||
this.fulltask = res;
|
this.fulltask = res;
|
||||||
this.updateProcessOnDB(res);
|
|
||||||
|
|
||||||
|
this.updateProcessOnDB(res);
|
||||||
|
console.log('this.fulltask', this.fulltask)
|
||||||
let thedate = new Date(this.task.CreateDate);
|
let thedate = new Date(this.task.CreateDate);
|
||||||
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]);
|
||||||
|
|
||||||
@@ -416,13 +417,15 @@ export class DespachoPrPage implements OnInit {
|
|||||||
} else {
|
} else {
|
||||||
classs = 'modal modal-desktop showAsideOptions'
|
classs = 'modal modal-desktop showAsideOptions'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// console.log('this.fulltask send', this.fulltask)
|
||||||
const modal = await this.modalController.create({
|
const modal = await this.modalController.create({
|
||||||
component: CreateProcessPage,
|
component: CreateProcessPage,
|
||||||
componentProps: {
|
componentProps: {
|
||||||
taskAction: taskAction,
|
taskAction: taskAction,
|
||||||
task: task,
|
task: task,
|
||||||
profile: this.profile,
|
profile: this.profile,
|
||||||
fulltak: this.fulltask
|
fulltask: this.fulltask
|
||||||
},
|
},
|
||||||
cssClass: classs,
|
cssClass: classs,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -65,7 +65,6 @@
|
|||||||
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
|
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
|
||||||
<div class="exp-top-detail">
|
<div class="exp-top-detail">
|
||||||
<div class="subject">
|
<div class="subject">
|
||||||
{{ task.taskStatus || task.TaskStatus }}
|
|
||||||
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
|
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
|
||||||
</div>
|
</div>
|
||||||
<div class="exp-icon">
|
<div class="exp-icon">
|
||||||
@@ -103,7 +102,6 @@
|
|||||||
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
|
<div class="item width-100 expediente" *ngIf="TaskService.filter(task, filterName)">
|
||||||
<div class="exp-top-detail">
|
<div class="exp-top-detail">
|
||||||
<div class="subject">
|
<div class="subject">
|
||||||
{{ task.taskStatus || task.TaskStatus }}
|
|
||||||
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
|
<ion-label [class.gb-seen]="TaskService.seen(task)">{{ task.Folio }}</ion-label>
|
||||||
</div>
|
</div>
|
||||||
<div class="exp-icon">
|
<div class="exp-icon">
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "a87f46196",
|
"shortSHA": "45a401430",
|
||||||
"SHA": "a87f4619639be1cbd650c1744a828a3854e5d5e3",
|
"SHA": "45a4014307bb15795eb55a4b84de2f9e9c84f5ed",
|
||||||
"branch": "feature/gabineteLabels",
|
"branch": "feature/gabineteLabels",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Tue Apr 18 09:37:41 2023 +0100'",
|
"lastCommitTime": "'Tue Apr 18 11:51:56 2023 +0100'",
|
||||||
"lastCommitMessage": "fix gabinete labels",
|
"lastCommitMessage": "fix variables",
|
||||||
"lastCommitNumber": "4917",
|
"lastCommitNumber": "4918",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts",
|
"changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user