Commit Graph

13391 Commits

Author SHA1 Message Date
Rodrigo Quelca
847a0fb744 fix bad merge 2019-05-17 12:22:59 -04:00
Rodrigo Quelca
81aaae594a solve conflicts 2019-05-17 11:16:18 -04:00
Rodrigo Quelca
817c7836a0 PMC-760: Advanced Search Loader UI
fix CR notes

fix code style

bad equal

fix the error handling

remove catch error line

fix time out

solve conflicts

solve conflicts

PMC-760: Advanced Search Loader UI

fix CR notes

fix code style

bad equal

fix the error handling

remove catch error line

fix time out

solve conflicts with be
2019-05-16 12:27:08 -04:00
Paula Quispe
a6df306166 Merged in bugfix/PMC-783 (pull request #6891)
PMC-783

Approved-by: David Callizaya <david.callizaya@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-16 14:16:04 +00:00
paulis
57c2ab282c Conflicts 2019-05-15 22:41:23 -04:00
Andrea Adamczyk
7055872083 PMC-380 2019-05-15 22:18:05 -04:00
Roly Rudy Gutierrez Pinto
bc1862db3d PMC-585-A 2019-05-15 20:20:24 -04:00
Julio Cesar Laura Avendaño
5d8949255b Merged in bugfix/PMC-602 (pull request #6893)
PMC-602

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-05-15 22:34:41 +00:00
Julio Cesar Laura Avendaño
f432e66233 PMC-602 2019-05-15 16:34:14 -04:00
Paula Quispe
ae1e23b668 Merged in bugfix/PMC-751 (pull request #6885)
PMC-751

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-15 18:51:53 +00:00
Paula Quispe
093b378220 PMC-783 2019-05-14 12:22:56 -04:00
Paula Quispe
0caf82ab2f Merged in bugfix/PMC-371 (pull request #6882)
PMC-371

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-09 21:44:44 +00:00
Paula Quispe
d2b1e04c02 Merge remote-tracking branch 'origin/release/3.3.10' into bugfix/PMC-580 2019-05-07 14:47:08 -04:00
Paula Quispe
5486bbb027 Merge remote-tracking branch 'origin/release/3.3.9' into bugfix/PMC-580 2019-05-07 14:47:01 -04:00
Paula Quispe
ca8a914aa3 PMC-580: release/3.3.8 2019-05-07 14:46:34 -04:00
Paula Quispe
ef659e4e1a PMC-580: release/3.3.7 2019-05-07 14:39:05 -04:00
Paula Quispe
13f53bb559 PMC-567 2019-05-07 14:25:07 -04:00
Paula Quispe
d3f1516f14 PMC-751 2019-05-07 13:54:58 -04:00
Paula Quispe
1e1c23c8cf PMC-763 2019-05-07 12:32:34 -04:00
Paula Quispe
3c00a4dc98 PMC-371 2019-05-06 12:31:34 -04:00
Paula Quispe
7f3b8b1e40 filter by task title and order by lastModified, dueDate, status, process and task 2019-05-03 16:09:24 -04:00
Taylor Dondich
3b28019fe5 Add check for invalid USER potentially due to unassigned. In this situation, assign blank values to result. Fixes test to check for unassigned users. 2019-05-03 14:36:21 -04:00
Julio Cesar Laura Avendaño
5955ff6737 conflicts 2019-05-03 14:35:52 -04:00
Paula Quispe
532f872966 conflicts 2019-05-03 14:34:34 -04:00
Julio Cesar Laura Avendaño
a874ab2390 First commit for filter by category 2019-05-03 14:31:44 -04:00
Paula Quispe
24368423c0 conflicts 2019-05-03 14:29:24 -04:00
Taylor Dondich
17e6ef3441 Add sample tests. Change userUid argument to be properly userId. Do some safe checks in search. 2019-05-03 14:27:23 -04:00
Taylor Dondich
9fa4c1750a Join on APP NUMBER instead of APP_UID 2019-05-03 14:27:15 -04:00
dante
1936f5cf3b Delegations Factory 2019-05-03 14:27:03 -04:00
Taylor Dondich
9768f07a1e Add change to always bring in specific columns since we always join on task and application in search. 2019-05-03 14:26:57 -04:00
Taylor Dondich
52a877bb94 Add status filtering. Status always requires us joining on application. 2019-05-03 14:26:50 -04:00
Taylor Dondich
0331e65626 Make sure all sorting works. Verify process category selection. Use date range selection. 2019-05-03 14:26:43 -04:00
dante
d3a944c2f6 User assignment for created tasks 2019-05-03 14:26:29 -04:00
Taylor Dondich
ccf7209228 Add some sort functionality and app title, case number and task title searching working properly. 2019-05-03 14:26:22 -04:00
dante
ea6b030193 Model for ROUTE table 2019-05-03 14:26:15 -04:00
Taylor Dondich
141e358b6b Remove commented line in proxyCasesList. Add filtering support for task title and application only when requested. 2019-05-03 14:26:04 -04:00
Taylor Dondich
e79503f590 Include initial transform to transform results to desired necessity. Change proxyCaseList to utilize Delegation search. 2019-05-03 14:25:59 -04:00
dante
2bf175ac85 timestamps attribute visibility set to public 2019-05-03 14:25:53 -04:00
Taylor Dondich
426c2f6f39 Update models to have more relationships and timestamp column definitions. 2019-05-03 14:25:47 -04:00
Taylor Dondich
9aec728509 Move models to proper ProcessMaker Model namespace. 2019-05-03 14:25:41 -04:00
Paula Quispe
1b77bd12b9 Merged in bugfix/PMC-748 (pull request #6871)
PMC-748

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-02 19:11:00 +00:00
Paula Quispe
a482e96dc3 Merged in bugfix/PMC-112 (pull request #6870)
PMC-112

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-04-30 20:20:55 +00:00
Paula Quispe
91da0d6ea4 PMC-748 2019-04-30 16:06:41 -04:00
Paula Quispe
701b59e8e5 PMC-112 2019-04-29 10:05:31 -04:00
Roly Rudy Gutierrez Pinto
5879b2158f PMC-695 2019-04-26 09:24:15 -04:00
Julio Cesar Laura Avendaño
8ec6c34ecb PMC-594 2019-04-23 14:35:34 -04:00
Julio Cesar Laura Avendaño
67a28e0117 Merged in develop (pull request #6865)
Updating feature branch with last changes in develop

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-04-22 16:41:15 +00:00
Roly
34723302ca Merged in bugfix/PMC-359 (pull request #6854)
PMC-359

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-04-18 19:52:51 +00:00
Roly Rudy Gutierrez Pinto
06fb08671f PMC-693-A 2019-04-18 14:48:18 -04:00
Paula Quispe
52073709aa Merged in bugfix/PMC-387-A (pull request #6863)
PMC-387

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-04-17 22:06:48 +00:00