-
+
- Editar evento por aprovar
+ Editar evento por aprovar ccxcxcxc
Campos marcados com * são obrigatórios
- -
+ +
From 7a832be657aab212b35848f1f5edce2462b641ae Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Fri, 1 Mar 2024 19:13:43 +0100 Subject: [PATCH 6/6] start all day on event --- ios/App/App.xcodeproj/project.pbxproj | 8 +++--- ios/App/App/Info.plist | 13 ++++++++-- ios/App/Share/Info.plist | 6 ----- .../agenda/new-event/new-event.page.html | 12 ++++++++- .../agenda/new-event/new-event.page.scss | 5 ++++ .../pages/agenda/new-event/new-event.page.ts | 26 +++++++++++++++++++ .../new-publication/new-publication.page.ts | 5 ++-- 7 files changed, 60 insertions(+), 15 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index cabd98fea..2325a68ae 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/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 = ""; diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index 20cacdb91..a3dc95ea3 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -2,8 +2,6 @@ - - CFBundleDevelopmentRegion en CFBundleDisplayName @@ -39,6 +37,17 @@ LSRequiresIPhoneOS + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSAllowsArbitraryLoadsForMedia + + NSAllowsArbitraryLoadsInWebContent + + NSAllowsLocalNetworking + + NSCameraUsageDescription This app requires access to the camera. NSMicrophoneUsageDescription diff --git a/ios/App/Share/Info.plist b/ios/App/Share/Info.plist index 193fc7713..1bc711114 100644 --- a/ios/App/Share/Info.plist +++ b/ios/App/Share/Info.plist @@ -4,10 +4,6 @@ CFBundleURLTypes - - CFBundleURLName - - CFBundleURLName com.gpr.gabinetedigital.teste @@ -41,8 +37,6 @@ 1 NSExtensionActivationSupportsWebURLWithMaxCount 1 - NSExtensionActivationUsesStrictMatching - diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 669d6ba44..de1a8a5c3 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -112,6 +112,16 @@
+
+
+ + Todo dia + + +
+
+ +
@@ -141,7 +151,7 @@
-
+
diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/pages/agenda/new-event/new-event.page.scss index 715fdc075..7f3c222f5 100644 --- a/src/app/pages/agenda/new-event/new-event.page.scss +++ b/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; +} diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 6097fa19b..c1e182bda 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/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 + } } 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 fe37e55b4..7581ea20c 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/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