diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 5226aa346..75c242352 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -152,6 +152,10 @@ const routes: Routes = [ }, ] }, + { + path:'new-publication', + loadChildren: ()=> import('../shared/publication/new-publication/new-publication.module').then(m => m.NewPublicationPageModule) + }, ] }, { diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index 5df45dc6c..e62a3e09e 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -23,7 +23,7 @@
- +
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index fcda710bc..502a47b0c 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -160,10 +160,8 @@ export class NewPublicationPage implements OnInit { } console.log('Create'); - console.log(this.pub); - console.log(this.publication); - /* this.publications.CreatePublication(this.folderId, this.publication); */ + this.publications.CreatePublication(this.folderId, this.publication); this.close(); } } diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 5baf710a6..b2c6e612f 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -86,7 +86,7 @@ class="height-100 d-flex flex-column overflow-hidden background-white flex-grow-1" [folderId]="folderId" [publicationType]="publicationType" - [publication]="publication" + (closeDesktopComponent)="closeDesktopComponent($event)" (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)" (goBackToViewPublications)="goBackToViewPublications($event)" diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index b9ae10405..6aedeab1d 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -13,7 +13,7 @@
- +
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index c547eb9b5..a61fefa58 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -24,7 +24,8 @@ import { LoadingService } from 'src/app/services/loading.service'; }) export class NewPublicationPage implements OnInit { showLoader: boolean; - pub: Publication = new Publication(); + pub: Publication; + pubTitle:string; image: Image = new Image(); publicationTitle:string; @@ -34,8 +35,8 @@ export class NewPublicationPage implements OnInit { photo: SafeResourceUrl; + publication: Publication; - @Input() publication: Publication; @Input() publicationType: string; @Input() folderId: string; @Output() closeDesktopComponent = new EventEmitter(); @@ -55,9 +56,16 @@ export class NewPublicationPage implements OnInit { private camera: Camera, ) { this.publicationTitle = 'Nova Publicação'; + this.pubTitle = 'new'; + this.pub = new Publication(); + this.pub.Title = 'title'; } ngOnInit() { + console.log(this.publication); + console.log(this.folderId); + console.log(this.publicationType); + this.setTitle(); this.clear(); this.takePicture(); @@ -104,7 +112,9 @@ export class NewPublicationPage implements OnInit { }); } - async save(){ +save(){ + console.log(this.publicationType); + if(this.publicationType == '3'){ if(this.capturedImage != ''){ @@ -138,7 +148,7 @@ export class NewPublicationPage implements OnInit { } console.log('Edit - keep image'); console.log(this.publication); - this.publications.UpdatePublication(this.publication.ProcessId, this.publication); + /* this.publications.UpdatePublication(this.publication.ProcessId, this.publication); */ this.goBack(); } } @@ -148,18 +158,19 @@ export class NewPublicationPage implements OnInit { DateIndex: new Date(), DocumentId:null, ProcessId:this.folderId, - Title: this.pub.Title, + Title: this.pubTitle, Message: this.pub.Message, DatePublication: new Date(), OriginalFileName: this.capturedImageTitle, FileBase64: this.capturedImage, FileExtension: 'jpeg', } - + console.log(this.pubTitle); + console.log(this.pub); console.log(this.publication); - this.publications.CreatePublication(this.folderId, this.publication); + //this.publications.CreatePublication(this.folderId, this.publication); - this.closeDesktopComponent.emit(); + //this.closeDesktopComponent.emit(); } }