jsharmony-workflow 1.1.2 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/models/Reports/Task_Perf.json +7 -7
  2. package/models/Reports/WkflowState_Perf.json +7 -7
  3. package/models/Reports/Wkflow_Perf.json +5 -5
  4. package/models/sql/objects/task.json +1 -1
  5. package/models/sql/objects/wkflow.json +3 -3
  6. package/package.json +3 -3
package/models/Reports/Task_Perf.json CHANGED
@@ -11,14 +11,14 @@
11
11
  {"name": "dt_from","caption": "Date From","type": "date","control": "date_mmddyy","validate": [ "Required" ],"default": "js:moment().add(-1, 'month').format()"},
12
12
  {"name": "dt_to","caption": "To","type": "date","control": "date_mmddyy", "validate": [ "Required" ],"default": "js:moment().format()","captionstyle":"width:30px;text-align:right;", "nl": false},
13
13
  {"name":"wkflow_def_code","caption": "Workflow","type":"varchar","length":16,"actions":"B","nl":1,"control":"dropdown_S",
14
- "lov": {"sql":"select wkflow_def_code codeval,wkflow_def_name codetxt from wkflow.wkflow_def where 1=1 order by wkflow_def_name ","blank":"(All)"} },
14
+ "lov": {"sql":"select wkflow_def_code codeval,wkflow_def_name codetxt from {schema}.wkflow_def where 1=1 order by wkflow_def_name ","blank":"(All)"} },
15
15
  {"control":"button","value":"Run Report","controlstyle": "padding:3px 8px;","nl": true,"onclick": "jsh.XPage.RunReport();","caption":""},
16
16
  //{"control":"button","value":"Preview Report","controlstyle": "padding:3px 8px;","nl": true,"onclick": "jsh.XPage.RunReportHTML();","caption":""},
17
17
  ],
18
18
  "reportdata" : {
19
19
  "global":{
20
20
  "sql":[
21
- "select $iif(@wkflow_def_code is null,'(All)',(select wkflow_def_name from wkflow.wkflow_def where wkflow_def_code = @wkflow_def_code)) wkflow_def_name ",
21
+ "select $iif(@wkflow_def_code is null,'(All)',(select wkflow_def_name from {schema}.wkflow_def where wkflow_def_code = @wkflow_def_code)) wkflow_def_name ",
22
22
  " from jsharmony.single",
23
23
  " where 1=1 %%%DATALOCKS%%% "
24
24
  ]
@@ -43,11 +43,11 @@
43
43
  " task.task_def_id, ",
44
44
  " task_def.task_def_code, ",
45
45
  " task_def.task_def_name ",
46
- " from wkflow.task ",
47
- " inner join wkflow.wkflow on wkflow.wkflow_id = task.wkflow_id ",
48
- " inner join wkflow.wkflow_def on wkflow_def.wkflow_def_id = wkflow.wkflow_def_id ",
49
- " inner join wkflow.task_def on task_def.task_def_id = task.task_def_id ",
50
- " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from wkflow.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ",
46
+ " from {schema}.task ",
47
+ " inner join {schema}.wkflow on wkflow.wkflow_id = task.wkflow_id ",
48
+ " inner join {schema}.wkflow_def on wkflow_def.wkflow_def_id = wkflow.wkflow_def_id ",
49
+ " inner join {schema}.task_def on task_def.task_def_id = task.task_def_id ",
50
+ " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from {schema}.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ",
51
51
  " and task.task_sts = 'COMPLETE' ",
52
52
  " and isnull(@dt_from, task.task_etstmp) <= task.task_etstmp ",
53
53
  " and isnull($addDays(@dt_to,1), task.task_etstmp) > task.task_etstmp ",
package/models/Reports/WkflowState_Perf.json CHANGED
@@ -11,14 +11,14 @@
11
11
  {"name": "dt_from","caption": "Date From","type": "date","control": "date_mmddyy","validate": [ "Required" ],"default": "js:moment().add(-1, 'month').format()"},
12
12
  {"name": "dt_to","caption": "To","type": "date","control": "date_mmddyy", "validate": [ "Required" ],"default": "js:moment().format()","captionstyle":"width:30px;text-align:right;", "nl": false},
13
13
  {"name":"wkflow_def_code","caption": "Workflow","type":"varchar","length":16,"actions":"B","nl":1,"control":"dropdown_S",
14
- "lov": {"sql":"select wkflow_def_code codeval,wkflow_def_name codetxt from wkflow.wkflow_def where 1=1 order by wkflow_def_name ","blank":"(All)"} },
14
+ "lov": {"sql":"select wkflow_def_code codeval,wkflow_def_name codetxt from {schema}.wkflow_def where 1=1 order by wkflow_def_name ","blank":"(All)"} },
15
15
  {"control":"button","value":"Run Report","controlstyle": "padding:3px 8px;","nl": true,"onclick": "jsh.XPage.RunReport();","caption":""},
16
16
  //{"control":"button","value":"Preview Report","controlstyle": "padding:3px 8px;","nl": true,"onclick": "jsh.XPage.RunReportHTML();","caption":""},
17
17
  ],
18
18
  "reportdata" : {
19
19
  "global":{
20
20
  "sql":[
21
- "select $iif(@wkflow_def_code is null,'(All)',(select wkflow_def_name from wkflow.wkflow_def where wkflow_def_code = @wkflow_def_code)) wkflow_def_name ",
21
+ "select $iif(@wkflow_def_code is null,'(All)',(select wkflow_def_name from {schema}.wkflow_def where wkflow_def_code = @wkflow_def_code)) wkflow_def_name ",
22
22
  " from jsharmony.single",
23
23
  " where 1=1 %%%DATALOCKS%%% "
24
24
  ]
@@ -35,11 +35,11 @@
35
35
  " sum(datediff(minute, wkflow_state.wkflow_state_start_tstmp, wkflow_state.wkflow_state_end_tstmp)) duration_minutes, ",
36
36
  " wkflow_def.wkflow_def_name, ",
37
37
  " wkflow_def_state.wkflow_def_state_name ",
38
- " from wkflow.wkflow_state ",
39
- " inner join wkflow.wkflow on wkflow.wkflow_id = wkflow_state.wkflow_id ",
40
- " inner join wkflow.wkflow_def on wkflow_def.wkflow_def_id = wkflow.wkflow_def_id ",
41
- " inner join wkflow.wkflow_def_state on wkflow_def_state.wkflow_def_state_id = wkflow_state.wkflow_def_state_id ",
42
- " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from wkflow.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ",
38
+ " from {schema}.wkflow_state ",
39
+ " inner join {schema}.wkflow on wkflow.wkflow_id = wkflow_state.wkflow_id ",
40
+ " inner join {schema}.wkflow_def on wkflow_def.wkflow_def_id = wkflow.wkflow_def_id ",
41
+ " inner join {schema}.wkflow_def_state on wkflow_def_state.wkflow_def_state_id = wkflow_state.wkflow_def_state_id ",
42
+ " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from {schema}.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ",
43
43
  " and isnull(@dt_from, wkflow_state.wkflow_state_start_tstmp) <= wkflow_state.wkflow_state_start_tstmp ",
44
44
  " and isnull($addDays(@dt_to,1), wkflow_state.wkflow_state_start_tstmp) > wkflow_state.wkflow_state_start_tstmp ",
45
45
  " group by wkflow_state.wkflow_id, wkflow_def.wkflow_def_name, wkflow_def_state.wkflow_def_state_name ",
package/models/Reports/Wkflow_Perf.json CHANGED
@@ -11,14 +11,14 @@
11
11
  {"name": "dt_from","caption": "Date From","type": "date","control": "date_mmddyy","validate": [ "Required" ],"default": "js:moment().add(-1, 'month').format()"},
12
12
  {"name": "dt_to","caption": "To","type": "date","control": "date_mmddyy", "validate": [ "Required" ],"default": "js:moment().format()","captionstyle":"width:30px;text-align:right;", "nl": false},
13
13
  {"name":"wkflow_def_code","caption": "Workflow","type":"varchar","length":16,"actions":"B","nl":1,"control":"dropdown_S",
14
- "lov": {"sql":"select wkflow_def_code codeval,wkflow_def_name codetxt from wkflow.wkflow_def where 1=1 order by wkflow_def_name ","blank":"(All)"} },
14
+ "lov": {"sql":"select wkflow_def_code codeval,wkflow_def_name codetxt from {schema}.wkflow_def where 1=1 order by wkflow_def_name ","blank":"(All)"} },
15
15
  {"control":"button","value":"Run Report","controlstyle": "padding:3px 8px;","nl": true,"onclick": "jsh.XPage.RunReport();","caption":""},
16
16
  //{"control":"button","value":"Preview Report","controlstyle": "padding:3px 8px;","nl": true,"onclick": "jsh.XPage.RunReportHTML();","caption":""},
17
17
  ],
18
18
  "reportdata" : {
19
19
  "global":{
20
20
  "sql":[
21
- "select $iif(@wkflow_def_code is null,'(All)',(select wkflow_def_name from wkflow.wkflow_def where wkflow_def_code = @wkflow_def_code)) wkflow_def_name ",
21
+ "select $iif(@wkflow_def_code is null,'(All)',(select wkflow_def_name from {schema}.wkflow_def where wkflow_def_code = @wkflow_def_code)) wkflow_def_name ",
22
22
  " from jsharmony.single",
23
23
  " where 1=1 %%%DATALOCKS%%% "
24
24
  ]
@@ -39,9 +39,9 @@
39
39
  " wkflow.wkflow_def_id, ",
40
40
  " wkflow_def.wkflow_def_code, ",
41
41
  " wkflow_def.wkflow_def_name ",
42
- " from wkflow.wkflow ",
43
- " inner join wkflow.wkflow_def on wkflow_def.wkflow_def_id = wkflow.wkflow_def_id ",
44
- " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from wkflow.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ",
42
+ " from {schema}.wkflow ",
43
+ " inner join {schema}.wkflow_def on wkflow_def.wkflow_def_id = wkflow.wkflow_def_id ",
44
+ " where wkflow.wkflow_def_id = isnull((select wkflow_def_id from {schema}.wkflow_def where wkflow_def.wkflow_def_code=@wkflow_def_code),wkflow.wkflow_def_id) ",
45
45
  " and wkflow.wkflow_sts = 'COMPLETE' ",
46
46
  " and isnull(@dt_from, wkflow.wkflow_etstmp) <= wkflow.wkflow_etstmp ",
47
47
  " and isnull($addDays(@dt_to,1), wkflow.wkflow_etstmp) > wkflow.wkflow_etstmp ",
package/models/sql/objects/task.json CHANGED
@@ -132,7 +132,7 @@
132
132
  ],
133
133
  "index": [
134
134
  { "columns": ["task_def_id"] },
135
- { "columns": ["wkflow_id"] },
135
+ { "columns": ["sys_func_name"] },
136
136
  ],
137
137
  "triggers": [
138
138
  { "on": ["insert"], "exec": [
package/models/sql/objects/wkflow.json CHANGED
@@ -299,7 +299,7 @@
299
299
  ]
300
300
  },
301
301
  { "on": ["update"], "exec": [
302
- ["insert into wkflow.wkflow_state(wkflow_id, wkflow_def_state_id, wkflow_state_start_tstmp, wkflow_state_end_tstmp)",
302
+ ["insert into {schema}.wkflow_state(wkflow_id, wkflow_def_state_id, wkflow_state_start_tstmp, wkflow_state_end_tstmp)",
303
303
  " select deleted(wkflow_id), deleted(wkflow_def_state_id), deleted(wkflow_def_state_id_tstmp), %%%%%%jsh.map.timestamp%%%%%%",
304
304
  " where inserted(wkflow_def_state_id) <> deleted(wkflow_def_state_id)"
305
305
  ],
@@ -316,11 +316,11 @@
316
316
  ]
317
317
  },
318
318
  { "on": ["update"], "exec": [
319
- "jsharmony.log_audit_update_mult('wkflow',deleted(wkflow_id),[\"wkflow_def_id\",\"wkflow_sts\",\"wkflow_tran_sts\",\"wkflow_def_state_id\",\"wkflow_custom_flag\",\"wkflow_custom_note\"])",
319
+ "jsharmony.log_audit_update_mult('wkflow',deleted(wkflow_id),[\"wkflow_def_id\",\"wkflow_sts\",\"wkflow_tran_sts\",\"wkflow_def_state_id\"])",
320
320
  ]
321
321
  },
322
322
  { "on": ["delete"], "exec": [
323
- "jsharmony.log_audit_delete_mult('wkflow',deleted(wkflow_id),[\"wkflow_def_id\",\"wkflow_sts\",\"wkflow_tran_sts\",\"wkflow_def_state_id\",\"wkflow_custom_flag\",\"wkflow_custom_note\"])",
323
+ "jsharmony.log_audit_delete_mult('wkflow',deleted(wkflow_id),[\"wkflow_def_id\",\"wkflow_sts\",\"wkflow_tran_sts\",\"wkflow_def_state_id\"])",
324
324
  ]
325
325
  }
326
326
  ],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jsharmony-workflow",
3
- "version": "1.1.2",
3
+ "version": "2.0.0",
4
4
  "description": "jsHarmony Workflow",
5
5
  "main": "index.js",
6
6
  "keywords": [
@@ -12,8 +12,8 @@
12
12
  "author": "apHarmony <contact@apharmony.com> (http://www.apharmony.com/)",
13
13
  "license": "LGPL-3.0",
14
14
  "dependencies": {
15
- "jsharmony": "^1.33.0",
16
- "jsharmony-factory": "^1.21.1",
15
+ "jsharmony": "^2.0.0",
16
+ "jsharmony-factory": "^2.0.0",
17
17
  "lodash": "^4.17.19",
18
18
  "async": "^2.6.2",
19
19
  "rrule": "^2.7.1"