Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1461c22
saving progress
CarliPinell Nov 22, 2024
e52e94a
Ready for PR
CarliPinell Dec 11, 2024
63ae6c7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
CarliPinell Dec 11, 2024
5c25ad7
Ready for PR based on epic/20297
CarliPinell Dec 16, 2024
4a8e7bf
Adding new component ParticipantHomeScren.vue
CarliPinell Dec 16, 2024
a126adc
Merge pull request #7818 from ProcessMaker/feature/FOUR-20298
nolanpro Dec 16, 2024
09d12bb
Ready for PR
CarliPinell Dec 16, 2024
365842a
Applying Code Styles, removing unused comments and fixing test unit
CarliPinell Dec 16, 2024
850f988
Ready for PR
CarliPinell Dec 16, 2024
dbc969b
Styles and fixes copied from feature/FOUR-20299
CarliPinell Dec 16, 2024
6164f98
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
aa4edca
Merge pull request #7829 from ProcessMaker/feature/FOUR-20299
boliviacoca Dec 17, 2024
70107b9
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
99f1b5f
Adding new component ProcessesDashboardsMenu.vue
CarliPinell Dec 17, 2024
bc2ce99
saving progress 2
CarliPinell Dec 17, 2024
88c162d
Saving progress 3
CarliPinell Dec 17, 2024
c569423
Saving progress 4
CarliPinell Dec 17, 2024
7119606
saving progress 6 router-view working good
CarliPinell Dec 18, 2024
bf7c690
Saving progress 7
CarliPinell Dec 18, 2024
25488d3
saving progress 8 ready for PR
CarliPinell Dec 18, 2024
6b9cdf7
saving progress 1 dynamic processes working fine
CarliPinell Dec 18, 2024
40b66ed
Saving progress 2
CarliPinell Dec 19, 2024
83d3693
Adding dynamic processes list and refactoring router-view calling for…
CarliPinell Dec 19, 2024
233026a
modifying router.js to call tasks/process/{id} and tasks/dashboard/{id}
CarliPinell Dec 19, 2024
cb22d9a
Saving progress Left Pane working, Process rendered ok in new Container
CarliPinell Dec 20, 2024
329b73f
Merge pull request #7835 from ProcessMaker/feature/FOUR-20300
nolanpro Jan 6, 2025
b5ef068
improvements on loadProcess method
CarliPinell Jan 6, 2025
421e022
Ready for PR
CarliPinell Jan 7, 2025
316fde4
solving conflicts
CarliPinell Jan 7, 2025
b2faf7f
Ready to start ticket merged with Epic branch
CarliPinell Jan 8, 2025
692d735
SAving progress 1
CarliPinell Jan 8, 2025
3159c1a
ready for PR
CarliPinell Jan 9, 2025
751ece8
improvements on styles
CarliPinell Jan 10, 2025
0a3a769
saving progress
CarliPinell Jan 10, 2025
5c2cec0
saving progress 2
CarliPinell Jan 13, 2025
b49d9c3
adding info button
CarliPinell Jan 13, 2025
0e5960e
saving progress 3
CarliPinell Jan 13, 2025
70bb230
Merge branch 'release-2025-winter' of github.com:ProcessMaker/process…
CarliPinell Jan 13, 2025
3db9105
Merge branch 'epic/FOUR-20297-b' of github.com:ProcessMaker/processma…
CarliPinell Jan 14, 2025
aabde4b
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Jan 14, 2025
92731e0
Modifying new route name for /inbox route
CarliPinell Jan 14, 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ class UserConfigurationController extends Controller
'tasks' => [
'isMenuCollapse' => true,
],
'tasks_inbox' => [
'isMenuCollapse' => false,
],
];

public function index()
Expand DownExpand Up@@ -54,6 +57,7 @@ public function store(Request $request)
'ui_configuration.cases' => 'required|array',
'ui_configuration.requests' => 'required|array',
'ui_configuration.tasks' => 'required|array',
'ui_configuration.tasks_inbox' => 'required|array',
]);
$uiConfiguration = json_encode($request->input('ui_configuration'));

Expand Down
16 changes: 12 additions & 4 deletions ProcessMaker/Http/Controllers/HomeController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,14 +14,22 @@ public function index(Request $request)
if (Auth::check()) {
// Redirect to home dynamic only if the package was enable
if (hasPackage('package-dynamic-ui')) {
$user = \Auth::user();
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
$user = Auth::user();

return redirect($homePage);
// Check if there is at least one custom dashboard per user
$customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD')
->where('assignable_id', $user->id)
->count() > 0;

if ($customDashboardExists) {
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);

return redirect($homePage);
}
}

// Redirect to the default view
return redirect('/requests');
return redirect('/inbox');
}
}

Expand Down
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';

if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All@@ -58,7 +60,9 @@ public function index()

$taskDraftsEnabled = TaskDraft::draftsEnabled();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled'));
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
15 changes: 14 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,20 @@ private function indexBaseQuery($request)
// Determine if the data should be included
$includeData = in_array('data', $includes);

$query = ProcessRequestToken::exclude(['data'])->with([
$query = ProcessRequestToken::exclude(['data']);

// If all_inbox is true and user has process requests, filter to only show the latest process
if ($request->has('all_inbox') && $request->input('all_inbox') === 'false') {
$latestProcessRequest = ProcessRequestToken::where('user_id', auth()->id())
->orderBy('created_at', 'desc')
->first();

if ($latestProcessRequest) {
$query->where('process_id', $latestProcessRequest->process_id);
}
}

$query = $query->with([
'processRequest' => function ($q) use ($includeData) {
if (!$includeData) {
return $q->exclude(['data']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/tachometer-alt-average.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/fonts/pm-font/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<div class="info">
Icons generated with svgtofont. For add new icons, please check the README file
</div>
Expand All@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.css
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -55,6 +55,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

Binary file modifiedresources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,5 +53,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -54,7 +54,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

}
22 changes: 12 additions & 10 deletions resources/fonts/pm-font/processmaker-font.scss
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,8 +53,9 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand DownExpand Up@@ -95,6 +96,7 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";
$fp-tachometer-alt-average: "\ea28";
$fp-trash: "\ea29";
$fp-unlink: "\ea2a";

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1461c22
saving progress
CarliPinell Nov 22, 2024
e52e94a
Ready for PR
CarliPinell Dec 11, 2024
63ae6c7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
CarliPinell Dec 11, 2024
5c25ad7
Ready for PR based on epic/20297
CarliPinell Dec 16, 2024
4a8e7bf
Adding new component ParticipantHomeScren.vue
CarliPinell Dec 16, 2024
a126adc
Merge pull request #7818 from ProcessMaker/feature/FOUR-20298
nolanpro Dec 16, 2024
09d12bb
Ready for PR
CarliPinell Dec 16, 2024
365842a
Applying Code Styles, removing unused comments and fixing test unit
CarliPinell Dec 16, 2024
850f988
Ready for PR
CarliPinell Dec 16, 2024
dbc969b
Styles and fixes copied from feature/FOUR-20299
CarliPinell Dec 16, 2024
6164f98
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
aa4edca
Merge pull request #7829 from ProcessMaker/feature/FOUR-20299
boliviacoca Dec 17, 2024
70107b9
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
99f1b5f
Adding new component ProcessesDashboardsMenu.vue
CarliPinell Dec 17, 2024
bc2ce99
saving progress 2
CarliPinell Dec 17, 2024
88c162d
Saving progress 3
CarliPinell Dec 17, 2024
c569423
Saving progress 4
CarliPinell Dec 17, 2024
7119606
saving progress 6 router-view working good
CarliPinell Dec 18, 2024
bf7c690
Saving progress 7
CarliPinell Dec 18, 2024
25488d3
saving progress 8 ready for PR
CarliPinell Dec 18, 2024
6b9cdf7
saving progress 1 dynamic processes working fine
CarliPinell Dec 18, 2024
40b66ed
Saving progress 2
CarliPinell Dec 19, 2024
83d3693
Adding dynamic processes list and refactoring router-view calling for…
CarliPinell Dec 19, 2024
233026a
modifying router.js to call tasks/process/{id} and tasks/dashboard/{id}
CarliPinell Dec 19, 2024
cb22d9a
Saving progress Left Pane working, Process rendered ok in new Container
CarliPinell Dec 20, 2024
329b73f
Merge pull request #7835 from ProcessMaker/feature/FOUR-20300
nolanpro Jan 6, 2025
b5ef068
improvements on loadProcess method
CarliPinell Jan 6, 2025
421e022
Ready for PR
CarliPinell Jan 7, 2025
316fde4
solving conflicts
CarliPinell Jan 7, 2025
b2faf7f
Ready to start ticket merged with Epic branch
CarliPinell Jan 8, 2025
692d735
SAving progress 1
CarliPinell Jan 8, 2025
3159c1a
ready for PR
CarliPinell Jan 9, 2025
751ece8
improvements on styles
CarliPinell Jan 10, 2025
0a3a769
saving progress
CarliPinell Jan 10, 2025
5c2cec0
saving progress 2
CarliPinell Jan 13, 2025
b49d9c3
adding info button
CarliPinell Jan 13, 2025
0e5960e
saving progress 3
CarliPinell Jan 13, 2025
70bb230
Merge branch 'release-2025-winter' of github.com:ProcessMaker/process…
CarliPinell Jan 13, 2025
3db9105
Merge branch 'epic/FOUR-20297-b' of github.com:ProcessMaker/processma…
CarliPinell Jan 14, 2025
aabde4b
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Jan 14, 2025
92731e0
Modifying new route name for /inbox route
CarliPinell Jan 14, 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ class UserConfigurationController extends Controller
'tasks' => [
'isMenuCollapse' => true,
],
'tasks_inbox' => [
'isMenuCollapse' => false,
],
];

public function index()
Expand DownExpand Up@@ -54,6 +57,7 @@ public function store(Request $request)
'ui_configuration.cases' => 'required|array',
'ui_configuration.requests' => 'required|array',
'ui_configuration.tasks' => 'required|array',
'ui_configuration.tasks_inbox' => 'required|array',
]);
$uiConfiguration = json_encode($request->input('ui_configuration'));

Expand Down
16 changes: 12 additions & 4 deletions ProcessMaker/Http/Controllers/HomeController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,14 +14,22 @@ public function index(Request $request)
if (Auth::check()) {
// Redirect to home dynamic only if the package was enable
if (hasPackage('package-dynamic-ui')) {
$user = \Auth::user();
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
$user = Auth::user();

return redirect($homePage);
// Check if there is at least one custom dashboard per user
$customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD')
->where('assignable_id', $user->id)
->count() > 0;

if ($customDashboardExists) {
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);

return redirect($homePage);
}
}

// Redirect to the default view
return redirect('/requests');
return redirect('/inbox');
}
}

Expand Down
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';

if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All@@ -58,7 +60,9 @@ public function index()

$taskDraftsEnabled = TaskDraft::draftsEnabled();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled'));
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
15 changes: 14 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,20 @@ private function indexBaseQuery($request)
// Determine if the data should be included
$includeData = in_array('data', $includes);

$query = ProcessRequestToken::exclude(['data'])->with([
$query = ProcessRequestToken::exclude(['data']);

// If all_inbox is true and user has process requests, filter to only show the latest process
if ($request->has('all_inbox') && $request->input('all_inbox') === 'false') {
$latestProcessRequest = ProcessRequestToken::where('user_id', auth()->id())
->orderBy('created_at', 'desc')
->first();

if ($latestProcessRequest) {
$query->where('process_id', $latestProcessRequest->process_id);
}
}

$query = $query->with([
'processRequest' => function ($q) use ($includeData) {
if (!$includeData) {
return $q->exclude(['data']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/tachometer-alt-average.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/fonts/pm-font/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<div class="info">
Icons generated with svgtofont. For add new icons, please check the README file
</div>
Expand All@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.css
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -55,6 +55,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

Binary file modifiedresources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,5 +53,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -54,7 +54,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

}
22 changes: 12 additions & 10 deletions resources/fonts/pm-font/processmaker-font.scss
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,8 +53,9 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand DownExpand Up@@ -95,6 +96,7 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";
$fp-tachometer-alt-average: "\ea28";
$fp-trash: "\ea29";
$fp-unlink: "\ea2a";

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1461c22
saving progress
CarliPinell Nov 22, 2024
e52e94a
Ready for PR
CarliPinell Dec 11, 2024
63ae6c7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
CarliPinell Dec 11, 2024
5c25ad7
Ready for PR based on epic/20297
CarliPinell Dec 16, 2024
4a8e7bf
Adding new component ParticipantHomeScren.vue
CarliPinell Dec 16, 2024
a126adc
Merge pull request #7818 from ProcessMaker/feature/FOUR-20298
nolanpro Dec 16, 2024
09d12bb
Ready for PR
CarliPinell Dec 16, 2024
365842a
Applying Code Styles, removing unused comments and fixing test unit
CarliPinell Dec 16, 2024
850f988
Ready for PR
CarliPinell Dec 16, 2024
dbc969b
Styles and fixes copied from feature/FOUR-20299
CarliPinell Dec 16, 2024
6164f98
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
aa4edca
Merge pull request #7829 from ProcessMaker/feature/FOUR-20299
boliviacoca Dec 17, 2024
70107b9
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
99f1b5f
Adding new component ProcessesDashboardsMenu.vue
CarliPinell Dec 17, 2024
bc2ce99
saving progress 2
CarliPinell Dec 17, 2024
88c162d
Saving progress 3
CarliPinell Dec 17, 2024
c569423
Saving progress 4
CarliPinell Dec 17, 2024
7119606
saving progress 6 router-view working good
CarliPinell Dec 18, 2024
bf7c690
Saving progress 7
CarliPinell Dec 18, 2024
25488d3
saving progress 8 ready for PR
CarliPinell Dec 18, 2024
6b9cdf7
saving progress 1 dynamic processes working fine
CarliPinell Dec 18, 2024
40b66ed
Saving progress 2
CarliPinell Dec 19, 2024
83d3693
Adding dynamic processes list and refactoring router-view calling for…
CarliPinell Dec 19, 2024
233026a
modifying router.js to call tasks/process/{id} and tasks/dashboard/{id}
CarliPinell Dec 19, 2024
cb22d9a
Saving progress Left Pane working, Process rendered ok in new Container
CarliPinell Dec 20, 2024
329b73f
Merge pull request #7835 from ProcessMaker/feature/FOUR-20300
nolanpro Jan 6, 2025
b5ef068
improvements on loadProcess method
CarliPinell Jan 6, 2025
421e022
Ready for PR
CarliPinell Jan 7, 2025
316fde4
solving conflicts
CarliPinell Jan 7, 2025
b2faf7f
Ready to start ticket merged with Epic branch
CarliPinell Jan 8, 2025
692d735
SAving progress 1
CarliPinell Jan 8, 2025
3159c1a
ready for PR
CarliPinell Jan 9, 2025
751ece8
improvements on styles
CarliPinell Jan 10, 2025
0a3a769
saving progress
CarliPinell Jan 10, 2025
5c2cec0
saving progress 2
CarliPinell Jan 13, 2025
b49d9c3
adding info button
CarliPinell Jan 13, 2025
0e5960e
saving progress 3
CarliPinell Jan 13, 2025
70bb230
Merge branch 'release-2025-winter' of github.com:ProcessMaker/process…
CarliPinell Jan 13, 2025
3db9105
Merge branch 'epic/FOUR-20297-b' of github.com:ProcessMaker/processma…
CarliPinell Jan 14, 2025
aabde4b
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Jan 14, 2025
92731e0
Modifying new route name for /inbox route
CarliPinell Jan 14, 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ class UserConfigurationController extends Controller
'tasks' => [
'isMenuCollapse' => true,
],
'tasks_inbox' => [
'isMenuCollapse' => false,
],
];

public function index()
Expand DownExpand Up@@ -54,6 +57,7 @@ public function store(Request $request)
'ui_configuration.cases' => 'required|array',
'ui_configuration.requests' => 'required|array',
'ui_configuration.tasks' => 'required|array',
'ui_configuration.tasks_inbox' => 'required|array',
]);
$uiConfiguration = json_encode($request->input('ui_configuration'));

Expand Down
16 changes: 12 additions & 4 deletions ProcessMaker/Http/Controllers/HomeController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,14 +14,22 @@ public function index(Request $request)
if (Auth::check()) {
// Redirect to home dynamic only if the package was enable
if (hasPackage('package-dynamic-ui')) {
$user = \Auth::user();
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
$user = Auth::user();

return redirect($homePage);
// Check if there is at least one custom dashboard per user
$customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD')
->where('assignable_id', $user->id)
->count() > 0;

if ($customDashboardExists) {
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);

return redirect($homePage);
}
}

// Redirect to the default view
return redirect('/requests');
return redirect('/inbox');
}
}

Expand Down
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';

if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All@@ -58,7 +60,9 @@ public function index()

$taskDraftsEnabled = TaskDraft::draftsEnabled();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled'));
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
15 changes: 14 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,20 @@ private function indexBaseQuery($request)
// Determine if the data should be included
$includeData = in_array('data', $includes);

$query = ProcessRequestToken::exclude(['data'])->with([
$query = ProcessRequestToken::exclude(['data']);

// If all_inbox is true and user has process requests, filter to only show the latest process
if ($request->has('all_inbox') && $request->input('all_inbox') === 'false') {
$latestProcessRequest = ProcessRequestToken::where('user_id', auth()->id())
->orderBy('created_at', 'desc')
->first();

if ($latestProcessRequest) {
$query->where('process_id', $latestProcessRequest->process_id);
}
}

$query = $query->with([
'processRequest' => function ($q) use ($includeData) {
if (!$includeData) {
return $q->exclude(['data']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/tachometer-alt-average.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/fonts/pm-font/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<div class="info">
Icons generated with svgtofont. For add new icons, please check the README file
</div>
Expand All@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.css
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -55,6 +55,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

Binary file modifiedresources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,5 +53,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -54,7 +54,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

}
22 changes: 12 additions & 10 deletions resources/fonts/pm-font/processmaker-font.scss
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,8 +53,9 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand DownExpand Up@@ -95,6 +96,7 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";
$fp-tachometer-alt-average: "\ea28";
$fp-trash: "\ea29";
$fp-unlink: "\ea2a";

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1461c22
saving progress
CarliPinell Nov 22, 2024
e52e94a
Ready for PR
CarliPinell Dec 11, 2024
63ae6c7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
CarliPinell Dec 11, 2024
5c25ad7
Ready for PR based on epic/20297
CarliPinell Dec 16, 2024
4a8e7bf
Adding new component ParticipantHomeScren.vue
CarliPinell Dec 16, 2024
a126adc
Merge pull request #7818 from ProcessMaker/feature/FOUR-20298
nolanpro Dec 16, 2024
09d12bb
Ready for PR
CarliPinell Dec 16, 2024
365842a
Applying Code Styles, removing unused comments and fixing test unit
CarliPinell Dec 16, 2024
850f988
Ready for PR
CarliPinell Dec 16, 2024
dbc969b
Styles and fixes copied from feature/FOUR-20299
CarliPinell Dec 16, 2024
6164f98
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
aa4edca
Merge pull request #7829 from ProcessMaker/feature/FOUR-20299
boliviacoca Dec 17, 2024
70107b9
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
99f1b5f
Adding new component ProcessesDashboardsMenu.vue
CarliPinell Dec 17, 2024
bc2ce99
saving progress 2
CarliPinell Dec 17, 2024
88c162d
Saving progress 3
CarliPinell Dec 17, 2024
c569423
Saving progress 4
CarliPinell Dec 17, 2024
7119606
saving progress 6 router-view working good
CarliPinell Dec 18, 2024
bf7c690
Saving progress 7
CarliPinell Dec 18, 2024
25488d3
saving progress 8 ready for PR
CarliPinell Dec 18, 2024
6b9cdf7
saving progress 1 dynamic processes working fine
CarliPinell Dec 18, 2024
40b66ed
Saving progress 2
CarliPinell Dec 19, 2024
83d3693
Adding dynamic processes list and refactoring router-view calling for…
CarliPinell Dec 19, 2024
233026a
modifying router.js to call tasks/process/{id} and tasks/dashboard/{id}
CarliPinell Dec 19, 2024
cb22d9a
Saving progress Left Pane working, Process rendered ok in new Container
CarliPinell Dec 20, 2024
329b73f
Merge pull request #7835 from ProcessMaker/feature/FOUR-20300
nolanpro Jan 6, 2025
b5ef068
improvements on loadProcess method
CarliPinell Jan 6, 2025
421e022
Ready for PR
CarliPinell Jan 7, 2025
316fde4
solving conflicts
CarliPinell Jan 7, 2025
b2faf7f
Ready to start ticket merged with Epic branch
CarliPinell Jan 8, 2025
692d735
SAving progress 1
CarliPinell Jan 8, 2025
3159c1a
ready for PR
CarliPinell Jan 9, 2025
751ece8
improvements on styles
CarliPinell Jan 10, 2025
0a3a769
saving progress
CarliPinell Jan 10, 2025
5c2cec0
saving progress 2
CarliPinell Jan 13, 2025
b49d9c3
adding info button
CarliPinell Jan 13, 2025
0e5960e
saving progress 3
CarliPinell Jan 13, 2025
70bb230
Merge branch 'release-2025-winter' of github.com:ProcessMaker/process…
CarliPinell Jan 13, 2025
3db9105
Merge branch 'epic/FOUR-20297-b' of github.com:ProcessMaker/processma…
CarliPinell Jan 14, 2025
aabde4b
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Jan 14, 2025
92731e0
Modifying new route name for /inbox route
CarliPinell Jan 14, 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ class UserConfigurationController extends Controller
'tasks' => [
'isMenuCollapse' => true,
],
'tasks_inbox' => [
'isMenuCollapse' => false,
],
];

public function index()
Expand DownExpand Up@@ -54,6 +57,7 @@ public function store(Request $request)
'ui_configuration.cases' => 'required|array',
'ui_configuration.requests' => 'required|array',
'ui_configuration.tasks' => 'required|array',
'ui_configuration.tasks_inbox' => 'required|array',
]);
$uiConfiguration = json_encode($request->input('ui_configuration'));

Expand Down
16 changes: 12 additions & 4 deletions ProcessMaker/Http/Controllers/HomeController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,14 +14,22 @@ public function index(Request $request)
if (Auth::check()) {
// Redirect to home dynamic only if the package was enable
if (hasPackage('package-dynamic-ui')) {
$user = \Auth::user();
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
$user = Auth::user();

return redirect($homePage);
// Check if there is at least one custom dashboard per user
$customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD')
->where('assignable_id', $user->id)
->count() > 0;

if ($customDashboardExists) {
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);

return redirect($homePage);
}
}

// Redirect to the default view
return redirect('/requests');
return redirect('/inbox');
}
}

Expand Down
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';

if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All@@ -58,7 +60,9 @@ public function index()

$taskDraftsEnabled = TaskDraft::draftsEnabled();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled'));
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
15 changes: 14 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,20 @@ private function indexBaseQuery($request)
// Determine if the data should be included
$includeData = in_array('data', $includes);

$query = ProcessRequestToken::exclude(['data'])->with([
$query = ProcessRequestToken::exclude(['data']);

// If all_inbox is true and user has process requests, filter to only show the latest process
if ($request->has('all_inbox') && $request->input('all_inbox') === 'false') {
$latestProcessRequest = ProcessRequestToken::where('user_id', auth()->id())
->orderBy('created_at', 'desc')
->first();

if ($latestProcessRequest) {
$query->where('process_id', $latestProcessRequest->process_id);
}
}

$query = $query->with([
'processRequest' => function ($q) use ($includeData) {
if (!$includeData) {
return $q->exclude(['data']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/tachometer-alt-average.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/fonts/pm-font/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<div class="info">
Icons generated with svgtofont. For add new icons, please check the README file
</div>
Expand All@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.css
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -55,6 +55,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

Binary file modifiedresources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,5 +53,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -54,7 +54,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

}
22 changes: 12 additions & 10 deletions resources/fonts/pm-font/processmaker-font.scss
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,8 +53,9 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand DownExpand Up@@ -95,6 +96,7 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";
$fp-tachometer-alt-average: "\ea28";
$fp-trash: "\ea29";
$fp-unlink: "\ea2a";

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1461c22
saving progress
CarliPinell Nov 22, 2024
e52e94a
Ready for PR
CarliPinell Dec 11, 2024
63ae6c7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
CarliPinell Dec 11, 2024
5c25ad7
Ready for PR based on epic/20297
CarliPinell Dec 16, 2024
4a8e7bf
Adding new component ParticipantHomeScren.vue
CarliPinell Dec 16, 2024
a126adc
Merge pull request #7818 from ProcessMaker/feature/FOUR-20298
nolanpro Dec 16, 2024
09d12bb
Ready for PR
CarliPinell Dec 16, 2024
365842a
Applying Code Styles, removing unused comments and fixing test unit
CarliPinell Dec 16, 2024
850f988
Ready for PR
CarliPinell Dec 16, 2024
dbc969b
Styles and fixes copied from feature/FOUR-20299
CarliPinell Dec 16, 2024
6164f98
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
aa4edca
Merge pull request #7829 from ProcessMaker/feature/FOUR-20299
boliviacoca Dec 17, 2024
70107b9
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
99f1b5f
Adding new component ProcessesDashboardsMenu.vue
CarliPinell Dec 17, 2024
bc2ce99
saving progress 2
CarliPinell Dec 17, 2024
88c162d
Saving progress 3
CarliPinell Dec 17, 2024
c569423
Saving progress 4
CarliPinell Dec 17, 2024
7119606
saving progress 6 router-view working good
CarliPinell Dec 18, 2024
bf7c690
Saving progress 7
CarliPinell Dec 18, 2024
25488d3
saving progress 8 ready for PR
CarliPinell Dec 18, 2024
6b9cdf7
saving progress 1 dynamic processes working fine
CarliPinell Dec 18, 2024
40b66ed
Saving progress 2
CarliPinell Dec 19, 2024
83d3693
Adding dynamic processes list and refactoring router-view calling for…
CarliPinell Dec 19, 2024
233026a
modifying router.js to call tasks/process/{id} and tasks/dashboard/{id}
CarliPinell Dec 19, 2024
cb22d9a
Saving progress Left Pane working, Process rendered ok in new Container
CarliPinell Dec 20, 2024
329b73f
Merge pull request #7835 from ProcessMaker/feature/FOUR-20300
nolanpro Jan 6, 2025
b5ef068
improvements on loadProcess method
CarliPinell Jan 6, 2025
421e022
Ready for PR
CarliPinell Jan 7, 2025
316fde4
solving conflicts
CarliPinell Jan 7, 2025
b2faf7f
Ready to start ticket merged with Epic branch
CarliPinell Jan 8, 2025
692d735
SAving progress 1
CarliPinell Jan 8, 2025
3159c1a
ready for PR
CarliPinell Jan 9, 2025
751ece8
improvements on styles
CarliPinell Jan 10, 2025
0a3a769
saving progress
CarliPinell Jan 10, 2025
5c2cec0
saving progress 2
CarliPinell Jan 13, 2025
b49d9c3
adding info button
CarliPinell Jan 13, 2025
0e5960e
saving progress 3
CarliPinell Jan 13, 2025
70bb230
Merge branch 'release-2025-winter' of github.com:ProcessMaker/process…
CarliPinell Jan 13, 2025
3db9105
Merge branch 'epic/FOUR-20297-b' of github.com:ProcessMaker/processma…
CarliPinell Jan 14, 2025
aabde4b
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Jan 14, 2025
92731e0
Modifying new route name for /inbox route
CarliPinell Jan 14, 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ class UserConfigurationController extends Controller
'tasks' => [
'isMenuCollapse' => true,
],
'tasks_inbox' => [
'isMenuCollapse' => false,
],
];

public function index()
Expand DownExpand Up@@ -54,6 +57,7 @@ public function store(Request $request)
'ui_configuration.cases' => 'required|array',
'ui_configuration.requests' => 'required|array',
'ui_configuration.tasks' => 'required|array',
'ui_configuration.tasks_inbox' => 'required|array',
]);
$uiConfiguration = json_encode($request->input('ui_configuration'));

Expand Down
16 changes: 12 additions & 4 deletions ProcessMaker/Http/Controllers/HomeController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,14 +14,22 @@ public function index(Request $request)
if (Auth::check()) {
// Redirect to home dynamic only if the package was enable
if (hasPackage('package-dynamic-ui')) {
$user = \Auth::user();
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
$user = Auth::user();

return redirect($homePage);
// Check if there is at least one custom dashboard per user
$customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD')
->where('assignable_id', $user->id)
->count() > 0;

if ($customDashboardExists) {
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);

return redirect($homePage);
}
}

// Redirect to the default view
return redirect('/requests');
return redirect('/inbox');
}
}

Expand Down
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';

if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All@@ -58,7 +60,9 @@ public function index()

$taskDraftsEnabled = TaskDraft::draftsEnabled();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled'));
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
15 changes: 14 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,20 @@ private function indexBaseQuery($request)
// Determine if the data should be included
$includeData = in_array('data', $includes);

$query = ProcessRequestToken::exclude(['data'])->with([
$query = ProcessRequestToken::exclude(['data']);

// If all_inbox is true and user has process requests, filter to only show the latest process
if ($request->has('all_inbox') && $request->input('all_inbox') === 'false') {
$latestProcessRequest = ProcessRequestToken::where('user_id', auth()->id())
->orderBy('created_at', 'desc')
->first();

if ($latestProcessRequest) {
$query->where('process_id', $latestProcessRequest->process_id);
}
}

$query = $query->with([
'processRequest' => function ($q) use ($includeData) {
if (!$includeData) {
return $q->exclude(['data']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/tachometer-alt-average.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/fonts/pm-font/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<div class="info">
Icons generated with svgtofont. For add new icons, please check the README file
</div>
Expand All@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.css
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -55,6 +55,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

Binary file modifiedresources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,5 +53,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -54,7 +54,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

}
22 changes: 12 additions & 10 deletions resources/fonts/pm-font/processmaker-font.scss
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,8 +53,9 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand DownExpand Up@@ -95,6 +96,7 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";
$fp-tachometer-alt-average: "\ea28";
$fp-trash: "\ea29";
$fp-unlink: "\ea2a";

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1461c22
saving progress
CarliPinell Nov 22, 2024
e52e94a
Ready for PR
CarliPinell Dec 11, 2024
63ae6c7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
CarliPinell Dec 11, 2024
5c25ad7
Ready for PR based on epic/20297
CarliPinell Dec 16, 2024
4a8e7bf
Adding new component ParticipantHomeScren.vue
CarliPinell Dec 16, 2024
a126adc
Merge pull request #7818 from ProcessMaker/feature/FOUR-20298
nolanpro Dec 16, 2024
09d12bb
Ready for PR
CarliPinell Dec 16, 2024
365842a
Applying Code Styles, removing unused comments and fixing test unit
CarliPinell Dec 16, 2024
850f988
Ready for PR
CarliPinell Dec 16, 2024
dbc969b
Styles and fixes copied from feature/FOUR-20299
CarliPinell Dec 16, 2024
6164f98
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
aa4edca
Merge pull request #7829 from ProcessMaker/feature/FOUR-20299
boliviacoca Dec 17, 2024
70107b9
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
99f1b5f
Adding new component ProcessesDashboardsMenu.vue
CarliPinell Dec 17, 2024
bc2ce99
saving progress 2
CarliPinell Dec 17, 2024
88c162d
Saving progress 3
CarliPinell Dec 17, 2024
c569423
Saving progress 4
CarliPinell Dec 17, 2024
7119606
saving progress 6 router-view working good
CarliPinell Dec 18, 2024
bf7c690
Saving progress 7
CarliPinell Dec 18, 2024
25488d3
saving progress 8 ready for PR
CarliPinell Dec 18, 2024
6b9cdf7
saving progress 1 dynamic processes working fine
CarliPinell Dec 18, 2024
40b66ed
Saving progress 2
CarliPinell Dec 19, 2024
83d3693
Adding dynamic processes list and refactoring router-view calling for…
CarliPinell Dec 19, 2024
233026a
modifying router.js to call tasks/process/{id} and tasks/dashboard/{id}
CarliPinell Dec 19, 2024
cb22d9a
Saving progress Left Pane working, Process rendered ok in new Container
CarliPinell Dec 20, 2024
329b73f
Merge pull request #7835 from ProcessMaker/feature/FOUR-20300
nolanpro Jan 6, 2025
b5ef068
improvements on loadProcess method
CarliPinell Jan 6, 2025
421e022
Ready for PR
CarliPinell Jan 7, 2025
316fde4
solving conflicts
CarliPinell Jan 7, 2025
b2faf7f
Ready to start ticket merged with Epic branch
CarliPinell Jan 8, 2025
692d735
SAving progress 1
CarliPinell Jan 8, 2025
3159c1a
ready for PR
CarliPinell Jan 9, 2025
751ece8
improvements on styles
CarliPinell Jan 10, 2025
0a3a769
saving progress
CarliPinell Jan 10, 2025
5c2cec0
saving progress 2
CarliPinell Jan 13, 2025
b49d9c3
adding info button
CarliPinell Jan 13, 2025
0e5960e
saving progress 3
CarliPinell Jan 13, 2025
70bb230
Merge branch 'release-2025-winter' of github.com:ProcessMaker/process…
CarliPinell Jan 13, 2025
3db9105
Merge branch 'epic/FOUR-20297-b' of github.com:ProcessMaker/processma…
CarliPinell Jan 14, 2025
aabde4b
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Jan 14, 2025
92731e0
Modifying new route name for /inbox route
CarliPinell Jan 14, 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ class UserConfigurationController extends Controller
'tasks' => [
'isMenuCollapse' => true,
],
'tasks_inbox' => [
'isMenuCollapse' => false,
],
];

public function index()
Expand DownExpand Up@@ -54,6 +57,7 @@ public function store(Request $request)
'ui_configuration.cases' => 'required|array',
'ui_configuration.requests' => 'required|array',
'ui_configuration.tasks' => 'required|array',
'ui_configuration.tasks_inbox' => 'required|array',
]);
$uiConfiguration = json_encode($request->input('ui_configuration'));

Expand Down
16 changes: 12 additions & 4 deletions ProcessMaker/Http/Controllers/HomeController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,14 +14,22 @@ public function index(Request $request)
if (Auth::check()) {
// Redirect to home dynamic only if the package was enable
if (hasPackage('package-dynamic-ui')) {
$user = \Auth::user();
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
$user = Auth::user();

return redirect($homePage);
// Check if there is at least one custom dashboard per user
$customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD')
->where('assignable_id', $user->id)
->count() > 0;

if ($customDashboardExists) {
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);

return redirect($homePage);
}
}

// Redirect to the default view
return redirect('/requests');
return redirect('/inbox');
}
}

Expand Down
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';

if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All@@ -58,7 +60,9 @@ public function index()

$taskDraftsEnabled = TaskDraft::draftsEnabled();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled'));
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
15 changes: 14 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,20 @@ private function indexBaseQuery($request)
// Determine if the data should be included
$includeData = in_array('data', $includes);

$query = ProcessRequestToken::exclude(['data'])->with([
$query = ProcessRequestToken::exclude(['data']);

// If all_inbox is true and user has process requests, filter to only show the latest process
if ($request->has('all_inbox') && $request->input('all_inbox') === 'false') {
$latestProcessRequest = ProcessRequestToken::where('user_id', auth()->id())
->orderBy('created_at', 'desc')
->first();

if ($latestProcessRequest) {
$query->where('process_id', $latestProcessRequest->process_id);
}
}

$query = $query->with([
'processRequest' => function ($q) use ($includeData) {
if (!$includeData) {
return $q->exclude(['data']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/tachometer-alt-average.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/fonts/pm-font/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<div class="info">
Icons generated with svgtofont. For add new icons, please check the README file
</div>
Expand All@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.css
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -55,6 +55,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

Binary file modifiedresources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,5 +53,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -54,7 +54,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

}
22 changes: 12 additions & 10 deletions resources/fonts/pm-font/processmaker-font.scss
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,8 +53,9 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand DownExpand Up@@ -95,6 +96,7 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";
$fp-tachometer-alt-average: "\ea28";
$fp-trash: "\ea29";
$fp-unlink: "\ea2a";

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1461c22
saving progress
CarliPinell Nov 22, 2024
e52e94a
Ready for PR
CarliPinell Dec 11, 2024
63ae6c7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
CarliPinell Dec 11, 2024
5c25ad7
Ready for PR based on epic/20297
CarliPinell Dec 16, 2024
4a8e7bf
Adding new component ParticipantHomeScren.vue
CarliPinell Dec 16, 2024
a126adc
Merge pull request #7818 from ProcessMaker/feature/FOUR-20298
nolanpro Dec 16, 2024
09d12bb
Ready for PR
CarliPinell Dec 16, 2024
365842a
Applying Code Styles, removing unused comments and fixing test unit
CarliPinell Dec 16, 2024
850f988
Ready for PR
CarliPinell Dec 16, 2024
dbc969b
Styles and fixes copied from feature/FOUR-20299
CarliPinell Dec 16, 2024
6164f98
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
aa4edca
Merge pull request #7829 from ProcessMaker/feature/FOUR-20299
boliviacoca Dec 17, 2024
70107b9
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
99f1b5f
Adding new component ProcessesDashboardsMenu.vue
CarliPinell Dec 17, 2024
bc2ce99
saving progress 2
CarliPinell Dec 17, 2024
88c162d
Saving progress 3
CarliPinell Dec 17, 2024
c569423
Saving progress 4
CarliPinell Dec 17, 2024
7119606
saving progress 6 router-view working good
CarliPinell Dec 18, 2024
bf7c690
Saving progress 7
CarliPinell Dec 18, 2024
25488d3
saving progress 8 ready for PR
CarliPinell Dec 18, 2024
6b9cdf7
saving progress 1 dynamic processes working fine
CarliPinell Dec 18, 2024
40b66ed
Saving progress 2
CarliPinell Dec 19, 2024
83d3693
Adding dynamic processes list and refactoring router-view calling for…
CarliPinell Dec 19, 2024
233026a
modifying router.js to call tasks/process/{id} and tasks/dashboard/{id}
CarliPinell Dec 19, 2024
cb22d9a
Saving progress Left Pane working, Process rendered ok in new Container
CarliPinell Dec 20, 2024
329b73f
Merge pull request #7835 from ProcessMaker/feature/FOUR-20300
nolanpro Jan 6, 2025
b5ef068
improvements on loadProcess method
CarliPinell Jan 6, 2025
421e022
Ready for PR
CarliPinell Jan 7, 2025
316fde4
solving conflicts
CarliPinell Jan 7, 2025
b2faf7f
Ready to start ticket merged with Epic branch
CarliPinell Jan 8, 2025
692d735
SAving progress 1
CarliPinell Jan 8, 2025
3159c1a
ready for PR
CarliPinell Jan 9, 2025
751ece8
improvements on styles
CarliPinell Jan 10, 2025
0a3a769
saving progress
CarliPinell Jan 10, 2025
5c2cec0
saving progress 2
CarliPinell Jan 13, 2025
b49d9c3
adding info button
CarliPinell Jan 13, 2025
0e5960e
saving progress 3
CarliPinell Jan 13, 2025
70bb230
Merge branch 'release-2025-winter' of github.com:ProcessMaker/process…
CarliPinell Jan 13, 2025
3db9105
Merge branch 'epic/FOUR-20297-b' of github.com:ProcessMaker/processma…
CarliPinell Jan 14, 2025
aabde4b
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Jan 14, 2025
92731e0
Modifying new route name for /inbox route
CarliPinell Jan 14, 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ class UserConfigurationController extends Controller
'tasks' => [
'isMenuCollapse' => true,
],
'tasks_inbox' => [
'isMenuCollapse' => false,
],
];

public function index()
Expand DownExpand Up@@ -54,6 +57,7 @@ public function store(Request $request)
'ui_configuration.cases' => 'required|array',
'ui_configuration.requests' => 'required|array',
'ui_configuration.tasks' => 'required|array',
'ui_configuration.tasks_inbox' => 'required|array',
]);
$uiConfiguration = json_encode($request->input('ui_configuration'));

Expand Down
16 changes: 12 additions & 4 deletions ProcessMaker/Http/Controllers/HomeController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,14 +14,22 @@ public function index(Request $request)
if (Auth::check()) {
// Redirect to home dynamic only if the package was enable
if (hasPackage('package-dynamic-ui')) {
$user = \Auth::user();
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
$user = Auth::user();

return redirect($homePage);
// Check if there is at least one custom dashboard per user
$customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD')
->where('assignable_id', $user->id)
->count() > 0;

if ($customDashboardExists) {
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);

return redirect($homePage);
}
}

// Redirect to the default view
return redirect('/requests');
return redirect('/inbox');
}
}

Expand Down
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';

if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All@@ -58,7 +60,9 @@ public function index()

$taskDraftsEnabled = TaskDraft::draftsEnabled();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled'));
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
15 changes: 14 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,20 @@ private function indexBaseQuery($request)
// Determine if the data should be included
$includeData = in_array('data', $includes);

$query = ProcessRequestToken::exclude(['data'])->with([
$query = ProcessRequestToken::exclude(['data']);

// If all_inbox is true and user has process requests, filter to only show the latest process
if ($request->has('all_inbox') && $request->input('all_inbox') === 'false') {
$latestProcessRequest = ProcessRequestToken::where('user_id', auth()->id())
->orderBy('created_at', 'desc')
->first();

if ($latestProcessRequest) {
$query->where('process_id', $latestProcessRequest->process_id);
}
}

$query = $query->with([
'processRequest' => function ($q) use ($includeData) {
if (!$includeData) {
return $q->exclude(['data']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/tachometer-alt-average.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/fonts/pm-font/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<div class="info">
Icons generated with svgtofont. For add new icons, please check the README file
</div>
Expand All@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.css
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -55,6 +55,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

Binary file modifiedresources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,5 +53,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -54,7 +54,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

}
22 changes: 12 additions & 10 deletions resources/fonts/pm-font/processmaker-font.scss
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,8 +53,9 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand DownExpand Up@@ -95,6 +96,7 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";
$fp-tachometer-alt-average: "\ea28";
$fp-trash: "\ea29";
$fp-unlink: "\ea2a";

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
1461c22
saving progress
CarliPinell Nov 22, 2024
e52e94a
Ready for PR
CarliPinell Dec 11, 2024
63ae6c7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
CarliPinell Dec 11, 2024
5c25ad7
Ready for PR based on epic/20297
CarliPinell Dec 16, 2024
4a8e7bf
Adding new component ParticipantHomeScren.vue
CarliPinell Dec 16, 2024
a126adc
Merge pull request #7818 from ProcessMaker/feature/FOUR-20298
nolanpro Dec 16, 2024
09d12bb
Ready for PR
CarliPinell Dec 16, 2024
365842a
Applying Code Styles, removing unused comments and fixing test unit
CarliPinell Dec 16, 2024
850f988
Ready for PR
CarliPinell Dec 16, 2024
dbc969b
Styles and fixes copied from feature/FOUR-20299
CarliPinell Dec 16, 2024
6164f98
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
aa4edca
Merge pull request #7829 from ProcessMaker/feature/FOUR-20299
boliviacoca Dec 17, 2024
70107b9
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Dec 17, 2024
99f1b5f
Adding new component ProcessesDashboardsMenu.vue
CarliPinell Dec 17, 2024
bc2ce99
saving progress 2
CarliPinell Dec 17, 2024
88c162d
Saving progress 3
CarliPinell Dec 17, 2024
c569423
Saving progress 4
CarliPinell Dec 17, 2024
7119606
saving progress 6 router-view working good
CarliPinell Dec 18, 2024
bf7c690
Saving progress 7
CarliPinell Dec 18, 2024
25488d3
saving progress 8 ready for PR
CarliPinell Dec 18, 2024
6b9cdf7
saving progress 1 dynamic processes working fine
CarliPinell Dec 18, 2024
40b66ed
Saving progress 2
CarliPinell Dec 19, 2024
83d3693
Adding dynamic processes list and refactoring router-view calling for…
CarliPinell Dec 19, 2024
233026a
modifying router.js to call tasks/process/{id} and tasks/dashboard/{id}
CarliPinell Dec 19, 2024
cb22d9a
Saving progress Left Pane working, Process rendered ok in new Container
CarliPinell Dec 20, 2024
329b73f
Merge pull request #7835 from ProcessMaker/feature/FOUR-20300
nolanpro Jan 6, 2025
b5ef068
improvements on loadProcess method
CarliPinell Jan 6, 2025
421e022
Ready for PR
CarliPinell Jan 7, 2025
316fde4
solving conflicts
CarliPinell Jan 7, 2025
b2faf7f
Ready to start ticket merged with Epic branch
CarliPinell Jan 8, 2025
692d735
SAving progress 1
CarliPinell Jan 8, 2025
3159c1a
ready for PR
CarliPinell Jan 9, 2025
751ece8
improvements on styles
CarliPinell Jan 10, 2025
0a3a769
saving progress
CarliPinell Jan 10, 2025
5c2cec0
saving progress 2
CarliPinell Jan 13, 2025
b49d9c3
adding info button
CarliPinell Jan 13, 2025
0e5960e
saving progress 3
CarliPinell Jan 13, 2025
70bb230
Merge branch 'release-2025-winter' of github.com:ProcessMaker/process…
CarliPinell Jan 13, 2025
3db9105
Merge branch 'epic/FOUR-20297-b' of github.com:ProcessMaker/processma…
CarliPinell Jan 14, 2025
aabde4b
Merge branch 'epic/FOUR-20297' of github.com:ProcessMaker/processmake…
CarliPinell Jan 14, 2025
92731e0
Modifying new route name for /inbox route
CarliPinell Jan 14, 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
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ class UserConfigurationController extends Controller
'tasks' => [
'isMenuCollapse' => true,
],
'tasks_inbox' => [
'isMenuCollapse' => false,
],
];

public function index()
Expand DownExpand Up@@ -54,6 +57,7 @@ public function store(Request $request)
'ui_configuration.cases' => 'required|array',
'ui_configuration.requests' => 'required|array',
'ui_configuration.tasks' => 'required|array',
'ui_configuration.tasks_inbox' => 'required|array',
]);
$uiConfiguration = json_encode($request->input('ui_configuration'));

Expand Down
16 changes: 12 additions & 4 deletions ProcessMaker/Http/Controllers/HomeController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,14 +14,22 @@ public function index(Request $request)
if (Auth::check()) {
// Redirect to home dynamic only if the package was enable
if (hasPackage('package-dynamic-ui')) {
$user = \Auth::user();
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);
$user = Auth::user();

return redirect($homePage);
// Check if there is at least one custom dashboard per user
$customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD')
->where('assignable_id', $user->id)
->count() > 0;

if ($customDashboardExists) {
$homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user);

return redirect($homePage);
}
}

// Redirect to the default view
return redirect('/requests');
return redirect('/inbox');
}
}

Expand Down
6 changes: 5 additions & 1 deletion ProcessMaker/Http/Controllers/TaskController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,8 @@ public function index()
{
$title = 'To Do Tasks';

$showOldTaskScreen = Request::path() !== 'inbox';

if (Request::input('status') == 'CLOSED') {
$title = 'Completed Tasks';
}
Expand All@@ -58,7 +60,9 @@ public function index()

$taskDraftsEnabled = TaskDraft::draftsEnabled();

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled'));
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'] ?? [];

return view('tasks.index', compact('title', 'userFilter', 'defaultColumns', 'taskDraftsEnabled', 'userConfiguration', 'showOldTaskScreen'));
}

public function edit(ProcessRequestToken $task, string $preview = '')
Expand Down
15 changes: 14 additions & 1 deletion ProcessMaker/Traits/TaskControllerIndexMethods.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,20 @@ private function indexBaseQuery($request)
// Determine if the data should be included
$includeData = in_array('data', $includes);

$query = ProcessRequestToken::exclude(['data'])->with([
$query = ProcessRequestToken::exclude(['data']);

// If all_inbox is true and user has process requests, filter to only show the latest process
if ($request->has('all_inbox') && $request->input('all_inbox') === 'false') {
$latestProcessRequest = ProcessRequestToken::where('user_id', auth()->id())
->orderBy('created_at', 'desc')
->first();

if ($latestProcessRequest) {
$query->where('process_id', $latestProcessRequest->process_id);
}
}

$query = $query->with([
'processRequest' => function ($q) use ($includeData) {
if (!$includeData) {
return $q->exclude(['data']);
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/tachometer-alt-average.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/fonts/pm-font/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<div class="info">
Icons generated with svgtofont. For add new icons, please check the README file
</div>
Expand All@@ -115,7 +115,7 @@ <h1>ProcessMaker Icons<sup>4.12.0+alpha-3</sup></h1>
</div>
<div class="icons">
<ul>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
<li class="class-icon"><i class="fp-bpmn-action-by-email"></i><p class="name">bpmn-action-by-email</p></li><li class="class-icon"><i class="fp-bpmn-data-connector"></i><p class="name">bpmn-data-connector</p></li><li class="class-icon"><i class="fp-bpmn-data-object"></i><p class="name">bpmn-data-object</p></li><li class="class-icon"><i class="fp-bpmn-data-store"></i><p class="name">bpmn-data-store</p></li><li class="class-icon"><i class="fp-bpmn-docusign"></i><p class="name">bpmn-docusign</p></li><li class="class-icon"><i class="fp-bpmn-end-event"></i><p class="name">bpmn-end-event</p></li><li class="class-icon"><i class="fp-bpmn-flowgenie"></i><p class="name">bpmn-flowgenie</p></li><li class="class-icon"><i class="fp-bpmn-gateway"></i><p class="name">bpmn-gateway</p></li><li class="class-icon"><i class="fp-bpmn-generic-gateway"></i><p class="name">bpmn-generic-gateway</p></li><li class="class-icon"><i class="fp-bpmn-idp"></i><p class="name">bpmn-idp</p></li><li class="class-icon"><i class="fp-bpmn-intermediate-event"></i><p class="name">bpmn-intermediate-event</p></li><li class="class-icon"><i class="fp-bpmn-pool"></i><p class="name">bpmn-pool</p></li><li class="class-icon"><i class="fp-bpmn-send-email"></i><p class="name">bpmn-send-email</p></li><li class="class-icon"><i class="fp-bpmn-start-event"></i><p class="name">bpmn-start-event</p></li><li class="class-icon"><i class="fp-bpmn-task"></i><p class="name">bpmn-task</p></li><li class="class-icon"><i class="fp-bpmn-text-annotation"></i><p class="name">bpmn-text-annotation</p></li><li class="class-icon"><i class="fp-brush-icon"></i><p class="name">brush-icon</p></li><li class="class-icon"><i class="fp-close"></i><p class="name">close</p></li><li class="class-icon"><i class="fp-cloud-download-outline"></i><p class="name">cloud-download-outline</p></li><li class="class-icon"><i class="fp-copy"></i><p class="name">copy</p></li><li class="class-icon"><i class="fp-desktop"></i><p class="name">desktop</p></li><li class="class-icon"><i class="fp-eye"></i><p class="name">eye</p></li><li class="class-icon"><i class="fp-fields-icon"></i><p class="name">fields-icon</p></li><li class="class-icon"><i class="fp-flowgenie-outline"></i><p class="name">flowgenie-outline</p></li><li class="class-icon"><i class="fp-folder-outline"></i><p class="name">folder-outline</p></li><li class="class-icon"><i class="fp-fullscreen"></i><p class="name">fullscreen</p></li><li class="class-icon"><i class="fp-github"></i><p class="name">github</p></li><li class="class-icon"><i class="fp-layout-icon"></i><p class="name">layout-icon</p></li><li class="class-icon"><i class="fp-map"></i><p class="name">map</p></li><li class="class-icon"><i class="fp-mobile"></i><p class="name">mobile</p></li><li class="class-icon"><i class="fp-pdf"></i><p class="name">pdf</p></li><li class="class-icon"><i class="fp-play-outline"></i><p class="name">play-outline</p></li><li class="class-icon"><i class="fp-plus"></i><p class="name">plus</p></li><li class="class-icon"><i class="fp-screen-outline"></i><p class="name">screen-outline</p></li><li class="class-icon"><i class="fp-script-outline"></i><p class="name">script-outline</p></li><li class="class-icon"><i class="fp-slack-notification"></i><p class="name">slack-notification</p></li><li class="class-icon"><i class="fp-slack"></i><p class="name">slack</p></li><li class="class-icon"><i class="fp-slideshow"></i><p class="name">slideshow</p></li><li class="class-icon"><i class="fp-table"></i><p class="name">table</p></li><li class="class-icon"><i class="fp-tachometer-alt-average"></i><p class="name">tachometer-alt-average</p></li><li class="class-icon"><i class="fp-trash"></i><p class="name">trash</p></li><li class="class-icon"><i class="fp-unlink"></i><p class="name">unlink</p></li>
</ul>
</div>
<p class="links">
Expand Down
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.css
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -55,6 +55,7 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

Binary file modifiedresources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,5 +53,6 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
17 changes: 9 additions & 8 deletions resources/fonts/pm-font/processmaker-font.module.less
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -54,7 +54,8 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

}
22 changes: 12 additions & 10 deletions resources/fonts/pm-font/processmaker-font.scss
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
@font-face {font-family: "processmaker-font";
src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/
src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1730322668195") format("woff2"),
url("processmaker-font.woff?t=1730322668195") format("woff"),
url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */
src: url('processmaker-font.eot?t=1736427523749'); /* IE9*/
src: url('processmaker-font.eot?t=1736427523749#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1736427523749") format("woff2"),
url("processmaker-font.woff?t=1736427523749") format("woff"),
url('processmaker-font.ttf?t=1736427523749') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1736427523749#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand DownExpand Up@@ -53,8 +53,9 @@
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-trash:before { content: "\ea28"; }
.fp-unlink:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }

$fp-bpmn-action-by-email: "\ea01";
$fp-bpmn-data-connector: "\ea02";
Expand DownExpand Up@@ -95,6 +96,7 @@ $fp-slack-notification: "\ea24";
$fp-slack: "\ea25";
$fp-slideshow: "\ea26";
$fp-table: "\ea27";
$fp-trash: "\ea28";
$fp-unlink: "\ea29";
$fp-tachometer-alt-average: "\ea28";
$fp-trash: "\ea29";
$fp-unlink: "\ea2a";

Loading