Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
256 commits
Select commit Hold shift + click to select a range
68b39e4
FOUR-23575:S2: Case tab - Implement the component to show a counters
henryjonathanquispe Apr 25, 2025
c822ee4
[FOUR-23473](https://processmaker.atlassian.net/browse/FOUR-23473) S1…
gproly Apr 25, 2025
22a3ec6
FOUR-23473
gproly Apr 25, 2025
a9f24f5
Merge pull request #8204 from ProcessMaker/feature/FOUR-23575
pmPaulis Apr 25, 2025
026c904
Merge pull request #8209 from ProcessMaker/feature/FOUR-23473
pmPaulis Apr 25, 2025
e012bcf
Merge pull request #8208 from ProcessMaker/feature/FOUR-23484
pmPaulis Apr 25, 2025
5879719
Adding stages
pmPaulis Apr 28, 2025
9487e64
FOUR-23577: S12: Implement component Financial Aid - College Dashboard
henryjonathanquispe Apr 28, 2025
56b067d
FOUR-23577: S12: Implement component Financial Aid - College Dashboard
henryjonathanquispe Apr 28, 2025
b40f331
adding columns related
pmPaulis Apr 28, 2025
32c82f3
Merge pull request #8211 from ProcessMaker/feature/FOUR-23577
pmPaulis Apr 29, 2025
7d56240
Update the tables structure
pmPaulis Apr 29, 2025
52332fe
Update stages
pmPaulis Apr 29, 2025
7b27cb4
Update stages
pmPaulis Apr 29, 2025
8261216
Add progress information in CasesController
pmPaulis Apr 29, 2025
2e8cb4a
Save stages per process
pmPaulis Apr 30, 2025
73d1fce
solving name
pmPaulis Apr 30, 2025
c269e38
FOUR-23474 S1: Add stage component with drag and drop and Save changes
gproly Apr 30, 2025
16aabd3
Merge pull request #8205 from ProcessMaker/feature/FOUR-23478
pmPaulis May 2, 2025
639b864
Merge pull request #8215 from ProcessMaker/feature/FOUR-23474
pmPaulis May 2, 2025
b706437
FOUR-24219
pmPaulis May 3, 2025
1159119
Merge pull request #8220 from ProcessMaker/feature/FOUR-24219
pmPaulis May 5, 2025
d3944bc
FOUR-23485
pmPaulis May 5, 2025
a9a502f
FOUR-23485 using the stagesSummary in the ProgressBarSection
pmPaulis May 5, 2025
a802c1a
FOUR-24086: S12: Settings - Add a select List to define the view/tce-…
henryjonathanquispe May 6, 2025
533a9c4
Merge pull request #8221 from ProcessMaker/feature/FOUR-23485
pmPaulis May 6, 2025
2e11be6
FOUR-23483: Add in Details the Stage and bar
fagubla May 6, 2025
b421581
Update CasesController.php
fagubla May 6, 2025
6ff5197
FOUR-24229
pmPaulis May 6, 2025
8208c30
FOUR-24229
pmPaulis May 7, 2025
6a8d0da
remove a var_dump
pmPaulis May 7, 2025
87963fd
Merge pull request #8222 from ProcessMaker/feature/FOUR-23483
pmPaulis May 8, 2025
7d529e8
Merge pull request #8224 from ProcessMaker/feature/FOUR-24229
pmPaulis May 8, 2025
abdceed
FOUR-24086: S12: Settings - Add a select List to define the view/tce-…
henryjonathanquispe May 8, 2025
7b09036
FOUR-24086: S12: Settings - Add a select List to define the view/tce-…
henryjonathanquispe May 8, 2025
c94b31c
Merge pull request #8226 from ProcessMaker/feature/FOUR-24086
pmPaulis May 9, 2025
c9595ff
FOUR-24087: S12: Create the view to show a dashboard with the compone…
henryjonathanquispe May 9, 2025
4b8e93b
FOUR-24148: UI related Process Info - Carousel (refactor)
fagubla May 9, 2025
35599a6
reset behavior
fagubla May 9, 2025
31a31c3
FOUR-24233:The Summary tab needs to show per default
fagubla May 9, 2025
be13181
FOUR-22734 S1: The Publish and save process needs to save the stages
gproly May 9, 2025
4b17b49
Merge pull request #8231 from ProcessMaker/feature/FOUR-24148
pmPaulis May 9, 2025
ef0ed05
FOUR-24087: S12: Create the view to show a dashboard with the compone…
henryjonathanquispe May 12, 2025
aaa52ec
FOUR-22605: Resolve conflicts
henryjonathanquispe May 12, 2025
0ff37ba
FOUR-24087: S12: Create the view to show a dashboard with the compone…
henryjonathanquispe May 12, 2025
8f713b5
Merge pull request #8225 from ProcessMaker/epic/FOUR-22600
pmPaulis May 12, 2025
01ac325
Merge pull request #8236 from ProcessMaker/feature/FOUR-24087
pmPaulis May 12, 2025
35e03a3
FOUR-24089: S12: Create the view to show a dashboard with the compone…
henryjonathanquispe May 12, 2025
06e3652
solving conflicts
pmPaulis May 13, 2025
bad6c66
Merge pull request #8232 from ProcessMaker/feature/FOUR-24233
pmPaulis May 13, 2025
d7202bf
FOUR-24089: S12: Create the view to show a dashboard with the compone…
henryjonathanquispe May 13, 2025
123def9
FOUR-24089: S12: Create the view to show a dashboard with the compone…
henryjonathanquispe May 13, 2025
1d88fda
FOUR-24227: Adding changes in order to get the status: Done, In progr…
pmPaulis May 13, 2025
f4354b9
FOUR-24089: S12: Create the view to show a dashboard with the compone…
henryjonathanquispe May 14, 2025
eb3ae7a
FOUR-24227: Add in the display screen a New control - Case Progress Bar
fagubla May 14, 2025
753144b
FOUR-24230: S12: Add the Request List using the columns defined
henryjonathanquispe May 14, 2025
a70d1ae
Merge pull request #8242 from ProcessMaker/feature/FOUR-24227-P
pmPaulis May 14, 2025
85250b0
FOUR-24234: Creating API stages and metrics per process
pmPaulis May 15, 2025
cfd9674
Updating the results
pmPaulis May 15, 2025
b5c485d
fixing unit test issue
pmPaulis May 15, 2025
e007f39
fixing unit test issue
pmPaulis May 15, 2025
bdfc504
fixing unit test issue
pmPaulis May 15, 2025
c6c32ca
Merge pull request #8244 from ProcessMaker/feature/FOUR-24234
pmPaulis May 15, 2025
2908cc9
Merge branch 'epic/FOUR-22605' of github.com:ProcessMaker/processmake…
henryjonathanquispe May 15, 2025
d7276ab
FOUR-23689: Cannot read properties of null (reading 'colorScheme') Er…
henryjonathanquispe May 15, 2025
fab24cc
FOUR-22734 S1: The Publish and save process needs to save the stages
gproly May 16, 2025
962b064
FOUR-24089: S12: Create the view to show a dashboard with the compone…
henryjonathanquispe May 16, 2025
60475c3
Merge pull request #8239 from ProcessMaker/feature/FOUR-24089
pmPaulis May 16, 2025
d9a805c
Merge pull request #8243 from ProcessMaker/feature/FOUR-24227
pmPaulis May 16, 2025
63e9c10
FOUR-22734 Add endpoints to save and load stages in the modeler, and …
gproly May 16, 2025
2fdd318
FOUR-22734 Fix incorrectly selected stages.
gproly May 16, 2025
351a784
FOUR-22734 Fix null values for stages.
gproly May 16, 2025
b74815f
FOUR-22734 Fixed the id field to ensure it is unique, and perform the…
gproly May 16, 2025
4680310
Merge pull request #8234 from ProcessMaker/feature/FOUR-22734
pmPaulis May 16, 2025
1b5f353
Merge remote-tracking branch 'origin/release-2025-spring' into epic/F…
pmPaulis May 16, 2025
08daa3c
FOUR-24234: Adding information about stages
pmPaulis May 16, 2025
b79b689
Merge pull request #8247 from ProcessMaker/feature/FOUR-24234-2
pmPaulis May 16, 2025
86c6aff
FOUR-24448
pmPaulis May 19, 2025
cee55f4
FOUR-24450
pmPaulis May 19, 2025
a9fcf2c
FOUR-24448: Update default stages in other use cases
pmPaulis May 19, 2025
440cf45
Merge pull request #8251 from ProcessMaker/feature/FOUR-24448
pmPaulis May 20, 2025
5efd40e
FOUR-24453: Define the structure to save the aggregations in process,…
pmPaulis May 20, 2025
30523d5
Merge pull request #8252 from ProcessMaker/feature/FOUR-24450
pmPaulis May 20, 2025
8dbac2a
Merge branch 'epic/FOUR-22605' of github.com:ProcessMaker/processmake…
pmPaulis May 20, 2025
5bc12b5
FOUR-24453: Update using the new structure of stages
pmPaulis May 20, 2025
ff153ed
removing unused function
pmPaulis May 20, 2025
13e62fc
FOUR-23482 S2: BE - Populate the STAGE and PROGRESS columns in run ca…
gproly May 21, 2025
ca57974
FOUR-23482 Fixed code style.
gproly May 21, 2025
dd700cb
FOUR-24454: S12: Update/Adjustments some behaviors the Dashboard
henryjonathanquispe May 21, 2025
4951318
FOUR-24454: S12: Update/Adjustments some behaviors the Dashboard
henryjonathanquispe May 21, 2025
1532209
FOUR-23607:Add a Link to configure cases column & show the component …
fagubla May 21, 2025
347aae8
FOUR-22605: Update label with name
pmPaulis May 21, 2025
695bb56
FOUR-23482 Improvement to allow all flows to be tracked and retrieve …
gproly May 22, 2025
b60205c
FOUR-23482 Fixed code style issues.
gproly May 22, 2025
3dd9ee9
Title corrections
fagubla May 22, 2025
3df9801
FOUR-23482 Improvement for the calculation of the progress field.
gproly May 22, 2025
cca7df8
FOUR-23482 Fixed code style issues.
gproly May 22, 2025
9db817d
Merge pull request #8259 from ProcessMaker/feature/FOUR-23607
pmPaulis May 22, 2025
28cf895
FOUR-24336:Create a new View when a case is open and the TCE_CUSTOMIZ…
fagubla May 22, 2025
461ac95
FOUR-24454: S12: Update/Adjustments some behaviors the Dashboard
henryjonathanquispe May 22, 2025
62d1102
FOUR-23482 Improvements: we no longer use Nayra’s event subscriber.
gproly May 22, 2025
7d3e79a
FOUR-23482 Fixed observation issues.
gproly May 22, 2025
44bf1fd
FOUR-23482 Fixed observation issues.
gproly May 22, 2025
fee9556
Merge pull request #8265 from ProcessMaker/feature/FOUR-24336
pmPaulis May 22, 2025
22ad193
Solving issue with test
pmPaulis May 22, 2025
6003995
validating the function
pmPaulis May 22, 2025
d6a906e
FOUR-23482 Fixed unit test issues.
gproly May 23, 2025
6cc8bcc
Merge pull request #8256 from ProcessMaker/feature/FOUR-23482
pmPaulis May 23, 2025
de13b1e
FOUR-24454: S12: Update/Adjustments some behaviors the Dashboard
henryjonathanquispe May 23, 2025
1f6e910
Merge remote-tracking branch 'origin/release-2025-spring' into epic/F…
pmPaulis May 23, 2025
0c3aeae
Merge pull request #8257 from ProcessMaker/feature/FOUR-24454
pmPaulis May 23, 2025
35b54bc
FOUR-22600 and FOUR-22605 merged with conflicts solved
pmPaulis May 23, 2025
4e53427
Merge pull request #8267 from ProcessMaker/epic/FOUR-22600_FOUR-22605
pmPaulis May 23, 2025
5657a8e
Solving conflicts
pmPaulis May 23, 2025
0c02848
FOUR-24453: API related to aggregation
pmPaulis May 24, 2025
91795ca
FOUR-23609: 3. S3: Display the column configured in My Cases List
henryjonathanquispe May 26, 2025
355f806
FOUR-23609: 3. S3: Display the column configured in My Cases List
henryjonathanquispe May 26, 2025
7a120ed
Merge pull request #8254 from ProcessMaker/feature/FOUR-24453
pmPaulis May 26, 2025
e3a42f2
Merge branch 'epic/FOUR-22605' of github.com:ProcessMaker/processmake…
henryjonathanquispe May 26, 2025
b32b4f5
FOUR-23609: 3. S3: Display the column configured in My Cases List
henryjonathanquispe May 26, 2025
afad7c8
FOUR-23609: 3. S3: Display the column configured in My Cases List
henryjonathanquispe May 26, 2025
2c25167
FOUR-23609: 3. S3: Display the column configured in My Cases List
henryjonathanquispe May 26, 2025
ecacd14
FOUR-24456
pmPaulis May 26, 2025
e213cd0
Merge pull request #8270 from ProcessMaker/feature/FOUR-23609
pmPaulis May 26, 2025
2a990ac
FOUR-23609: 3. S3: Display the column configured in My Cases List
henryjonathanquispe May 26, 2025
6f23a7d
FOUR-24474: S12: API request/ needs to consider a filter by Stage_id
henryjonathanquispe May 26, 2025
0e45917
FOUR-24452: Add a Agreggation property in modeler
fagubla May 26, 2025
e06b626
Adding new variable to use metricsApiEndpoint
pmPaulis May 26, 2025
0fb6c84
Add Progress column
pmPaulis May 26, 2025
1f4ce4e
Merge pull request #8274 from ProcessMaker/feature/FOUR-24452
pmPaulis May 26, 2025
98730e4
Merge pull request #8272 from ProcessMaker/feature/FOUR-24456
pmPaulis May 27, 2025
8588a9e
FOUR-24474: S12: API request/ needs to consider a filter by Stage_id
henryjonathanquispe May 27, 2025
caa6c36
FOUR-24474: S12: API request/ needs to consider a filter by Stage_id
henryjonathanquispe May 27, 2025
516915d
FOUR-24554:Sync: Cases - Enable the columns Stage and Progress
fagubla May 27, 2025
25e3d2e
FOUR-24474: S12: API request/ needs to consider a filter by Stage_id
henryjonathanquispe May 28, 2025
04644ef
FOUR-24474: S12: API request/ needs to consider a filter by Stage_id
henryjonathanquispe May 28, 2025
c544710
Merge pull request #8279 from ProcessMaker/feature/FOUR-24554
pmPaulis May 28, 2025
d12ccf8
FOUR-24474: S12: API request/ needs to consider a filter by Stage_id
henryjonathanquispe May 28, 2025
a07fab4
FOUR-2463: Error is showing in the API: api/1.0/cases/stages_bar/2
pmPaulis May 28, 2025
62eb8f6
FOUR-24580:Process Info - Started Cases and total is not showing
fagubla May 28, 2025
381386d
Merge pull request #8283 from ProcessMaker/feature/FOUR-24636
pmPaulis May 28, 2025
7a8ed2b
Update ProcessInfo.vue
fagubla May 29, 2025
201b5d8
FOUR-24474: S12: API request/ needs to consider a filter by Stage_id
henryjonathanquispe May 29, 2025
2615af7
Merge pull request #8277 from ProcessMaker/feature/FOUR-24474
pmPaulis May 29, 2025
822b69f
FOUR-24457
pmPaulis May 29, 2025
ee4f033
Merge pull request #8285 from ProcessMaker/feature/FOUR-24580
pmPaulis May 29, 2025
8023211
Solving unit tests
pmPaulis May 30, 2025
2c2fbaf
FOUR-24717: adding key total and stages
pmPaulis May 30, 2025
b684430
Merge pull request #8292 from ProcessMaker/feature/FOUR-24457
pmPaulis May 30, 2025
ff67f35
Solve issues
henryjonathanquispe May 30, 2025
aa96e66
FOUR-24717: Update the Total Information for Stages
henryjonathanquispe May 30, 2025
f99690a
solving observation
pmPaulis May 30, 2025
bae77db
FOUR-24707: Stages - Update the Checklist design with click option
henryjonathanquispe Jun 2, 2025
079262f
FOUR-23608 2. S3: Storage the columns into process_launchpad.properti…
gproly Jun 2, 2025
f15d18a
Merge pull request #8295 from ProcessMaker/feature/FOUR-24717
pmPaulis Jun 2, 2025
29a151f
FOUR-24707: Stages - Update the Checklist design with click option
henryjonathanquispe Jun 2, 2025
0a9953c
iFOUR-23608 Read columns from CustomHomeTableSection
gproly Jun 3, 2025
1152e54
FOUR-24757: UI: Update Grants according the figma
henryjonathanquispe Jun 3, 2025
8ed3cf6
FOUR-24764: UI: Student and College according figma
henryjonathanquispe Jun 3, 2025
d7831b9
Merge pull request #8297 from ProcessMaker/feature/FOUR-23608
pmPaulis Jun 4, 2025
a967252
Merge pull request #8298 from ProcessMaker/bugfix/FOUR-24757
pmPaulis Jun 5, 2025
51dfeb1
FOUR-24707 Removing unnecessary changes; the required logic is added …
gproly Jun 5, 2025
7a1a7ef
FOUR-24707 Fix code style.
gproly Jun 5, 2025
b1f2da8
FOUR-24707 Fix code style.
gproly Jun 5, 2025
3406dde
FOUR-24707 Fix code style.
gproly Jun 5, 2025
41ff58a
FOUR-24803
pmPaulis Jun 6, 2025
b9d100d
FOUR-24803
pmPaulis Jun 6, 2025
23ae340
Merge pull request #8296 from ProcessMaker/bugfix/FOUR-24707
pmPaulis Jun 9, 2025
a537eb9
FOUR-24705:The Stage Name is required
fagubla Jun 11, 2025
1dda79f
validation
fagubla Jun 12, 2025
6261295
validation
fagubla Jun 13, 2025
ecfc60d
Merge pull request #8321 from ProcessMaker/bugfix/FOUR-24705
pmPaulis Jun 16, 2025
f1cdb10
FOUR-24764: UI: Student and College according figma
henryjonathanquispe Jun 16, 2025
9ec4427
Solving conflicst with develop
pmPaulis Jun 16, 2025
f1ccb3f
FOUR-24773:One or two lines should be visible in stages name configur…
fagubla Jun 17, 2025
e609979
Merge pull request #8328 from ProcessMaker/bugfix/FOUR-24773
pmPaulis Jun 27, 2025
841a0c1
FOUR-24795:The stage ID is duplicated if the first stages are deleted.
fagubla Jun 27, 2025
e0ccc0e
Merge pull request #8305 from ProcessMaker/feature/FOUR-24803
pmPaulis Jun 30, 2025
d7211e0
FOUR-24764: UI: Student and College according figma
henryjonathanquispe Jun 30, 2025
3fb520f
Merge pull request #8332 from ProcessMaker/bugfix/FOUR-24795
pmPaulis Jun 30, 2025
83fd90a
FOUR-24890:The FE needs to validate if the API does not exist or para…
fagubla Jul 1, 2025
52c5d98
Merge pull request #8300 from ProcessMaker/bugfix/FOUR-24764
pmPaulis Jul 2, 2025
01fa9de
FOUR-24972: There is not scroll in "Completed & Form" Cases
fagubla Jul 2, 2025
3a2a811
add default height
fagubla Jul 3, 2025
76605ed
FOUR-24778: The columns data.someFields does not show the correct inf…
henryjonathanquispe Jul 3, 2025
22153f7
Merge pull request #8342 from ProcessMaker/bugfix/FOUR-24778
pmPaulis Jul 3, 2025
1249251
FOUR-24887
pmPaulis Jul 3, 2025
9092a27
Merge pull request #8340 from ProcessMaker/bugfix/FOUR-24972
pmPaulis Jul 3, 2025
faa484d
FOUR-25809
pmPaulis Jul 3, 2025
8c546ee
Merge pull request #8336 from ProcessMaker/bugfix/FOUR-24890
pmPaulis Jul 3, 2025
5e203e8
validation response
fagubla Jul 3, 2025
92f2847
Merge pull request #8344 from ProcessMaker/feature/FOUR-25089
pmPaulis Jul 3, 2025
fe2c5ca
Solving issue with show the stage
pmPaulis Jul 3, 2025
6f48e8d
FOUR-24981
pmPaulis Jul 4, 2025
5732a2c
Update translations
pmPaulis Jul 4, 2025
d78d0e9
Revert the change in the public
pmPaulis Jul 4, 2025
d989fb0
FROU-24983:It is possible to add more than 8 stages in modeler
fagubla Jul 4, 2025
a732a24
correction
fagubla Jul 4, 2025
9121142
Merge pull request #8343 from ProcessMaker/feature/FOUR-24887
pmPaulis Jul 4, 2025
a74321a
FOUR-24891 : FE: remove the fake variables related to the custom columns
henryjonathanquispe Jul 7, 2025
06a00b6
Merge pull request #8348 from ProcessMaker/bugfix/FOUR-24983
pmPaulis Jul 7, 2025
7783c23
Merge pull request #8345 from ProcessMaker/bugfix/FOUR-24890
pmPaulis Jul 7, 2025
ae70c64
Merge pull request #8350 from ProcessMaker/bugfix/FOUR-24891
pmPaulis Jul 7, 2025
c409858
Solving issue in the Create stage
pmPaulis Jul 7, 2025
26eb176
adding code styles
pmPaulis Jul 8, 2025
ab8483e
adding translations
pmPaulis Jul 8, 2025
30200b8
Merge pull request #8347 from ProcessMaker/feature/FOUR-24981
pmPaulis Jul 8, 2025
acd1d93
Merge remote-tracking branch 'origin/develop' into epic/FOUR-22605
pmPaulis Jul 8, 2025
f0e694d
Merge remote-tracking branch 'origin/develop' into epic/FOUR-22605
pmPaulis Jul 10, 2025
aee2857
FOUR-25271
pmPaulis Jul 10, 2025
bdcff78
FOUR-24887
pmPaulis Jul 11, 2025
a035aa3
Merge pull request #8360 from ProcessMaker/feature/FOUR-25271
pmPaulis Jul 21, 2025
6b6232f
Merge pull request #8365 from ProcessMaker/feature/FOUR-25306
pmPaulis Jul 21, 2025
e6306d2
FOUR-25222: There is no synchronization with the 'i' button and the f…
henryjonathanquispe Jul 21, 2025
ec46a00
Merge pull request #8376 from ProcessMaker/bugfix/FOUR-25222
pmPaulis Jul 21, 2025
90e7a75
solving conflicts with develop
pmPaulis Jul 21, 2025
1c28f55
FOUR-25269: In Grant chart the tabs In progress and Completed does no…
henryjonathanquispe Jul 22, 2025
5aef5ac
Fixing unit test
pmPaulis Jul 22, 2025
8c8df72
Merge pull request #8377 from ProcessMaker/bugfix/FOUR-25269
pmPaulis Jul 22, 2025
e4b9b0e
FOUR-24578
pmPaulis Jul 22, 2025
3f47bf6
solving observations
pmPaulis Jul 23, 2025
4c5b6ff
FOUR-25283: It is not possible to change other variable in amount
henryjonathanquispe Jul 23, 2025
031cea2
Merge pull request #8378 from ProcessMaker/bugfix/FOUR-24578
pmPaulis Jul 23, 2025
97391e4
Merge pull request #8386 from ProcessMaker/bugfix/FOUR-25283
pmPaulis Jul 24, 2025
395adb8
FOUR-25355 : Move Progress Column in Cases List
henryjonathanquispe Jul 24, 2025
fde9bcd
Merge pull request #8392 from ProcessMaker/bugfix/FOUR-25355
pmPaulis Jul 24, 2025
65dc6b0
FOUR-25426:UI: There is no validation of variables in Stage Aggregation
henryjonathanquispe Jul 28, 2025
a01e1c1
FOUR-25273:Labels in stage flows are not lost after deleting all stages.
fagubla Jul 29, 2025
78d943a
FOUR-25356: UI: Review the render of TCE Dasboards
henryjonathanquispe Jul 29, 2025
3c5df03
FOUR-25426:UI: There is no validation of variables in Stage Aggregation
henryjonathanquispe Jul 30, 2025
ca827df
FOUR-25356: UI: Review the render of TCE Dasboards
henryjonathanquispe Jul 30, 2025
a35c043
FOUR-25356: UI: Review the render of TCE Dasboards
henryjonathanquispe Jul 30, 2025
a261695
FOUR-25356: UI: Review the render of TCE Dasboards
henryjonathanquispe Jul 30, 2025
5b9e8d7
Merge pull request #8397 from ProcessMaker/bugfix/FOUR-25273
pmPaulis Jul 30, 2025
21119bd
FOUR-25282: UI: Cards in screen launcher are not the same as in figma…
henryjonathanquispe Jul 30, 2025
e628864
Merge pull request #8396 from ProcessMaker/bugfix/FOUR-25426
pmPaulis Jul 30, 2025
82f986e
Merge pull request #8401 from ProcessMaker/bugfix/FOUR-25282
pmPaulis Jul 30, 2025
658ecf3
FOUR-25425:The stage is assigned to the flow when it is edited
fagubla Jul 30, 2025
dc32c7c
Merge pull request #8399 from ProcessMaker/bugfix/FOUR-25356
pmPaulis Jul 30, 2025
6a62fe0
FOUR-25219 Changes are not reflected in "Active Columns" in “Edit Cas…
gproly Jul 31, 2025
42d5929
Merge pull request #8403 from ProcessMaker/bugfix/FOUR-25425
pmPaulis Jul 31, 2025
913bc6e
Merge pull request #8404 from ProcessMaker/bugfix/FOUR-25219
pmPaulis Jul 31, 2025
214ac21
FOUR-25467
pmPaulis Jul 31, 2025
dfaf690
FOUR-24579:Update stages according the alternatives
fagubla Aug 4, 2025
28f323c
Merge remote-tracking branch 'origin/develop' into epic/FOUR-22605
pmPaulis Aug 8, 2025
312c57f
Merge branch 'epic/FOUR-22605' of github.com:ProcessMaker/processmake…
pmPaulis Aug 8, 2025
870cbec
Merge remote-tracking branch 'origin/epic/FOUR-22605' into bugfix/FOU…
pmPaulis Aug 8, 2025
2abff98
Merge pull request #8414 from ProcessMaker/bugfix/FOUR-24579
pmPaulis Aug 9, 2025
53ffc3b
Merge pull request #8407 from ProcessMaker/feature/FOUR-25467
pmPaulis Aug 11, 2025
3102803
solving conflict
pmPaulis Aug 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ProcessMaker/Cache/AbstractCacheFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
abstract class AbstractCacheFactory implements CacheFactoryInterface
{
protected static ?CacheInterface $testInstance = null;

protected static bool $storeMetrics = true;

/**
Expand Down
17 changes: 17 additions & 0 deletions ProcessMaker/Filters/BaseFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ abstract class BaseFilter

public const TYPE_FIELD = 'Field';

public const TYPE_STAGE = 'Stage';

public const TYPE_PROCESS = 'Process';

public const TYPE_PROCESS_NAME = 'ProcessName';
Expand Down Expand Up @@ -98,6 +100,8 @@ private function apply($query): void
{
if ($valueAliasMethod = $this->valueAliasMethod()) {
$this->valueAliasAdapter($valueAliasMethod, $query);
} elseif ($this->subjectType === self::TYPE_STAGE) {
$this->filterByStageId($query);
} elseif ($this->subjectType === self::TYPE_PROCESS) {
$this->filterByProcessId($query);
} elseif ($this->subjectValue === self::PROCESS_NAME_IN_REQUEST) {
Expand All @@ -124,6 +128,19 @@ private function apply($query): void
}
}

private function filterByStageId(Builder $query): void
{
if ($query->getModel() instanceof ProcessRequestToken) {
$query->whereIn('process_request_id', function ($query) {
$query->select('id')
->from('process_requests')
->whereIn('last_stage_id', (array) $this->value());
});
} else {
$query->whereIn('last_stage_id', (array) $this->value());
}
}

private function applyQueryBuilderMethod($query)
{
$method = $this->method();
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Http/Controllers/Api/BookmarkController.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public function index(Request $request)
// Get the launchpad configuration
$process->launchpad = ProcessLaunchpad::getLaunchpad($launchpad, $process->id);
$process->counts = $process->getCounts();
// Load Stages
$process->stagesSummary = $process->getStagesSummary($process->stages);
}

return new ProcessCollection($processes);
Expand Down
181 changes: 181 additions & 0 deletions ProcessMaker/Http/Controllers/Api/CaseController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Models\ProcessRequestToken;

class CaseController extends Controller
{
/**
* Get stage information for cases
*/
public function getStagePerCase($case_number = null)
{
if (!empty($case_number)) {
$responseData = $this->getSpecificCaseStages($case_number);

return response()->json($responseData);
}

$responseData = [
'parentRequest' => [],
'requestCount' => 0,
'all_stages' => [],
'current_stage' => [],
'stages_per_case' => $this->getDefaultCaseStages(),
];

return response()->json($responseData);
}

/**
* Get specific case stages information
* @param string $caseNumber The unique identifier of the case to retrieve stages for
* @return array
*/
private function getSpecificCaseStages($caseNumber)
{
$allRequests = ProcessRequest::where('case_number', $caseNumber)->get();
// Check if any requests were found
if ($allRequests->isEmpty()) {
return $this->getDefaultCaseStages();
}
$parentRequest = null;
$requestCount = $allRequests->count();
// Search the parent request parent_request_id and load $request
foreach ($allRequests as $request) {
if (is_null($request->parent_request_id)) {
$parentRequest = $request;
break;
}
}

$stagesPerCase = $this->getStagesSummary($parentRequest);

return [
'parentRequest' => [
'id' => $parentRequest->id,
'case_number' => $parentRequest->case_number,
'status' => $parentRequest->status,
'completed_at' => $parentRequest->completed_at,
],
'requestCount' => $requestCount,
'all_stages' => [],
'current_stage' => [],
'stages_per_case' => $stagesPerCase,
];
}

/**
* Get default case stages with status handling
*
* @param string|null $status The status to set for the stages
* @return array
*/
private function getDefaultCaseStages($status = null)
{
return [
[
'id' => 0,
'name' => 'In Progress',
'status' => $this->mapStatus($status, 'In Progress'),
'completed_at' => '',
],
[
'id' => 0,
'name' => 'Completed',
'status' => $this->mapStatus($status, 'Completed'),
'completed_at' => '',
],
];
}

/**
* Map the status for each stage based on the input status
*
* @param string|null $status The input status to map
* @param string $stageName The name of the stage ('In Progress' or 'Completed')
* @return string The mapped status
*/
private function mapStatus($status, $stageName)
{
if ($status === 'COMPLETED') {
return 'Done';
}

if ($status === 'ACTIVE') {
return match ($stageName) {
'In Progress' => 'In Progress',
'Completed' => 'Pending',
default => 'Pending'
};
}

return 'Pending';
}

/**
* Get the stages summary based on the provided request.
*
* @param $requestId
* @return array An array of stage results, each containing the stage ID, name, status,
* and completion date.
*/
private function getStagesSummary(ProcessRequest $request)
{
$requestId = $request->id;
$processId = $request->process_id;
$process = Process::where('id', $processId)->first();
if ($process && !empty($process->stages)) {
$allStages = $process->stages;
} else {
// Return the default stages if the process does not have
return $this->getDefaultCaseStages($request->status);
}

$allCurrentStages = ProcessRequestToken::where('process_request_id', $requestId)
->select('stage_id', 'stage_name', 'status', 'completed_at')
->get()
->toArray();
if (empty($allCurrentStages)) {
// TO_DO: define what happen if the process does not have task, is a valid use case
}

// Helper to map status
$mapStatus = function ($status) {
if ($status === 'CLOSED') {
return 'Done';
} elseif ($status === 'ACTIVE') {
return 'In Progress';
} else {
return 'Pending';
}
};

$stageResult = [];
// Initialize stage counts with zero for all stages
foreach ($allStages as $stage) {
$stageData = [
'id' => $stage['id'],
'name' => $stage['name'],
'status' => 'Pending',
'completed_at' => '',
];

foreach ($allCurrentStages as $task) {
if ($task['stage_id'] === $stage['id']) {
$stageData['status'] = $mapStatus($task['status']);
$stageData['completed_at'] = $task['completed_at'] ?? '';
break;
}
}

$stageResult[] = $stageData;
}

return $stageResult;
}
}
Loading
Loading