diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.scss b/src/app/shared/popover/deploma-options/deploma-options.page.scss
index 41abf3ba8..3f1718b98 100644
--- a/src/app/shared/popover/deploma-options/deploma-options.page.scss
+++ b/src/app/shared/popover/deploma-options/deploma-options.page.scss
@@ -25,11 +25,11 @@
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
- .btn-ok, .btn-cancel{
- //width: 50% !important;
- margin-bottom: 5px !important;
- margin-top: 5px !important;
-}
+ .btn-ok, .btn-cancel, .btn-delete{
+ width: calc(50% - 10px) !important;
+ margin: 5px 5px 5px 5px !important;
+ }
+
@media only screen and (max-width: 800px) {
.btn-ok, .btn-cancel, .btn-delete{
width: 47% !important;
@@ -53,4 +53,4 @@
/* .solid{
display: block;
} */
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.scss b/src/app/shared/popover/despachos-options/despachos-options.page.scss
index 7ad4b7bbf..5ea5fa2c7 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.scss
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.scss
@@ -3,6 +3,7 @@
--padding-bottom:20px !important;
--padding-start:20px !important;
--padding-end:20px !important;
+
}
.arrow-right {
display: none;
@@ -25,11 +26,10 @@
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
- .btn-ok, .btn-cancel{
- //width: 50% !important;
- margin-bottom: 5px !important;
- margin-top: 5px !important;
-}
+ .btn-ok, .btn-cancel, .btn-delete{
+ width: calc(50% - 10px) !important;
+ margin: 5px 5px 5px 5px !important;
+ }
.pr-options {
.btn-ok, .btn-cancel{
@@ -45,7 +45,7 @@
width: 30%;
}
}
-
+
@media only screen and (min-width: 1140px){
.content{
width: 75%;
@@ -54,9 +54,9 @@
width: 25%;
}
}
-
+
.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.html b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
index b02dd875b..fdf88d42e 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
@@ -20,6 +20,7 @@
+
@@ -28,11 +29,12 @@
+
-
-
+
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 6108784b8..91b87ddc7 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
@@ -58,4 +58,4 @@
.desk{
text-align: left;
background-color: white;
-}
\ No newline at end of file
+}
diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/shared/popover/messages-options/messages-options.page.scss
index dd61665a1..29fe1e464 100644
--- a/src/app/shared/popover/messages-options/messages-options.page.scss
+++ b/src/app/shared/popover/messages-options/messages-options.page.scss
@@ -25,6 +25,10 @@
border-top: 1px solid #bbb;
margin: 0 auto !important;
}
+ /* .btn-ok, .btn-cancel, .btn-delete{
+ width: calc(50% - 10px) !important;
+ margin: 5px 5px 5px 5px !important;
+ } */
@media only screen and (min-width: 701px) {
.arrow-right{
display: flex;
diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html
index a343f7758..e02596261 100644
--- a/src/app/shared/popover/request-options/request-options.page.html
+++ b/src/app/shared/popover/request-options/request-options.page.html
@@ -15,6 +15,7 @@
+
@@ -25,6 +26,7 @@
+
@@ -36,15 +38,17 @@
+
-
+
+
@@ -54,6 +58,10 @@
+
+
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index cf4b91daf..3cd00bfc5 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -39,7 +39,7 @@ export class RequestOptionsPage implements OnInit {
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');
this.serialNumber = this.navParams.get('serialNumber');
-
+
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialNumber = params["serialNumber"];
@@ -62,7 +62,7 @@ export class RequestOptionsPage implements OnInit {
ngOnInit() {
console.log(this.task);
this.profile = "mdgpr";
-
+
window.onresize = (event) => {
if( window.innerWidth >= 800){
this.popoverController.dismiss();
@@ -73,6 +73,9 @@ export class RequestOptionsPage implements OnInit {
close() {
this.popoverController.dismiss('close')
}
+ cancel(){
+ this.popoverController.dismiss();
+ }
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
@@ -83,7 +86,7 @@ export class RequestOptionsPage implements OnInit {
this.toastService.badRequest('Processo não encontrado')
});
-
+
}
async openBookMeetingModal(task: any) {
@@ -130,7 +133,7 @@ export class RequestOptionsPage implements OnInit {
console.log(res['data']);
if(res['data']=='openDiscart') {
console.log('open discart');
-
+
} else {
this.popoverController.dismiss('close')
}
@@ -139,8 +142,8 @@ export class RequestOptionsPage implements OnInit {
}
async repreciar(note:string, documents:any) {
- let body = {
- "serialNumber": this.serialNumber,
+ let body = {
+ "serialNumber": this.serialNumber,
"action": "Reapreciação",
"ActionTypeId": 100000009,
"dataFields": {
@@ -151,13 +154,13 @@ export class RequestOptionsPage implements OnInit {
const loader = this.toastService.loading()
- try {
+ try {
await this.processes.CompleteTask(body).toPromise()
this.close();
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
- }
+ }
finally {
loader.remove()
}
@@ -180,9 +183,9 @@ export class RequestOptionsPage implements OnInit {
cssClass: classs,
backdropDismiss: true
});
-
+
await modal.present();
-
+
modal.onDidDismiss().then(async (res) => {
@@ -192,7 +195,7 @@ export class RequestOptionsPage implements OnInit {
SourceId: e.Id,
}
});
-
+
let docs = {
ProcessInstanceID: "",
Attachments: DocumentToSave,
@@ -217,7 +220,7 @@ export class RequestOptionsPage implements OnInit {
const loader = this.toastService.loading()
- try {
+ try {
await this.pedidoService.arquivar({serialNumber: this.serialNumber,
documents,
note
@@ -233,7 +236,7 @@ export class RequestOptionsPage implements OnInit {
}
async openDarParecer(task: any) {
-
+
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -258,7 +261,7 @@ export class RequestOptionsPage implements OnInit {
async openDelegarModal(task: any) {
-
+
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -275,7 +278,7 @@ export class RequestOptionsPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then( async (res)=> {
-
+
if(res['data']=='close') {
this.popoverController.dismiss('close');
}