diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
index 3736c8e3e..cabd98fea 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 = 1;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 94BRNM2LSS;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
INFOPLIST_FILE = App/Info.plist;
@@ -516,7 +516,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 94BRNM2LSS;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
INFOPLIST_FILE = App/Info.plist;
diff --git a/ios/App/App.xcodeproj/xcshareddata/xcschemes/Share.xcscheme b/ios/App/App.xcodeproj/xcshareddata/xcschemes/Share.xcscheme
new file mode 100644
index 000000000..fdd282d21
--- /dev/null
+++ b/ios/App/App.xcodeproj/xcshareddata/xcschemes/Share.xcscheme
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ios/App/Share/Info.plist b/ios/App/Share/Info.plist
index 8e4af7102..193fc7713 100644
--- a/ios/App/Share/Info.plist
+++ b/ios/App/Share/Info.plist
@@ -1,46 +1,49 @@
-
- CFBundleURLTypes
-
-
- CFBundleURLName
-
-
-
- CFBundleURLName
- com.gpr.gabinetedigital.teste
-
-
- NSExtension
-
- NSExtensionAttributes
-
- NSExtensionActivationRule
- TRUEPREDICATE
-
- NSExtensionMainStoryboard
- MainInterface
- NSExtensionPointIdentifier
- com.apple.share-services
-
- NSExtensionActivationRule
-
- NSExtensionActivationSupportsFileWithMaxCount
- 5
- NSExtensionActivationSupportsImageWithMaxCount
- 5
- NSExtensionActivationSupportsMovieWithMaxCount
- 5
- NSExtensionActivationSupportsText
-
- NSExtensionActivationSupportsWebPageWithMaxCount
- 1
- NSExtensionActivationSupportsWebURLWithMaxCount
- 1
- NSExtensionActivationUsesStrictMatching
-
-
-
+
+ CFBundleURLTypes
+
+
+ CFBundleURLName
+
+
+
+ CFBundleURLName
+ com.gpr.gabinetedigital.teste
+
+
+ NSExtension
+
+ NSExtensionAttributes
+
+ NSExtensionActivationRule
+ TRUEPREDICATE
+
+ NSExtensionMainStoryboard
+ MainInterface
+ NSExtensionPointIdentifier
+ com.apple.share-services
+
+ NSExtensionAttributes
+
+ NSExtensionActivationRule
+
+ NSExtensionActivationSupportsFileWithMaxCount
+ 5
+ NSExtensionActivationSupportsImageWithMaxCount
+ 5
+ NSExtensionActivationSupportsMovieWithMaxCount
+ 5
+ NSExtensionActivationSupportsText
+
+ NSExtensionActivationSupportsWebPageWithMaxCount
+ 1
+ NSExtensionActivationSupportsWebURLWithMaxCount
+ 1
+ NSExtensionActivationUsesStrictMatching
+
+
+
+
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/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/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;
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);
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