Skip to content

FOUR-20562 [20302] Implement Column setup PER PROCESS for Tasks and C… #7915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 23 additions & 1 deletion ProcessMaker/Http/Controllers/ProcessesCatalogueController.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use ProcessMaker\Models\ProcessCategory;
use ProcessMaker\Models\ProcessLaunchpad;
use ProcessMaker\Traits\HasControllerAddons;
use ProcessMaker\Package\SavedSearch\Models\SavedSearch;

/**
* @param Request $request
Expand Down Expand Up @@ -48,6 +49,27 @@ public function index(Request $request, Process $process = null)
return view('processes-catalogue.mobile', compact('title', 'process', 'currentUser', 'manager'));
}
$userConfiguration = (new UserConfigurationController())->index()['ui_configuration'];
return view('processes-catalogue.index', compact('process', 'currentUser', 'manager', 'userConfiguration'));

$defaultSavedSearch = $this->getDefaultSavedSearchId();

return view('processes-catalogue.index', compact('process', 'currentUser', 'manager', 'userConfiguration', 'defaultSavedSearch'));
}

/**
* Get the ID of the default saved search for tasks.
*
* @return int|null
*/
private function getDefaultSavedSearchId()
{
$id = null;
if (class_exists(SavedSearch::class)) {
$savedSearch = SavedSearch::firstSystemSearchFor(
Auth::user(),
SavedSearch::KEY_TASKS,
);
$id = $savedSearch->id;
}
return $id;
}
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,9 @@ Please follow the steps:
```text
npm install
```
2. Add the new svg icon file in the /processmaker/resources/icons
2. Add the new svg icon file in the /processmaker/resources/devhub/pm-font/svg
```text
/processmaker/resources/icons/my-new-icon.svg
/processmaker/resources/devhub/pm-font/svg/my-new-icon.svg
```
3.Run the follow command
```text
Expand Down
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions devhub/pm-font/svg/box-arrow-up-right.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 number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@

<div class="header">

<h1>ProcessMaker Icons<sup>4.12.0</sup></h1>
<h1>ProcessMaker Icons<sup>4.12.2</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</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-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>
<li class="class-icon"><i class="fp-arrow-left"></i><p class="name">arrow-left</p></li><li class="class-icon"><i class="fp-box-arrow-up-right"></i><p class="name">box-arrow-up-right</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
98 changes: 50 additions & 48 deletions resources/fonts/pm-font/processmaker-font.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: "processmaker-font";
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- */
src: url('processmaker-font.eot?t=1738008776900'); /* IE9*/
src: url('processmaker-font.eot?t=1738008776900#iefix') format('embedded-opentype'), /* IE6-IE8 */
url("processmaker-font.woff2?t=1738008776900") format("woff2"),
url("processmaker-font.woff?t=1738008776900") format("woff"),
url('processmaker-font.ttf?t=1738008776900') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
url('processmaker-font.svg?t=1738008776900#processmaker-font') format('svg'); /* iOS 4.1- */
}

[class^="fp-"], [class*=" fp-"] {
Expand All @@ -16,46 +16,48 @@
}


.fp-bpmn-action-by-email:before { content: "\ea01"; }
.fp-bpmn-data-connector:before { content: "\ea02"; }
.fp-bpmn-data-object:before { content: "\ea03"; }
.fp-bpmn-data-store:before { content: "\ea04"; }
.fp-bpmn-docusign:before { content: "\ea05"; }
.fp-bpmn-end-event:before { content: "\ea06"; }
.fp-bpmn-flowgenie:before { content: "\ea07"; }
.fp-bpmn-gateway:before { content: "\ea08"; }
.fp-bpmn-generic-gateway:before { content: "\ea09"; }
.fp-bpmn-idp:before { content: "\ea0a"; }
.fp-bpmn-intermediate-event:before { content: "\ea0b"; }
.fp-bpmn-pool:before { content: "\ea0c"; }
.fp-bpmn-send-email:before { content: "\ea0d"; }
.fp-bpmn-start-event:before { content: "\ea0e"; }
.fp-bpmn-task:before { content: "\ea0f"; }
.fp-bpmn-text-annotation:before { content: "\ea10"; }
.fp-brush-icon:before { content: "\ea11"; }
.fp-close:before { content: "\ea12"; }
.fp-cloud-download-outline:before { content: "\ea13"; }
.fp-copy:before { content: "\ea14"; }
.fp-desktop:before { content: "\ea15"; }
.fp-eye:before { content: "\ea16"; }
.fp-fields-icon:before { content: "\ea17"; }
.fp-flowgenie-outline:before { content: "\ea18"; }
.fp-folder-outline:before { content: "\ea19"; }
.fp-fullscreen:before { content: "\ea1a"; }
.fp-github:before { content: "\ea1b"; }
.fp-layout-icon:before { content: "\ea1c"; }
.fp-map:before { content: "\ea1d"; }
.fp-mobile:before { content: "\ea1e"; }
.fp-pdf:before { content: "\ea1f"; }
.fp-play-outline:before { content: "\ea20"; }
.fp-plus:before { content: "\ea21"; }
.fp-screen-outline:before { content: "\ea22"; }
.fp-script-outline:before { content: "\ea23"; }
.fp-slack-notification:before { content: "\ea24"; }
.fp-slack:before { content: "\ea25"; }
.fp-slideshow:before { content: "\ea26"; }
.fp-table:before { content: "\ea27"; }
.fp-tachometer-alt-average:before { content: "\ea28"; }
.fp-trash:before { content: "\ea29"; }
.fp-unlink:before { content: "\ea2a"; }
.fp-arrow-left:before { content: "\ea01"; }
.fp-box-arrow-up-right:before { content: "\ea02"; }
.fp-bpmn-action-by-email:before { content: "\ea03"; }
.fp-bpmn-data-connector:before { content: "\ea04"; }
.fp-bpmn-data-object:before { content: "\ea05"; }
.fp-bpmn-data-store:before { content: "\ea06"; }
.fp-bpmn-docusign:before { content: "\ea07"; }
.fp-bpmn-end-event:before { content: "\ea08"; }
.fp-bpmn-flowgenie:before { content: "\ea09"; }
.fp-bpmn-gateway:before { content: "\ea0a"; }
.fp-bpmn-generic-gateway:before { content: "\ea0b"; }
.fp-bpmn-idp:before { content: "\ea0c"; }
.fp-bpmn-intermediate-event:before { content: "\ea0d"; }
.fp-bpmn-pool:before { content: "\ea0e"; }
.fp-bpmn-send-email:before { content: "\ea0f"; }
.fp-bpmn-start-event:before { content: "\ea10"; }
.fp-bpmn-task:before { content: "\ea11"; }
.fp-bpmn-text-annotation:before { content: "\ea12"; }
.fp-brush-icon:before { content: "\ea13"; }
.fp-close:before { content: "\ea14"; }
.fp-cloud-download-outline:before { content: "\ea15"; }
.fp-copy:before { content: "\ea16"; }
.fp-desktop:before { content: "\ea17"; }
.fp-eye:before { content: "\ea18"; }
.fp-fields-icon:before { content: "\ea19"; }
.fp-flowgenie-outline:before { content: "\ea1a"; }
.fp-folder-outline:before { content: "\ea1b"; }
.fp-fullscreen:before { content: "\ea1c"; }
.fp-github:before { content: "\ea1d"; }
.fp-layout-icon:before { content: "\ea1e"; }
.fp-map:before { content: "\ea1f"; }
.fp-mobile:before { content: "\ea20"; }
.fp-pdf:before { content: "\ea21"; }
.fp-play-outline:before { content: "\ea22"; }
.fp-plus:before { content: "\ea23"; }
.fp-screen-outline:before { content: "\ea24"; }
.fp-script-outline:before { content: "\ea25"; }
.fp-slack-notification:before { content: "\ea26"; }
.fp-slack:before { content: "\ea27"; }
.fp-slideshow:before { content: "\ea28"; }
.fp-table:before { content: "\ea29"; }
.fp-tachometer-alt-average:before { content: "\ea2a"; }
.fp-trash:before { content: "\ea2b"; }
.fp-unlink:before { content: "\ea2c"; }

Binary file modified resources/fonts/pm-font/processmaker-font.eot
Binary file not shown.
Loading
Loading