+
{{ Document.Assunto || "Sem assunto" }} Rascunho
{{ Document.Sender}}{{ Document.DocDate | date: 'dd-MM-yyyy HH:mm' }}
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
index a030067a5..3538bd4f8 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
@@ -183,9 +183,6 @@ ion-button{
}
}
@media only screen and (min-width: 801px) {
- .div-icon{
- display: none;
- }
.content{
width: 65%;
border-right: 1px solid #d8d8d8;
@@ -261,7 +258,8 @@ ion-button{
}
.mobile-header {
- flex-grow: 1;
+ display: flex;
+ justify-content: space-around;
}
.content-details {
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index ad347b67c..be4244646 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -46,7 +46,7 @@ export class PendentesPage implements OnInit {
private router: Router,
private sortService: SortService,
private storage: Storage,
- public TaskService: TaskService,
+ public TaskService: TaskService,
public ThemeService: ThemeService) {
this.loggeduser = SessionStore.user;
}
@@ -82,7 +82,7 @@ export class PendentesPage implements OnInit {
}
-
+
ngOnDestroy() {
this.listSubscription.delete()
this.routerSubscription?.unsubscribe();
@@ -99,7 +99,7 @@ export class PendentesPage implements OnInit {
async dynamicSearch() {
if(this.showSearch && this.searchSubject) {
-
+
const list = this.pendentesstore.list.filter((task) => {
let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
subject = subject.toLowerCase();
@@ -146,11 +146,11 @@ export class PendentesPage implements OnInit {
this.listToPresent = pendentesList
this.pendentesstore.reset(pendentesList);
this.storage.set('pendente-list',pendentesList).then(() => {
-
+
})
this.dynamicSearch()
-
+
}, (error) => {
this.skeletonLoader = false;
if(error.status == 0){
@@ -165,7 +165,7 @@ export class PendentesPage implements OnInit {
this.listToPresent =pendentes
})
}
-
+
doRefresh(event) {
if (event) {
setTimeout(() => {
@@ -183,13 +183,13 @@ export class PendentesPage implements OnInit {
async viewTaskDetails({ SerialNumber, WorkflowName, activityInstanceName }:customTask) {
- //
+ //
if(WorkflowName == 'Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
}
else if (WorkflowName == 'Despacho do Presidente da República') {
- this.router.navigate(['/home/gabinete-digital/despachos', SerialNumber, 'gabinete-digital']);
+ this.router.navigate(['/home/gabinete-digital/despachos-pr', SerialNumber, 'gabinete-digital']);
}
else if(WorkflowName == 'Pedido de Parecer' || WorkflowName == 'Pedido de Deferimento' || WorkflowName == 'Pedido de Parecer do Presidente') {
this.router.navigate(['/home/gabinete-digital/pedidos',SerialNumber,'gabinete-digital']);
@@ -207,7 +207,7 @@ export class PendentesPage implements OnInit {
this.router.navigate(['/home/gabinete-digital/despachos',SerialNumber,'gabinete-digital']);
}
else {
-
+
}
}
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options-routing.module.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options-routing.module.ts
new file mode 100644
index 000000000..3b1c53b2a
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DiplomaOptionsPage } from './deploma-options.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: DiplomaOptionsPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class DeplomaOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.module.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options.module.ts
new file mode 100644
index 000000000..e6866f35a
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.module.ts
@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DeplomaOptionsPageRoutingModule } from './deploma-options-routing.module';
+
+import { DiplomaOptionsPage } from './deploma-options.page';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { CreateProcessPageModule } from 'src/app/modals/create-process/create-process.module';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ DeplomaOptionsPageRoutingModule,
+ CreateProcessPageModule
+ ],
+ declarations: [
+ DiplomaOptionsPage,
+ ],
+ exports: [DiplomaOptionsPage],
+ entryComponents: [
+ DiplomaOptionsPage,
+ CreateProcessPage
+ ]
+})
+export class DeplomaOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.html b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.html
new file mode 100644
index 000000000..87e350eda
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.html
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss
new file mode 100644
index 000000000..60dbe2483
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.scss
@@ -0,0 +1,56 @@
+@import '~src/function.scss';
+
+.options-container{
+ --padding-top:20px !important;
+ --padding-bottom:20px !important;
+ --padding-start:20px !important;
+ --padding-end:20px !important;
+}
+.arrow-right {
+ margin-bottom: 20px;
+ .arrow-right-icon {
+ width: 37px;
+ float: right;
+ font-size: rem(35);
+ overflow: hidden;
+ }
+}
+.buttons {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
+}
+.solid {
+ width: 90%;
+ border-top: 1px solid #bbb;
+ margin: 0 auto !important;
+ }
+ .btn-ok, .btn-cancel, .btn-delete{
+ width: 100% !important;
+ margin: 5px 5px 5px 5px !important;
+ }
+
+@media only screen and (max-width: 800px) {
+ .btn-ok, .btn-cancel, .btn-delete{
+ width: 100% !important;
+ min-width: 300px;
+ }
+}
+@media only screen and (min-width: 1024px) {
+ .arrow-right{
+ display: flex;
+ justify-content: flex-end;
+ }
+ .btn-cancel{
+ width: 100% !important;
+ margin-bottom: 10px !important;
+ }
+ .btn-delete, .btn-ok{
+ width: 100% !important;
+ margin-bottom: 10px !important;
+ margin-top: 10px !important;
+ }
+ /* .solid{
+ display: block;
+ } */
+}
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts
new file mode 100644
index 000000000..46b0d3958
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DeplomaOptionsPage } from './deploma-options.page';
+
+describe('DeplomaOptionsPage', () => {
+ let component: DeplomaOptionsPage;
+ let fixture: ComponentFixture
;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DeplomaOptionsPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(DeplomaOptionsPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts
new file mode 100644
index 000000000..e9ca3988c
--- /dev/null
+++ b/src/app/shared/popover/desktop/deploma-options/deploma-options.page.ts
@@ -0,0 +1,428 @@
+import { Component, OnInit } from '@angular/core';
+import { ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
+import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { ToastService } from 'src/app/services/toast.service';
+import { RouteService } from 'src/app/services/route.service';
+import { PermissionService } from 'src/app/services/permission.service';
+import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
+import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
+import { AttachmentList } from 'src/app/models/Excludetask';
+import { DespachoService } from 'src/app/Rules/despacho.service';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { TaskService } from 'src/app/services/task.service'
+import { PopupQuestionPage } from 'src/app/modals/popup-question/popup-question.page';
+
+@Component({
+ selector: 'app-deploma-options',
+ templateUrl: './deploma-options.page.html',
+ styleUrls: ['./deploma-options.page.scss'],
+})
+export class DiplomaOptionsPage implements OnInit {
+
+
+ serialNumber: string;
+ profile: string;
+ task: any
+ fulltask: any
+ DraftIds = ""
+ DraftNames = ""
+ asDraft: boolean;
+
+
+ constructor(
+ public popoverController: PopoverController,
+ private modalController: ModalController,
+ private processes: ProcessesService,
+ private navParams: NavParams,
+ private toastService: ToastService,
+ private RouteService: RouteService,
+ public p: PermissionService,
+ private despachoService: DespachoService,
+ private httpErroHandle: HttpErrorHandle,
+ public TaskService: TaskService) {
+ this.serialNumber = this.navParams.get('serialNumber');
+ this.task = this.navParams.get('task');
+ this.fulltask = this.navParams.get('fulltask');
+
+ this.DraftIds = this.navParams.get("DraftIds");
+ this.DraftNames = this.navParams.get("DraftNames");
+ this.asDraft = this.navParams.get('asDraft');
+
+
+ console.log('this.task', this.task)
+
+ }
+
+ ngOnInit() {
+ console.log(this.task.activityInstanceName)
+
+ }
+
+ async openAddNoteModal(actionName: string) {
+ // this.popoverController.dismiss();
+ let classs;
+ if (window.innerWidth <= 800) {
+ classs = 'modal modal-desktop'
+ } else {
+ classs = 'modal modal-desktop'
+ }
+
+ this.modalController.dismiss()
+ const modal = await this.modalController.create({
+ component: AddNotePage,
+ componentProps: {
+ actionName: actionName
+ },
+ cssClass: classs,
+ backdropDismiss: true
+ });
+
+ modal.onDidDismiss().then(async (res) => {
+ if (res.data) {
+
+
+ const DocumentToSave = res.data.documents.map((e) => {
+ return {
+ ApplicationId: e.ApplicationType,
+ SourceId: e.Id,
+ }
+ });
+
+ let docs = {
+ ProcessInstanceID: "",
+ Attachments: DocumentToSave,
+ }
+
+ if (actionName == 'Solicitar assinatura') {
+ await this.askSignature(res.data.note, docs);
+ this.goBack();
+ } else if (actionName == 'Solicitar alteração') {
+ await this.askToChange(res.data.note, docs);
+ this.goBack();
+ } else if (actionName == 'Assinar Diploma') {
+ await this.sign(res.data.note, docs);
+ this.goBack();
+ } else if (actionName == 'Concluir diploma') {
+ await this.finish(res.data.note, docs);
+ this.goBack();
+ } else if (actionName == 'Arquivo') {
+ await this.arquivar(res.data.note, docs);
+ this.goBack();
+ } else if (actionName == 'AssinarNew') {
+ await this.AssinarNew(res.data.note, docs)
+ }
+ }
+ }, (error) => {
+ console.log(error)
+ });
+
+ await modal.present();
+ }
+
+ async askToChange(note: string, documents: any) {
+ let body = {
+ "serialNumber": this.serialNumber,
+ "action": "Retificar",
+ "ActionTypeId": 99999841,
+ "dataFields": {
+ "ReviewUserComment": note,
+ },
+ "AttachmentList": documents,
+ }
+
+ const loader = this.toastService.loading()
+
+ try {
+ await this.processes.CompleteTask(body).toPromise()
+ this.close();
+ this.toastService._successMessage()
+ } catch (error) {
+ if (error.status == 0) {
+ this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+ } else {
+
+ this.toastService._badRequest()
+ }
+ } finally {
+ loader.remove()
+ }
+
+ }
+
+
+ async openBookMeetingModal(task: any) {
+ this.popoverController.dismiss();
+ let classs;
+ if (window.innerWidth <= 800) {
+ classs = 'book-meeting-modal modal modal-desktop'
+ } else {
+ classs = 'modal modal-desktop showAsideOptions'
+ }
+
+ this.modalController.dismiss()
+ const modal = await this.modalController.create({
+ component: BookMeetingModalPage,
+ componentProps: {
+ task: this.task,
+ fulltask: this.fulltask
+ },
+ cssClass: classs,
+ backdropDismiss: false
+ });
+ await modal.present();
+ modal.onDidDismiss().then(
+ () => { },
+ (error) => {
+ console.log(error)
+ }
+ )
+ }
+
+
+ async askSignature(note: string, documents: any) {
+ let body = {
+ "serialNumber": this.serialNumber,
+ "action": "Aprovar",
+ "ActionTypeId": 99999840,
+ "dataFields": {
+ "ReviewUserComment": note,
+ },
+ "AttachmentList": documents,
+ }
+
+ const loader = this.toastService.loading()
+
+ try {
+ await this.processes.CompleteTask(body).toPromise()
+ this.close();
+ this.toastService._successMessage()
+ } catch (error) {
+ if (error.status == 0) {
+ this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+ } else {
+
+ this.toastService._badRequest()
+ }
+ } finally {
+ loader.remove()
+ }
+
+ }
+
+
+ async sign(note?: string, documents?: any) {
+ let body = {
+ "serialNumber": this.serialNumber,
+ "action": "Assinado",
+ "ActionTypeId": 99999842,
+ "FolderId": this.task.FolderID,
+ "dataFields": {
+ "ReviewUserComment": note,
+ "InstanceIDNew": this.task.InstanceID,
+ "DraftIds": "",
+ },
+ "AttachmentList": {
+ "ProcessInstanceID": this.task.InstanceID,
+ /* "DraftIds": null, */
+ "Attachments": []
+ },
+ }
+
+
+ try {
+ await this.processes.CompleteTask(body).toPromise()
+ this.httpErroHandle.httpsSucessMessagge('Assinado')
+ } catch (error) {
+ if (error.status == 0) {
+ this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+ } else {
+ this.toastService._badRequest()
+ }
+ } finally { }
+ }
+
+ async AssinarNew(note?, doc?) {
+
+ if (this.asDraft) {
+
+ this.modalController.dismiss()
+ const modal = await this.modalController.create({
+ component: PopupQuestionPage,
+ componentProps: {
+ title: 'Deseja assinar este Diploma?',
+ /* message: 'Nota: Ao Efetuar esta operação, o tratamento deste diploma não poderá ser realizado a partir da caixa de correspondência' */
+
+ },
+ cssClass: "popup-question discart-expedient-modal",
+ backdropDismiss: true
+ });
+
+ modal.onDidDismiss().then(async (res) => {
+ const data = res.data
+ if (data == "Yes") {
+
+ console.log(' diploma options Draft draft',this.DraftIds)
+ let body = {
+ "InstanceId": this.task.InstanceID,
+ "FolderId": this.task.FolderID,
+ "DraftIds": this.task.DraftIds,
+ "OriginalFileName": this.DraftNames
+ }
+ const loader = this.toastService.loading()
+
+ try {
+ await this.processes.presidentialActionsSignature(body).toPromise()
+ await this.sign()
+ this.TaskService.loadDiplomas()
+ this.goBack();
+ } catch (error) {
+ this.httpErroHandle.httpStatusHandle(error)
+ }
+ finally {
+ loader.remove()
+ }
+ }
+
+ }, (error) => {
+ console.log(error)
+ });
+
+ await modal.present();
+ } else {
+ this.httpErroHandle.validationMessagge("diplomaAsDraft");
+ }
+
+ }
+
+
+ async finish(note: string, documents: any) {
+
+ let body = {
+ "serialNumber": this.serialNumber,
+ "action": "Concluir",
+ "ActionTypeId": 95,
+ "dataFields": {
+ "ReviewUserComment": note,
+ },
+ "AttachmentList": documents,
+ }
+
+ const loader = this.toastService.loading()
+
+ try {
+ await this.processes.CompleteTask(body).toPromise();
+ this.toastService._successMessage('Processo concluído')
+ } catch (error) {
+ if (error.status == 0) {
+ this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+ } else {
+
+ this.toastService._badRequest()
+ }
+ }
+ finally {
+ loader.remove()
+ }
+
+ }
+
+ async arquivar(note: string, documents: AttachmentList) {
+
+ const loader = this.toastService.loading()
+
+ try {
+ await this.despachoService.arquivar(note, documents, this.serialNumber).toPromise()
+ this.httpErroHandle.httpsSucessMessagge('Arquivar')
+ this.close();
+ } catch (error) {
+ this.httpErroHandle.httpStatusHandle(error)
+ }
+ finally {
+ loader.remove()
+ }
+
+ }
+
+ async openExpedientActionsModal(taskAction: any, task: any) {
+
+ let classs;
+ if (window.innerWidth <= 800) {
+ classs = 'modal modal-desktop'
+ } else {
+ classs = 'modal modal-desktop showAsideOptions'
+ }
+
+
+ this.modalController.dismiss()
+ const modal = await this.modalController.create({
+ component: CreateProcessPage,
+ componentProps: {
+ taskAction: taskAction,
+ task: task,
+ profile: this.profile,
+ fulltask: this.fulltask
+ },
+ cssClass: classs,
+ });
+ modal.onDidDismiss().then(async (res) => {
+
+
+ if (res['data'] == 'openDiscart') {
+ await this.distartExpedientModal();
+ }
+
+ this.goBack();
+ }, (error) => {
+ console.log(error)
+ }).catch(e => {
+ console.log(e)
+ })
+
+ await modal.present();
+ }
+
+ async distartExpedientModal() {
+
+ this.modalController.dismiss()
+ const modal = await this.modalController.create({
+ component: DiscartExpedientModalPage,
+ componentProps: {
+ serialNumber: this.fulltask.serialNumber,
+ folderId: this.fulltask.workflowInstanceDataFields.FolderID,
+ action: 'complete',
+ },
+ cssClass: 'discart-expedient-modal',
+ backdropDismiss: false
+ });
+
+ modal.onDidDismiss().then(res => {
+ if (res['data'] == 'close') {
+ this.close();
+ /*
+ this.close();
+ this.openMenu(); */
+ }
+
+ }, (error) => {
+ console.log(error)
+ }).catch(e => {
+ console.log(e)
+ })
+
+ await modal.present();
+
+ }
+
+ goBack() {
+ this.RouteService.goBack()
+ this.TaskService.loadDiplomas()
+ }
+
+
+ close() {
+ this.popoverController.dismiss();
+ }
+
+}
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts
new file mode 100644
index 000000000..247b1696e
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-options-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DespachosOptionsPage } from './despachos-options.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: DespachosOptionsPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class DespachosOptionsPageRoutingModule {}
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts b/src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts
new file mode 100644
index 000000000..1819906f6
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-options.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DespachosOptionsPageRoutingModule } from './despachos-options-routing.module';
+
+import { DespachosOptionsPage } from './despachos-options.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ DespachosOptionsPageRoutingModule
+ ],
+ declarations: [DespachosOptionsPage]
+})
+export class DespachosOptionsPageModule {}
diff --git a/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html
new file mode 100644
index 000000000..43eb6c605
--- /dev/null
+++ b/src/app/shared/popover/desktop/despachos-options/despachos-options.page.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ publicationTitle }}
Campos marcados com * são obrigatórios
@@ -16,7 +16,7 @@
-
@@ -27,7 +27,7 @@
-