mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
code stashed unstashed
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1520"
|
||||
wasCreatedForAppExtension = "YES"
|
||||
version = "2.0">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A9D8C5152B87B08300C95FBB"
|
||||
BuildableName = "Share.appex"
|
||||
BlueprintName = "Share"
|
||||
ReferencedContainer = "container:App.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "504EC3031FED79650016851F"
|
||||
BuildableName = "App.app"
|
||||
BlueprintName = "App"
|
||||
ReferencedContainer = "container:App.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
shouldAutocreateTestPlan = "YES">
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
buildConfiguration = "Debug"
|
||||
selectedDebuggerIdentifier = ""
|
||||
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
|
||||
launchStyle = "0"
|
||||
askForAppToLaunch = "Yes"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
debugServiceExtension = "internal"
|
||||
allowLocationSimulation = "YES"
|
||||
launchAutomaticallySubstyle = "2">
|
||||
<RemoteRunnable
|
||||
runnableDebuggingMode = "0"
|
||||
BundleIdentifier = "com.gpr.gabinetedigital.teste"
|
||||
RemotePath = "/var/containers/Bundle/Application/4DABC741-6955-4CE4-ACA6-D23E375EC4FD/App.app">
|
||||
</RemoteRunnable>
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "504EC3031FED79650016851F"
|
||||
BuildableName = "App.app"
|
||||
BlueprintName = "App"
|
||||
ReferencedContainer = "container:App.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
askForAppToLaunch = "Yes"
|
||||
launchAutomaticallySubstyle = "2">
|
||||
<BuildableProductRunnable
|
||||
runnableDebuggingMode = "0">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "504EC3031FED79650016851F"
|
||||
BuildableName = "App.app"
|
||||
BlueprintName = "App"
|
||||
ReferencedContainer = "container:App.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildableProductRunnable>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<dict>
|
||||
<key>CFBundleURLTypes</key>
|
||||
<array>
|
||||
<dict>
|
||||
@@ -25,6 +25,8 @@
|
||||
<key>NSExtensionPointIdentifier</key>
|
||||
<string>com.apple.share-services</string>
|
||||
</dict>
|
||||
<key>NSExtensionAttributes</key>
|
||||
<dict>
|
||||
<key>NSExtensionActivationRule</key>
|
||||
<dict>
|
||||
<key>NSExtensionActivationSupportsFileWithMaxCount</key>
|
||||
@@ -42,5 +44,6 @@
|
||||
<key>NSExtensionActivationUsesStrictMatching</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</dict>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -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,
|
||||
});
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
+31
-5
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user