diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index 339e13364..2609972af 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -61,7 +61,7 @@
Documentos Anexados
-
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index 70917f0f8..0af829ddb 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -129,7 +129,6 @@ export class DespachoPrPage implements OnInit {
}
});
- this.getDocumentDetails(this.task.FolderId, '361');
}, (error)=>{
try {
@@ -146,13 +145,6 @@ export class DespachoPrPage implements OnInit {
});
}
- getDocumentDetails(forlderId:string, applicationId:string) {
- this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
- this.attachments = res.Documents;
- console.log(res['Documents']);
- console.log(this.attachments);
- })
- }
// async LoadRelatedEvents(serial: string) {
// if (this.eventsList == null) {
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 640e05a21..308b8076a 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -70,7 +70,7 @@ export class DespachosPrPage implements OnInit {
const pathname = location.pathname + location.search
this.LoadList()
-
+
this.router.events.forEach((event) => {
if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
@@ -98,12 +98,10 @@ export class DespachosPrPage implements OnInit {
openExpedientDetailPage(data){
console.log(data);
- // this.openExpedientDetail.emit(data);
}
async LoadList() {
-
this.skeletonLoader = true
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
@@ -120,8 +118,6 @@ export class DespachosPrPage implements OnInit {
console.log(result);
despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
- console.log(despachosPr);
-
break;
}
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
index 8ea4ffe3f..e2df44f8b 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
@@ -5,22 +5,40 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss
index 009bb2ba4..6d42b51b4 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.scss
@@ -3,18 +3,19 @@
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
+ width: 100%;
}
-.arrow-right {
+.arrow-right{
display: none;
margin-bottom: 20px;
- .arrow-right-icon {
+ .arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
-.buttons {
+.buttons{
display: flex;
flex-wrap: wrap;
justify-content: space-around;
@@ -30,10 +31,8 @@
margin-bottom: 5px !important;
margin-top: 5px !important;
}
-@media only screen and (max-width: 800px) {
- .btn-ok, .btn-cancel, .btn-delete{
- width: 47% !important;
- }
+.btn-ok, .btn-cancel, .btn-delete{
+ width: 100% !important;
}
@media only screen and (min-width: 1024px) {
.arrow-right{
@@ -53,4 +52,10 @@
/* .solid{
display: block;
} */
+}
+
+
+.desk{
+ text-align: left;
+ background-color: white;
}
\ No newline at end of file
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index b64235c28..ade13929f 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -13,6 +13,7 @@ import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { ToastService } from 'src/app/services/toast.service';
import { Location } from '@angular/common'
+import { PermissionService } from 'src/app/OtherService/permission.service';
@Component({
selector: 'app-despachos-pr-options',
@@ -29,18 +30,14 @@ export class DespachosPrOptionsPage implements OnInit {
constructor(private activateRoute: ActivatedRoute,
private processes: ProcessesService,
- private iab: InAppBrowser,
- private attachmentsService: AttachmentsService,
- private events: EventsService,
- private menu: MenuController,
private router: Router,
private modalController: ModalController,
- private alertService: AlertService,
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
- private animationController: AnimationController,
private toastService: ToastService,
- private location: Location,) { }
+ private location: Location,
+ public p: PermissionService,
+ ) { }
ngOnInit() {
@@ -331,13 +328,15 @@ export class DespachosPrOptionsPage implements OnInit {
goBack() {
- let navigationExtras: NavigationExtras = {
- queryParams: {
- "despachospr": true,
- }
- };
+ // let navigationExtras: NavigationExtras = {
+ // queryParams: {
+ // "despachospr": true,
+ // }
+ // };
- this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+ // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+
+ this.location.back()
}