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

ios/App/App.xcodeproj/project.pbxproj

@@ -489,7 +489,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -498,7 +498,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -516,7 +516,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 94BRNM2LSS;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -525,7 +525,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

ios/App/App/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key></key>
-	<string></string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -39,6 +37,17 @@
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+		<key>NSAllowsArbitraryLoadsForMedia</key>
+		<true/>
+		<key>NSAllowsArbitraryLoadsInWebContent</key>
+		<true/>
+		<key>NSAllowsLocalNetworking</key>
+		<true/>
+	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>This app requires access to the camera.</string>
 	<key>NSMicrophoneUsageDescription</key>

ios/App/Share/Info.plist

@@ -4,10 +4,6 @@
     <dict>
         <key>CFBundleURLTypes</key>
         <array>
-            <dict>
-                <key>CFBundleURLName</key>
-                <string></string>
-            </dict>
             <dict>
                 <key>CFBundleURLName</key>
                 <string>com.gpr.gabinetedigital.teste</string>
@@ -41,8 +37,6 @@
                 <integer>1</integer>
                 <key>NSExtensionActivationSupportsWebURLWithMaxCount</key>
                 <integer>1</integer>
-                <key>NSExtensionActivationUsesStrictMatching</key>
-                <false/>
             </dict>
         </dict>
     </dict>

src/app/pages/agenda/new-event/new-event.page.html

@@ -112,6 +112,16 @@
       </div>
     </div>
 
+    <div class="container-div">
+        <div>
+          <ion-item>
+            <ion-label>Todo dia</ion-label>
+            <ion-checkbox [(ngModel)]="recursoAtivado" (ionChange)="onCheckboxChange($event)"></ion-checkbox>
+          </ion-item>
+        </div>
+    </div>
+    
+
 
     <div class="container-div">
       <div class="ion-item-class-2 d-flex" >
@@ -141,7 +151,7 @@
       </div>
     </div>
 
-    <div class="container-div">
+    <div *ngIf="!allDayCheck" class="container-div">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>

src/app/pages/agenda/new-event/new-event.page.scss

@@ -222,3 +222,8 @@ ion-content{
 .icon-time{
   color: #797979b0;
 }
+
+.checkbox{
+  width: auto;
+  height: 30px;
+}

src/app/pages/agenda/new-event/new-event.page.ts

@@ -98,6 +98,7 @@ export class NewEventPage implements OnInit {
   environment = environment
   eventPersons: EventPerson[];
   contacts: EventPerson[];
+  allDayCheck: boolean = false;
 
 
   constructor(
@@ -877,4 +878,29 @@ export class NewEventPage implements OnInit {
       );
     }
   }
+
+  onCheckboxChange(event: any) {
+    if (this.allDayCheck) {
+      this.allDayCheck = !this.allDayCheck
+      this.postEvent.IsAllDayEvent = this.allDayCheck;
+    
+      console.log('Recurso desativado');
+    } else {
+      this.allDayCheck = !this.allDayCheck
+      this.postEvent.IsAllDayEvent = this.allDayCheck;
+      this.postEvent.StartDate = this.setAlldayTime(this.CalendarDate)
+      console.log('Recurso ativado!!');
+    }
+  }
+
+  setAlldayTime(timeToReturn) {
+    let date: any = new Date(timeToReturn) || new Date();
+    let newdate = new Date();
+    date.setHours(0)
+    date.setMinutes(0)
+    date.setSeconds(0);
+
+
+    return date
+  }
 }

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

@@ -32,7 +32,7 @@ import { Media } from '@ionic-native/media/ngx';
 import { checkFileTypeService } from 'src/app/services/checkFileType.service';
 import { FileValidatorService } from "src/app/services/file/file-validator.service"
 import { App } from '@capacitor/app';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { VideoconvertService } from 'src/app/services/videoconvert.service'
 
 
@@ -555,7 +555,8 @@ export class NewPublicationPage implements OnInit {
             if(window.innerWidth <= 700) {
               this.router.navigate(['/home/publications', this.folderId]);
             } else if(window.innerWidth >= 701){
-              this.router.navigate(['/home/publications?folderId='+this.folderId]);
+              let navigationExtras: NavigationExtras = { queryParams: { "folderId": this.folderId, } };
+              this.router.navigate(['/home/publications']);
             }
 
             return

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

@@ -120,14 +120,11 @@ export class NewActionPage implements OnInit {
 
 
   async save() {
-    alert('hererr')
     this.injectValidation()
     this.runValidation()
 
     if(this.Form.invalid) return false
 
-    alert('hererr 222')
-
     this.folder = {
       ProcessId: null,
       Description: this.folder.Description,

src/environments/environment.prod.ts

@@ -1,7 +1,7 @@
 import { Environment } from './../app/models/envarioment'
 import { oaprProd } from './suport/oapr'
-// import { doneITProd } from './suport/doneIt'
+import { doneITProd } from './suport/doneIt'
-import { DevDev } from './suport/dev'
+ import { DevDev } from './suport/dev'
 
 
 export const environment: Environment = oaprProd;