diff --git a/src/app/pages/publications/new-publication/new-publication.module.ts b/src/app/pages/publications/new-publication/new-publication.module.ts
index 8924a0a48..aeaa9cc9c 100644
--- a/src/app/pages/publications/new-publication/new-publication.module.ts
+++ b/src/app/pages/publications/new-publication/new-publication.module.ts
@@ -8,13 +8,14 @@ import { NewPublicationPageRoutingModule } from './new-publication-routing.modul
import { NewPublicationPage } from './new-publication.page';
import '@teamhive/capacitor-video-recorder';
-
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
- NewPublicationPageRoutingModule
+ NewPublicationPageRoutingModule,
+ FontAwesomeModule,
],
exports: [NewPublicationPage],
declarations: [NewPublicationPage]
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 798f80d85..fe0e05983 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -32,21 +32,23 @@
-
+
+
+
+ X
+
+
+ (click)="imageSize(capturedImage)" style="height: 69px;">
-
-
-
-
+
displayLimit" lot="start">
@@ -80,7 +82,7 @@
-->
-
+
-
+
diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts
index 36e6e1b3b..143defd21 100644
--- a/src/app/services/publications.service.ts
+++ b/src/app/services/publications.service.ts
@@ -16,7 +16,7 @@ import { ChangeProfileService } from './change-profile.service';
})
export class PublicationsService {
-
+
authheader = {};
loggeduser: LoginUserRespose;
@@ -31,7 +31,7 @@ export class PublicationsService {
this.changeProfileService.registerCallback(() => {
this.setHeader()
})
-
+
}
setHeader () {
@@ -42,8 +42,8 @@ export class PublicationsService {
GetPublicationFolderList(){
const geturl = environment.apiURL + 'presidentialActions';
- let options = {
- headers: this.headers,
+ let options = {
+ headers: this.headers,
};
return this.http.get
(`${geturl}`, options);
}
@@ -51,7 +51,7 @@ export class PublicationsService {
GetPresidentialAction(id:any){
const geturl = environment.apiURL + 'presidentialActions/'+id;
- let options = {
+ let options = {
headers: this.headers,
};
return this.http.get(`${geturl}`, options);
@@ -60,7 +60,7 @@ export class PublicationsService {
UpdatePresidentialAction(body:any) {
const geturl = environment.apiURL + 'presidentialActions';
- let options = {
+ let options = {
headers: this.headers,
};
return this.http.put(`${geturl}`, body, options);
@@ -68,7 +68,7 @@ export class PublicationsService {
CreatePublicationFolder(body:any){
const geturl = environment.apiURL + 'presidentialActions';
- let options = {
+ let options = {
headers: this.headers,
};
return this.http.post(`${geturl}`, body, options)
@@ -76,20 +76,20 @@ export class PublicationsService {
UpdatePublicationFolder(body:any) {
const geturl = environment.apiURL + 'presidentialActions';
-
- let options = {
+
+ let options = {
headers: this.headers,
};
-
+
return this.http.put(`${geturl}`, body, options).toPromise().then(res =>{
-
+
});
}
DeletePresidentialAction(id:any){
const geturl = environment.apiURL + 'presidentialActions/'+id;
-
- let options = {
+
+ let options = {
headers: this.headers,
};
return this.http.delete(`${geturl}`, options);
@@ -101,7 +101,7 @@ export class PublicationsService {
params = params.set("folderId", folder);
- let options = {
+ let options = {
headers: this.headers,
params: params
};
@@ -115,7 +115,7 @@ export class PublicationsService {
params = params.set("folderId", id);
- let options = {
+ let options = {
headers: this.headers,
params: params
};
@@ -129,13 +129,13 @@ export class PublicationsService {
params = params.set("folderId", id);
- let options = {
+ let options = {
headers: this.headers,
params: params
};
return this.http.get(`${geturl}`, options)
}
-
+
GetPublicationById( publicationId:any){
const geturl = environment.apiURL + 'presidentialActions/posts/'+ publicationId;
@@ -143,7 +143,7 @@ export class PublicationsService {
params = params.set("id", publicationId);
- let options = {
+ let options = {
headers: this.headers,
params: params
};
@@ -156,22 +156,22 @@ export class PublicationsService {
params = params.set("id", publicationId);
- let options = {
+ let options = {
headers: this.headers,
params: params
};
return this.http.get(`${geturl}`, options);
}
-
+
// my own tries
GetPublicationByIdNext( publicationId:any){
let geturl = environment.apiURL + 'presidentialActions/'+ publicationId + '/posts/ids';
let params = new HttpParams();
- params = params.set("folderId", publicationId);
+ params = params.set("folderId", publicationId);
- let options = {
+ let options = {
headers: this.headers,
/* params: params */
};
@@ -181,7 +181,7 @@ GetPublicationByIdNext( publicationId:any){
return true
}else{
const navigation = this.router.getCurrentNavigation()
-
+
if(navigation){
geturl = navigation.extractedUrl.toString()
@@ -198,7 +198,7 @@ GetIdsPublicationNext(id:any){
params = params.set("id", id);
- let options = {
+ let options = {
headers: this.headers,
params: params
};
@@ -206,13 +206,13 @@ GetIdsPublicationNext(id:any){
var search = this.http.get(`${geturl}`, options).subscribe(
res => {
res.this.activatedRoute.snapshot.queryParams.get('returnto') || '/posts'
-
+
}
-
+
)
return search
-
+
}
//my last tries
@@ -222,7 +222,7 @@ GetIdsPublicationNext(id:any){
const geturl = environment.apiURL + 'presidentialActions/'+folderId+'/v2/posts';
let params = new HttpParams();
params = params.set("folderId", folderId);
- let options = {
+ let options = {
headers: this.headers,
/* params: params */
};
@@ -233,11 +233,19 @@ GetIdsPublicationNext(id:any){
const geturl = environment.apiURL + 'presidentialActions/'+folderId+'/posts';
let params = new HttpParams();
params = params.set("folderId", folderId);
- let options = {
+ let options = {
headers: this.headers,
/* params: params */
};
+
+
+ body.Files = body.Files.map( e => ({
+ FileBase64: e.FileBase64,
+ FileExtension: e.FileExtension,
+ OriginalFileName: 'foto'
+ }))
+
return this.http.put(`${geturl}`, body, options)
}
@@ -246,7 +254,7 @@ GetIdsPublicationNext(id:any){
let params = new HttpParams();
params = params.set("folderId", folderId);
params = params.set("id", publicationId);
- let options = {
+ let options = {
headers: this.headers,
/* params: params */
};
diff --git a/src/app/shared/publication/new-publication/new-publication.module.ts b/src/app/shared/publication/new-publication/new-publication.module.ts
index 3580e799a..182691858 100644
--- a/src/app/shared/publication/new-publication/new-publication.module.ts
+++ b/src/app/shared/publication/new-publication/new-publication.module.ts
@@ -7,13 +7,17 @@ import { IonicModule } from '@ionic/angular';
import { NewPublicationPageRoutingModule } from './new-publication-routing.module';
import { NewPublicationPage } from './new-publication.page';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
- NewPublicationPageRoutingModule
+ NewPublicationPageRoutingModule,
+ MatProgressBarModule,
+ FontAwesomeModule,
],
exports: [NewPublicationPage],
declarations: [NewPublicationPage]
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 0b4e9dcd0..b15540f64 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.html
+++ b/src/app/shared/publication/new-publication/new-publication.page.html
@@ -43,22 +43,39 @@
0">
Anexos
-
+
+
+
+ X
+
+
+ name="image" ngDefaultControl [src]="seleted.FileBase64" style="height: 69px;">
+
+
+
+
+
+
-
-
-
+
diff --git a/src/app/shared/publication/new-publication/new-publication.page.scss b/src/app/shared/publication/new-publication/new-publication.page.scss
index e646db0eb..d6bbd0b09 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.scss
+++ b/src/app/shared/publication/new-publication/new-publication.page.scss
@@ -156,3 +156,24 @@ font-size: rem(25);
display: block;
}
+
+
+
+
+
+.progress-container {
+ width: 50%;
+ background-color: #f1f1f1;
+ border: 1px solid #ddd;
+ border-radius: 5px;
+ overflow: hidden;
+}
+
+.progress-bar {
+ width: 0;
+ height: 30px;
+ background-color: #4caf50;
+ text-align: center;
+ line-height: 30px;
+ color: white;
+}
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 1e5042d85..dfd27dc3b 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -401,12 +401,8 @@ export class NewPublicationPage implements OnInit {
}
-
- let a = this.publication
-
- this.publicationFormMV.setDataToFrom(a)
- this.publicationFormMV.uploadVideosFiles()
-
+ // this.publicationFormMV.setDataToFrom(this.publication)
+ // this.publicationFormMV.uploadVideosFiles()
this.publication.Files = this.publication.Files.map( e => ({
FileBase64: e.FileBase64,
@@ -414,7 +410,6 @@ export class NewPublicationPage implements OnInit {
OriginalFileName: 'foto'
}))
-
const loader = this.toastService.loading()
try {