merge

src/app/shared/agenda/approve-event/approve-event.page.ts

@@ -192,7 +192,12 @@ export class ApproveEventPage implements OnInit {
           this.toastService._successMessage('Evento enviado para revisão');
           this.close();
         } catch (error) {
-          this.toastService._badRequest();
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+           
+            this.toastService._badRequest();
+          }
         }  finally {
           loader.remove()
         }

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -415,7 +415,12 @@ export class EditEventToApprovePage implements OnInit {
       this.toastService._successMessage();
       this.goToApproveEventList();
     } catch (error) {
-      this.toastService._badRequest();
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest();
+      }
     }  finally {
       loader.remove()
     }

src/app/shared/agenda/new-event/new-event.page.html

@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="title-content">
         <div class="middle">
-          <ion-label class="title">Novo Evento</ion-label>
+          <ion-label class="title">Novo Evento"</ion-label>
         </div>
       </div>
       <ion-progress-bar class="calendar-progress-bar" type="indeterminate" *ngIf="showLoader"></ion-progress-bar>

src/app/shared/agenda/new-event/new-event.page.ts

@@ -25,6 +25,7 @@ import {  FormGroup, Validators } from '@angular/forms';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { ThemeService } from 'src/app/services/theme.service'
 import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service';
+import { ServerConnectionService } from 'src/app/services/server-connection.service';
 import { SessionStore } from 'src/app/store/session.service';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -129,6 +130,7 @@ export class NewEventPage implements OnInit {
     private dateAdapter: DateAdapter<any>,
     public ThemeService: ThemeService,
     private chatMethodService: ChatMethodsService,
+    private ServerConnectionService: ServerConnectionService
     // private translate: TranslateService
   ) {
     this.dateAdapter.setLocale('pt');
@@ -529,9 +531,15 @@ export class NewEventPage implements OnInit {
           
         },
         error => {
+          console.log(error, 'error')
           loader.remove()
           this.showLoader = false
-          this.toastService._badRequest('Evento não criado')
+
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+            this.toastService._badRequest('Evento não criado')
+          }
       });
 
     }
@@ -585,10 +593,19 @@ export class NewEventPage implements OnInit {
           }
 
           this.toastService._successMessage('Evento criado')
-        },()=>{
+        },(error) => {
+
+          //const connectionToServer = this.ServerConnectionService.BaseAPI()
+
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+            this.toastService._badRequest('Evento não criado')
+          }
+
           loader.remove()
           this.showLoader = false
-          this.toastService._badRequest('Evento não criado')
+          
         });
     } else {
 
@@ -641,10 +658,15 @@ export class NewEventPage implements OnInit {
             this.chatMethodService.sendMessage(this.roomId,data);
           }
           this.toastService._successMessage('Evento criado')
-      },()=>{
+      },(error)=>{
+
         loader.remove()
         this.showLoader = false
-        this.toastService._badRequest('Evento não criado')
+        if(error.status == 0) {
+          this.toastService._badRequest('sem conexão ao servidor')
+        } else {
+          this.toastService._badRequest('Evento não criado')
+        }
       });
 
     }

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts

@@ -312,7 +312,12 @@ export class EditEventToApproveComponent implements OnInit {
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
       this.toastService._successMessage('Evento editado');
     }, error =>{
-      this.toastService._badRequest('Evento não editado');
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest('Evento não editado');
+      }
     })
 
 
@@ -322,14 +327,24 @@ export class EditEventToApproveComponent implements OnInit {
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{
           this.toastService._successMessage();
         }, error =>{
-          this.toastService._badRequest();
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+           
+            this.toastService._badRequest();
+          }
         });
       } else if(document['action'] == 'delete') {
         delete document.action
         this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{
           this.toastService._successMessage()
         }, error =>{
-          this.toastService._badRequest()
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+           
+            this.toastService._badRequest()
+          }
         })
       }
 

src/app/shared/popover/deploma-options/deploma-options.page.ts

@@ -107,7 +107,12 @@ export class DeplomaOptionsPage implements OnInit {
       this.close();
       this.toastService._successMessage()
     } catch (error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }     finally {
       loader.remove()
     }
@@ -154,7 +159,12 @@ export class DeplomaOptionsPage implements OnInit {
       this.close();
       this.toastService._successMessage()
     } catch (error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }     finally {
       loader.remove()
     }
@@ -180,7 +190,11 @@ export class DeplomaOptionsPage implements OnInit {
       this.close();
       this.toastService._successMessage()
     } catch (error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+        this.toastService._badRequest()
+      }
     } finally {
       loader.remove()
     }
@@ -205,7 +219,12 @@ export class DeplomaOptionsPage implements OnInit {
       await this.processes.CompleteTask(body).toPromise();
       this.toastService._successMessage('Processo concluído')
     } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
       this.toastService._badRequest()
+      }
     }
     finally {
       loader.remove()

src/app/shared/popover/despachos-options/despachos-options.page.ts

@@ -78,9 +78,14 @@ export class DespachosOptionsPage implements OnInit {
       loader.remove()
       
       this.close();
-    },()=>{
+    },(error)=>{
       loader.remove()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
       this.toastService._badRequest('Processo não encontrado')
+      }
     });
   }
 
@@ -173,7 +178,12 @@ export class DespachosOptionsPage implements OnInit {
       this.toastService._successMessage()
       this.close();
     } catch (error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }     finally {
       loader.remove()
     }
@@ -254,7 +264,12 @@ export class DespachosOptionsPage implements OnInit {
       this.toastService._successMessage('Processo arquivado')
       this.close();
     } catch (error) {
-      this.toastService._badRequest('Processo não arquivado')
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest('Processo não arquivado')
+      }
     }     finally {
       loader.remove()
     }
@@ -281,7 +296,12 @@ export class DespachosOptionsPage implements OnInit {
       this.close();
       this.toastService._successMessage()
     } catch(error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }  finally {
       loader.remove()
     }
@@ -308,7 +328,12 @@ export class DespachosOptionsPage implements OnInit {
       this.toastService._successMessage()
       this.close();
     } catch (error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }   finally {
       loader.remove()
     }

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts

@@ -104,10 +104,14 @@ export class DespachosPrOptionsPage implements OnInit {
       this.toastService._successMessage()
       this.popoverController.dismiss('close')
       loader.remove()
-    },()=>{
+    },(error)=>{
       loader.remove()
-
-      this.toastService._badRequest('Processo não encontrado')
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest('Processo não encontrado')
+      }
     });
   }
 
@@ -206,7 +210,12 @@ export class DespachosPrOptionsPage implements OnInit {
       this.toastService._successMessage()
       this.close();
     } catch (error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }   finally {
       loader.remove()
     }
@@ -290,7 +299,12 @@ export class DespachosPrOptionsPage implements OnInit {
       this.toastService._successMessage('')
       this.close();
     } catch (error) {
-      this.toastService._badRequest()
+    if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }
     finally {
       loader.remove()

src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts

@@ -92,7 +92,12 @@ export class DiplomasGerarOptionsPage implements OnInit {
           this.toastService._successMessage();
           this.goBack()
         } catch (error) {
-          this.toastService._badRequest();
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+           
+            this.toastService._badRequest();
+          }
         } finally {
           loader.remove()
         }

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -142,7 +142,12 @@ export class OptsExpedientePrPage implements OnInit {
       this.close();
       this.toastService._successMessage()
     } catch(error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }     finally {
       loader.remove()
     }
@@ -180,7 +185,12 @@ export class OptsExpedientePrPage implements OnInit {
             this.toastService._successMessage('Processo descartado');
             this.goBack();
           } catch (error) {
-            this.toastService._badRequest('Processo não descartado')
+            if(error.status == 0) {
+              this.toastService._badRequest('sem conexão ao servidor')
+            } else {
+             
+              this.toastService._badRequest('Processo não descartado')
+            }
           }     finally {
             loader.remove()
           }
@@ -199,7 +209,12 @@ export class OptsExpedientePrPage implements OnInit {
             // this.toastService.successMessage('Processo descartado');
             this.goBack();
           } catch (error) {
-            this.toastService._badRequest('Processo não descartado');
+            if(error.status == 0) {
+              this.toastService._badRequest('sem conexão ao servidor')
+            } else {
+             
+              this.toastService._badRequest('Processo não descartado');
+            }
           }  finally {
             loader.remove()
           }
@@ -214,7 +229,12 @@ export class OptsExpedientePrPage implements OnInit {
             this.toastService._successMessage();
             this.goBack();
           } catch (error) {
-            this.toastService._badRequest();
+            if(error.status == 0) {
+              this.toastService._badRequest('sem conexão ao servidor')
+            } else {
+             
+              this.toastService._badRequest();
+            }
           }     finally {
             loader.remove()
           }
@@ -242,7 +262,12 @@ export class OptsExpedientePrPage implements OnInit {
       this.close();
       this.toastService._successMessage()
     } catch(error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }     finally {
       loader.remove()
     }
@@ -255,9 +280,13 @@ export class OptsExpedientePrPage implements OnInit {
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       loader.remove()
       this.close();
-    },()=>{
-
-      this.toastService._badRequest('Processo não encontrado')
+    }, (error) => {
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest('Processo não encontrado')
+      }
       loader.remove()
     });
   }
@@ -295,7 +324,11 @@ export class OptsExpedientePrPage implements OnInit {
           // this.toastService.successMessage('Processo descartado');
           this.goBack();
         } catch (error) {
-          this.toastService._badRequest('Processo não descartado');
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+            this.toastService._badRequest('Processo não descartado');
+          } 
         }  finally {
           loader.remove()
         }

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -170,8 +170,13 @@ export class OptsExpedientePage implements OnInit {
 
             this.attachmentsService.AddAttachment(body).subscribe((res)=> {
               this.toastService._successMessage()
-            },()=> {
-              this.toastService._badRequest()
+            }, (error) => {
+              if(error.status == 0) {
+                this.toastService._badRequest('sem conexão ao servidor')
+              } else {
+               
+                this.toastService._badRequest()
+              }
             },()=> {
               loader.remove()
             });
@@ -248,7 +253,12 @@ export class OptsExpedientePage implements OnInit {
       this.close();
       this.toastService._successMessage()
     } catch(error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     } finally {
       loader.remove()
     }
@@ -258,9 +268,13 @@ export class OptsExpedientePage implements OnInit {
     this.close();
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       this.goBack();
-    },()=>{
-
-      this.toastService._badRequest('Processo não encontrado')
+    },(error)=>{
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest('Processo não encontrado')
+      }
     });
   }
 
@@ -284,7 +298,12 @@ export class OptsExpedientePage implements OnInit {
       this.close();
       this.toastService._successMessage('Processo aprovado')
     } catch(error) {
-      this.toastService._badRequest('Processo não aprovado')
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest('Processo não aprovado')
+      }
     }  finally {
       loader.remove()
     }
@@ -340,7 +359,12 @@ export class OptsExpedientePage implements OnInit {
           await this.processes.CompleteTask(body).toPromise();
             this.goBack();
           } catch (error) {
-            this.toastService._badRequest('Processo não descartado')
+            if(error.status == 0) {
+              this.toastService._badRequest('sem conexão ao servidor')
+            } else {
+             
+              this.toastService._badRequest('Processo não descartado')
+            }
           } finally {
             loader.remove()
         }
@@ -375,7 +399,12 @@ export class OptsExpedientePage implements OnInit {
             this.toastService._successMessage('Processo descartado');
             this.goBack();
           } catch (error) {
-            this.toastService._badRequest('Processo não descartado')
+            if(error.status == 0) {
+              this.toastService._badRequest('sem conexão ao servidor')
+            } else {
+             
+              this.toastService._badRequest('Processo não descartado')
+            }
           } finally {
             loader.remove()
           }
@@ -395,7 +424,12 @@ export class OptsExpedientePage implements OnInit {
             this.toastService._successMessage('Processo descartado');
             this.goBack();
           } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('sem conexão ao servidor')
+            } else {
+             
             this.toastService._badRequest('Processo não descartado')
+            }
           }     finally {
             loader.remove()
           }
@@ -409,8 +443,12 @@ export class OptsExpedientePage implements OnInit {
             await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
             this.toastService._successMessage();
             this.goBack();
-          } catch (error) {
+          } catch (error) { 
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
             this.toastService._badRequest()
+          }
           }     finally {
             loader.remove()
           }

src/app/shared/popover/request-options/request-options.page.ts

@@ -191,7 +191,12 @@ export class RequestOptionsPage implements OnInit {
       this.close();
       this.toastService._successMessage()
     } catch (error) {
-      this.toastService._badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
+        this.toastService._badRequest()
+      }
     }
     finally {
       loader.remove()
@@ -260,7 +265,12 @@ export class RequestOptionsPage implements OnInit {
 
       this.toastService._successMessage('Processo arquivado')
     } catch (error) {
-      this.toastService._badRequest('Processo não arquivado')
+      if(error.status == 0) {
+          this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+        
+        this.toastService._badRequest('Processo não arquivado')
+      }
     } finally {
       loader.remove()
     }

src/app/shared/publication/edit-action/edit-action.page.ts

@@ -111,7 +111,11 @@ export class EditActionPage implements OnInit {
       this.getActions.emit()
 
     } catch (error) {
-      this.toastService._badRequest('Não foi possivel atualizar a acção presidencial')
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+        this.toastService._badRequest('Não foi possivel atualizar a acção presidencial')
+      }
     } finally {
       loader.remove()
     }

src/app/shared/publication/new-action/new-action.page.ts

@@ -133,7 +133,12 @@ export class NewActionPage implements OnInit {
 
       this.getActions.emit()
     } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
       this.toastService._badRequest('Não foi possivel criar a acção presidencial')
+      }
     } finally {
       loader.remove()
     }

src/app/shared/publication/new-publication/new-publication.page.ts

@@ -159,7 +159,11 @@ export class NewPublicationPage implements OnInit {
 
           this.goBack();
         } catch (error) {
-          this.toastService._badRequest()
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+            this.toastService._badRequest()
+          }
         }     finally {
           loader.remove()
         }
@@ -188,7 +192,11 @@ export class NewPublicationPage implements OnInit {
 
           this.goBack();
         } catch (error) {
-          this.toastService._badRequest()
+          if(error.status == 0) {
+           this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+            this.toastService._badRequest()
+          }
         }     finally {
           loader.remove()
         }
@@ -216,7 +224,11 @@ export class NewPublicationPage implements OnInit {
 
           this.goBack();
         } catch (error) {
-          this.toastService._badRequest()
+          if(error.status == 0) {
+            this.toastService._badRequest('sem conexão ao servidor')
+          } else {
+            this.toastService._badRequest()
+          }
         }     finally {
           loader.remove()
         }
@@ -247,7 +259,11 @@ export class NewPublicationPage implements OnInit {
 
         this.goBackToViewPublications.emit();
       } catch (error) {
-        this.toastService._badRequest()
+        if(error.status == 0) {
+          this.toastService._badRequest('sem conexão ao servidor')
+        } else {
+          this.toastService._badRequest()
+        }
       }     finally {
         loader.remove()
       }

src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts

@@ -90,7 +90,11 @@ export class PublicationDetailPage implements OnInit {
       this.toastService._successMessage("Publicação eliminado")
       this.goBackToViewPublications.emit();
     } catch (error) {
-      this.toastService._badRequest("Publicação não eliminado")
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+        this.toastService._badRequest("Publicação não eliminado")
+      }
     } finally {
       laoder.remove()
     }

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -26,7 +26,7 @@ export class ViewPublicationsPage implements OnInit {
   getpublication = [];
   error: any;
 
-  @Input() folderId: string;
+  @Input() folderId: any;
   @Output() addNewPublication =  new EventEmitter<any>();
   @Output() editPublication =  new EventEmitter<any>();
   @Output() openPublicationDetails= new EventEmitter<any>();
@@ -221,8 +221,13 @@ export class ViewPublicationsPage implements OnInit {
     try {
       await this.publications.DeletePresidentialAction(folderId).toPromise();
       this.toastService._successMessage()
-    } catch (e) {
+    } catch (error) {
+      if(error.status == 0) {
+        this.toastService._badRequest('sem conexão ao servidor')
+      } else {
+       
       this.toastService._badRequest()
+      }
     }
     finally {
       loader.remove()