Skip to content

Commit e62777f

Browse files
optimajetoptimajet
committed
WFE 12.3.0 (autocommit)
1 parent 7b12f57 commit e62777f

File tree

315 files changed

+7165
-347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

315 files changed

+7165
-347
lines changed

‎Designer/Localization/ar.json renamed to ‎Designer/localization/ar.json

File renamed without changes.

‎Designer/Localization/de.json renamed to ‎Designer/localization/de.json

File renamed without changes.

‎Designer/Localization/en_default.json renamed to ‎Designer/localization/en_default.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"DeleteConfirmCurrent": "Are you sure you want to delete this item?",
1010
"EscapeConfirm": "There are unsaved changes. Do you want to save the schema?",
1111
"FieldIsRequired": "Field is required!",
12-
"FieldIsNotCorrected": "Field is not corrected!",
12+
"FieldIsNotCorrected": "Field is not correct!",
13+
"DoNotCombineCalendars": "It is impossible to combine time with working time",
1314
"FieldMustBeUnique": "Field must be unique!",
1415
"FieldMustContainAt": "Field must contain @",
1516
"ButtonTextDelete": "Delete",

‎Designer/Localization/es.json renamed to ‎Designer/localization/es.json

File renamed without changes.

‎Designer/Localization/fr.json renamed to ‎Designer/localization/fr.json

File renamed without changes.

‎Designer/Localization/index.js renamed to ‎Designer/localization/index.js

File renamed without changes.

‎Designer/Localization/it.json renamed to ‎Designer/localization/it.json

File renamed without changes.

‎Designer/Localization/pt.json renamed to ‎Designer/localization/pt.json

File renamed without changes.

‎Designer/Localization/ru.json renamed to ‎Designer/localization/ru.json

File renamed without changes.

‎Designer/Localization/tr.json renamed to ‎Designer/localization/tr.json

File renamed without changes.

‎Designer/templates/activitytoolbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<el-button class="WorkflowDesignerElementToolbarIcon WorkflowDesignerToolbarIcon Clone" @click="activity.Clone()"></el-button>
2323
</div>
2424
</el-tooltip>
25-
<div class="WorkflowDesignerElementToolbarIconContainer">
25+
<div v-if="!graph.Settings.readonly" class="WorkflowDesignerElementToolbarIconContainer">
2626
<el-button class="WorkflowDesignerElementToolbarIcon WorkflowDesignerToolbarIcon Color"></el-button>
2727
</div>
2828
<el-tooltip v-if="!graph.Settings.readonly" :content="labels.Color">

‎Designer/templates/timers.html

Lines changed: 56 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,13 @@ <h3 class="WorkflowDesignerTitleWithCreate">
177177
return WorkflowDesignerConstants.FieldIsRequired;
178178
}
179179

180-
if (name === 'Value' && item.Type === 'Interval' && me.VueConfig.methods.validateValueWithCalendar(item.Value)) {
181-
182-
return WorkflowDesignerConstants.FieldIsNotCorrected;
180+
if (name === 'Value' && item.Type === 'Interval') {
181+
if (me.VueConfig.methods.validateCombineValueWithCalendar(item.Value)) {
182+
return WorkflowDesignerConstants.DoNotCombineCalendars;
183+
}
184+
if (me.VueConfig.methods.validateValueWithCalendar(item.Value)) {
185+
return WorkflowDesignerConstants.FieldIsNotCorrected;
186+
}
183187
}
184188

185189
if (name === 'Name') {
@@ -192,24 +196,59 @@ <h3 class="WorkflowDesignerTitleWithCreate">
192196
}
193197
};
194198

199+
me.VueConfig.methods.validateCombineValueWithCalendar = function (value) {
200+
const calendarRegexList = [
201+
new RegExp(/\d+\s*((wyears)|(wyear)|(wy))(\W|\d|$)/, 'i'),
202+
new RegExp(/\d+\s*((wmonths)|(wmonth)|(wmm))(\W|\d|$)/, 'i'),
203+
new RegExp(/\d+\s*((wdays)|(wday)|(wd))(\W|\d|$)/, 'i'),
204+
new RegExp(/\d+\s*((whours)|(whour)|(wh))(\W|\d|$)/, 'i'),
205+
new RegExp(/\d+\s*((wminutes)|(wminute)|(wm))(\W|\d|$)/, 'i'),
206+
]
207+
208+
const defaultRegexList = [
209+
new RegExp(/\d+(\s+|$)/, "i"),
210+
new RegExp(/\d+\s*((years)|(year)|(y))(\W|\d|$)/, 'i'),
211+
new RegExp(/\d+\s*((months)|(month)|(mm))(\W|\d|$)/, 'i'),
212+
new RegExp(/\d+\s*((days)|(day)|(d))(\W|\d|$)/, 'i'),
213+
new RegExp(/\d+\s*((hours)|(hour)|(h))(\W|\d|$)/, 'i'),
214+
new RegExp(/\d+\s*((minutes)|(minute)|(m))(\W|\d|$)/, 'i'),
215+
new RegExp(/\d+\s*((seconds)|(second)|(s))(\W|\d|$)/, 'i'),
216+
new RegExp(/\d+\s*((milliseconds)|(millisecond)|(ms))(\W|\d|$)/, 'i'),
217+
]
218+
219+
let isCalendar = false;
220+
let isDefault = false;
221+
calendarRegexList.forEach(regex => {
222+
if (regex.test(value)) {
223+
isCalendar = true;
224+
}
225+
})
226+
defaultRegexList.forEach(regex => {
227+
if (regex.test(value)) {
228+
isDefault = true;
229+
}
230+
})
231+
232+
return isCalendar === isDefault;
233+
}
234+
195235
me.VueConfig.methods.validateValueWithCalendar = function (value) {
196236
const calendarRegexList = [
197-
new RegExp(/\d+\s*((years)|(year)|(y))(\W|\d|$)/, "i"),
198-
new RegExp(/\d+\s*((months)|(month)|(mm))(\W|\d|$)/, "i"),
199-
new RegExp(/\d+\s*((days)|(day)|(d))(\W|\d|$)/, "i"),
200-
new RegExp(/\d+\s*((hours)|(hour)|(h))(\W|\d|$)/, "i"),
201-
new RegExp(/\d+\s*((minutes)|(minute)|(m))(\W|\d|$)/, "i"),
202-
new RegExp(/\d+\s*((seconds)|(second)|(s))(\W|\d|$)/, "i"),
203-
new RegExp(/\d+\s*((milliseconds)|(millisecond)|(ml))(\W|\d|$)/, "i")
237+
new RegExp(/\d+\s*((wyears)|(wyear)|(wy))(\s*$)/, "i"),
238+
new RegExp(/\d+\s*((wmonths)|(wmonth)|(wmm))(\s*$)/, "i"),
239+
new RegExp(/\d+\s*((wdays)|(wday)|(wd))(\s*$)/, "i"),
240+
new RegExp(/\d+\s*((whours)|(whour)|(wh))(\s*$)/, "i"),
241+
new RegExp(/\d+\s*((wminutes)|(wminute)|(wm))(\s*$)/, "i"),
204242
]
205243
const defaultRegexList = [
206-
new RegExp(/\d+\s*((wyears)|(wyear)|(wy))(\W|\d|$)/, "i"),
207-
new RegExp(/\d+\s*((wmonths)|(wmonth)|(wmm))(\W|\d|$)/, "i"),
208-
new RegExp(/\d+\s*((wdays)|(wday)|(wd))(\W|\d|$)/, "i"),
209-
new RegExp(/\d+\s*((whours)|(whour)|(wh))(\W|\d|$)/, "i"),
210-
new RegExp(/\d+\s*((wminutes)|(wminute)|(wm))(\W|\d|$)/, "i"),
211-
new RegExp(/\d+\s*((wseconds)|(wsecond)|(ws))(\W|\d|$)/, "i"),
212-
new RegExp(/\d+\s*((wmilliseconds)|(wmillisecond)|(wml))(\W|\d|$)/, "i")
244+
new RegExp(/\d+(?!\w+)(\s*$)/, "i"),
245+
new RegExp(/\d+\s*((years)|(year)|(y))(\s*$)/, "i"),
246+
new RegExp(/\d+\s*((months)|(month)|(mm))(\s*$)/, "i"),
247+
new RegExp(/\d+\s*((days)|(day)|(d))(\s*$)/, "i"),
248+
new RegExp(/\d+\s*((hours)|(hour)|(h))(\s*$)/, "i"),
249+
new RegExp(/\d+\s*((minutes)|(minute)|(m))(\s*$)/, "i"),
250+
new RegExp(/\d+\s*((seconds)|(second)|(s))(\s*$)/, "i"),
251+
new RegExp(/\d+\s*((milliseconds)|(millisecond)|(ms))(\s*$)/, "i")
213252
]
214253
let isCalendar = false;
215254
let isDefault = false;

‎Designer/templates/transitiontoolbar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@click="transition.ShowProperties()"></el-button>
66
</div>
77
</el-tooltip>
8-
<div class="WorkflowDesignerElementToolbarIconContainer">
8+
<div v-if="!graph.Settings.readonly" class="WorkflowDesignerElementToolbarIconContainer">
99
<el-button class="WorkflowDesignerElementToolbarIcon WorkflowDesignerToolbarIcon Color"></el-button>
1010
</div>
1111
<el-tooltip v-if="!graph.Settings.readonly" :content="labels.Color">

‎Designer/workflowdesigner.min.css

Lines changed: 28 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Designer/workflowdesigner.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.dll

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.DbPersistence/SQL/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
4-
Version: 12.2
4+
Version: 12.3
55
File: CreatePersistenceObjects.sql
66
77
*/

‎Providers/OptimaJet.Workflow.DbPersistence/SQL/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL
4-
Version: 12.2
4+
Version: 12.3
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
4-
Version: 12.2
4+
Version: 12.3
55
File: CreatePersistenceObjects.sql
66
77
*/

‎Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MSSQL
4-
Version: 12.2
4+
Version: 12.3
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.MongoDB/OptimaJet.Workflow.MongoDB.dll

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.MySql/OptimaJet.Workflow.MySql.dll

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.MySql/SQL/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Company: OptimaJet
55
Project: WorkflowEngine.NET Provider for MySQL
6-
Version: 12.2
6+
Version: 12.3
77
File: CreatePersistenceObjects.sql
88
*/
99

‎Providers/OptimaJet.Workflow.MySql/SQL/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MySQL
4-
Version: 12.2
4+
Version: 12.3
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.MySql/Source/Scripts/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Company: OptimaJet
55
Project: WorkflowEngine.NET Provider for MySQL
6-
Version: 12.2
6+
Version: 12.3
77
File: CreatePersistenceObjects.sql
88
*/
99

‎Providers/OptimaJet.Workflow.MySql/Source/Scripts/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for MySQL
4-
Version: 12.2
4+
Version: 12.3
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.Oracle/OptimaJet.Workflow.Oracle.dll

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.Oracle/SQL/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for Oracle
4-
Version: 12.2
4+
Version: 12.3
55
File: CreatePersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.Oracle/SQL/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for Oracle
4-
Version: 12.2
4+
Version: 12.3
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.Oracle/Source/Scripts/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for Oracle
4-
Version: 12.2
4+
Version: 12.3
55
File: CreatePersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.Oracle/Source/Scripts/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for Oracle
4-
Version: 12.2
4+
Version: 12.3
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.PostgreSQL/OptimaJet.Workflow.PostgreSQL.dll

0 Bytes
Binary file not shown.

‎Providers/OptimaJet.Workflow.PostgreSQL/SQL/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for PostgreSQL
4-
Version: 12.2
4+
Version: 12.3
55
File: CreatePersistenceObjects.sql
66
*/
77
-- WorkflowInbox

‎Providers/OptimaJet.Workflow.PostgreSQL/SQL/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for PostgreSQL
4-
Version: 12.2
4+
Version: 12.3
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.PostgreSQL/Source/Scripts/CreatePersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for PostgreSQL
4-
Version: 12.2
4+
Version: 12.3
55
File: CreatePersistenceObjects.sql
66
*/
77
-- WorkflowInbox

‎Providers/OptimaJet.Workflow.PostgreSQL/Source/Scripts/DropPersistenceObjects.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Company: OptimaJet
33
Project: WorkflowEngine.NET Provider for PostgreSQL
4-
Version: 12.2
4+
Version: 12.3
55
File: DropPersistenceObjects.sql
66
*/
77

‎Providers/OptimaJet.Workflow.Redis/OptimaJet.Workflow.Redis.dll

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)