From cdc55aa00c357032f96a6ea92d2bf5c84df1f850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 15 Feb 2024 11:25:19 +0100 Subject: [PATCH 1/4] bug creating action with begin date higher then end date solved --- .../shared/publication/new-action/new-action.page.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 68eedee4e..21cc28180 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -73,7 +73,7 @@ export class NewActionPage implements OnInit { } - get dateValid() { +/* get dateValid() { var validado: boolean; if (window.innerWidth <= 800) { @@ -86,6 +86,10 @@ export class NewActionPage implements OnInit { } else { return ['ok'] } + } */ + + get dateValid() { + return new Date(this.folder.DateBegin).getTime() < new Date(this.folder.DateBegin).getTime() ? 'ok': null } runValidation() { @@ -117,11 +121,7 @@ export class NewActionPage implements OnInit { this.injectValidation() this.runValidation() - if(this.Form.invalid) { - return false - } else { - - } + if(this.Form.invalid) return false From a70f1d8f4926b73d8188b28c367ca03aa10c4a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 15 Feb 2024 11:35:49 +0100 Subject: [PATCH 2/4] Bug of encode revert to html solved --- src/app/pages/agenda/view-event/view-event.page.ts | 4 ++-- src/app/shared/agenda/view-event/view-event.page.ts | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 5357b4d24..3fadb0eb5 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -215,9 +215,9 @@ export class ViewEventPage implements OnInit { if(this.CalendarId) { this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { - const div = document.createElement("div") + /* const div = document.createElement("div") div.innerHTML = res.Body.Text - res.Body.Text = div.innerText + res.Body.Text = div.innerText */ this.loadedEvent = res; this.setTimeZone() diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 0bcae5e4f..64cb68226 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -126,6 +126,7 @@ export class ViewEventPage implements OnInit { this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; + this.setTimeZone() this.today = new Date(res.StartDate); @@ -145,10 +146,11 @@ export class ViewEventPage implements OnInit { this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => { - const div = document.createElement("div") + /* const div = document.createElement("div") div.innerHTML = res.Body.Text - res.Body.Text = div.innerText + res.Body.Text = div.innerText */ this.loadedEvent = res; + console.log('Event details',res) this.setTimeZone() this.today = new Date(res.StartDate); From f21d49dc3a640c6ff2edbf1a9afd388db15d7288 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 16 Feb 2024 10:41:12 +0100 Subject: [PATCH 3/4] create dispatch from attachment --- .../view-document/view-document.page.ts | 5 ++- .../expedient-task-modal.page.ts | 38 ++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index c9fe527e3..5f32c03fd 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -172,7 +172,10 @@ export class ViewDocumentPage implements OnInit { taskAction: taskAction, // check task: this.task, // check document: this.Document, // nope - aplicationId: this.Document.ApplicationId || this.Document.ApplicationID // check + aplicationId: this.Document.ApplicationId || this.Document.ApplicationID, // check + applicationId: this.applicationId, + docId: this.docId, + createProcessFromFile: true, }, cssClass: classs, }); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 99acd47cd..b28900f29 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { ModalController, NavParams } from '@ionic/angular'; import { Despacho } from 'src/app/models/despacho.model'; @@ -27,6 +27,7 @@ import { PermissionService } from 'src/app/services/permission.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { RouteService } from 'src/app/services/route.service'; import { TaskService } from 'src/app/services/task.service' +import { z } from 'zod'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -41,6 +42,12 @@ const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { } +const createProcessFromFileSchema = z.object({ + applicationId: z.any(), + docId: z.any(), +}); + + @Component({ selector: 'app-expedient-task-modal', templateUrl: './expedient-task-modal.page.html', @@ -59,6 +66,8 @@ export class ExpedientTaskModalPage implements OnInit { taskType:string; task: task; aplicationId = null + docId!: string + createProcessFromFile: false taskParticipants: any = []; taskParticipantsCc: any = []; @@ -121,14 +130,31 @@ export class ExpedientTaskModalPage implements OnInit { this.loggeduser = SessionStore.user; this.task = this.navParams.get('task'); - - this.SearchFolder = this.navParams.get('SearchFolder'); - this.aplicationId = this.navParams.get('aplicationId') - this.document = this.navParams.get('document') + this.aplicationId = this.navParams.get('aplicationId') | this.navParams.get('applicationId') + this.docId = this.navParams.get('docId') + this.createProcessFromFile = this.navParams.get('createProcessFromFile') || false; + this.document = this.navParams.get('document'); this.taskType = this.navParams.get('taskAction'); + + if(this.createProcessFromFile) { + try { + createProcessFromFileSchema.parse({ + applicationId: this.aplicationId, + docId: this.docId + }); + + this.task.workflowInstanceDataFields.SourceSecFsID = this.aplicationId; //361 + this.task.workflowInstanceDataFields.SourceType = 'DOC'; //FOLDER + this.task.workflowInstanceDataFields.SourceID = this.docId; //FolderId + + } catch (error) { + console.error('Validation failed params, expediente-task-modal:', error.errors); + } + } + // try { // if(this.document) { // const doc: any = this.document @@ -475,7 +501,7 @@ export class ExpedientTaskModalPage implements OnInit { this.validateField = true; this.toastService._badRequest('Por favor selecione um assunto'); } */ - + /* } else{ this.validateField = true; From 0a13dd5d04aeadc2e74a73b952e071c80fa0b38d Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Thu, 22 Feb 2024 13:32:33 +0100 Subject: [PATCH 4/4] build ios sucessol --- ios/App/App.xcodeproj/project.pbxproj | 18 +++++++++--------- package-lock.json | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 581569877..7b6dc7c42 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -15,7 +15,7 @@ 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; }; - DAD1AB3F2ACF3A7F001D9958 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DAD1AB3D2ACF39DE001D9958 /* GoogleService-Info.plist */; }; + A96A2DA42B876DBB008CFA1B /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A96A2DA32B876DBB008CFA1B /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -28,6 +28,7 @@ 504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = ""; }; + A96A2DA32B876DBB008CFA1B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Downloads/GoogleService-Info.plist"; sourceTree = ""; }; AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; DA6FE4D02ACEEACD006F1E0D /* CapacitorPushNotifications.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CapacitorPushNotifications.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -36,7 +37,6 @@ DA6FE4D72ACEF2DA006F1E0D /* FirebaseInstallations.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FirebaseInstallations.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DA6FE4D82ACEF2DA006F1E0D /* FirebaseMessaging.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = FirebaseMessaging.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DA8422AF2AD03FBE00AC9118 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = ""; }; - DAD1AB3D2ACF39DE001D9958 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../Downloads/App 2023-09-14 12-28-07/GoogleService-Info.plist"; sourceTree = ""; }; FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -86,10 +86,10 @@ 504EC3061FED79650016851F /* App */ = { isa = PBXGroup; children = ( + A96A2DA32B876DBB008CFA1B /* GoogleService-Info.plist */, DA8422AF2AD03FBE00AC9118 /* App.entitlements */, 50379B222058CBB4000EE86E /* capacitor.config.json */, 504EC3071FED79650016851F /* AppDelegate.swift */, - DAD1AB3D2ACF39DE001D9958 /* GoogleService-Info.plist */, 504EC30B1FED79650016851F /* Main.storyboard */, 504EC30E1FED79650016851F /* Assets.xcassets */, 504EC3101FED79650016851F /* LaunchScreen.storyboard */, @@ -180,7 +180,7 @@ 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */, 504EC30D1FED79650016851F /* Main.storyboard in Resources */, 2FAD9763203C412B000D30F8 /* config.xml in Resources */, - DAD1AB3F2ACF3A7F001D9958 /* GoogleService-Info.plist in Resources */, + A96A2DA42B876DBB008CFA1B /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -394,7 +394,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS; INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -404,7 +404,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = GabineteProfile; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = GabineteDigitalProfile; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -423,7 +423,7 @@ DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 94BRNM2LSS; INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -432,7 +432,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.gpr.gabinetedigital.teste; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = GabineteProfile; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = GabineteDigitalProfile; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/package-lock.json b/package-lock.json index a0d74e455..f5a8ffc8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "@capacitor/push-notifications": "^5.1.0", "@capacitor/share": "^4.1.0", "@capacitor/storage": "^1.2.5", - "@capawesome/capacitor-file-picker": "^5.1.1", + "@capawesome/capacitor-file-picker": "^5.3.0", "@fortawesome/angular-fontawesome": "^0.9.0", "@fortawesome/fontawesome-free": "^5.15.3", "@fortawesome/fontawesome-svg-core": "^1.2.35", @@ -4018,9 +4018,9 @@ } }, "node_modules/@capawesome/capacitor-file-picker": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.1.1.tgz", - "integrity": "sha512-VtWV/er8Kux5Bbb0BtRneAaL8aj7zKoSPSR5sn3QlVBccete+CX+nH3scg6JKrogoitNP35PS33LIoaz9WVZiA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.3.0.tgz", + "integrity": "sha512-r+cfD+9FCBXMYtckSovgi7WoMWT5cxzNDaH3SDNuiORiyQklOl+7DExfhW00p1DqsDR+f50nADk/NBb4IsGVYg==", "funding": [ { "type": "github", @@ -46494,9 +46494,9 @@ "requires": {} }, "@capawesome/capacitor-file-picker": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.1.1.tgz", - "integrity": "sha512-VtWV/er8Kux5Bbb0BtRneAaL8aj7zKoSPSR5sn3QlVBccete+CX+nH3scg6JKrogoitNP35PS33LIoaz9WVZiA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.3.0.tgz", + "integrity": "sha512-r+cfD+9FCBXMYtckSovgi7WoMWT5cxzNDaH3SDNuiORiyQklOl+7DExfhW00p1DqsDR+f50nADk/NBb4IsGVYg==", "requires": {} }, "@cnakazawa/watch": {