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 6aedeab1d..a0fb02be2 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 @@
- +
@@ -31,7 +31,7 @@
Fotografia Anexada
-
+
image
@@ -45,26 +45,26 @@
-
+ - + -
+
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 a61fefa58..5b816f0a6 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -24,8 +24,7 @@ import { LoadingService } from 'src/app/services/loading.service'; }) export class NewPublicationPage implements OnInit { showLoader: boolean; - pub: Publication; - pubTitle:string; + pub: Publication = new Publication(); image: Image = new Image(); publicationTitle:string; @@ -35,7 +34,8 @@ export class NewPublicationPage implements OnInit { photo: SafeResourceUrl; - publication: Publication; + + publication: Publication = new Publication(); @Input() publicationType: string; @Input() folderId: string; @@ -56,16 +56,9 @@ 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(); @@ -112,9 +105,7 @@ export class NewPublicationPage implements OnInit { }); } -save(){ - console.log(this.publicationType); - + async save(){ if(this.publicationType == '3'){ if(this.capturedImage != ''){ @@ -148,7 +139,7 @@ save(){ } 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(); } } @@ -158,19 +149,18 @@ save(){ DateIndex: new Date(), DocumentId:null, ProcessId:this.folderId, - Title: this.pubTitle, + Title: this.pub.Title, 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(); } } diff --git a/src/global.scss b/src/global.scss index 4a1266b0e..4321ddc74 100644 --- a/src/global.scss +++ b/src/global.scss @@ -330,7 +330,7 @@ border-top: 1px solid #d8d8d8; } .showAsideOptions{ - @media only screen and (min-width: 801px) { + @media only screen and (min-width: 800px) { .div-icon{ display: none; } diff --git a/src/style/main.scss b/src/style/main.scss index a54c700b9..ad7f2f7f9 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -65,7 +65,7 @@ .flex-0{ flex: 0;} -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 800px) { // overflow .v-application-md .overflow-md-auto {overflow: auto !important;} .overflow-md-hidden {overflow: hidden !important;}