Merge branch 'feature/shared-content' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/shared-content

android/app/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
   <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
   <application
     android:allowBackup="true"

src/app/pages/publications/new-publication/new-publication.page.html

@@ -32,7 +32,7 @@
 
         <div class="d-flex justify-content-between">
           <div class="d-flex">
-            <ion-thumbnail *ngFor="let seleted of seletedContent.slice(0, displayLimit), let i = index" lot="start">
+            <ion-thumbnail *ngFor="let seleted of seletedContent.slice(0, displayLimit), let i = index" (click)="deleteFromSeletedContent(i)" lot="start">
 
               <ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'" [(ngModel)]="capturedImage"
                 name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.FileBase64"

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -233,7 +233,7 @@ export class NewPublicationPage implements OnInit {
 
   async startVideoRecording() {
     try {
-      let options: CaptureImageOptions = { limit: 5 }
+      let options: CaptureImageOptions = { limit: 1 }
       const data: any = await this.mediaCapture.captureVideo(options)
       this.video = data[0];
       console.log(data)
@@ -727,6 +727,9 @@ export class NewPublicationPage implements OnInit {
     return parseInt(sizeInMB)
   }
 
+  deleteFromSeletedContent(index){
+    this.seletedContent.splice(index,1)
+  }
 
 }
 

src/app/pages/publications/publications.page.ts

@@ -142,7 +142,7 @@ export class PublicationsPage implements OnInit {
   close() {
     window["sharedContent"] = null;
     this.intent = null;
-    this.router.navigateByUrl("/home/");
+   /*  this.router.navigateByUrl("/home/"); */
   }
   get windowInnerWidth(): number {
     return window.innerWidth

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

@@ -16,7 +16,7 @@
   <div class="main-content">
     <div class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
       <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*"
-        [(ngModel)]="_postEvent.Subject"></ion-input>
+         [innerHTML]="_postEvent.Subject"></ion-input>
     </div>
     <div *ngIf="Form && validateFrom">
       <div *ngIf="Form.get('Subject').invalid " class="input-errror-message">

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

@@ -50,7 +50,7 @@ export class EditActionPage implements OnInit {
   public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
   public currentDate = new Date();
 
-  folder: PublicationFolder;
+  folder: PublicationFolder = new PublicationFolder();;
   @Input() folderId: string;
   @Output() closeDesktopComponent= new EventEmitter<any>();
   @Output() updateDesktopComponent= new EventEmitter<any>();
@@ -61,7 +61,7 @@ export class EditActionPage implements OnInit {
     private toastService: ToastService,
     private httpErrorHandle: HttpErrorHandle,
   ) {
-    this.folder = new PublicationFolder();
+   
   }
 
   ngOnInit() {
@@ -73,12 +73,17 @@ export class EditActionPage implements OnInit {
   }
 
   getPublicationDetail() {
+    
     this.publicationsService.GetPresidentialAction(this.folderId).subscribe( res => {
       this.folder = res;
+      console.log('FOLDER',this.folder)
+
 
       this.dateControlStart = new FormControl(moment(new Date(this.folder.DateBegin)));
       this.dateControlEnd = new FormControl(moment(new Date(this.folder.DateEnd)));
 
+    },error => {
+      console.log(error)
     });
   }
 

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

@@ -45,7 +45,7 @@
       <div class="d-flex justify-content-between">
         <div class="d-flex">
 
-          <ion-thumbnail *ngFor="let seleted of seletedContent.slice(0, displayLimit), let i = index" lot="start">
+          <ion-thumbnail *ngFor="let seleted of seletedContent.slice(0, displayLimit), let i = index" (click)="deleteFromSeletedContent(i)" lot="start">
 
             <ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'"
               name="image" ngDefaultControl [src]="seleted.FileBase64"></ion-img>

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

@@ -808,4 +808,8 @@ export class NewPublicationPage implements OnInit {
     return parseInt(sizeInMB)
   }
 
+  deleteFromSeletedContent(index){
+    this.seletedContent.splice(index,1)
+  }
+
 }

src/environments/suport/dev.ts

@@ -3,10 +3,12 @@ import { Environment } from './../../app/models/envarioment'
 
 export const DevProd: Environment = {
   id:'3',
-  apiURL: 'https://gdapi-dev.dyndns.info/jwt/api/',
+  apiURL: 'http://gpr-dev-01:83/jwt/api/',
+  /* apiURL: 'https://gdapi-dev-0.dyndns.info/jwt/api/', */
   apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
   apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
-  apiPCURL: 'https://gdcmapi-dev.dyndns.info/api/',
+  apiPCURL: 'http://gpr-dev-01:86/api/',
+  /* apiPCURL: 'https://gdcmapi-dev.dyndns.info/api/', */
   logoLabel: 'Presidente da República',
   despachoLabel: 'Presidenciais',
   despachoLabel2: 'Despachos Presidênciais',

src/environments/suport/oapr.ts

@@ -4,9 +4,12 @@ import { Environment } from './../../app/models/envarioment'
 
 export const oaprProd: Environment = {
   id: '0',
+  /* apiURL: 'http://gpr-dev-01:83/jwt/api/', */
   apiURL: 'https://gdqas-api.oapr.gov.ao/api/',
+  /* apiChatUrl: 'http://192.168.0.29:3000/api/v1/', */
   apiChatUrl: 'https://gdqas-chat.oapr.gov.ao/api/v1/',
   apiWsChatUrl: 'wss://gdqas-chat.oapr.gov.ao/websocket',
+  /* apiPCURL: 'http://gpr-dev-01:86/api/', */
   apiPCURL: 'https://gdqas-cmapi.oapr.gov.ao/api/',
   logoLabel: 'Presidente da República',
   despachoLabel: 'Presidenciais',
@@ -30,9 +33,12 @@ export const oaprProd: Environment = {
 
 export const oaprDev: Environment = {
   id: '0',
+  /* apiURL: 'http://gpr-dev-01:83/jwt/api/', */
   apiURL: 'https://gdqas-api.oapr.gov.ao/api/',
+  /* apiChatUrl: 'http://192.168.0.29:3000/api/v1/', */
   apiChatUrl: 'https://gdqas-chat.oapr.gov.ao/api/v1/',
   apiWsChatUrl: 'wss://gdqas-chat.oapr.gov.ao/websocket',
+  /* apiPCURL: 'http://gpr-dev-01:86/api/', */
   apiPCURL: 'https://gdqas-cmapi.oapr.gov.ao/api/',
   logoLabel: 'Presidente da República',
   despachoLabel: 'Presidencial',